diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 15:53:58 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 15:53:58 +0100 |
| commit | 2492891f112caac6076ce49721d9d5d78a152c3a (patch) | |
| tree | 36dd11a60bd963e6bd44e2e312b6e4b57d1849ea /plugins | |
| parent | 3c829c50a8f705402bdc759946d49ae7caebd003 (diff) | |
New upstream version 0.26.4upstream/0.26.4
Diffstat (limited to 'plugins')
50 files changed, 24319 insertions, 24415 deletions
diff --git a/plugins/authenticator/shotwell-authenticator.h b/plugins/authenticator/shotwell-authenticator.h index d73d0d0..67c3c36 100644 --- a/plugins/authenticator/shotwell-authenticator.h +++ b/plugins/authenticator/shotwell-authenticator.h @@ -1,4 +1,4 @@ -/* shotwell-authenticator.h generated by valac 0.34.7, the Vala compiler, do not modify */ +/* shotwell-authenticator.h generated by valac 0.36.6, the Vala compiler, do not modify */ #ifndef __PLUGINS_AUTHENTICATOR_SHOTWELL_AUTHENTICATOR_H__ diff --git a/plugins/authenticator/shotwell-authenticator.vapi b/plugins/authenticator/shotwell-authenticator.vapi index 3271694..ed10082 100644 --- a/plugins/authenticator/shotwell-authenticator.vapi +++ b/plugins/authenticator/shotwell-authenticator.vapi @@ -1,4 +1,4 @@ -/* shotwell-authenticator.vapi generated by valac 0.34.7, do not modify. */ +/* shotwell-authenticator.vapi generated by valac 0.36.6, do not modify. */ namespace Publishing { namespace Authenticator { diff --git a/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c b/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c index 967e976..480b915 100644 --- a/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c +++ b/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c @@ -1,4 +1,4 @@ -/* FacebookPublishingAuthenticator.c generated by valac 0.34.7, the Vala compiler +/* FacebookPublishingAuthenticator.c generated by valac 0.36.6, the Vala compiler * generated from FacebookPublishingAuthenticator.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -47,6 +47,12 @@ typedef struct _PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLoca #define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL))) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) typedef struct _PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneParamSpecLocaleLookup PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneParamSpecLocaleLookup; +enum { + PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOGIN_SUCCEEDED_SIGNAL, + PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOGIN_FAILED_SIGNAL, + PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LAST_SIGNAL +}; +static guint publishing_authenticator_shotwell_facebook_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LAST_SIGNAL] = {0}; #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK (publishing_authenticator_shotwell_facebook_facebook_get_type ()) #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook)) @@ -120,7 +126,7 @@ static gint publishing_authenticator_shotwell_facebook_web_authentication_pane_l static gint _publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_table_size_ = 0; static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_parent_class = NULL; static gpointer publishing_authenticator_shotwell_facebook_facebook_parent_class = NULL; -static SpitPublishingAuthenticatorIface* publishing_authenticator_shotwell_facebook_facebook_spit_publishing_authenticator_parent_iface = NULL; +static SpitPublishingAuthenticatorIface * publishing_authenticator_shotwell_facebook_facebook_spit_publishing_authenticator_parent_iface = NULL; #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_APPLICATION_ID "1612018629063184" GType publishing_authenticator_shotwell_facebook_web_authentication_pane_get_type (void) G_GNUC_CONST; @@ -145,8 +151,8 @@ gboolean publishing_authenticator_shotwell_facebook_web_authentication_pane_is_c enum { PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP_DUMMY_PROPERTY }; -static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_finalize (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* obj); -static void publishing_authenticator_shotwell_facebook_web_authentication_pane_finalize (GObject* obj); +static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_finalize (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * obj); +static void publishing_authenticator_shotwell_facebook_web_authentication_pane_finalize (GObject * obj); GType publishing_authenticator_shotwell_facebook_facebook_get_type (void) G_GNUC_CONST; #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebookPrivate)) enum { @@ -184,7 +190,7 @@ static void _publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pan static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed (PublishingAuthenticatorShotwellFacebookFacebook* self); static void _publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_failed (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _sender, gpointer self); static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_session (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* good_login_uri); -static void publishing_authenticator_shotwell_facebook_facebook_finalize (GObject* obj); +static void publishing_authenticator_shotwell_facebook_facebook_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); @@ -192,8 +198,8 @@ static gint _vala_array_length (gpointer array); PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* publishing_authenticator_shotwell_facebook_web_authentication_pane_construct (GType object_type) { PublishingAuthenticatorShotwellFacebookWebAuthenticationPane * self = NULL; - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp0_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_get_login_url (); #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -204,62 +210,62 @@ PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* publishing_authent _g_free0 (_tmp1_); #line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return self; -#line 200 "FacebookPublishingAuthenticator.c" +#line 206 "FacebookPublishingAuthenticator.c" } PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* publishing_authenticator_shotwell_facebook_web_authentication_pane_new (void) { #line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return publishing_authenticator_shotwell_facebook_web_authentication_pane_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE); -#line 207 "FacebookPublishingAuthenticator.c" +#line 213 "FacebookPublishingAuthenticator.c" } static gpointer _publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref0 (gpointer self) { #line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return self ? publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (self) : NULL; -#line 214 "FacebookPublishingAuthenticator.c" +#line 220 "FacebookPublishingAuthenticator.c" } static gboolean string_contains (const gchar* self, const gchar* needle) { gboolean result = FALSE; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; -#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp0_; + gchar* _tmp1_; +#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = needle; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_ != NULL; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 234 "FacebookPublishingAuthenticator.c" +#line 240 "FacebookPublishingAuthenticator.c" } static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane_get_system_locale_as_facebook_locale (void) { gchar* result = NULL; const gchar* raw_system_locale = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; gboolean _tmp1_ = FALSE; - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; gchar* system_locale = NULL; - const gchar* _tmp5_ = NULL; - gchar** _tmp6_ = NULL; - gchar** _tmp7_ = NULL; - gchar** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup** _tmp12_ = NULL; - gint _tmp12__length1 = 0; - gchar* _tmp43_ = NULL; + const gchar* _tmp5_; + gchar** _tmp6_; + gchar** _tmp7_; + gchar** _tmp8_; + gint _tmp8__length1; + const gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup** _tmp12_; + gint _tmp12__length1; + gchar* _tmp43_; #line 93 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp0_ = setlocale (LC_ALL, ""); #line 93 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -270,26 +276,26 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane if (_tmp2_ == NULL) { #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp1_ = TRUE; -#line 266 "FacebookPublishingAuthenticator.c" +#line 272 "FacebookPublishingAuthenticator.c" } else { - const gchar* _tmp3_ = NULL; + const gchar* _tmp3_; #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp3_ = raw_system_locale; #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp1_ = g_strcmp0 (_tmp3_, "") == 0; -#line 273 "FacebookPublishingAuthenticator.c" +#line 279 "FacebookPublishingAuthenticator.c" } #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" if (_tmp1_) { -#line 277 "FacebookPublishingAuthenticator.c" - gchar* _tmp4_ = NULL; +#line 283 "FacebookPublishingAuthenticator.c" + gchar* _tmp4_; #line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp4_ = g_strdup ("www"); #line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" result = _tmp4_; #line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return result; -#line 285 "FacebookPublishingAuthenticator.c" +#line 291 "FacebookPublishingAuthenticator.c" } #line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp5_ = raw_system_locale; @@ -313,7 +319,7 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane _tmp12_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_table; #line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp12__length1 = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_table_length1; -#line 309 "FacebookPublishingAuthenticator.c" +#line 315 "FacebookPublishingAuthenticator.c" { PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup** locale_lookup_collection = NULL; gint locale_lookup_collection_length1 = 0; @@ -325,26 +331,26 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane locale_lookup_collection_length1 = _tmp12__length1; #line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" for (locale_lookup_it = 0; locale_lookup_it < _tmp12__length1; locale_lookup_it = locale_lookup_it + 1) { -#line 321 "FacebookPublishingAuthenticator.c" - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp13_ = NULL; +#line 327 "FacebookPublishingAuthenticator.c" + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp13_; PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* locale_lookup = NULL; #line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp13_ = _publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref0 (locale_lookup_collection[locale_lookup_it]); #line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" locale_lookup = _tmp13_; -#line 328 "FacebookPublishingAuthenticator.c" +#line 334 "FacebookPublishingAuthenticator.c" { - const gchar* _tmp14_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp29_ = NULL; - const gchar* _tmp30_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp40_ = NULL; - const gchar* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; + const gchar* _tmp14_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp15_; + const gchar* _tmp16_; + gboolean _tmp17_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp18_; + const gchar* _tmp19_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp29_; + const gchar* _tmp30_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp40_; + const gchar* _tmp41_; + gchar* _tmp42_; #line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp14_ = system_locale; #line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -359,7 +365,7 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane _publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup); #line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" continue; -#line 355 "FacebookPublishingAuthenticator.c" +#line 361 "FacebookPublishingAuthenticator.c" } #line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp18_ = locale_lookup; @@ -367,13 +373,13 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane _tmp19_ = _tmp18_->exception_code; #line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" if (_tmp19_ != NULL) { -#line 363 "FacebookPublishingAuthenticator.c" - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - gboolean _tmp25_ = FALSE; +#line 369 "FacebookPublishingAuthenticator.c" + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp20_; + const gchar* _tmp21_; + const gchar* _tmp22_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp23_; + const gchar* _tmp24_; + gboolean _tmp25_; #line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp20_ = locale_lookup; #line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -390,10 +396,10 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane _tmp25_ = string_contains (_tmp22_, _tmp24_); #line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" if (_tmp25_) { -#line 386 "FacebookPublishingAuthenticator.c" - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; +#line 392 "FacebookPublishingAuthenticator.c" + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp26_; + const gchar* _tmp27_; + gchar* _tmp28_; #line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp26_ = locale_lookup; #line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -408,7 +414,7 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane _g_free0 (system_locale); #line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return result; -#line 404 "FacebookPublishingAuthenticator.c" +#line 410 "FacebookPublishingAuthenticator.c" } } #line 110 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -417,13 +423,13 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane _tmp30_ = _tmp29_->exception_code_2; #line 110 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" if (_tmp30_ != NULL) { -#line 413 "FacebookPublishingAuthenticator.c" - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp31_ = NULL; - const gchar* _tmp32_ = NULL; - const gchar* _tmp33_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp34_ = NULL; - const gchar* _tmp35_ = NULL; - gboolean _tmp36_ = FALSE; +#line 419 "FacebookPublishingAuthenticator.c" + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp31_; + const gchar* _tmp32_; + const gchar* _tmp33_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp34_; + const gchar* _tmp35_; + gboolean _tmp36_; #line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp31_ = locale_lookup; #line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -440,10 +446,10 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane _tmp36_ = string_contains (_tmp33_, _tmp35_); #line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" if (_tmp36_) { -#line 436 "FacebookPublishingAuthenticator.c" - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp37_ = NULL; - const gchar* _tmp38_ = NULL; - gchar* _tmp39_ = NULL; +#line 442 "FacebookPublishingAuthenticator.c" + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp37_; + const gchar* _tmp38_; + gchar* _tmp39_; #line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp37_ = locale_lookup; #line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -458,7 +464,7 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane _g_free0 (system_locale); #line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return result; -#line 454 "FacebookPublishingAuthenticator.c" +#line 460 "FacebookPublishingAuthenticator.c" } } #line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -475,7 +481,7 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane _g_free0 (system_locale); #line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return result; -#line 471 "FacebookPublishingAuthenticator.c" +#line 477 "FacebookPublishingAuthenticator.c" } } } @@ -487,15 +493,15 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane _g_free0 (system_locale); #line 121 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return result; -#line 483 "FacebookPublishingAuthenticator.c" +#line 489 "FacebookPublishingAuthenticator.c" } static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane_get_login_url (void) { gchar* result = NULL; gchar* facebook_locale = NULL; - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; #line 125 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp0_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_get_system_locale_as_facebook_locale (); #line 125 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -510,46 +516,46 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane _g_free0 (facebook_locale); #line 127 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return result; -#line 504 "FacebookPublishingAuthenticator.c" +#line 510 "FacebookPublishingAuthenticator.c" } static gint string_index_of_char (const gchar* self, gunichar c, gint start_index) { gint result = 0; gchar* _result_ = NULL; - gint _tmp0_ = 0; - gunichar _tmp1_ = 0U; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; -#line 1007 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint _tmp0_; + gunichar _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; +#line 1031 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = c; -#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_); -#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 529 "FacebookPublishingAuthenticator.c" - gchar* _tmp4_ = NULL; -#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 535 "FacebookPublishingAuthenticator.c" + gchar* _tmp4_; +#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 537 "FacebookPublishingAuthenticator.c" +#line 543 "FacebookPublishingAuthenticator.c" } else { -#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = -1; -#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 543 "FacebookPublishingAuthenticator.c" +#line 549 "FacebookPublishingAuthenticator.c" } } @@ -557,238 +563,280 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde static gchar* string_slice (const gchar* self, glong start, glong end) { gchar* result = NULL; glong string_length = 0L; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - glong _tmp2_ = 0L; - glong _tmp5_ = 0L; + gint _tmp0_; + gint _tmp1_; + glong _tmp2_; + glong _tmp5_; gboolean _tmp8_ = FALSE; - glong _tmp9_ = 0L; + glong _tmp9_; gboolean _tmp12_ = FALSE; - glong _tmp13_ = 0L; - glong _tmp16_ = 0L; - glong _tmp17_ = 0L; - glong _tmp18_ = 0L; - glong _tmp19_ = 0L; - glong _tmp20_ = 0L; - gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp13_; + glong _tmp16_; + glong _tmp17_; + glong _tmp18_; + glong _tmp19_; + glong _tmp20_; + gchar* _tmp21_; +#line 1355 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { -#line 577 "FacebookPublishingAuthenticator.c" - glong _tmp3_ = 0L; - glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 583 "FacebookPublishingAuthenticator.c" + glong _tmp3_; + glong _tmp4_; +#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; -#line 586 "FacebookPublishingAuthenticator.c" +#line 592 "FacebookPublishingAuthenticator.c" } -#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { -#line 592 "FacebookPublishingAuthenticator.c" - glong _tmp6_ = 0L; - glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 598 "FacebookPublishingAuthenticator.c" + glong _tmp6_; + glong _tmp7_; +#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; -#line 601 "FacebookPublishingAuthenticator.c" +#line 607 "FacebookPublishingAuthenticator.c" } -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { -#line 607 "FacebookPublishingAuthenticator.c" - glong _tmp10_ = 0L; - glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 613 "FacebookPublishingAuthenticator.c" + glong _tmp10_; + glong _tmp11_; +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; -#line 616 "FacebookPublishingAuthenticator.c" +#line 622 "FacebookPublishingAuthenticator.c" } else { -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = FALSE; -#line 620 "FacebookPublishingAuthenticator.c" +#line 626 "FacebookPublishingAuthenticator.c" } -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { -#line 628 "FacebookPublishingAuthenticator.c" - glong _tmp14_ = 0L; - glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 634 "FacebookPublishingAuthenticator.c" + glong _tmp14_; + glong _tmp15_; +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; -#line 637 "FacebookPublishingAuthenticator.c" +#line 643 "FacebookPublishingAuthenticator.c" } else { -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 641 "FacebookPublishingAuthenticator.c" +#line 647 "FacebookPublishingAuthenticator.c" } -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 663 "FacebookPublishingAuthenticator.c" +#line 669 "FacebookPublishingAuthenticator.c" } static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 676 "FacebookPublishingAuthenticator.c" +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if ((*((gchar*) self)) == '\0') { +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp1_ = TRUE; +#line 688 "FacebookPublishingAuthenticator.c" + } else { + const gchar* _tmp2_; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp2_ = old; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; +#line 695 "FacebookPublishingAuthenticator.c" + } +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if (_tmp1_) { +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp0_ = TRUE; +#line 701 "FacebookPublishingAuthenticator.c" + } else { + const gchar* _tmp3_; + const gchar* _tmp4_; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp3_ = old; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp4_ = replacement; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; +#line 711 "FacebookPublishingAuthenticator.c" + } +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if (_tmp0_) { +#line 715 "FacebookPublishingAuthenticator.c" + gchar* _tmp5_; +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp5_ = g_strdup (self); +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp5_; +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + return result; +#line 723 "FacebookPublishingAuthenticator.c" + } { GRegex* regex = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - GRegex* _tmp3_ = NULL; - GRegex* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - GRegex* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp0_ = old; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp2_ = _tmp1_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp4_ = _tmp3_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _g_free0 (_tmp2_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - regex = _tmp4_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + GRegex* _tmp9_; + GRegex* _tmp10_; + gchar* _tmp11_ = NULL; + GRegex* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp6_ = old; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp7_ = g_regex_escape_string (_tmp6_, -1); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp8_ = _tmp7_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp10_ = _tmp9_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp8_); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + regex = _tmp10_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 707 "FacebookPublishingAuthenticator.c" +#line 755 "FacebookPublishingAuthenticator.c" goto __catch0_g_regex_error; } -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 716 "FacebookPublishingAuthenticator.c" +#line 764 "FacebookPublishingAuthenticator.c" } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp6_ = regex; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp7_ = replacement; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp5_ = _tmp8_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp12_ = regex; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp13_ = replacement; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = _tmp14_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 732 "FacebookPublishingAuthenticator.c" +#line 780 "FacebookPublishingAuthenticator.c" goto __catch0_g_regex_error; } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 743 "FacebookPublishingAuthenticator.c" +#line 791 "FacebookPublishingAuthenticator.c" } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp9_ = _tmp5_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp5_ = NULL; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - result = _tmp9_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _g_free0 (_tmp5_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp15_ = _tmp11_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = NULL; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp15_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp11_); +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 757 "FacebookPublishingAuthenticator.c" +#line 805 "FacebookPublishingAuthenticator.c" } goto __finally0; __catch0_g_regex_error: { GError* e = NULL; -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 771 "FacebookPublishingAuthenticator.c" +#line 819 "FacebookPublishingAuthenticator.c" } __finally0: -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 782 "FacebookPublishingAuthenticator.c" +#line 830 "FacebookPublishingAuthenticator.c" } } @@ -796,21 +844,21 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* static void publishing_authenticator_shotwell_facebook_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base) { PublishingAuthenticatorShotwellFacebookWebAuthenticationPane * self; gchar* loaded_url = NULL; - WebKitWebView* _tmp0_ = NULL; - WebKitWebView* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; - const gchar* _tmp22_ = NULL; - gboolean _tmp23_ = FALSE; - const gchar* _tmp28_ = NULL; - gboolean _tmp29_ = FALSE; + WebKitWebView* _tmp0_; + WebKitWebView* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + const gchar* _tmp9_; + gboolean _tmp10_; + const gchar* _tmp22_; + gboolean _tmp23_; + const gchar* _tmp28_; + gboolean _tmp29_; #line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellFacebookWebAuthenticationPane); #line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -845,20 +893,20 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_r _tmp10_ = string_contains (_tmp9_, "?"); #line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" if (_tmp10_) { -#line 839 "FacebookPublishingAuthenticator.c" +#line 887 "FacebookPublishingAuthenticator.c" gint index = 0; - const gchar* _tmp11_ = NULL; - gint _tmp12_ = 0; + const gchar* _tmp11_; + gint _tmp12_; gchar* params = NULL; - const gchar* _tmp13_ = NULL; - gint _tmp14_ = 0; - const gchar* _tmp15_ = NULL; - gint _tmp16_ = 0; - gint _tmp17_ = 0; - gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; + const gchar* _tmp13_; + gint _tmp14_; + const gchar* _tmp15_; + gint _tmp16_; + gint _tmp17_; + gchar* _tmp18_; + const gchar* _tmp19_; + const gchar* _tmp20_; + gchar* _tmp21_; #line 136 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp11_ = loaded_url; #line 136 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -891,7 +939,7 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_r loaded_url = _tmp21_; #line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _g_free0 (params); -#line 885 "FacebookPublishingAuthenticator.c" +#line 933 "FacebookPublishingAuthenticator.c" } #line 142 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp22_ = loaded_url; @@ -899,11 +947,11 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_r _tmp23_ = string_contains (_tmp22_, "login_success"); #line 142 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" if (_tmp23_) { -#line 893 "FacebookPublishingAuthenticator.c" - WebKitWebView* _tmp24_ = NULL; - WebKitWebView* _tmp25_ = NULL; - const gchar* _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; +#line 941 "FacebookPublishingAuthenticator.c" + WebKitWebView* _tmp24_; + WebKitWebView* _tmp25_; + const gchar* _tmp26_; + const gchar* _tmp27_; #line 143 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" publishing_authenticator_shotwell_facebook_web_authentication_pane_cache_dirty = TRUE; #line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -915,14 +963,14 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_r #line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp27_ = _tmp26_; #line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" - g_signal_emit_by_name (self, "login-succeeded", _tmp27_); + g_signal_emit (self, publishing_authenticator_shotwell_facebook_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOGIN_SUCCEEDED_SIGNAL], 0, _tmp27_); #line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _g_object_unref0 (_tmp25_); #line 145 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _g_free0 (loaded_url); #line 145 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return; -#line 916 "FacebookPublishingAuthenticator.c" +#line 964 "FacebookPublishingAuthenticator.c" } #line 149 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp28_ = loaded_url; @@ -931,46 +979,46 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_r #line 149 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" if (_tmp29_) { #line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" - g_signal_emit_by_name (self, "login-failed"); + g_signal_emit (self, publishing_authenticator_shotwell_facebook_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOGIN_FAILED_SIGNAL], 0); #line 151 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _g_free0 (loaded_url); #line 151 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return; -#line 930 "FacebookPublishingAuthenticator.c" +#line 978 "FacebookPublishingAuthenticator.c" } #line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _g_free0 (loaded_url); -#line 934 "FacebookPublishingAuthenticator.c" +#line 982 "FacebookPublishingAuthenticator.c" } gboolean publishing_authenticator_shotwell_facebook_web_authentication_pane_is_cache_dirty (void) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 156 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp0_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_cache_dirty; #line 156 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" result = _tmp0_; #line 156 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return result; -#line 947 "FacebookPublishingAuthenticator.c" +#line 995 "FacebookPublishingAuthenticator.c" } static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_construct (GType object_type, const gchar* prefix, const gchar* translation, const gchar* exception_code, const gchar* exception_translation, const gchar* exception_code_2, const gchar* exception_translation_2) { PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; + const gchar* _tmp8_; + gchar* _tmp9_; + const gchar* _tmp10_; + gchar* _tmp11_; #line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" g_return_val_if_fail (prefix != NULL, NULL); #line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -1027,21 +1075,21 @@ static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* self->exception_translation_2 = _tmp11_; #line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return self; -#line 1021 "FacebookPublishingAuthenticator.c" +#line 1069 "FacebookPublishingAuthenticator.c" } static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new (const gchar* prefix, const gchar* translation, const gchar* exception_code, const gchar* exception_translation, const gchar* exception_code_2, const gchar* exception_translation_2) { #line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP, prefix, translation, exception_code, exception_translation, exception_code_2, exception_translation_2); -#line 1028 "FacebookPublishingAuthenticator.c" +#line 1076 "FacebookPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_init (GValue* value) { #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" value->data[0].v_pointer = NULL; -#line 1035 "FacebookPublishingAuthenticator.c" +#line 1083 "FacebookPublishingAuthenticator.c" } @@ -1050,7 +1098,7 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_v if (value->data[0].v_pointer) { #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref (value->data[0].v_pointer); -#line 1044 "FacebookPublishingAuthenticator.c" +#line 1092 "FacebookPublishingAuthenticator.c" } } @@ -1060,11 +1108,11 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_v if (src_value->data[0].v_pointer) { #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" dest_value->data[0].v_pointer = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (src_value->data[0].v_pointer); -#line 1054 "FacebookPublishingAuthenticator.c" +#line 1102 "FacebookPublishingAuthenticator.c" } else { #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" dest_value->data[0].v_pointer = NULL; -#line 1058 "FacebookPublishingAuthenticator.c" +#line 1106 "FacebookPublishingAuthenticator.c" } } @@ -1072,66 +1120,66 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_v static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_peek_pointer (const GValue* value) { #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return value->data[0].v_pointer; -#line 1066 "FacebookPublishingAuthenticator.c" +#line 1114 "FacebookPublishingAuthenticator.c" } static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" if (collect_values[0].v_pointer) { -#line 1073 "FacebookPublishingAuthenticator.c" - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* object; +#line 1121 "FacebookPublishingAuthenticator.c" + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * object; object = collect_values[0].v_pointer; #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" if (object->parent_instance.g_class == NULL) { #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1080 "FacebookPublishingAuthenticator.c" +#line 1128 "FacebookPublishingAuthenticator.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1084 "FacebookPublishingAuthenticator.c" +#line 1132 "FacebookPublishingAuthenticator.c" } #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" value->data[0].v_pointer = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (object); -#line 1088 "FacebookPublishingAuthenticator.c" +#line 1136 "FacebookPublishingAuthenticator.c" } else { #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" value->data[0].v_pointer = NULL; -#line 1092 "FacebookPublishingAuthenticator.c" +#line 1140 "FacebookPublishingAuthenticator.c" } #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return NULL; -#line 1096 "FacebookPublishingAuthenticator.c" +#line 1144 "FacebookPublishingAuthenticator.c" } static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup** object_p; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup ** object_p; object_p = collect_values[0].v_pointer; #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" if (!object_p) { #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1107 "FacebookPublishingAuthenticator.c" +#line 1155 "FacebookPublishingAuthenticator.c" } #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" if (!value->data[0].v_pointer) { #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" *object_p = NULL; -#line 1113 "FacebookPublishingAuthenticator.c" +#line 1161 "FacebookPublishingAuthenticator.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" *object_p = value->data[0].v_pointer; -#line 1117 "FacebookPublishingAuthenticator.c" +#line 1165 "FacebookPublishingAuthenticator.c" } else { #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" *object_p = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (value->data[0].v_pointer); -#line 1121 "FacebookPublishingAuthenticator.c" +#line 1169 "FacebookPublishingAuthenticator.c" } #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return NULL; -#line 1125 "FacebookPublishingAuthenticator.c" +#line 1173 "FacebookPublishingAuthenticator.c" } @@ -1145,7 +1193,7 @@ static GParamSpec* publishing_authenticator_shotwell_facebook_web_authentication G_PARAM_SPEC (spec)->value_type = object_type; #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return G_PARAM_SPEC (spec); -#line 1139 "FacebookPublishingAuthenticator.c" +#line 1187 "FacebookPublishingAuthenticator.c" } @@ -1154,12 +1202,12 @@ static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pa g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP), NULL); #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return value->data[0].v_pointer; -#line 1148 "FacebookPublishingAuthenticator.c" +#line 1196 "FacebookPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_set_locale_lookup (GValue* value, gpointer v_object) { - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* old; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * old; #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP)); #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -1174,23 +1222,23 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_v value->data[0].v_pointer = v_object; #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (value->data[0].v_pointer); -#line 1168 "FacebookPublishingAuthenticator.c" +#line 1216 "FacebookPublishingAuthenticator.c" } else { #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" value->data[0].v_pointer = NULL; -#line 1172 "FacebookPublishingAuthenticator.c" +#line 1220 "FacebookPublishingAuthenticator.c" } #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" if (old) { #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref (old); -#line 1178 "FacebookPublishingAuthenticator.c" +#line 1226 "FacebookPublishingAuthenticator.c" } } static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_take_locale_lookup (GValue* value, gpointer v_object) { - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* old; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * old; #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP)); #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -1203,17 +1251,17 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_v g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" value->data[0].v_pointer = v_object; -#line 1197 "FacebookPublishingAuthenticator.c" +#line 1245 "FacebookPublishingAuthenticator.c" } else { #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" value->data[0].v_pointer = NULL; -#line 1201 "FacebookPublishingAuthenticator.c" +#line 1249 "FacebookPublishingAuthenticator.c" } #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" if (old) { #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref (old); -#line 1207 "FacebookPublishingAuthenticator.c" +#line 1255 "FacebookPublishingAuthenticator.c" } } @@ -1223,18 +1271,18 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_l publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_parent_class = g_type_class_peek_parent (klass); #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" ((PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookupClass *) klass)->finalize = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_finalize; -#line 1217 "FacebookPublishingAuthenticator.c" +#line 1265 "FacebookPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_instance_init (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * self) { #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" self->ref_count = 1; -#line 1224 "FacebookPublishingAuthenticator.c" +#line 1272 "FacebookPublishingAuthenticator.c" } -static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_finalize (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* obj) { +static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_finalize (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * obj) { PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * self; #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP, PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup); @@ -1252,7 +1300,7 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_l _g_free0 (self->exception_code_2); #line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _g_free0 (self->exception_translation_2); -#line 1246 "FacebookPublishingAuthenticator.c" +#line 1294 "FacebookPublishingAuthenticator.c" } @@ -1271,18 +1319,18 @@ static GType publishing_authenticator_shotwell_facebook_web_authentication_pane_ static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (gpointer instance) { - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* self; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * self; self = instance; #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" g_atomic_int_inc (&self->ref_count); #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return instance; -#line 1271 "FacebookPublishingAuthenticator.c" +#line 1319 "FacebookPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref (gpointer instance) { - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* self; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * self; self = instance; #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1290,68 +1338,68 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_l PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP_GET_CLASS (self)->finalize (self); #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1284 "FacebookPublishingAuthenticator.c" +#line 1332 "FacebookPublishingAuthenticator.c" } } static void publishing_authenticator_shotwell_facebook_web_authentication_pane_class_init (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneClass * klass) { - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp0_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp1_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp2_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp3_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp4_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp5_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp6_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp7_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp8_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp9_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp10_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp11_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp12_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp13_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp14_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp15_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp16_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp17_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp18_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp19_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp20_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp21_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp22_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp23_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp24_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp25_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp26_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp27_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp28_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp29_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp30_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp31_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp32_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp33_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp34_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp35_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp36_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp37_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp38_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp39_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp40_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp41_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp42_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp43_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp44_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup** _tmp45_ = NULL; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp0_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp1_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp2_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp3_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp4_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp5_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp6_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp7_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp8_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp9_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp10_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp11_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp12_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp13_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp14_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp15_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp16_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp17_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp18_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp19_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp20_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp21_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp22_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp23_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp24_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp25_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp26_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp27_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp28_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp29_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp30_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp31_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp32_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp33_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp34_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp35_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp36_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp37_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp38_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp39_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp40_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp41_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp42_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp43_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp44_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup** _tmp45_; #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" publishing_authenticator_shotwell_facebook_web_authentication_pane_parent_class = g_type_class_peek_parent (klass); #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" - ((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*)(ShotwellPluginsCommonWebAuthenticationPane*)) publishing_authenticator_shotwell_facebook_web_authentication_pane_real_on_page_load; + ((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*) (ShotwellPluginsCommonWebAuthenticationPane *)) publishing_authenticator_shotwell_facebook_web_authentication_pane_real_on_page_load; #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_facebook_web_authentication_pane_finalize; #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" - g_signal_new ("login_succeeded", PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); + publishing_authenticator_shotwell_facebook_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOGIN_SUCCEEDED_SIGNAL] = g_signal_new ("login-succeeded", PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" - g_signal_new ("login_failed", PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + publishing_authenticator_shotwell_facebook_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOGIN_FAILED_SIGNAL] = g_signal_new ("login-failed", PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp0_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("es", "es-la", "ES", "es-es", NULL, NULL); #line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -1538,7 +1586,7 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_c publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_table = _tmp45_; #line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_table_length1 = 45; -#line 1532 "FacebookPublishingAuthenticator.c" +#line 1580 "FacebookPublishingAuthenticator.c" } @@ -1546,13 +1594,13 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_i } -static void publishing_authenticator_shotwell_facebook_web_authentication_pane_finalize (GObject* obj) { +static void publishing_authenticator_shotwell_facebook_web_authentication_pane_finalize (GObject * obj) { PublishingAuthenticatorShotwellFacebookWebAuthenticationPane * self; #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellFacebookWebAuthenticationPane); #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" G_OBJECT_CLASS (publishing_authenticator_shotwell_facebook_web_authentication_pane_parent_class)->finalize (obj); -#line 1546 "FacebookPublishingAuthenticator.c" +#line 1594 "FacebookPublishingAuthenticator.c" } @@ -1571,31 +1619,31 @@ GType publishing_authenticator_shotwell_facebook_web_authentication_pane_get_typ static gpointer _g_object_ref0 (gpointer self) { #line 172 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return self ? g_object_ref (self) : NULL; -#line 1565 "FacebookPublishingAuthenticator.c" +#line 1613 "FacebookPublishingAuthenticator.c" } static void _g_free0_ (gpointer var) { #line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" var = (g_free (var), NULL); -#line 1572 "FacebookPublishingAuthenticator.c" +#line 1620 "FacebookPublishingAuthenticator.c" } static void _g_variant_unref0_ (gpointer var) { #line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" (var == NULL) ? NULL : (var = (g_variant_unref (var), NULL)); -#line 1579 "FacebookPublishingAuthenticator.c" +#line 1627 "FacebookPublishingAuthenticator.c" } PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_construct (GType object_type, SpitPublishingPluginHost* host) { PublishingAuthenticatorShotwellFacebookFacebook * self = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; - GHashFunc _tmp2_ = NULL; - GEqualFunc _tmp3_ = NULL; - GHashTable* _tmp4_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; + GHashFunc _tmp2_; + GEqualFunc _tmp3_; + GHashTable* _tmp4_; #line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL); #line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -1620,34 +1668,34 @@ PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwe self->priv->params = _tmp4_; #line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return self; -#line 1614 "FacebookPublishingAuthenticator.c" +#line 1662 "FacebookPublishingAuthenticator.c" } PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_new (SpitPublishingPluginHost* host) { #line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return publishing_authenticator_shotwell_facebook_facebook_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, host); -#line 1621 "FacebookPublishingAuthenticator.c" +#line 1669 "FacebookPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_facebook_facebook_real_authenticate (SpitPublishingAuthenticator* base) { PublishingAuthenticatorShotwellFacebookFacebook * self; - gboolean _tmp0_ = FALSE; - gboolean _tmp6_ = FALSE; + gboolean _tmp0_; + gboolean _tmp6_; #line 176 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook); #line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp0_ = publishing_authenticator_shotwell_facebook_facebook_is_persistent_session_valid (self); #line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" if (_tmp0_) { -#line 1635 "FacebookPublishingAuthenticator.c" +#line 1683 "FacebookPublishingAuthenticator.c" gchar* access_token = NULL; - gchar* _tmp1_ = NULL; - GHashTable* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GVariant* _tmp5_ = NULL; + gchar* _tmp1_; + GHashTable* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; + GVariant* _tmp5_; #line 181 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp1_ = publishing_authenticator_shotwell_facebook_facebook_get_persistent_access_token (self); #line 181 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -1670,15 +1718,15 @@ static void publishing_authenticator_shotwell_facebook_facebook_real_authenticat _g_free0 (access_token); #line 184 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return; -#line 1664 "FacebookPublishingAuthenticator.c" +#line 1712 "FacebookPublishingAuthenticator.c" } #line 188 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp6_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_is_cache_dirty (); #line 188 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" if (_tmp6_) { -#line 1670 "FacebookPublishingAuthenticator.c" - SpitPublishingPluginHost* _tmp7_ = NULL; - SpitPublishingPluginHost* _tmp8_ = NULL; +#line 1718 "FacebookPublishingAuthenticator.c" + SpitPublishingPluginHost* _tmp7_; + SpitPublishingPluginHost* _tmp8_; #line 189 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp7_ = self->priv->host; #line 189 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -1687,11 +1735,11 @@ static void publishing_authenticator_shotwell_facebook_facebook_real_authenticat _tmp8_ = self->priv->host; #line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" spit_publishing_plugin_host_install_static_message_pane (_tmp8_, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_RESTART_ERROR_MESSAGE, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); -#line 1681 "FacebookPublishingAuthenticator.c" +#line 1729 "FacebookPublishingAuthenticator.c" } else { #line 193 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" publishing_authenticator_shotwell_facebook_facebook_do_show_service_welcome_pane (self); -#line 1685 "FacebookPublishingAuthenticator.c" +#line 1733 "FacebookPublishingAuthenticator.c" } } @@ -1705,22 +1753,22 @@ static gboolean publishing_authenticator_shotwell_facebook_facebook_real_can_log result = TRUE; #line 198 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return result; -#line 1699 "FacebookPublishingAuthenticator.c" +#line 1747 "FacebookPublishingAuthenticator.c" } static gpointer _g_hash_table_ref0 (gpointer self) { #line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return self ? g_hash_table_ref (self) : NULL; -#line 1706 "FacebookPublishingAuthenticator.c" +#line 1754 "FacebookPublishingAuthenticator.c" } static GHashTable* publishing_authenticator_shotwell_facebook_facebook_real_get_authentication_parameter (SpitPublishingAuthenticator* base) { PublishingAuthenticatorShotwellFacebookFacebook * self; GHashTable* result = NULL; - GHashTable* _tmp0_ = NULL; - GHashTable* _tmp1_ = NULL; + GHashTable* _tmp0_; + GHashTable* _tmp1_; #line 201 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook); #line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -1731,7 +1779,7 @@ static GHashTable* publishing_authenticator_shotwell_facebook_facebook_real_get_ result = _tmp1_; #line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return result; -#line 1725 "FacebookPublishingAuthenticator.c" +#line 1773 "FacebookPublishingAuthenticator.c" } @@ -1743,7 +1791,7 @@ void publishing_authenticator_shotwell_facebook_facebook_invalidate_persistent_s "session."); #line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" publishing_authenticator_shotwell_facebook_facebook_set_persistent_access_token (self, ""); -#line 1736 "FacebookPublishingAuthenticator.c" +#line 1784 "FacebookPublishingAuthenticator.c" } @@ -1753,7 +1801,7 @@ static void publishing_authenticator_shotwell_facebook_facebook_real_logout (Spi self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook); #line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" publishing_authenticator_shotwell_facebook_facebook_invalidate_persistent_session (self); -#line 1746 "FacebookPublishingAuthenticator.c" +#line 1794 "FacebookPublishingAuthenticator.c" } @@ -1761,16 +1809,16 @@ static void publishing_authenticator_shotwell_facebook_facebook_real_refresh (Sp PublishingAuthenticatorShotwellFacebookFacebook * self; #line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook); -#line 1754 "FacebookPublishingAuthenticator.c" +#line 1802 "FacebookPublishingAuthenticator.c" } static gboolean publishing_authenticator_shotwell_facebook_facebook_is_persistent_session_valid (PublishingAuthenticatorShotwellFacebookFacebook* self) { gboolean result = FALSE; gchar* token = NULL; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp3_ = NULL; + gchar* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp3_; #line 219 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self), FALSE); #line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -1781,19 +1829,19 @@ static gboolean publishing_authenticator_shotwell_facebook_facebook_is_persisten _tmp1_ = token; #line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" if (_tmp1_ != NULL) { -#line 1774 "FacebookPublishingAuthenticator.c" - const gchar* _tmp2_ = NULL; +#line 1822 "FacebookPublishingAuthenticator.c" + const gchar* _tmp2_; #line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp2_ = token; #line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" g_debug ("FacebookPublishingAuthenticator.vala:223: existing Facebook session fo" \ "und in configuration database (access_token = %s).", _tmp2_); -#line 1780 "FacebookPublishingAuthenticator.c" +#line 1828 "FacebookPublishingAuthenticator.c" } else { #line 226 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" g_debug ("FacebookPublishingAuthenticator.vala:226: no existing Facebook session" \ " available."); -#line 1784 "FacebookPublishingAuthenticator.c" +#line 1832 "FacebookPublishingAuthenticator.c" } #line 228 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp3_ = token; @@ -1803,14 +1851,14 @@ static gboolean publishing_authenticator_shotwell_facebook_facebook_is_persisten _g_free0 (token); #line 228 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return result; -#line 1794 "FacebookPublishingAuthenticator.c" +#line 1842 "FacebookPublishingAuthenticator.c" } static gchar* publishing_authenticator_shotwell_facebook_facebook_get_persistent_access_token (PublishingAuthenticatorShotwellFacebookFacebook* self) { gchar* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gchar* _tmp1_; #line 231 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self), NULL); #line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -1821,13 +1869,13 @@ static gchar* publishing_authenticator_shotwell_facebook_facebook_get_persistent result = _tmp1_; #line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return result; -#line 1812 "FacebookPublishingAuthenticator.c" +#line 1860 "FacebookPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_facebook_facebook_set_persistent_access_token (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* access_token) { - SpitPublishingPluginHost* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + const gchar* _tmp1_; #line 235 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self)); #line 235 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -1838,20 +1886,20 @@ static void publishing_authenticator_shotwell_facebook_facebook_set_persistent_a _tmp1_ = access_token; #line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_token", _tmp1_); -#line 1829 "FacebookPublishingAuthenticator.c" +#line 1877 "FacebookPublishingAuthenticator.c" } static void _publishing_authenticator_shotwell_facebook_facebook_on_login_clicked_spit_publishing_login_callback (gpointer self) { #line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" publishing_authenticator_shotwell_facebook_facebook_on_login_clicked ((PublishingAuthenticatorShotwellFacebookFacebook*) self); -#line 1836 "FacebookPublishingAuthenticator.c" +#line 1884 "FacebookPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_facebook_facebook_do_show_service_welcome_pane (PublishingAuthenticatorShotwellFacebookFacebook* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; #line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self)); #line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -1865,7 +1913,7 @@ static void publishing_authenticator_shotwell_facebook_facebook_do_show_service_ _tmp1_ = self->priv->host; #line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" spit_publishing_plugin_host_set_service_locked (_tmp1_, FALSE); -#line 1855 "FacebookPublishingAuthenticator.c" +#line 1903 "FacebookPublishingAuthenticator.c" } @@ -1877,31 +1925,31 @@ static void publishing_authenticator_shotwell_facebook_facebook_on_login_clicked "on welcome pane."); #line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" publishing_authenticator_shotwell_facebook_facebook_do_hosted_web_authentication (self); -#line 1866 "FacebookPublishingAuthenticator.c" +#line 1914 "FacebookPublishingAuthenticator.c" } static void _publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_succeeded (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _sender, const gchar* success_url, gpointer self) { #line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded ((PublishingAuthenticatorShotwellFacebookFacebook*) self, success_url); -#line 1873 "FacebookPublishingAuthenticator.c" +#line 1921 "FacebookPublishingAuthenticator.c" } static void _publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_failed (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _sender, gpointer self) { #line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed ((PublishingAuthenticatorShotwellFacebookFacebook*) self); -#line 1880 "FacebookPublishingAuthenticator.c" +#line 1928 "FacebookPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_facebook_facebook_do_hosted_web_authentication (PublishingAuthenticatorShotwellFacebookFacebook* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp1_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp2_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp3_ = NULL; - SpitPublishingPluginHost* _tmp4_ = NULL; - PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp5_ = NULL; + SpitPublishingPluginHost* _tmp0_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp1_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp2_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp3_; + SpitPublishingPluginHost* _tmp4_; + PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp5_; #line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self)); #line 253 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -1931,12 +1979,12 @@ static void publishing_authenticator_shotwell_facebook_facebook_do_hosted_web_au _tmp5_ = self->priv->web_auth_pane; #line 261 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" spit_publishing_plugin_host_install_dialog_pane (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); -#line 1919 "FacebookPublishingAuthenticator.c" +#line 1967 "FacebookPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* success_url) { - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self)); #line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -1948,7 +1996,7 @@ static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane _tmp0_ = success_url; #line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" publishing_authenticator_shotwell_facebook_facebook_do_authenticate_session (self, _tmp0_); -#line 1935 "FacebookPublishingAuthenticator.c" +#line 1983 "FacebookPublishingAuthenticator.c" } @@ -1960,75 +2008,75 @@ static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane "ed."); #line 281 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" publishing_authenticator_shotwell_facebook_facebook_do_show_service_welcome_pane (self); -#line 1946 "FacebookPublishingAuthenticator.c" +#line 1994 "FacebookPublishingAuthenticator.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 1973 "FacebookPublishingAuthenticator.c" - gchar* _tmp4_ = NULL; -#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2021 "FacebookPublishingAuthenticator.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 1981 "FacebookPublishingAuthenticator.c" +#line 2029 "FacebookPublishingAuthenticator.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 1987 "FacebookPublishingAuthenticator.c" +#line 2035 "FacebookPublishingAuthenticator.c" } } static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_session (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* good_login_uri) { - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; gchar* decoded_uri = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + const gchar* _tmp1_; + gchar* _tmp2_; gchar* access_token = NULL; gint index = 0; - const gchar* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; - const gchar* _tmp12_ = NULL; + const gchar* _tmp3_; + gint _tmp4_; + gint _tmp5_; + const gchar* _tmp12_; gchar* trailing_params = NULL; - const gchar* _tmp16_ = NULL; - gint _tmp17_ = 0; - gint _tmp18_ = 0; - const gchar* _tmp25_ = NULL; - const gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - GHashTable* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; - const gchar* _tmp33_ = NULL; - GVariant* _tmp34_ = NULL; - const gchar* _tmp35_ = NULL; + const gchar* _tmp16_; + gint _tmp17_; + gint _tmp18_; + const gchar* _tmp25_; + const gchar* _tmp29_; + gchar* _tmp30_; + GHashTable* _tmp31_; + gchar* _tmp32_; + const gchar* _tmp33_; + GVariant* _tmp34_; + const gchar* _tmp35_; #line 284 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self)); #line 284 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -2056,13 +2104,13 @@ static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_ _tmp5_ = index; #line 294 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" if (_tmp5_ >= 0) { -#line 2041 "FacebookPublishingAuthenticator.c" - const gchar* _tmp6_ = NULL; - gint _tmp7_ = 0; - const gchar* _tmp8_ = NULL; - gint _tmp9_ = 0; - gint _tmp10_ = 0; - gchar* _tmp11_ = NULL; +#line 2089 "FacebookPublishingAuthenticator.c" + const gchar* _tmp6_; + gint _tmp7_; + const gchar* _tmp8_; + gint _tmp9_; + gint _tmp10_; + gchar* _tmp11_; #line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp6_ = decoded_uri; #line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -2079,16 +2127,16 @@ static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_ _g_free0 (access_token); #line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" access_token = _tmp11_; -#line 2064 "FacebookPublishingAuthenticator.c" +#line 2112 "FacebookPublishingAuthenticator.c" } #line 296 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp12_ = access_token; #line 296 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" if (_tmp12_ == NULL) { -#line 2070 "FacebookPublishingAuthenticator.c" - SpitPublishingPluginHost* _tmp13_ = NULL; - GError* _tmp14_ = NULL; - GError* _tmp15_ = NULL; +#line 2118 "FacebookPublishingAuthenticator.c" + SpitPublishingPluginHost* _tmp13_; + GError* _tmp14_; + GError* _tmp15_; #line 297 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp13_ = self->priv->host; #line 297 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -2105,7 +2153,7 @@ static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_ _g_free0 (decoded_uri); #line 299 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" return; -#line 2090 "FacebookPublishingAuthenticator.c" +#line 2138 "FacebookPublishingAuthenticator.c" } #line 303 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" trailing_params = NULL; @@ -2119,13 +2167,13 @@ static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_ _tmp18_ = index; #line 305 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" if (_tmp18_ >= 0) { -#line 2104 "FacebookPublishingAuthenticator.c" - const gchar* _tmp19_ = NULL; - gint _tmp20_ = 0; - const gchar* _tmp21_ = NULL; - gint _tmp22_ = 0; - gint _tmp23_ = 0; - gchar* _tmp24_ = NULL; +#line 2152 "FacebookPublishingAuthenticator.c" + const gchar* _tmp19_; + gint _tmp20_; + const gchar* _tmp21_; + gint _tmp22_; + gint _tmp23_; + gchar* _tmp24_; #line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp19_ = access_token; #line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -2142,16 +2190,16 @@ static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_ _g_free0 (trailing_params); #line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" trailing_params = _tmp24_; -#line 2127 "FacebookPublishingAuthenticator.c" +#line 2175 "FacebookPublishingAuthenticator.c" } #line 307 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp25_ = trailing_params; #line 307 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" if (_tmp25_ != NULL) { -#line 2133 "FacebookPublishingAuthenticator.c" - const gchar* _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; +#line 2181 "FacebookPublishingAuthenticator.c" + const gchar* _tmp26_; + const gchar* _tmp27_; + gchar* _tmp28_; #line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp26_ = access_token; #line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" @@ -2162,7 +2210,7 @@ static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_ _g_free0 (access_token); #line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" access_token = _tmp28_; -#line 2147 "FacebookPublishingAuthenticator.c" +#line 2195 "FacebookPublishingAuthenticator.c" } #line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _tmp29_ = access_token; @@ -2196,7 +2244,7 @@ static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_ _g_free0 (access_token); #line 284 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" _g_free0 (decoded_uri); -#line 2181 "FacebookPublishingAuthenticator.c" +#line 2229 "FacebookPublishingAuthenticator.c" } @@ -2207,7 +2255,7 @@ static void publishing_authenticator_shotwell_facebook_facebook_class_init (Publ g_type_class_add_private (klass, sizeof (PublishingAuthenticatorShotwellFacebookFacebookPrivate)); #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_facebook_facebook_finalize; -#line 2192 "FacebookPublishingAuthenticator.c" +#line 2240 "FacebookPublishingAuthenticator.c" } @@ -2215,16 +2263,16 @@ static void publishing_authenticator_shotwell_facebook_facebook_spit_publishing_ #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" publishing_authenticator_shotwell_facebook_facebook_spit_publishing_authenticator_parent_iface = g_type_interface_peek_parent (iface); #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" - iface->authenticate = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_facebook_facebook_real_authenticate; + iface->authenticate = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_facebook_facebook_real_authenticate; #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" - iface->can_logout = (gboolean (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_facebook_facebook_real_can_logout; + iface->can_logout = (gboolean (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_facebook_facebook_real_can_logout; #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" - iface->get_authentication_parameter = (GHashTable* (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_facebook_facebook_real_get_authentication_parameter; + iface->get_authentication_parameter = (GHashTable* (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_facebook_facebook_real_get_authentication_parameter; #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" - iface->logout = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_facebook_facebook_real_logout; + iface->logout = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_facebook_facebook_real_logout; #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" - iface->refresh = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_facebook_facebook_real_refresh; -#line 2209 "FacebookPublishingAuthenticator.c" + iface->refresh = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_facebook_facebook_real_refresh; +#line 2257 "FacebookPublishingAuthenticator.c" } @@ -2233,11 +2281,11 @@ static void publishing_authenticator_shotwell_facebook_facebook_instance_init (P self->priv = PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_GET_PRIVATE (self); #line 162 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" self->priv->web_auth_pane = NULL; -#line 2218 "FacebookPublishingAuthenticator.c" +#line 2266 "FacebookPublishingAuthenticator.c" } -static void publishing_authenticator_shotwell_facebook_facebook_finalize (GObject* obj) { +static void publishing_authenticator_shotwell_facebook_facebook_finalize (GObject * obj) { PublishingAuthenticatorShotwellFacebookFacebook * self; #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook); @@ -2249,7 +2297,7 @@ static void publishing_authenticator_shotwell_facebook_facebook_finalize (GObjec _g_hash_table_unref0 (self->priv->params); #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" G_OBJECT_CLASS (publishing_authenticator_shotwell_facebook_facebook_parent_class)->finalize (obj); -#line 2234 "FacebookPublishingAuthenticator.c" +#line 2282 "FacebookPublishingAuthenticator.c" } diff --git a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c index d0d74d4..ab19db3 100644 --- a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c +++ b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c @@ -1,4 +1,4 @@ -/* FlickrPublishingAuthenticator.c generated by valac 0.34.7, the Vala compiler +/* FlickrPublishingAuthenticator.c generated by valac 0.36.6, the Vala compiler * generated from FlickrPublishingAuthenticator.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -76,6 +76,11 @@ typedef struct _PublishingAuthenticatorShotwellFlickrPinEntryPaneClass Publishin typedef struct _PublishingAuthenticatorShotwellFlickrPinEntryPanePrivate PublishingAuthenticatorShotwellFlickrPinEntryPanePrivate; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _g_slist_free0(var) ((var == NULL) ? NULL : (var = (g_slist_free (var), NULL))) +enum { + PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_PROCEED_SIGNAL, + PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_LAST_SIGNAL +}; +static guint publishing_authenticator_shotwell_flickr_pin_entry_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_LAST_SIGNAL] = {0}; #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR (publishing_authenticator_shotwell_flickr_flickr_get_type ()) #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr)) @@ -180,9 +185,9 @@ static gpointer publishing_authenticator_shotwell_flickr_session_parent_class = static gpointer publishing_authenticator_shotwell_flickr_authentication_request_transaction_parent_class = NULL; static gpointer publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_parent_class = NULL; static gpointer publishing_authenticator_shotwell_flickr_pin_entry_pane_parent_class = NULL; -static SpitPublishingDialogPaneIface* publishing_authenticator_shotwell_flickr_pin_entry_pane_spit_publishing_dialog_pane_parent_iface = NULL; +static SpitPublishingDialogPaneIface * publishing_authenticator_shotwell_flickr_pin_entry_pane_spit_publishing_dialog_pane_parent_iface = NULL; static gpointer publishing_authenticator_shotwell_flickr_flickr_parent_class = NULL; -static SpitPublishingAuthenticatorIface* publishing_authenticator_shotwell_flickr_flickr_spit_publishing_authenticator_parent_iface = NULL; +static SpitPublishingAuthenticatorIface * publishing_authenticator_shotwell_flickr_flickr_spit_publishing_authenticator_parent_iface = NULL; #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_ENDPOINT_URL "https://api.flickr.com/services/rest" #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_EXPIRED_SESSION_ERROR_CODE "98" @@ -218,7 +223,7 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_request_phase_token gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token (PublishingAuthenticatorShotwellFlickrSession* self); gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token_secret (PublishingAuthenticatorShotwellFlickrSession* self); gchar* publishing_authenticator_shotwell_flickr_session_get_username (PublishingAuthenticatorShotwellFlickrSession* self); -static void publishing_authenticator_shotwell_flickr_session_finalize (PublishingRESTSupportSession* obj); +static void publishing_authenticator_shotwell_flickr_session_finalize (PublishingRESTSupportSession * obj); #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_API_KEY "60dd96d4a2ad04888b09c9e18d82c26f" #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_API_SECRET "d0960565e03547c1" #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_SERVICE_WELCOME_MESSAGE _ ("You are not currently logged into Flickr.\n" \ @@ -253,7 +258,7 @@ static void _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_continue static void _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self); static void publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base); static void g_cclosure_user_marshal_VOID__OBJECT_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void publishing_authenticator_shotwell_flickr_pin_entry_pane_finalize (GObject* obj); +static void publishing_authenticator_shotwell_flickr_pin_entry_pane_finalize (GObject * obj); GType publishing_authenticator_shotwell_flickr_flickr_get_type (void) G_GNUC_CONST; #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickrPrivate)) enum { @@ -304,15 +309,15 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_ph static GVariant* _variant_new3 (gchar* value); static GVariant* _variant_new4 (gchar* value); static GVariant* _variant_new5 (gchar* value); -static void publishing_authenticator_shotwell_flickr_flickr_finalize (GObject* obj); +static void publishing_authenticator_shotwell_flickr_flickr_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotwell_flickr_transaction_construct (GType object_type, PublishingAuthenticatorShotwellFlickrSession* session, PublishingRESTSupportHttpMethod method) { PublishingAuthenticatorShotwellFlickrTransaction* self = NULL; - PublishingAuthenticatorShotwellFlickrSession* _tmp0_ = NULL; - PublishingRESTSupportHttpMethod _tmp1_ = 0; + PublishingAuthenticatorShotwellFlickrSession* _tmp0_; + PublishingRESTSupportHttpMethod _tmp1_; #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (session), NULL); #line 15 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -325,22 +330,22 @@ PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotw publishing_authenticator_shotwell_flickr_transaction_setup_arguments (self); #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return self; -#line 326 "FlickrPublishingAuthenticator.c" +#line 331 "FlickrPublishingAuthenticator.c" } PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotwell_flickr_transaction_new (PublishingAuthenticatorShotwellFlickrSession* session, PublishingRESTSupportHttpMethod method) { #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return publishing_authenticator_shotwell_flickr_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_TRANSACTION, session, method); -#line 333 "FlickrPublishingAuthenticator.c" +#line 338 "FlickrPublishingAuthenticator.c" } PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotwell_flickr_transaction_construct_with_uri (GType object_type, PublishingAuthenticatorShotwellFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) { PublishingAuthenticatorShotwellFlickrTransaction* self = NULL; - PublishingAuthenticatorShotwellFlickrSession* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - PublishingRESTSupportHttpMethod _tmp2_ = 0; + PublishingAuthenticatorShotwellFlickrSession* _tmp0_; + const gchar* _tmp1_; + PublishingRESTSupportHttpMethod _tmp2_; #line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (session), NULL); #line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -357,26 +362,26 @@ PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotw publishing_authenticator_shotwell_flickr_transaction_setup_arguments (self); #line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return self; -#line 358 "FlickrPublishingAuthenticator.c" +#line 363 "FlickrPublishingAuthenticator.c" } PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotwell_flickr_transaction_new_with_uri (PublishingAuthenticatorShotwellFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) { #line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return publishing_authenticator_shotwell_flickr_transaction_construct_with_uri (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_TRANSACTION, session, uri, method); -#line 365 "FlickrPublishingAuthenticator.c" +#line 370 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_transaction_setup_arguments (PublishingAuthenticatorShotwellFlickrTransaction* self) { PublishingAuthenticatorShotwellFlickrSession* session = NULL; - PublishingRESTSupportSession* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + PublishingRESTSupportSession* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; #line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_TRANSACTION (self)); #line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -415,14 +420,14 @@ static void publishing_authenticator_shotwell_flickr_transaction_setup_arguments _g_free0 (_tmp6_); #line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _publishing_rest_support_session_unref0 (session); -#line 416 "FlickrPublishingAuthenticator.c" +#line 421 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) { PublishingAuthenticatorShotwellFlickrTransaction * self; - PublishingRESTSupportSession* _tmp0_ = NULL; - PublishingAuthenticatorShotwellFlickrSession* _tmp1_ = NULL; + PublishingRESTSupportSession* _tmp0_; + PublishingAuthenticatorShotwellFlickrSession* _tmp1_; GError * _inner_error_ = NULL; #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_TRANSACTION, PublishingAuthenticatorShotwellFlickrTransaction); @@ -444,7 +449,7 @@ static void publishing_authenticator_shotwell_flickr_transaction_real_execute (P g_propagate_error (error, _inner_error_); #line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return; -#line 445 "FlickrPublishingAuthenticator.c" +#line 450 "FlickrPublishingAuthenticator.c" } else { #line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -452,7 +457,7 @@ static void publishing_authenticator_shotwell_flickr_transaction_real_execute (P g_clear_error (&_inner_error_); #line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return; -#line 453 "FlickrPublishingAuthenticator.c" +#line 458 "FlickrPublishingAuthenticator.c" } } } @@ -462,8 +467,8 @@ static void publishing_authenticator_shotwell_flickr_transaction_class_init (Pub #line 12 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_transaction_parent_class = g_type_class_peek_parent (klass); #line 12 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_authenticator_shotwell_flickr_transaction_real_execute; -#line 464 "FlickrPublishingAuthenticator.c" + ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_authenticator_shotwell_flickr_transaction_real_execute; +#line 469 "FlickrPublishingAuthenticator.c" } @@ -489,14 +494,14 @@ PublishingAuthenticatorShotwellFlickrSession* publishing_authenticator_shotwell_ self = (PublishingAuthenticatorShotwellFlickrSession*) publishing_rest_support_session_construct (object_type, NULL); #line 53 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return self; -#line 490 "FlickrPublishingAuthenticator.c" +#line 495 "FlickrPublishingAuthenticator.c" } PublishingAuthenticatorShotwellFlickrSession* publishing_authenticator_shotwell_flickr_session_new (void) { #line 53 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return publishing_authenticator_shotwell_flickr_session_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_SESSION); -#line 497 "FlickrPublishingAuthenticator.c" +#line 502 "FlickrPublishingAuthenticator.c" } @@ -505,54 +510,54 @@ static gboolean publishing_authenticator_shotwell_flickr_session_real_is_authent gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_SESSION, PublishingAuthenticatorShotwellFlickrSession); #line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp2_ = self->priv->access_phase_token; #line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" if (_tmp2_ != NULL) { -#line 513 "FlickrPublishingAuthenticator.c" - const gchar* _tmp3_ = NULL; +#line 518 "FlickrPublishingAuthenticator.c" + const gchar* _tmp3_; #line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp3_ = self->priv->access_phase_token_secret; #line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp1_ = _tmp3_ != NULL; -#line 519 "FlickrPublishingAuthenticator.c" +#line 524 "FlickrPublishingAuthenticator.c" } else { #line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp1_ = FALSE; -#line 523 "FlickrPublishingAuthenticator.c" +#line 528 "FlickrPublishingAuthenticator.c" } #line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" if (_tmp1_) { -#line 527 "FlickrPublishingAuthenticator.c" - const gchar* _tmp4_ = NULL; +#line 532 "FlickrPublishingAuthenticator.c" + const gchar* _tmp4_; #line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp4_ = self->priv->username; #line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp0_ = _tmp4_ != NULL; -#line 533 "FlickrPublishingAuthenticator.c" +#line 538 "FlickrPublishingAuthenticator.c" } else { #line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp0_ = FALSE; -#line 537 "FlickrPublishingAuthenticator.c" +#line 542 "FlickrPublishingAuthenticator.c" } #line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" result = _tmp0_; #line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return result; -#line 543 "FlickrPublishingAuthenticator.c" +#line 548 "FlickrPublishingAuthenticator.c" } void publishing_authenticator_shotwell_flickr_session_authenticate_from_persistent_credentials (PublishingAuthenticatorShotwellFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; #line 62 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self)); #line 62 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -587,7 +592,7 @@ void publishing_authenticator_shotwell_flickr_session_authenticate_from_persiste self->priv->username = _tmp5_; #line 68 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated"); -#line 588 "FlickrPublishingAuthenticator.c" +#line 593 "FlickrPublishingAuthenticator.c" } @@ -606,15 +611,15 @@ void publishing_authenticator_shotwell_flickr_session_deauthenticate (Publishing _g_free0 (self->priv->username); #line 74 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" self->priv->username = NULL; -#line 607 "FlickrPublishingAuthenticator.c" +#line 612 "FlickrPublishingAuthenticator.c" } void publishing_authenticator_shotwell_flickr_session_set_api_credentials (PublishingAuthenticatorShotwellFlickrSession* self, const gchar* consumer_key, const gchar* consumer_secret) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; #line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self)); #line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -637,62 +642,62 @@ void publishing_authenticator_shotwell_flickr_session_set_api_credentials (Publi _g_free0 (self->priv->consumer_secret); #line 79 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" self->priv->consumer_secret = _tmp3_; -#line 638 "FlickrPublishingAuthenticator.c" +#line 643 "FlickrPublishingAuthenticator.c" } void publishing_authenticator_shotwell_flickr_session_sign_transaction (PublishingAuthenticatorShotwellFlickrSession* self, PublishingRESTSupportTransaction* txn) { gchar* http_method = NULL; - PublishingRESTSupportTransaction* _tmp0_ = NULL; - PublishingRESTSupportHttpMethod _tmp1_ = 0; - gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + PublishingRESTSupportHttpMethod _tmp1_; + gchar* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; PublishingRESTSupportArgument** base_string_arguments = NULL; - PublishingRESTSupportTransaction* _tmp6_ = NULL; - gint _tmp7_ = 0; - PublishingRESTSupportArgument** _tmp8_ = NULL; - gint base_string_arguments_length1 = 0; - gint _base_string_arguments_size_ = 0; + PublishingRESTSupportTransaction* _tmp6_; + gint _tmp7_; + PublishingRESTSupportArgument** _tmp8_; + gint base_string_arguments_length1; + gint _base_string_arguments_size_; PublishingRESTSupportArgument** sorted_args = NULL; - PublishingRESTSupportArgument** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - gint _tmp10_ = 0; - PublishingRESTSupportArgument** _tmp11_ = NULL; - gint sorted_args_length1 = 0; - gint _sorted_args_size_ = 0; + PublishingRESTSupportArgument** _tmp9_; + gint _tmp9__length1; + gint _tmp10_; + PublishingRESTSupportArgument** _tmp11_; + gint sorted_args_length1; + gint _sorted_args_size_; gchar* arguments_string = NULL; - gchar* _tmp12_ = NULL; + gchar* _tmp12_; gchar* signing_key = NULL; - const gchar* _tmp35_ = NULL; + const gchar* _tmp35_; gchar* signature_base_string = NULL; - const gchar* _tmp49_ = NULL; - gchar* _tmp50_ = NULL; - gchar* _tmp51_ = NULL; - PublishingRESTSupportTransaction* _tmp52_ = NULL; - gchar* _tmp53_ = NULL; - gchar* _tmp54_ = NULL; - gchar* _tmp55_ = NULL; - gchar* _tmp56_ = NULL; - gchar* _tmp57_ = NULL; - gchar* _tmp58_ = NULL; - gchar* _tmp59_ = NULL; - gchar* _tmp60_ = NULL; - const gchar* _tmp61_ = NULL; - gchar* _tmp62_ = NULL; - gchar* _tmp63_ = NULL; - gchar* _tmp64_ = NULL; - gchar* _tmp65_ = NULL; - const gchar* _tmp66_ = NULL; + const gchar* _tmp49_; + gchar* _tmp50_; + gchar* _tmp51_; + PublishingRESTSupportTransaction* _tmp52_; + gchar* _tmp53_; + gchar* _tmp54_; + gchar* _tmp55_; + gchar* _tmp56_; + gchar* _tmp57_; + gchar* _tmp58_; + gchar* _tmp59_; + gchar* _tmp60_; + const gchar* _tmp61_; + gchar* _tmp62_; + gchar* _tmp63_; + gchar* _tmp64_; + gchar* _tmp65_; + const gchar* _tmp66_; gchar* signature = NULL; - const gchar* _tmp67_ = NULL; - gchar* _tmp68_ = NULL; - const gchar* _tmp69_ = NULL; - gchar* _tmp70_ = NULL; - const gchar* _tmp71_ = NULL; - PublishingRESTSupportTransaction* _tmp72_ = NULL; - const gchar* _tmp73_ = NULL; + const gchar* _tmp67_; + gchar* _tmp68_; + const gchar* _tmp69_; + gchar* _tmp70_; + const gchar* _tmp71_; + PublishingRESTSupportTransaction* _tmp72_; + const gchar* _tmp73_; #line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self)); #line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -744,50 +749,50 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi _tmp12_ = g_strdup (""); #line 93 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" arguments_string = _tmp12_; -#line 744 "FlickrPublishingAuthenticator.c" +#line 749 "FlickrPublishingAuthenticator.c" { gint i = 0; #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" i = 0; -#line 749 "FlickrPublishingAuthenticator.c" +#line 754 "FlickrPublishingAuthenticator.c" { gboolean _tmp13_ = FALSE; #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp13_ = TRUE; #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" while (TRUE) { -#line 756 "FlickrPublishingAuthenticator.c" - gint _tmp15_ = 0; - PublishingRESTSupportArgument** _tmp16_ = NULL; - gint _tmp16__length1 = 0; - const gchar* _tmp17_ = NULL; - PublishingRESTSupportArgument** _tmp18_ = NULL; - gint _tmp18__length1 = 0; - gint _tmp19_ = 0; - PublishingRESTSupportArgument* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - PublishingRESTSupportArgument** _tmp24_ = NULL; - gint _tmp24__length1 = 0; - gint _tmp25_ = 0; - PublishingRESTSupportArgument* _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - gint _tmp31_ = 0; - PublishingRESTSupportArgument** _tmp32_ = NULL; - gint _tmp32__length1 = 0; +#line 761 "FlickrPublishingAuthenticator.c" + gint _tmp15_; + PublishingRESTSupportArgument** _tmp16_; + gint _tmp16__length1; + const gchar* _tmp17_; + PublishingRESTSupportArgument** _tmp18_; + gint _tmp18__length1; + gint _tmp19_; + PublishingRESTSupportArgument* _tmp20_; + const gchar* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + PublishingRESTSupportArgument** _tmp24_; + gint _tmp24__length1; + gint _tmp25_; + PublishingRESTSupportArgument* _tmp26_; + const gchar* _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; + gchar* _tmp30_; + gint _tmp31_; + PublishingRESTSupportArgument** _tmp32_; + gint _tmp32__length1; #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" if (!_tmp13_) { -#line 781 "FlickrPublishingAuthenticator.c" - gint _tmp14_ = 0; +#line 786 "FlickrPublishingAuthenticator.c" + gint _tmp14_; #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp14_ = i; #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" i = _tmp14_ + 1; -#line 787 "FlickrPublishingAuthenticator.c" +#line 792 "FlickrPublishingAuthenticator.c" } #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp13_ = FALSE; @@ -801,7 +806,7 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi if (!(_tmp15_ < _tmp16__length1)) { #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" break; -#line 801 "FlickrPublishingAuthenticator.c" +#line 806 "FlickrPublishingAuthenticator.c" } #line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp17_ = arguments_string; @@ -851,9 +856,9 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi _tmp32__length1 = sorted_args_length1; #line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" if (_tmp31_ < (_tmp32__length1 - 1)) { -#line 851 "FlickrPublishingAuthenticator.c" - const gchar* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; +#line 856 "FlickrPublishingAuthenticator.c" + const gchar* _tmp33_; + gchar* _tmp34_; #line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp33_ = arguments_string; #line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -862,7 +867,7 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi _g_free0 (arguments_string); #line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" arguments_string = _tmp34_; -#line 862 "FlickrPublishingAuthenticator.c" +#line 867 "FlickrPublishingAuthenticator.c" } } } @@ -873,12 +878,12 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi _tmp35_ = self->priv->access_phase_token_secret; #line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" if (_tmp35_ != NULL) { -#line 873 "FlickrPublishingAuthenticator.c" - const gchar* _tmp36_ = NULL; - gchar* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; - const gchar* _tmp39_ = NULL; - gchar* _tmp40_ = NULL; +#line 878 "FlickrPublishingAuthenticator.c" + const gchar* _tmp36_; + gchar* _tmp37_; + gchar* _tmp38_; + const gchar* _tmp39_; + gchar* _tmp40_; #line 102 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_debug ("FlickrPublishingAuthenticator.vala:102: access phase token secret avai" \ "lable; using it as signing key"); @@ -898,19 +903,19 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi signing_key = _tmp40_; #line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _g_free0 (_tmp38_); -#line 897 "FlickrPublishingAuthenticator.c" +#line 902 "FlickrPublishingAuthenticator.c" } else { - const gchar* _tmp41_ = NULL; + const gchar* _tmp41_; #line 105 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp41_ = self->priv->request_phase_token_secret; #line 105 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" if (_tmp41_ != NULL) { -#line 904 "FlickrPublishingAuthenticator.c" - const gchar* _tmp42_ = NULL; - gchar* _tmp43_ = NULL; - gchar* _tmp44_ = NULL; - const gchar* _tmp45_ = NULL; - gchar* _tmp46_ = NULL; +#line 909 "FlickrPublishingAuthenticator.c" + const gchar* _tmp42_; + gchar* _tmp43_; + gchar* _tmp44_; + const gchar* _tmp45_; + gchar* _tmp46_; #line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_debug ("FlickrPublishingAuthenticator.vala:106: request phase token secret ava" \ "ilable; using it as signing key"); @@ -930,10 +935,10 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi signing_key = _tmp46_; #line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _g_free0 (_tmp44_); -#line 928 "FlickrPublishingAuthenticator.c" +#line 933 "FlickrPublishingAuthenticator.c" } else { - const gchar* _tmp47_ = NULL; - gchar* _tmp48_ = NULL; + const gchar* _tmp47_; + gchar* _tmp48_; #line 110 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_debug ("FlickrPublishingAuthenticator.vala:110: %s", "neither access phase nor request phase token secrets available; using " \ "API " "key as signing key"); @@ -945,7 +950,7 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi _g_free0 (signing_key); #line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" signing_key = _tmp48_; -#line 942 "FlickrPublishingAuthenticator.c" +#line 947 "FlickrPublishingAuthenticator.c" } } #line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -1040,15 +1045,15 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi base_string_arguments = (_vala_array_free (base_string_arguments, base_string_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); #line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _g_free0 (http_method); -#line 1037 "FlickrPublishingAuthenticator.c" +#line 1042 "FlickrPublishingAuthenticator.c" } void publishing_authenticator_shotwell_flickr_session_set_request_phase_credentials (PublishingAuthenticatorShotwellFlickrSession* self, const gchar* token, const gchar* secret) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; #line 133 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self)); #line 133 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -1071,17 +1076,17 @@ void publishing_authenticator_shotwell_flickr_session_set_request_phase_credenti _g_free0 (self->priv->request_phase_token_secret); #line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" self->priv->request_phase_token_secret = _tmp3_; -#line 1068 "FlickrPublishingAuthenticator.c" +#line 1073 "FlickrPublishingAuthenticator.c" } void publishing_authenticator_shotwell_flickr_session_set_access_phase_credentials (PublishingAuthenticatorShotwellFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; #line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self)); #line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -1116,25 +1121,25 @@ void publishing_authenticator_shotwell_flickr_session_set_access_phase_credentia self->priv->username = _tmp5_; #line 143 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated"); -#line 1113 "FlickrPublishingAuthenticator.c" +#line 1118 "FlickrPublishingAuthenticator.c" } gchar* publishing_authenticator_shotwell_flickr_session_get_oauth_nonce (PublishingAuthenticatorShotwellFlickrSession* self) { gchar* result = NULL; GTimeVal currtime = {0}; - GTimeVal _tmp0_ = {0}; - glong _tmp1_ = 0L; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - GTimeVal _tmp4_ = {0}; - glong _tmp5_ = 0L; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; + GTimeVal _tmp0_; + glong _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + GTimeVal _tmp4_; + glong _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; #line 146 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL); #line 147 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -1175,50 +1180,50 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_oauth_nonce (Publish result = _tmp11_; #line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return result; -#line 1172 "FlickrPublishingAuthenticator.c" +#line 1177 "FlickrPublishingAuthenticator.c" } static glong string_strnlen (gchar* str, glong maxlen) { glong result = 0L; gchar* end = NULL; - gchar* _tmp0_ = NULL; - glong _tmp1_ = 0L; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + glong _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = maxlen; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp2_; -#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = end; -#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { -#line 1195 "FlickrPublishingAuthenticator.c" - glong _tmp4_ = 0L; -#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1200 "FlickrPublishingAuthenticator.c" + glong _tmp4_; +#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = maxlen; -#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1203 "FlickrPublishingAuthenticator.c" +#line 1208 "FlickrPublishingAuthenticator.c" } else { - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; -#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp5_; + gchar* _tmp6_; +#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str; -#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = (glong) (_tmp5_ - _tmp6_); -#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1215 "FlickrPublishingAuthenticator.c" +#line 1220 "FlickrPublishingAuthenticator.c" } } @@ -1227,133 +1232,133 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_ = 0L; - glong _tmp8_ = 0L; - glong _tmp14_ = 0L; - glong _tmp17_ = 0L; - glong _tmp18_ = 0L; - glong _tmp19_ = 0L; - glong _tmp20_ = 0L; - glong _tmp21_ = 0L; - gchar* _tmp22_ = NULL; -#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp1_; + glong _tmp8_; + glong _tmp14_; + glong _tmp17_; + glong _tmp18_; + glong _tmp19_; + glong _tmp20_; + glong _tmp21_; + gchar* _tmp22_; +#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = offset; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { -#line 1239 "FlickrPublishingAuthenticator.c" - glong _tmp2_ = 0L; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1244 "FlickrPublishingAuthenticator.c" + glong _tmp2_; +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = len; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); -#line 1245 "FlickrPublishingAuthenticator.c" +#line 1250 "FlickrPublishingAuthenticator.c" } else { -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 1249 "FlickrPublishingAuthenticator.c" +#line 1254 "FlickrPublishingAuthenticator.c" } -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 1253 "FlickrPublishingAuthenticator.c" - glong _tmp3_ = 0L; - glong _tmp4_ = 0L; - glong _tmp5_ = 0L; -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1258 "FlickrPublishingAuthenticator.c" + glong _tmp3_; + glong _tmp4_; + glong _tmp5_; +#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = offset; -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = len; -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" string_length = _tmp5_; -#line 1265 "FlickrPublishingAuthenticator.c" +#line 1270 "FlickrPublishingAuthenticator.c" } else { - gint _tmp6_ = 0; - gint _tmp7_ = 0; -#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint _tmp6_; + gint _tmp7_; +#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = strlen (self); -#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = _tmp6_; -#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; -#line 1275 "FlickrPublishingAuthenticator.c" +#line 1280 "FlickrPublishingAuthenticator.c" } -#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = offset; -#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { -#line 1281 "FlickrPublishingAuthenticator.c" - glong _tmp9_ = 0L; - glong _tmp10_ = 0L; - glong _tmp11_ = 0L; -#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1286 "FlickrPublishingAuthenticator.c" + glong _tmp9_; + glong _tmp10_; + glong _tmp11_; +#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = string_length; -#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = offset; -#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" offset = _tmp9_ + _tmp10_; -#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = offset; -#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 1295 "FlickrPublishingAuthenticator.c" +#line 1300 "FlickrPublishingAuthenticator.c" } else { - glong _tmp12_ = 0L; - glong _tmp13_ = 0L; -#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp12_; + glong _tmp13_; +#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = offset; -#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = string_length; -#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 1305 "FlickrPublishingAuthenticator.c" +#line 1310 "FlickrPublishingAuthenticator.c" } -#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = len; -#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { -#line 1311 "FlickrPublishingAuthenticator.c" - glong _tmp15_ = 0L; - glong _tmp16_ = 0L; -#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1316 "FlickrPublishingAuthenticator.c" + glong _tmp15_; + glong _tmp16_; +#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = offset; -#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; -#line 1320 "FlickrPublishingAuthenticator.c" +#line 1325 "FlickrPublishingAuthenticator.c" } -#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = offset; -#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = len; -#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = string_length; -#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = offset; -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = len; -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp22_; -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1340 "FlickrPublishingAuthenticator.c" +#line 1345 "FlickrPublishingAuthenticator.c" } gchar* publishing_authenticator_shotwell_flickr_session_get_oauth_timestamp (PublishingAuthenticatorShotwellFlickrSession* self) { gchar* result = NULL; - gint64 _tmp0_ = 0LL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + gint64 _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #line 154 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL); #line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -1372,15 +1377,15 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_oauth_timestamp (Pub result = _tmp4_; #line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return result; -#line 1369 "FlickrPublishingAuthenticator.c" +#line 1374 "FlickrPublishingAuthenticator.c" } gchar* publishing_authenticator_shotwell_flickr_session_get_consumer_key (PublishingAuthenticatorShotwellFlickrSession* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; #line 158 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL); #line 159 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -1395,15 +1400,15 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_consumer_key (Publis result = _tmp2_; #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return result; -#line 1392 "FlickrPublishingAuthenticator.c" +#line 1397 "FlickrPublishingAuthenticator.c" } gchar* publishing_authenticator_shotwell_flickr_session_get_request_phase_token (PublishingAuthenticatorShotwellFlickrSession* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; #line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL); #line 164 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -1418,15 +1423,15 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_request_phase_token result = _tmp2_; #line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return result; -#line 1415 "FlickrPublishingAuthenticator.c" +#line 1420 "FlickrPublishingAuthenticator.c" } gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token (PublishingAuthenticatorShotwellFlickrSession* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; #line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL); #line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -1441,15 +1446,15 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token ( result = _tmp2_; #line 170 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return result; -#line 1438 "FlickrPublishingAuthenticator.c" +#line 1443 "FlickrPublishingAuthenticator.c" } gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token_secret (PublishingAuthenticatorShotwellFlickrSession* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; #line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL); #line 174 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -1464,15 +1469,15 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token_s result = _tmp2_; #line 175 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return result; -#line 1461 "FlickrPublishingAuthenticator.c" +#line 1466 "FlickrPublishingAuthenticator.c" } gchar* publishing_authenticator_shotwell_flickr_session_get_username (PublishingAuthenticatorShotwellFlickrSession* self) { gchar* result = NULL; - gboolean _tmp0_ = FALSE; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + gboolean _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; #line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL); #line 179 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -1487,7 +1492,7 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_username (Publishing result = _tmp2_; #line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return result; -#line 1484 "FlickrPublishingAuthenticator.c" +#line 1489 "FlickrPublishingAuthenticator.c" } @@ -1499,8 +1504,8 @@ static void publishing_authenticator_shotwell_flickr_session_class_init (Publish #line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_type_class_add_private (klass, sizeof (PublishingAuthenticatorShotwellFlickrSessionPrivate)); #line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_authenticator_shotwell_flickr_session_real_is_authenticated; -#line 1497 "FlickrPublishingAuthenticator.c" + ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_authenticator_shotwell_flickr_session_real_is_authenticated; +#line 1502 "FlickrPublishingAuthenticator.c" } @@ -1521,11 +1526,11 @@ static void publishing_authenticator_shotwell_flickr_session_instance_init (Publ self->priv->consumer_key = NULL; #line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" self->priv->consumer_secret = NULL; -#line 1518 "FlickrPublishingAuthenticator.c" +#line 1523 "FlickrPublishingAuthenticator.c" } -static void publishing_authenticator_shotwell_flickr_session_finalize (PublishingRESTSupportSession* obj) { +static void publishing_authenticator_shotwell_flickr_session_finalize (PublishingRESTSupportSession * obj) { PublishingAuthenticatorShotwellFlickrSession * self; #line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_SESSION, PublishingAuthenticatorShotwellFlickrSession); @@ -1545,7 +1550,7 @@ static void publishing_authenticator_shotwell_flickr_session_finalize (Publishin _g_free0 (self->priv->consumer_secret); #line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_authenticator_shotwell_flickr_session_parent_class)->finalize (obj); -#line 1542 "FlickrPublishingAuthenticator.c" +#line 1547 "FlickrPublishingAuthenticator.c" } @@ -1563,7 +1568,7 @@ GType publishing_authenticator_shotwell_flickr_session_get_type (void) { PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_construct (GType object_type, PublishingAuthenticatorShotwellFlickrSession* session) { PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* self = NULL; - PublishingAuthenticatorShotwellFlickrSession* _tmp0_ = NULL; + PublishingAuthenticatorShotwellFlickrSession* _tmp0_; #line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (session), NULL); #line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -1572,21 +1577,21 @@ PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishin self = (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction*) publishing_authenticator_shotwell_flickr_transaction_construct_with_uri (object_type, _tmp0_, "https://www.flickr.com/services/oauth/request_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET); #line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return self; -#line 1569 "FlickrPublishingAuthenticator.c" +#line 1574 "FlickrPublishingAuthenticator.c" } PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_new (PublishingAuthenticatorShotwellFlickrSession* session) { #line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return publishing_authenticator_shotwell_flickr_authentication_request_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION, session); -#line 1576 "FlickrPublishingAuthenticator.c" +#line 1581 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_authentication_request_transaction_class_init (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransactionClass * klass) { #line 189 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_authentication_request_transaction_parent_class = g_type_class_peek_parent (klass); -#line 1583 "FlickrPublishingAuthenticator.c" +#line 1588 "FlickrPublishingAuthenticator.c" } @@ -1608,11 +1613,11 @@ GType publishing_authenticator_shotwell_flickr_authentication_request_transactio PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_construct (GType object_type, PublishingAuthenticatorShotwellFlickrSession* session, const gchar* user_verifier) { PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* self = NULL; - PublishingAuthenticatorShotwellFlickrSession* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - PublishingAuthenticatorShotwellFlickrSession* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + PublishingAuthenticatorShotwellFlickrSession* _tmp0_; + const gchar* _tmp1_; + PublishingAuthenticatorShotwellFlickrSession* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (session), NULL); #line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -1637,21 +1642,21 @@ PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_aut _g_free0 (_tmp4_); #line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return self; -#line 1634 "FlickrPublishingAuthenticator.c" +#line 1639 "FlickrPublishingAuthenticator.c" } PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (PublishingAuthenticatorShotwellFlickrSession* session, const gchar* user_verifier) { #line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, session, user_verifier); -#line 1641 "FlickrPublishingAuthenticator.c" +#line 1646 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_class_init (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionClass * klass) { #line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_parent_class = g_type_class_peek_parent (klass); -#line 1648 "FlickrPublishingAuthenticator.c" +#line 1653 "FlickrPublishingAuthenticator.c" } @@ -1674,35 +1679,35 @@ GType publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_ge static gpointer _g_object_ref0 (gpointer self) { #line 216 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return self ? g_object_ref (self) : NULL; -#line 1671 "FlickrPublishingAuthenticator.c" +#line 1676 "FlickrPublishingAuthenticator.c" } PublishingAuthenticatorShotwellFlickrPinEntryPane* publishing_authenticator_shotwell_flickr_pin_entry_pane_construct (GType object_type, GtkBuilder* builder) { PublishingAuthenticatorShotwellFlickrPinEntryPane * self = NULL; - GtkBuilder* _tmp0_ = NULL; - GtkBuilder* _tmp1_ = NULL; - GtkBuilder* _tmp2_ = NULL; - GtkBuilder* _tmp3_ = NULL; - GSList* _tmp4_ = NULL; - GSList* _tmp5_ = NULL; - guint _tmp6_ = 0U; - GtkBuilder* _tmp7_ = NULL; - GObject* _tmp8_ = NULL; - GtkLabel* _tmp9_ = NULL; - GtkBuilder* _tmp10_ = NULL; - GObject* _tmp11_ = NULL; - GtkLabel* _tmp12_ = NULL; - GtkBuilder* _tmp13_ = NULL; - GObject* _tmp14_ = NULL; - GtkEntry* _tmp15_ = NULL; - GtkBuilder* _tmp16_ = NULL; - GObject* _tmp17_ = NULL; - GtkButton* _tmp18_ = NULL; - GtkBuilder* _tmp19_ = NULL; - GObject* _tmp20_ = NULL; - GtkBox* _tmp21_ = NULL; - GtkBox* _tmp22_ = NULL; + GtkBuilder* _tmp0_; + GtkBuilder* _tmp1_; + GtkBuilder* _tmp2_; + GtkBuilder* _tmp3_; + GSList* _tmp4_; + GSList* _tmp5_; + guint _tmp6_; + GtkBuilder* _tmp7_; + GObject* _tmp8_; + GtkLabel* _tmp9_; + GtkBuilder* _tmp10_; + GObject* _tmp11_; + GtkLabel* _tmp12_; + GtkBuilder* _tmp13_; + GObject* _tmp14_; + GtkEntry* _tmp15_; + GtkBuilder* _tmp16_; + GObject* _tmp17_; + GtkButton* _tmp18_; + GtkBuilder* _tmp19_; + GObject* _tmp20_; + GtkBox* _tmp21_; + GtkBox* _tmp22_; #line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL); #line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -1789,20 +1794,20 @@ PublishingAuthenticatorShotwellFlickrPinEntryPane* publishing_authenticator_shot publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed (self); #line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return self; -#line 1786 "FlickrPublishingAuthenticator.c" +#line 1791 "FlickrPublishingAuthenticator.c" } PublishingAuthenticatorShotwellFlickrPinEntryPane* publishing_authenticator_shotwell_flickr_pin_entry_pane_new (GtkBuilder* builder) { #line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return publishing_authenticator_shotwell_flickr_pin_entry_pane_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, builder); -#line 1793 "FlickrPublishingAuthenticator.c" +#line 1798 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_pin_entry_pane_on_continue_clicked (PublishingAuthenticatorShotwellFlickrPinEntryPane* self) { - GtkEntry* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + GtkEntry* _tmp0_; + const gchar* _tmp1_; #line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_PIN_ENTRY_PANE (self)); #line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -1810,16 +1815,16 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_on_continue_ #line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp1_ = gtk_entry_get_text (_tmp0_); #line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - g_signal_emit_by_name (self, "proceed", self, _tmp1_); -#line 1808 "FlickrPublishingAuthenticator.c" + g_signal_emit (self, publishing_authenticator_shotwell_flickr_pin_entry_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_PROCEED_SIGNAL], 0, self, _tmp1_); +#line 1813 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed (PublishingAuthenticatorShotwellFlickrPinEntryPane* self) { - GtkButton* _tmp0_ = NULL; - GtkEntry* _tmp1_ = NULL; - guint _tmp2_ = 0U; - guint _tmp3_ = 0U; + GtkButton* _tmp0_; + GtkEntry* _tmp1_; + guint _tmp2_; + guint _tmp3_; #line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_PIN_ENTRY_PANE (self)); #line 237 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -1832,15 +1837,15 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry _tmp3_ = _tmp2_; #line 237 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp3_ > ((guint) 0)); -#line 1829 "FlickrPublishingAuthenticator.c" +#line 1834 "FlickrPublishingAuthenticator.c" } static GtkWidget* publishing_authenticator_shotwell_flickr_pin_entry_pane_real_get_widget (SpitPublishingDialogPane* base) { PublishingAuthenticatorShotwellFlickrPinEntryPane * self; GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingAuthenticatorShotwellFlickrPinEntryPane); #line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -1851,7 +1856,7 @@ static GtkWidget* publishing_authenticator_shotwell_flickr_pin_entry_pane_real_g result = _tmp1_; #line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return result; -#line 1848 "FlickrPublishingAuthenticator.c" +#line 1853 "FlickrPublishingAuthenticator.c" } @@ -1864,28 +1869,28 @@ static SpitPublishingDialogPaneGeometryOptions publishing_authenticator_shotwell result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; #line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return result; -#line 1861 "FlickrPublishingAuthenticator.c" +#line 1866 "FlickrPublishingAuthenticator.c" } static void _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_continue_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_pin_entry_pane_on_continue_clicked ((PublishingAuthenticatorShotwellFlickrPinEntryPane*) self); -#line 1868 "FlickrPublishingAuthenticator.c" +#line 1873 "FlickrPublishingAuthenticator.c" } static void _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 250 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed ((PublishingAuthenticatorShotwellFlickrPinEntryPane*) self); -#line 1875 "FlickrPublishingAuthenticator.c" +#line 1880 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_installed (SpitPublishingDialogPane* base) { PublishingAuthenticatorShotwellFlickrPinEntryPane * self; - GtkButton* _tmp0_ = NULL; - GtkEntry* _tmp1_ = NULL; + GtkButton* _tmp0_; + GtkEntry* _tmp1_; #line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingAuthenticatorShotwellFlickrPinEntryPane); #line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -1896,16 +1901,16 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane _tmp1_ = self->priv->pin_entry; #line 250 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed, self, 0); -#line 1893 "FlickrPublishingAuthenticator.c" +#line 1898 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) { PublishingAuthenticatorShotwellFlickrPinEntryPane * self; - GtkButton* _tmp0_ = NULL; - guint _tmp1_ = 0U; - GtkEntry* _tmp2_ = NULL; - guint _tmp3_ = 0U; + GtkButton* _tmp0_; + guint _tmp1_; + GtkEntry* _tmp2_; + guint _tmp3_; #line 253 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingAuthenticatorShotwellFlickrPinEntryPane); #line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -1920,7 +1925,7 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp3_, NULL, FALSE); #line 255 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed, self); -#line 1917 "FlickrPublishingAuthenticator.c" +#line 1922 "FlickrPublishingAuthenticator.c" } @@ -1939,19 +1944,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_STRING (GClosure * closure, GVa data1 = closure->data; #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" data2 = param_values->data[0].v_pointer; -#line 1936 "FlickrPublishingAuthenticator.c" +#line 1941 "FlickrPublishingAuthenticator.c" } else { #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" data1 = param_values->data[0].v_pointer; #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" data2 = closure->data; -#line 1942 "FlickrPublishingAuthenticator.c" +#line 1947 "FlickrPublishingAuthenticator.c" } #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" callback = (GMarshalFunc_VOID__OBJECT_STRING) (marshal_data ? marshal_data : cc->callback); #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_string (param_values + 2), data2); -#line 1948 "FlickrPublishingAuthenticator.c" +#line 1953 "FlickrPublishingAuthenticator.c" } @@ -1963,8 +1968,8 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_class_init ( #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_flickr_pin_entry_pane_finalize; #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - g_signal_new ("proceed", PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_STRING, G_TYPE_NONE, 2, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, G_TYPE_STRING); -#line 1961 "FlickrPublishingAuthenticator.c" + publishing_authenticator_shotwell_flickr_pin_entry_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_PROCEED_SIGNAL] = g_signal_new ("proceed", PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_STRING, G_TYPE_NONE, 2, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, G_TYPE_STRING); +#line 1966 "FlickrPublishingAuthenticator.c" } @@ -1972,14 +1977,14 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_spit_publish #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_pin_entry_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface); #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_get_widget; + iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_get_widget; #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_get_preferred_geometry; + iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_get_preferred_geometry; #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_installed; + iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_installed; #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_uninstalled; -#line 1976 "FlickrPublishingAuthenticator.c" + iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_uninstalled; +#line 1981 "FlickrPublishingAuthenticator.c" } @@ -1998,11 +2003,11 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_instance_ini self->priv->explanatory_text = NULL; #line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" self->priv->builder = NULL; -#line 1995 "FlickrPublishingAuthenticator.c" +#line 2000 "FlickrPublishingAuthenticator.c" } -static void publishing_authenticator_shotwell_flickr_pin_entry_pane_finalize (GObject* obj) { +static void publishing_authenticator_shotwell_flickr_pin_entry_pane_finalize (GObject * obj) { PublishingAuthenticatorShotwellFlickrPinEntryPane * self; #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingAuthenticatorShotwellFlickrPinEntryPane); @@ -2020,7 +2025,7 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_finalize (GO _g_object_unref0 (self->priv->builder); #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" G_OBJECT_CLASS (publishing_authenticator_shotwell_flickr_pin_entry_pane_parent_class)->finalize (obj); -#line 2017 "FlickrPublishingAuthenticator.c" +#line 2022 "FlickrPublishingAuthenticator.c" } @@ -2041,54 +2046,54 @@ GType publishing_authenticator_shotwell_flickr_pin_entry_pane_get_type (void) { static void _publishing_authenticator_shotwell_flickr_flickr_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer self) { #line 279 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_flickr_on_session_authenticated ((PublishingAuthenticatorShotwellFlickrFlickr*) self); -#line 2038 "FlickrPublishingAuthenticator.c" +#line 2043 "FlickrPublishingAuthenticator.c" } static void _g_free0_ (gpointer var) { #line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" var = (g_free (var), NULL); -#line 2045 "FlickrPublishingAuthenticator.c" +#line 2050 "FlickrPublishingAuthenticator.c" } static void _g_variant_unref0_ (gpointer var) { #line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" (var == NULL) ? NULL : (var = (g_variant_unref (var), NULL)); -#line 2052 "FlickrPublishingAuthenticator.c" +#line 2057 "FlickrPublishingAuthenticator.c" } static GVariant* _variant_new1 (const gchar* value) { #line 270 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 2059 "FlickrPublishingAuthenticator.c" +#line 2064 "FlickrPublishingAuthenticator.c" } static GVariant* _variant_new2 (const gchar* value) { #line 271 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 2066 "FlickrPublishingAuthenticator.c" +#line 2071 "FlickrPublishingAuthenticator.c" } PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_construct (GType object_type, SpitPublishingPluginHost* host) { PublishingAuthenticatorShotwellFlickrFlickr * self = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; - GHashFunc _tmp2_ = NULL; - GEqualFunc _tmp3_ = NULL; - GHashTable* _tmp4_ = NULL; - GHashTable* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - GVariant* _tmp7_ = NULL; - GHashTable* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - GVariant* _tmp10_ = NULL; - PublishingAuthenticatorShotwellFlickrSession* _tmp11_ = NULL; - PublishingAuthenticatorShotwellFlickrSession* _tmp12_ = NULL; - PublishingAuthenticatorShotwellFlickrSession* _tmp13_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; + GHashFunc _tmp2_; + GEqualFunc _tmp3_; + GHashTable* _tmp4_; + GHashTable* _tmp5_; + gchar* _tmp6_; + GVariant* _tmp7_; + GHashTable* _tmp8_; + gchar* _tmp9_; + GVariant* _tmp10_; + PublishingAuthenticatorShotwellFlickrSession* _tmp11_; + PublishingAuthenticatorShotwellFlickrSession* _tmp12_; + PublishingAuthenticatorShotwellFlickrSession* _tmp13_; #line 265 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL); #line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2143,14 +2148,14 @@ PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_f g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_session_authenticated_publishing_rest_support_session_authenticated, self, 0); #line 265 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return self; -#line 2140 "FlickrPublishingAuthenticator.c" +#line 2145 "FlickrPublishingAuthenticator.c" } PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_new (SpitPublishingPluginHost* host) { #line 265 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return publishing_authenticator_shotwell_flickr_flickr_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, host); -#line 2147 "FlickrPublishingAuthenticator.c" +#line 2152 "FlickrPublishingAuthenticator.c" } @@ -2163,7 +2168,7 @@ void publishing_authenticator_shotwell_flickr_flickr_invalidate_persistent_sessi publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_token_secret (self, ""); #line 285 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_username (self, ""); -#line 2160 "FlickrPublishingAuthenticator.c" +#line 2165 "FlickrPublishingAuthenticator.c" } @@ -2171,9 +2176,9 @@ static gboolean publishing_authenticator_shotwell_flickr_flickr_is_persistent_se gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + gchar* _tmp2_; + gchar* _tmp3_; + gboolean _tmp4_; #line 288 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self), FALSE); #line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2186,9 +2191,9 @@ static gboolean publishing_authenticator_shotwell_flickr_flickr_is_persistent_se _g_free0 (_tmp3_); #line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" if (_tmp4_) { -#line 2183 "FlickrPublishingAuthenticator.c" - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; +#line 2188 "FlickrPublishingAuthenticator.c" + gchar* _tmp5_; + gchar* _tmp6_; #line 290 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp5_ = publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_token (self); #line 290 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2197,17 +2202,17 @@ static gboolean publishing_authenticator_shotwell_flickr_flickr_is_persistent_se _tmp1_ = _tmp6_ != NULL; #line 290 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _g_free0 (_tmp6_); -#line 2194 "FlickrPublishingAuthenticator.c" +#line 2199 "FlickrPublishingAuthenticator.c" } else { #line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp1_ = FALSE; -#line 2198 "FlickrPublishingAuthenticator.c" +#line 2203 "FlickrPublishingAuthenticator.c" } #line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" if (_tmp1_) { -#line 2202 "FlickrPublishingAuthenticator.c" - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; +#line 2207 "FlickrPublishingAuthenticator.c" + gchar* _tmp7_; + gchar* _tmp8_; #line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp7_ = publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_token_secret (self); #line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2216,24 +2221,24 @@ static gboolean publishing_authenticator_shotwell_flickr_flickr_is_persistent_se _tmp0_ = _tmp8_ != NULL; #line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _g_free0 (_tmp8_); -#line 2213 "FlickrPublishingAuthenticator.c" +#line 2218 "FlickrPublishingAuthenticator.c" } else { #line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp0_ = FALSE; -#line 2217 "FlickrPublishingAuthenticator.c" +#line 2222 "FlickrPublishingAuthenticator.c" } #line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" result = _tmp0_; #line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return result; -#line 2223 "FlickrPublishingAuthenticator.c" +#line 2228 "FlickrPublishingAuthenticator.c" } static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_username (PublishingAuthenticatorShotwellFlickrFlickr* self) { gchar* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gchar* _tmp1_; #line 294 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self), NULL); #line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2244,13 +2249,13 @@ static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_acc result = _tmp1_; #line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return result; -#line 2241 "FlickrPublishingAuthenticator.c" +#line 2246 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_username (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* username) { - SpitPublishingPluginHost* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + const gchar* _tmp1_; #line 298 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self)); #line 298 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2261,14 +2266,14 @@ static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_acces _tmp1_ = username; #line 299 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_username", _tmp1_); -#line 2258 "FlickrPublishingAuthenticator.c" +#line 2263 "FlickrPublishingAuthenticator.c" } static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_token (PublishingAuthenticatorShotwellFlickrFlickr* self) { gchar* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gchar* _tmp1_; #line 302 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self), NULL); #line 303 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2279,13 +2284,13 @@ static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_acc result = _tmp1_; #line 303 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return result; -#line 2276 "FlickrPublishingAuthenticator.c" +#line 2281 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_token (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token) { - SpitPublishingPluginHost* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + const gchar* _tmp1_; #line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self)); #line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2296,14 +2301,14 @@ static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_acces _tmp1_ = token; #line 307 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token", _tmp1_); -#line 2293 "FlickrPublishingAuthenticator.c" +#line 2298 "FlickrPublishingAuthenticator.c" } static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellFlickrFlickr* self) { gchar* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gchar* _tmp1_; #line 310 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self), NULL); #line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2314,13 +2319,13 @@ static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_acc result = _tmp1_; #line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return result; -#line 2311 "FlickrPublishingAuthenticator.c" +#line 2316 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* secret) { - SpitPublishingPluginHost* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + const gchar* _tmp1_; #line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self)); #line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2331,27 +2336,27 @@ static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_acces _tmp1_ = secret; #line 315 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token_secret", _tmp1_); -#line 2328 "FlickrPublishingAuthenticator.c" +#line 2333 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_flickr_real_authenticate (SpitPublishingAuthenticator* base) { PublishingAuthenticatorShotwellFlickrFlickr * self; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 318 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr); #line 319 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp0_ = publishing_authenticator_shotwell_flickr_flickr_is_persistent_session_valid (self); #line 319 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" if (_tmp0_) { -#line 2341 "FlickrPublishingAuthenticator.c" - PublishingAuthenticatorShotwellFlickrSession* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; +#line 2346 "FlickrPublishingAuthenticator.c" + PublishingAuthenticatorShotwellFlickrSession* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; #line 320 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_debug ("FlickrPublishingAuthenticator.vala:320: attempt start: a persistent se" \ "ssion is available; using it"); @@ -2377,14 +2382,14 @@ static void publishing_authenticator_shotwell_flickr_flickr_real_authenticate (S _g_free0 (_tmp5_); #line 322 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _g_free0 (_tmp3_); -#line 2373 "FlickrPublishingAuthenticator.c" +#line 2378 "FlickrPublishingAuthenticator.c" } else { #line 325 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_debug ("FlickrPublishingAuthenticator.vala:325: attempt start: no persistent s" \ "ession available; showing login welcome pane"); #line 326 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_flickr_do_show_login_welcome_pane (self); -#line 2379 "FlickrPublishingAuthenticator.c" +#line 2384 "FlickrPublishingAuthenticator.c" } } @@ -2398,22 +2403,22 @@ static gboolean publishing_authenticator_shotwell_flickr_flickr_real_can_logout result = TRUE; #line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return result; -#line 2393 "FlickrPublishingAuthenticator.c" +#line 2398 "FlickrPublishingAuthenticator.c" } static gpointer _g_hash_table_ref0 (gpointer self) { #line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return self ? g_hash_table_ref (self) : NULL; -#line 2400 "FlickrPublishingAuthenticator.c" +#line 2405 "FlickrPublishingAuthenticator.c" } static GHashTable* publishing_authenticator_shotwell_flickr_flickr_real_get_authentication_parameter (SpitPublishingAuthenticator* base) { PublishingAuthenticatorShotwellFlickrFlickr * self; GHashTable* result = NULL; - GHashTable* _tmp0_ = NULL; - GHashTable* _tmp1_ = NULL; + GHashTable* _tmp0_; + GHashTable* _tmp1_; #line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr); #line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2424,13 +2429,13 @@ static GHashTable* publishing_authenticator_shotwell_flickr_flickr_real_get_auth result = _tmp1_; #line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return result; -#line 2419 "FlickrPublishingAuthenticator.c" +#line 2424 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_flickr_real_logout (SpitPublishingAuthenticator* base) { PublishingAuthenticatorShotwellFlickrFlickr * self; - PublishingAuthenticatorShotwellFlickrSession* _tmp0_ = NULL; + PublishingAuthenticatorShotwellFlickrSession* _tmp0_; #line 338 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr); #line 339 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2439,7 +2444,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_real_logout (SpitPub publishing_authenticator_shotwell_flickr_session_deauthenticate (_tmp0_); #line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_flickr_invalidate_persistent_session (self); -#line 2434 "FlickrPublishingAuthenticator.c" +#line 2439 "FlickrPublishingAuthenticator.c" } @@ -2447,20 +2452,20 @@ static void publishing_authenticator_shotwell_flickr_flickr_real_refresh (SpitPu PublishingAuthenticatorShotwellFlickrFlickr * self; #line 343 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr); -#line 2442 "FlickrPublishingAuthenticator.c" +#line 2447 "FlickrPublishingAuthenticator.c" } static void _publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked_spit_publishing_login_callback (gpointer self) { #line 351 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked ((PublishingAuthenticatorShotwellFlickrFlickr*) self); -#line 2449 "FlickrPublishingAuthenticator.c" +#line 2454 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_flickr_do_show_login_welcome_pane (PublishingAuthenticatorShotwellFlickrFlickr* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; #line 347 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self)); #line 348 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2474,7 +2479,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_show_login_welcom _tmp1_ = self->priv->host; #line 351 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" spit_publishing_plugin_host_install_welcome_pane (_tmp1_, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_SERVICE_WELCOME_MESSAGE, _publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked_spit_publishing_login_callback, self); -#line 2468 "FlickrPublishingAuthenticator.c" +#line 2473 "FlickrPublishingAuthenticator.c" } @@ -2486,31 +2491,30 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_logi "tton in the welcome pane"); #line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_flickr_do_run_authentication_request_transaction (self); -#line 2479 "FlickrPublishingAuthenticator.c" +#line 2484 "FlickrPublishingAuthenticator.c" } static void _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 367 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender); -#line 2486 "FlickrPublishingAuthenticator.c" +#line 2491 "FlickrPublishingAuthenticator.c" } static void _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 368 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender, err); -#line 2493 "FlickrPublishingAuthenticator.c" +#line 2498 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_flickr_do_run_authentication_request_transaction (PublishingAuthenticatorShotwellFlickrFlickr* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* txn = NULL; - PublishingAuthenticatorShotwellFlickrSession* _tmp3_ = NULL; - PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* _tmp4_ = NULL; + PublishingAuthenticatorShotwellFlickrSession* _tmp2_; + PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* _tmp3_; GError * _inner_error_ = NULL; #line 360 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self)); @@ -2524,20 +2528,18 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio #line 364 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp1_ = self->priv->host; #line 364 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - _tmp2_ = _ ("Preparing for login…"); -#line 364 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - spit_publishing_plugin_host_install_static_message_pane (_tmp1_, _tmp2_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); + spit_publishing_plugin_host_install_static_message_pane (_tmp1_, _ ("Preparing for login…"), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); #line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - _tmp3_ = self->priv->session; + _tmp2_ = self->priv->session; #line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - _tmp4_ = publishing_authenticator_shotwell_flickr_authentication_request_transaction_new (_tmp3_); + _tmp3_ = publishing_authenticator_shotwell_flickr_authentication_request_transaction_new (_tmp2_); #line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - txn = _tmp4_; + txn = _tmp3_; #line 367 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self, 0); #line 368 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self, 0); -#line 2529 "FlickrPublishingAuthenticator.c" +#line 2531 "FlickrPublishingAuthenticator.c" { #line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -2545,7 +2547,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio if (G_UNLIKELY (_inner_error_ != NULL)) { #line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2537 "FlickrPublishingAuthenticator.c" +#line 2539 "FlickrPublishingAuthenticator.c" goto __catch1_spit_publishing_publishing_error; } #line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2556,28 +2558,28 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio g_clear_error (&_inner_error_); #line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return; -#line 2548 "FlickrPublishingAuthenticator.c" +#line 2550 "FlickrPublishingAuthenticator.c" } } goto __finally1; __catch1_spit_publishing_publishing_error: { GError* err = NULL; - SpitPublishingPluginHost* _tmp5_ = NULL; - GError* _tmp6_ = NULL; + SpitPublishingPluginHost* _tmp4_; + GError* _tmp5_; #line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" err = _inner_error_; #line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _inner_error_ = NULL; #line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - _tmp5_ = self->priv->host; + _tmp4_ = self->priv->host; #line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - _tmp6_ = err; + _tmp5_ = err; #line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_); + spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_); #line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _g_error_free0 (err); -#line 2569 "FlickrPublishingAuthenticator.c" +#line 2571 "FlickrPublishingAuthenticator.c" } __finally1: #line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2590,25 +2592,25 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio g_clear_error (&_inner_error_); #line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return; -#line 2582 "FlickrPublishingAuthenticator.c" +#line 2584 "FlickrPublishingAuthenticator.c" } #line 360 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _publishing_rest_support_transaction_unref0 (txn); -#line 2586 "FlickrPublishingAuthenticator.c" +#line 2588 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - PublishingRESTSupportTransaction* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - PublishingRESTSupportTransaction* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + PublishingRESTSupportTransaction* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + PublishingRESTSupportTransaction* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 377 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self)); #line 377 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2646,17 +2648,17 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_ publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_from_auth_request (self, _tmp9_); #line 384 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _g_free0 (_tmp9_); -#line 2637 "FlickrPublishingAuthenticator.c" +#line 2639 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - SpitPublishingPluginHost* _tmp4_ = NULL; - GError* _tmp5_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + SpitPublishingPluginHost* _tmp4_; + GError* _tmp5_; #line 387 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self)); #line 387 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2684,27 +2686,27 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_ spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_); #line 395 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authentication-failed"); -#line 2674 "FlickrPublishingAuthenticator.c" +#line 2676 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_from_auth_request (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* response) { - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; gchar* oauth_token = NULL; gchar* oauth_token_secret = NULL; GHashTable* data = NULL; - const gchar* _tmp1_ = NULL; - GHashTable* _tmp2_ = NULL; - GHashTable* _tmp3_ = NULL; + const gchar* _tmp1_; + GHashTable* _tmp2_; + GHashTable* _tmp3_; gconstpointer _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - GHashTable* _tmp6_ = NULL; + gchar* _tmp5_; + GHashTable* _tmp6_; gconstpointer _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + gchar* _tmp8_; gboolean _tmp9_ = FALSE; - const gchar* _tmp10_ = NULL; - const gchar* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; + const gchar* _tmp10_; + const gchar* _tmp16_; + const gchar* _tmp17_; #line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self)); #line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2750,22 +2752,22 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_ if (_tmp10_ == NULL) { #line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp9_ = TRUE; -#line 2739 "FlickrPublishingAuthenticator.c" +#line 2741 "FlickrPublishingAuthenticator.c" } else { - const gchar* _tmp11_ = NULL; + const gchar* _tmp11_; #line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp11_ = oauth_token_secret; #line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp9_ = _tmp11_ == NULL; -#line 2746 "FlickrPublishingAuthenticator.c" +#line 2748 "FlickrPublishingAuthenticator.c" } #line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" if (_tmp9_) { -#line 2750 "FlickrPublishingAuthenticator.c" - SpitPublishingPluginHost* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - GError* _tmp14_ = NULL; - GError* _tmp15_ = NULL; +#line 2752 "FlickrPublishingAuthenticator.c" + SpitPublishingPluginHost* _tmp12_; + const gchar* _tmp13_; + GError* _tmp14_; + GError* _tmp15_; #line 409 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp12_ = self->priv->host; #line 409 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2778,7 +2780,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_ spit_publishing_plugin_host_post_error (_tmp12_, _tmp15_); #line 409 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _g_error_free0 (_tmp15_); -#line 2767 "FlickrPublishingAuthenticator.c" +#line 2769 "FlickrPublishingAuthenticator.c" } #line 413 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp16_ = oauth_token; @@ -2792,17 +2794,17 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_ _g_free0 (oauth_token_secret); #line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _g_free0 (oauth_token); -#line 2781 "FlickrPublishingAuthenticator.c" +#line 2783 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_flickr_on_authentication_token_available (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token, const gchar* token_secret) { - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - PublishingAuthenticatorShotwellFlickrSession* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + PublishingAuthenticatorShotwellFlickrSession* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp5_; #line 416 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self)); #line 416 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2828,7 +2830,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_authentication_to _tmp5_ = token; #line 422 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_flickr_do_launch_system_browser (self, _tmp5_); -#line 2816 "FlickrPublishingAuthenticator.c" +#line 2818 "FlickrPublishingAuthenticator.c" } @@ -2840,21 +2842,21 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_system_browser_la "."); #line 428 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_flickr_do_show_pin_entry_pane (self); -#line 2827 "FlickrPublishingAuthenticator.c" +#line 2829 "FlickrPublishingAuthenticator.c" } static void _publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed_publishing_authenticator_shotwell_flickr_pin_entry_pane_proceed (PublishingAuthenticatorShotwellFlickrPinEntryPane* _sender, PublishingAuthenticatorShotwellFlickrPinEntryPane* sender, const gchar* authorization_pin, gpointer self) { #line 432 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed ((PublishingAuthenticatorShotwellFlickrFlickr*) self, sender, authorization_pin); -#line 2834 "FlickrPublishingAuthenticator.c" +#line 2836 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingAuthenticatorShotwellFlickrPinEntryPane* sender, const gchar* pin) { - PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp0_ = NULL; - guint _tmp1_ = 0U; - const gchar* _tmp2_ = NULL; + PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp0_; + guint _tmp1_; + const gchar* _tmp2_; #line 431 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self)); #line 431 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2874,18 +2876,18 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed _tmp2_ = pin; #line 436 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (self, _tmp2_); -#line 2860 "FlickrPublishingAuthenticator.c" +#line 2862 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_flickr_do_launch_system_browser (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token) { gchar* login_uri = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + const gchar* _tmp5_; GError * _inner_error_ = NULL; #line 439 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self)); @@ -2910,11 +2912,11 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_launch_system_bro #line 443 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_debug ("FlickrPublishingAuthenticator.vala:443: ACTION: launching system brows" \ "er with uri = '%s'", _tmp5_); -#line 2895 "FlickrPublishingAuthenticator.c" +#line 2897 "FlickrPublishingAuthenticator.c" { - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + const gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; #line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp6_ = login_uri; #line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2929,7 +2931,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_launch_system_bro if (G_UNLIKELY (_inner_error_ != NULL)) { #line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" if (_inner_error_->domain == G_SPAWN_ERROR) { -#line 2914 "FlickrPublishingAuthenticator.c" +#line 2916 "FlickrPublishingAuthenticator.c" goto __catch2_g_spawn_error; } #line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2940,16 +2942,16 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_launch_system_bro g_clear_error (&_inner_error_); #line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return; -#line 2925 "FlickrPublishingAuthenticator.c" +#line 2927 "FlickrPublishingAuthenticator.c" } } goto __finally2; __catch2_g_spawn_error: { GError* e = NULL; - SpitPublishingPluginHost* _tmp9_ = NULL; - GError* _tmp10_ = NULL; - GError* _tmp11_ = NULL; + SpitPublishingPluginHost* _tmp9_; + GError* _tmp10_; + GError* _tmp11_; #line 445 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" e = _inner_error_; #line 445 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2970,7 +2972,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_launch_system_bro _g_free0 (login_uri); #line 450 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return; -#line 2955 "FlickrPublishingAuthenticator.c" +#line 2957 "FlickrPublishingAuthenticator.c" } __finally2: #line 445 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -2983,25 +2985,25 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_launch_system_bro g_clear_error (&_inner_error_); #line 445 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return; -#line 2968 "FlickrPublishingAuthenticator.c" +#line 2970 "FlickrPublishingAuthenticator.c" } #line 453 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_flickr_on_system_browser_launched (self); #line 439 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _g_free0 (login_uri); -#line 2974 "FlickrPublishingAuthenticator.c" +#line 2976 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_flickr_do_show_pin_entry_pane (PublishingAuthenticatorShotwellFlickrFlickr* self) { GtkBuilder* builder = NULL; - GtkBuilder* _tmp0_ = NULL; + GtkBuilder* _tmp0_; PublishingAuthenticatorShotwellFlickrPinEntryPane* pin_entry_pane = NULL; - GtkBuilder* _tmp8_ = NULL; - PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp9_ = NULL; - PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp10_ = NULL; - SpitPublishingPluginHost* _tmp11_ = NULL; - PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp12_ = NULL; + GtkBuilder* _tmp7_; + PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp8_; + PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp9_; + SpitPublishingPluginHost* _tmp10_; + PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp11_; GError * _inner_error_ = NULL; #line 456 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self)); @@ -3011,16 +3013,16 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_show_pin_entry_pa _tmp0_ = gtk_builder_new (); #line 459 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" builder = _tmp0_; -#line 2996 "FlickrPublishingAuthenticator.c" +#line 2998 "FlickrPublishingAuthenticator.c" { - GtkBuilder* _tmp1_ = NULL; + GtkBuilder* _tmp1_; #line 462 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp1_ = builder; #line 462 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/" "flickr_pin_entry_pane.ui", &_inner_error_); #line 462 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3005 "FlickrPublishingAuthenticator.c" +#line 3007 "FlickrPublishingAuthenticator.c" goto __catch3_g_error; } } @@ -3028,12 +3030,11 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_show_pin_entry_pa __catch3_g_error: { GError* e = NULL; - GError* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - SpitPublishingPluginHost* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - GError* _tmp6_ = NULL; - GError* _tmp7_ = NULL; + GError* _tmp2_; + const gchar* _tmp3_; + SpitPublishingPluginHost* _tmp4_; + GError* _tmp5_; + GError* _tmp6_; #line 461 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" e = _inner_error_; #line 461 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -3048,23 +3049,21 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_show_pin_entry_pa #line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp4_ = self->priv->host; #line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - _tmp5_ = _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \ -"n’t continue."); + _tmp5_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \ +"n’t continue.")); #line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - _tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp5_); -#line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - spit_publishing_plugin_host_post_error (_tmp4_, _tmp7_); + spit_publishing_plugin_host_post_error (_tmp4_, _tmp6_); #line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - _g_error_free0 (_tmp7_); + _g_error_free0 (_tmp6_); #line 469 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _g_error_free0 (e); #line 469 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _g_object_unref0 (builder); #line 469 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return; -#line 3047 "FlickrPublishingAuthenticator.c" +#line 3046 "FlickrPublishingAuthenticator.c" } __finally3: #line 461 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -3077,55 +3076,54 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_show_pin_entry_pa g_clear_error (&_inner_error_); #line 461 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return; -#line 3060 "FlickrPublishingAuthenticator.c" +#line 3059 "FlickrPublishingAuthenticator.c" } #line 472 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - _tmp8_ = builder; + _tmp7_ = builder; #line 472 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - _tmp9_ = publishing_authenticator_shotwell_flickr_pin_entry_pane_new (_tmp8_); + _tmp8_ = publishing_authenticator_shotwell_flickr_pin_entry_pane_new (_tmp7_); #line 472 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - pin_entry_pane = _tmp9_; + pin_entry_pane = _tmp8_; #line 473 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - _tmp10_ = pin_entry_pane; + _tmp9_ = pin_entry_pane; #line 473 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - g_signal_connect_object (_tmp10_, "proceed", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed_publishing_authenticator_shotwell_flickr_pin_entry_pane_proceed, self, 0); + g_signal_connect_object (_tmp9_, "proceed", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed_publishing_authenticator_shotwell_flickr_pin_entry_pane_proceed, self, 0); #line 474 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - _tmp11_ = self->priv->host; + _tmp10_ = self->priv->host; #line 474 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - _tmp12_ = pin_entry_pane; + _tmp11_ = pin_entry_pane; #line 474 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - spit_publishing_plugin_host_install_dialog_pane (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); + spit_publishing_plugin_host_install_dialog_pane (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); #line 456 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _g_object_unref0 (pin_entry_pane); #line 456 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _g_object_unref0 (builder); -#line 3082 "FlickrPublishingAuthenticator.c" +#line 3081 "FlickrPublishingAuthenticator.c" } static void _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 484 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender); -#line 3089 "FlickrPublishingAuthenticator.c" +#line 3088 "FlickrPublishingAuthenticator.c" } static void _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 485 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender, err); -#line 3096 "FlickrPublishingAuthenticator.c" +#line 3095 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* pin) { - const gchar* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; - SpitPublishingPluginHost* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + SpitPublishingPluginHost* _tmp1_; + SpitPublishingPluginHost* _tmp2_; PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* txn = NULL; - PublishingAuthenticatorShotwellFlickrSession* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* _tmp6_ = NULL; + PublishingAuthenticatorShotwellFlickrSession* _tmp3_; + const gchar* _tmp4_; + PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* _tmp5_; GError * _inner_error_ = NULL; #line 477 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self)); @@ -3143,22 +3141,20 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (Publi #line 481 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp2_ = self->priv->host; #line 481 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - _tmp3_ = _ ("Verifying authorization…"); -#line 481 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - spit_publishing_plugin_host_install_static_message_pane (_tmp2_, _tmp3_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); + spit_publishing_plugin_host_install_static_message_pane (_tmp2_, _ ("Verifying authorization…"), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); #line 483 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - _tmp4_ = self->priv->session; + _tmp3_ = self->priv->session; #line 483 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - _tmp5_ = pin; + _tmp4_ = pin; #line 483 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - _tmp6_ = publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (_tmp4_, _tmp5_); + _tmp5_ = publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (_tmp3_, _tmp4_); #line 483 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - txn = _tmp6_; + txn = _tmp5_; #line 484 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed, self, 0); #line 485 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error_publishing_rest_support_transaction_network_error, self, 0); -#line 3140 "FlickrPublishingAuthenticator.c" +#line 3136 "FlickrPublishingAuthenticator.c" { #line 488 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -3166,7 +3162,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (Publi if (G_UNLIKELY (_inner_error_ != NULL)) { #line 488 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3148 "FlickrPublishingAuthenticator.c" +#line 3144 "FlickrPublishingAuthenticator.c" goto __catch4_spit_publishing_publishing_error; } #line 488 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -3177,28 +3173,28 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (Publi g_clear_error (&_inner_error_); #line 488 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return; -#line 3159 "FlickrPublishingAuthenticator.c" +#line 3155 "FlickrPublishingAuthenticator.c" } } goto __finally4; __catch4_spit_publishing_publishing_error: { GError* err = NULL; - SpitPublishingPluginHost* _tmp7_ = NULL; - GError* _tmp8_ = NULL; + SpitPublishingPluginHost* _tmp6_; + GError* _tmp7_; #line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" err = _inner_error_; #line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _inner_error_ = NULL; #line 490 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - _tmp7_ = self->priv->host; + _tmp6_ = self->priv->host; #line 490 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - _tmp8_ = err; + _tmp7_ = err; #line 490 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_); + spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_); #line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _g_error_free0 (err); -#line 3180 "FlickrPublishingAuthenticator.c" +#line 3176 "FlickrPublishingAuthenticator.c" } __finally4: #line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -3211,22 +3207,22 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (Publi g_clear_error (&_inner_error_); #line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return; -#line 3193 "FlickrPublishingAuthenticator.c" +#line 3189 "FlickrPublishingAuthenticator.c" } #line 477 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _publishing_rest_support_transaction_unref0 (txn); -#line 3197 "FlickrPublishingAuthenticator.c" +#line 3193 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - PublishingRESTSupportTransaction* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + PublishingRESTSupportTransaction* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; #line 494 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self)); #line 494 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -3256,17 +3252,17 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetc publishing_authenticator_shotwell_flickr_flickr_do_extract_access_phase_credentials_from_reponse (self, _tmp6_); #line 500 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _g_free0 (_tmp6_); -#line 3237 "FlickrPublishingAuthenticator.c" +#line 3233 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - SpitPublishingPluginHost* _tmp4_ = NULL; - GError* _tmp5_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + SpitPublishingPluginHost* _tmp4_; + GError* _tmp5_; #line 503 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self)); #line 503 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -3294,33 +3290,33 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetc spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_); #line 511 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authentication-failed"); -#line 3274 "FlickrPublishingAuthenticator.c" +#line 3270 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_phase_credentials_from_reponse (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* response) { - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; gchar* token = NULL; gchar* token_secret = NULL; gchar* username = NULL; GHashTable* data = NULL; - const gchar* _tmp1_ = NULL; - GHashTable* _tmp2_ = NULL; - GHashTable* _tmp3_ = NULL; + const gchar* _tmp1_; + GHashTable* _tmp2_; + GHashTable* _tmp3_; gconstpointer _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - GHashTable* _tmp6_ = NULL; + gchar* _tmp5_; + GHashTable* _tmp6_; gconstpointer _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - GHashTable* _tmp9_ = NULL; + gchar* _tmp8_; + GHashTable* _tmp9_; gconstpointer _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; + gchar* _tmp11_; + const gchar* _tmp12_; + const gchar* _tmp13_; + const gchar* _tmp14_; gboolean _tmp15_ = FALSE; gboolean _tmp16_ = FALSE; - const gchar* _tmp17_ = NULL; + const gchar* _tmp17_; #line 514 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self)); #line 514 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -3387,34 +3383,34 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_ph if (_tmp17_ == NULL) { #line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp16_ = TRUE; -#line 3365 "FlickrPublishingAuthenticator.c" +#line 3361 "FlickrPublishingAuthenticator.c" } else { - const gchar* _tmp18_ = NULL; + const gchar* _tmp18_; #line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp18_ = token_secret; #line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp16_ = _tmp18_ == NULL; -#line 3372 "FlickrPublishingAuthenticator.c" +#line 3368 "FlickrPublishingAuthenticator.c" } #line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" if (_tmp16_) { #line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp15_ = TRUE; -#line 3378 "FlickrPublishingAuthenticator.c" +#line 3374 "FlickrPublishingAuthenticator.c" } else { - const gchar* _tmp19_ = NULL; + const gchar* _tmp19_; #line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp19_ = username; #line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp15_ = _tmp19_ == NULL; -#line 3385 "FlickrPublishingAuthenticator.c" +#line 3381 "FlickrPublishingAuthenticator.c" } #line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" if (_tmp15_) { -#line 3389 "FlickrPublishingAuthenticator.c" - SpitPublishingPluginHost* _tmp20_ = NULL; - GError* _tmp21_ = NULL; - GError* _tmp22_ = NULL; +#line 3385 "FlickrPublishingAuthenticator.c" + SpitPublishingPluginHost* _tmp20_; + GError* _tmp21_; + GError* _tmp22_; #line 530 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp20_ = self->priv->host; #line 530 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -3428,12 +3424,12 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_ph _g_error_free0 (_tmp22_); #line 533 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authentication-failed"); -#line 3405 "FlickrPublishingAuthenticator.c" +#line 3401 "FlickrPublishingAuthenticator.c" } else { - PublishingAuthenticatorShotwellFlickrSession* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; - const gchar* _tmp26_ = NULL; + PublishingAuthenticatorShotwellFlickrSession* _tmp23_; + const gchar* _tmp24_; + const gchar* _tmp25_; + const gchar* _tmp26_; #line 535 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _tmp23_ = self->priv->session; #line 535 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -3444,7 +3440,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_ph _tmp26_ = username; #line 535 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_session_set_access_phase_credentials (_tmp23_, _tmp24_, _tmp25_, _tmp26_); -#line 3421 "FlickrPublishingAuthenticator.c" +#line 3417 "FlickrPublishingAuthenticator.c" } #line 514 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _g_hash_table_unref0 (data); @@ -3454,59 +3450,59 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_ph _g_free0 (token_secret); #line 514 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" _g_free0 (token); -#line 3431 "FlickrPublishingAuthenticator.c" +#line 3427 "FlickrPublishingAuthenticator.c" } static GVariant* _variant_new3 (gchar* value) { #line 540 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 3438 "FlickrPublishingAuthenticator.c" +#line 3434 "FlickrPublishingAuthenticator.c" } static GVariant* _variant_new4 (gchar* value) { #line 541 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 3445 "FlickrPublishingAuthenticator.c" +#line 3441 "FlickrPublishingAuthenticator.c" } static GVariant* _variant_new5 (gchar* value) { #line 542 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 3452 "FlickrPublishingAuthenticator.c" +#line 3448 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_flickr_on_session_authenticated (PublishingAuthenticatorShotwellFlickrFlickr* self) { - GHashTable* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - PublishingAuthenticatorShotwellFlickrSession* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GVariant* _tmp5_ = NULL; - GHashTable* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - PublishingAuthenticatorShotwellFlickrSession* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - GVariant* _tmp11_ = NULL; - GHashTable* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - PublishingAuthenticatorShotwellFlickrSession* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - GVariant* _tmp17_ = NULL; - PublishingAuthenticatorShotwellFlickrSession* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - PublishingAuthenticatorShotwellFlickrSession* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - PublishingAuthenticatorShotwellFlickrSession* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; + GHashTable* _tmp0_; + gchar* _tmp1_; + PublishingAuthenticatorShotwellFlickrSession* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + GVariant* _tmp5_; + GHashTable* _tmp6_; + gchar* _tmp7_; + PublishingAuthenticatorShotwellFlickrSession* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + GVariant* _tmp11_; + GHashTable* _tmp12_; + gchar* _tmp13_; + PublishingAuthenticatorShotwellFlickrSession* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + GVariant* _tmp17_; + PublishingAuthenticatorShotwellFlickrSession* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; + PublishingAuthenticatorShotwellFlickrSession* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + PublishingAuthenticatorShotwellFlickrSession* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; #line 539 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self)); #line 540 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -3589,7 +3585,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_session_authentic _g_free0 (_tmp26_); #line 549 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authenticated"); -#line 3566 "FlickrPublishingAuthenticator.c" +#line 3562 "FlickrPublishingAuthenticator.c" } @@ -3600,7 +3596,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_class_init (Publishi g_type_class_add_private (klass, sizeof (PublishingAuthenticatorShotwellFlickrFlickrPrivate)); #line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_flickr_flickr_finalize; -#line 3577 "FlickrPublishingAuthenticator.c" +#line 3573 "FlickrPublishingAuthenticator.c" } @@ -3608,30 +3604,30 @@ static void publishing_authenticator_shotwell_flickr_flickr_spit_publishing_auth #line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_flickr_spit_publishing_authenticator_parent_iface = g_type_interface_peek_parent (iface); #line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - iface->authenticate = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_flickr_flickr_real_authenticate; + iface->authenticate = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_authenticate; #line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - iface->can_logout = (gboolean (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_flickr_flickr_real_can_logout; + iface->can_logout = (gboolean (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_can_logout; #line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - iface->get_authentication_parameter = (GHashTable* (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_flickr_flickr_real_get_authentication_parameter; + iface->get_authentication_parameter = (GHashTable* (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_get_authentication_parameter; #line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - iface->logout = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_flickr_flickr_real_logout; + iface->logout = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_logout; #line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - iface->refresh = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_flickr_flickr_real_refresh; -#line 3594 "FlickrPublishingAuthenticator.c" + iface->refresh = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_refresh; +#line 3590 "FlickrPublishingAuthenticator.c" } static void publishing_authenticator_shotwell_flickr_flickr_instance_init (PublishingAuthenticatorShotwellFlickrFlickr * self) { #line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" self->priv = PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR_GET_PRIVATE (self); -#line 3601 "FlickrPublishingAuthenticator.c" +#line 3597 "FlickrPublishingAuthenticator.c" } -static void publishing_authenticator_shotwell_flickr_flickr_finalize (GObject* obj) { +static void publishing_authenticator_shotwell_flickr_flickr_finalize (GObject * obj) { PublishingAuthenticatorShotwellFlickrFlickr * self; - PublishingAuthenticatorShotwellFlickrSession* _tmp0_ = NULL; - guint _tmp1_ = 0U; + PublishingAuthenticatorShotwellFlickrSession* _tmp0_; + guint _tmp1_; #line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr); #line 279 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" @@ -3648,7 +3644,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_finalize (GObject* o _g_object_unref0 (self->priv->host); #line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" G_OBJECT_CLASS (publishing_authenticator_shotwell_flickr_flickr_parent_class)->finalize (obj); -#line 3625 "FlickrPublishingAuthenticator.c" +#line 3621 "FlickrPublishingAuthenticator.c" } 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" } diff --git a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c index 248c757..2d42463 100644 --- a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c +++ b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c @@ -1,4 +1,4 @@ -/* ShotwellAuthenticatorFactory.c generated by valac 0.34.7, the Vala compiler +/* ShotwellAuthenticatorFactory.c generated by valac 0.36.6, the Vala compiler * generated from ShotwellAuthenticatorFactory.vala, do not modify */ @@ -66,7 +66,7 @@ struct _PublishingAuthenticatorFactoryClass { static gpointer publishing_authenticator_factory_parent_class = NULL; static PublishingAuthenticatorFactory* publishing_authenticator_factory_instance; static PublishingAuthenticatorFactory* publishing_authenticator_factory_instance = NULL; -static SpitPublishingAuthenticatorFactoryIface* publishing_authenticator_factory_spit_publishing_authenticator_factory_parent_iface = NULL; +static SpitPublishingAuthenticatorFactoryIface * publishing_authenticator_factory_spit_publishing_authenticator_factory_parent_iface = NULL; GType publishing_authenticator_factory_get_type (void) G_GNUC_CONST; enum { @@ -86,7 +86,7 @@ GType publishing_authenticator_shotwell_facebook_facebook_get_type (void) G_GNUC PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_new (const gchar* scope, const gchar* welcome_message, SpitPublishingPluginHost* host); PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_construct (GType object_type, const gchar* scope, const gchar* welcome_message, SpitPublishingPluginHost* host); GType publishing_authenticator_shotwell_google_google_get_type (void) G_GNUC_CONST; -static void publishing_authenticator_factory_finalize (GObject* obj); +static void publishing_authenticator_factory_finalize (GObject * obj); static gpointer _g_object_ref0 (gpointer self) { @@ -98,15 +98,15 @@ static gpointer _g_object_ref0 (gpointer self) { PublishingAuthenticatorFactory* publishing_authenticator_factory_get_instance (void) { PublishingAuthenticatorFactory* result = NULL; - PublishingAuthenticatorFactory* _tmp0_ = NULL; - PublishingAuthenticatorFactory* _tmp2_ = NULL; - PublishingAuthenticatorFactory* _tmp3_ = NULL; + PublishingAuthenticatorFactory* _tmp0_; + PublishingAuthenticatorFactory* _tmp2_; + PublishingAuthenticatorFactory* _tmp3_; #line 6 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" _tmp0_ = publishing_authenticator_factory_instance; #line 6 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" if (_tmp0_ == NULL) { #line 109 "ShotwellAuthenticatorFactory.c" - PublishingAuthenticatorFactory* _tmp1_ = NULL; + PublishingAuthenticatorFactory* _tmp1_; #line 7 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" _tmp1_ = publishing_authenticator_factory_new (); #line 7 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" @@ -131,7 +131,7 @@ static GeeList* publishing_authenticator_factory_real_get_available_authenticato PublishingAuthenticatorFactory * self; GeeList* result = NULL; GeeArrayList* list = NULL; - GeeArrayList* _tmp0_ = NULL; + GeeArrayList* _tmp0_; #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_TYPE_FACTORY, PublishingAuthenticatorFactory); #line 14 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" @@ -157,8 +157,8 @@ static GeeList* publishing_authenticator_factory_real_get_available_authenticato static SpitPublishingAuthenticator* publishing_authenticator_factory_real_create (SpitPublishingAuthenticatorFactory* base, const gchar* provider, SpitPublishingPluginHost* host) { PublishingAuthenticatorFactory * self; SpitPublishingAuthenticator* result = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; GQuark _tmp3_ = 0U; #line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" static GQuark _tmp2_label0 = 0; @@ -187,8 +187,8 @@ static SpitPublishingAuthenticator* publishing_authenticator_factory_real_create #line 188 "ShotwellAuthenticatorFactory.c" default: { - SpitPublishingPluginHost* _tmp4_ = NULL; - PublishingAuthenticatorShotwellFlickrFlickr* _tmp5_ = NULL; + SpitPublishingPluginHost* _tmp4_; + PublishingAuthenticatorShotwellFlickrFlickr* _tmp5_; #line 27 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" _tmp4_ = host; #line 27 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" @@ -206,8 +206,8 @@ static SpitPublishingAuthenticator* publishing_authenticator_factory_real_create #line 207 "ShotwellAuthenticatorFactory.c" default: { - SpitPublishingPluginHost* _tmp6_ = NULL; - PublishingAuthenticatorShotwellFacebookFacebook* _tmp7_ = NULL; + SpitPublishingPluginHost* _tmp6_; + PublishingAuthenticatorShotwellFacebookFacebook* _tmp7_; #line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" _tmp6_ = host; #line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" @@ -225,63 +225,57 @@ static SpitPublishingAuthenticator* publishing_authenticator_factory_real_create #line 226 "ShotwellAuthenticatorFactory.c" default: { - const gchar* _tmp8_ = NULL; - SpitPublishingPluginHost* _tmp9_ = NULL; - PublishingAuthenticatorShotwellGoogleGoogle* _tmp10_ = NULL; + SpitPublishingPluginHost* _tmp8_; + PublishingAuthenticatorShotwellGoogleGoogle* _tmp9_; #line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" - _tmp8_ = _ ("You are not currently logged into Picasa Web Albums.\n" \ + _tmp8_ = host; +#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" + _tmp9_ = publishing_authenticator_shotwell_google_google_new ("https://picasaweb.google.com/data/", _ ("You are not currently logged into Picasa Web Albums.\n" \ "\n" \ "Click Log in to log into Picasa Web Albums in your Web browser. You wi" \ "ll have to authorize Shotwell Connect to link to your Picasa Web Album" \ -"s account."); -#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" - _tmp9_ = host; +"s account."), _tmp8_); #line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" - _tmp10_ = publishing_authenticator_shotwell_google_google_new ("https://picasaweb.google.com/data/", _tmp8_, _tmp9_); -#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator); #line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" return result; -#line 242 "ShotwellAuthenticatorFactory.c" +#line 239 "ShotwellAuthenticatorFactory.c" } } } else if (_tmp3_ == ((0 != _tmp2_label3) ? _tmp2_label3 : (_tmp2_label3 = g_quark_from_static_string ("youtube")))) { #line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" switch (0) { -#line 248 "ShotwellAuthenticatorFactory.c" +#line 245 "ShotwellAuthenticatorFactory.c" default: { - const gchar* _tmp11_ = NULL; - SpitPublishingPluginHost* _tmp12_ = NULL; - PublishingAuthenticatorShotwellGoogleGoogle* _tmp13_ = NULL; + SpitPublishingPluginHost* _tmp10_; + PublishingAuthenticatorShotwellGoogleGoogle* _tmp11_; +#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" + _tmp10_ = host; #line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" - _tmp11_ = _ ("You are not currently logged into YouTube.\n" \ + _tmp11_ = publishing_authenticator_shotwell_google_google_new ("https://gdata.youtube.com/", _ ("You are not currently logged into YouTube.\n" \ "\n" \ "You must have already signed up for a Google account and set it up for" \ " use with YouTube to continue. You can set up most accounts by using y" \ -"our browser to log into the YouTube site at least once."); +"our browser to log into the YouTube site at least once."), _tmp10_); #line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" - _tmp12_ = host; -#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" - _tmp13_ = publishing_authenticator_shotwell_google_google_new ("https://gdata.youtube.com/", _tmp11_, _tmp12_); -#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator); #line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" return result; -#line 264 "ShotwellAuthenticatorFactory.c" +#line 258 "ShotwellAuthenticatorFactory.c" } } } else { #line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" switch (0) { -#line 270 "ShotwellAuthenticatorFactory.c" +#line 264 "ShotwellAuthenticatorFactory.c" default: { #line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" result = NULL; #line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" return result; -#line 277 "ShotwellAuthenticatorFactory.c" +#line 271 "ShotwellAuthenticatorFactory.c" } } } @@ -294,14 +288,14 @@ PublishingAuthenticatorFactory* publishing_authenticator_factory_construct (GTyp self = (PublishingAuthenticatorFactory*) g_object_new (object_type, NULL); #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" return self; -#line 290 "ShotwellAuthenticatorFactory.c" +#line 284 "ShotwellAuthenticatorFactory.c" } PublishingAuthenticatorFactory* publishing_authenticator_factory_new (void) { #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" return publishing_authenticator_factory_construct (PUBLISHING_AUTHENTICATOR_TYPE_FACTORY); -#line 297 "ShotwellAuthenticatorFactory.c" +#line 291 "ShotwellAuthenticatorFactory.c" } @@ -310,7 +304,7 @@ static void publishing_authenticator_factory_class_init (PublishingAuthenticator publishing_authenticator_factory_parent_class = g_type_class_peek_parent (klass); #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_factory_finalize; -#line 306 "ShotwellAuthenticatorFactory.c" +#line 300 "ShotwellAuthenticatorFactory.c" } @@ -318,10 +312,10 @@ static void publishing_authenticator_factory_spit_publishing_authenticator_facto #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" publishing_authenticator_factory_spit_publishing_authenticator_factory_parent_iface = g_type_interface_peek_parent (iface); #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" - iface->get_available_authenticators = (GeeList* (*)(SpitPublishingAuthenticatorFactory*)) publishing_authenticator_factory_real_get_available_authenticators; + iface->get_available_authenticators = (GeeList* (*) (SpitPublishingAuthenticatorFactory *)) publishing_authenticator_factory_real_get_available_authenticators; #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" - iface->create = (SpitPublishingAuthenticator* (*)(SpitPublishingAuthenticatorFactory*, const gchar*, SpitPublishingPluginHost*)) publishing_authenticator_factory_real_create; -#line 317 "ShotwellAuthenticatorFactory.c" + iface->create = (SpitPublishingAuthenticator* (*) (SpitPublishingAuthenticatorFactory *, const gchar*, SpitPublishingPluginHost*)) publishing_authenticator_factory_real_create; +#line 311 "ShotwellAuthenticatorFactory.c" } @@ -329,13 +323,13 @@ static void publishing_authenticator_factory_instance_init (PublishingAuthentica } -static void publishing_authenticator_factory_finalize (GObject* obj) { +static void publishing_authenticator_factory_finalize (GObject * obj) { PublishingAuthenticatorFactory * self; #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_TYPE_FACTORY, PublishingAuthenticatorFactory); #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" G_OBJECT_CLASS (publishing_authenticator_factory_parent_class)->finalize (obj); -#line 331 "ShotwellAuthenticatorFactory.c" +#line 325 "ShotwellAuthenticatorFactory.c" } diff --git a/plugins/common/BuilderPane.c b/plugins/common/BuilderPane.c index 69bbe30..5797f7d 100644 --- a/plugins/common/BuilderPane.c +++ b/plugins/common/BuilderPane.c @@ -1,4 +1,4 @@ -/* BuilderPane.c generated by valac 0.34.7, the Vala compiler +/* BuilderPane.c generated by valac 0.36.6, the Vala compiler * generated from BuilderPane.vala, do not modify */ /* Copyright 2016 Jens Georg <mail@jensge.org> @@ -51,16 +51,16 @@ struct _ShotwellPluginsCommonBuilderPanePrivate { static gpointer shotwell_plugins_common_builder_pane_parent_class = NULL; -static SpitPublishingDialogPaneIface* shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_parent_iface = NULL; +static SpitPublishingDialogPaneIface * shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_parent_iface = NULL; GType shotwell_plugins_common_builder_pane_get_type (void) G_GNUC_CONST; #define SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPanePrivate)) enum { SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DUMMY_PROPERTY, - SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY, - SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH, - SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS, - SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID + SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY_PROPERTY, + SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH_PROPERTY, + SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS_PROPERTY, + SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID_PROPERTY }; static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base); gchar* shotwell_plugins_common_builder_pane_get_resource_path (ShotwellPluginsCommonBuilderPane* self); @@ -81,7 +81,7 @@ static void shotwell_plugins_common_builder_pane_set_preferred_geometry (Shotwel static void shotwell_plugins_common_builder_pane_set_resource_path (ShotwellPluginsCommonBuilderPane* self, const gchar* value); static void shotwell_plugins_common_builder_pane_set_connect_signals (ShotwellPluginsCommonBuilderPane* self, gboolean value); static void shotwell_plugins_common_builder_pane_set_default_id (ShotwellPluginsCommonBuilderPane* self, const gchar* value); -static void shotwell_plugins_common_builder_pane_finalize (GObject* obj); +static void shotwell_plugins_common_builder_pane_finalize (GObject * obj); static void _vala_shotwell_plugins_common_builder_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_shotwell_plugins_common_builder_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -95,20 +95,20 @@ static gpointer _g_object_ref0 (gpointer self) { static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base) { ShotwellPluginsCommonBuilderPane * self; - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - GtkBuilder* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; - GtkBuilder* _tmp9_ = NULL; - GObject* _tmp10_ = NULL; - GtkWidget* _tmp11_ = NULL; - GtkWidget* _tmp12_ = NULL; - GtkContainer* _tmp13_ = NULL; - GtkContainer* _tmp14_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + GtkBuilder* _tmp6_; + gboolean _tmp7_; + GtkBuilder* _tmp9_; + GObject* _tmp10_; + GtkWidget* _tmp11_; + GtkWidget* _tmp12_; + GtkContainer* _tmp13_; + GtkContainer* _tmp14_; #line 22 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane); #line 23 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" @@ -142,7 +142,7 @@ static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base #line 28 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" if (_tmp7_) { #line 145 "BuilderPane.c" - GtkBuilder* _tmp8_ = NULL; + GtkBuilder* _tmp8_; #line 29 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" _tmp8_ = self->priv->builder; #line 29 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" @@ -168,10 +168,10 @@ static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base #line 35 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" if (_tmp14_ != NULL) { #line 171 "BuilderPane.c" - GtkWidget* _tmp15_ = NULL; - GtkContainer* _tmp16_ = NULL; - GtkContainer* _tmp17_ = NULL; - GtkWidget* _tmp18_ = NULL; + GtkWidget* _tmp15_; + GtkContainer* _tmp16_; + GtkContainer* _tmp17_; + GtkWidget* _tmp18_; #line 36 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" _tmp15_ = self->priv->content; #line 36 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" @@ -190,7 +190,7 @@ static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) { ShotwellPluginsCommonBuilderPane * self; SpitPublishingDialogPaneGeometryOptions result = 0; - SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0; + SpitPublishingDialogPaneGeometryOptions _tmp0_; #line 40 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane); #line 41 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" @@ -206,8 +206,8 @@ static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_p static GtkWidget* shotwell_plugins_common_builder_pane_real_get_widget (SpitPublishingDialogPane* base) { ShotwellPluginsCommonBuilderPane * self; GtkWidget* result = NULL; - GtkWidget* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkWidget* _tmp0_; + GtkWidget* _tmp1_; #line 44 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane); #line 45 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" @@ -224,8 +224,8 @@ static GtkWidget* shotwell_plugins_common_builder_pane_real_get_widget (SpitPubl GtkBuilder* shotwell_plugins_common_builder_pane_get_builder (ShotwellPluginsCommonBuilderPane* self) { GtkBuilder* result = NULL; - GtkBuilder* _tmp0_ = NULL; - GtkBuilder* _tmp1_ = NULL; + GtkBuilder* _tmp0_; + GtkBuilder* _tmp1_; #line 48 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), NULL); #line 49 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" @@ -242,14 +242,14 @@ GtkBuilder* shotwell_plugins_common_builder_pane_get_builder (ShotwellPluginsCom static GtkWidget* shotwell_plugins_common_builder_pane_real_get_default_widget (ShotwellPluginsCommonBuilderPane* self) { GtkWidget* result = NULL; - GtkBuilder* _tmp0_ = NULL; - GtkBuilder* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GObject* _tmp5_ = NULL; - GtkWidget* _tmp6_ = NULL; - GtkWidget* _tmp7_ = NULL; + GtkBuilder* _tmp0_; + GtkBuilder* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + GObject* _tmp5_; + GtkWidget* _tmp6_; + GtkWidget* _tmp7_; #line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" _tmp0_ = shotwell_plugins_common_builder_pane_get_builder (self); #line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" @@ -325,7 +325,7 @@ ShotwellPluginsCommonBuilderPane* shotwell_plugins_common_builder_pane_construct SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_get_preferred_geometry (ShotwellPluginsCommonBuilderPane* self) { SpitPublishingDialogPaneGeometryOptions result; - SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0; + SpitPublishingDialogPaneGeometryOptions _tmp0_; #line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), 0); #line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" @@ -339,23 +339,27 @@ SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_get static void shotwell_plugins_common_builder_pane_set_preferred_geometry (ShotwellPluginsCommonBuilderPane* self, SpitPublishingDialogPaneGeometryOptions value) { - SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0; #line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self)); #line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - _tmp0_ = value; + if (shotwell_plugins_common_builder_pane_get_preferred_geometry (self) != value) { +#line 347 "BuilderPane.c" + SpitPublishingDialogPaneGeometryOptions _tmp0_; #line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - self->priv->_preferred_geometry = _tmp0_; + _tmp0_ = value; #line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - g_object_notify ((GObject *) self, "preferred-geometry"); -#line 352 "BuilderPane.c" + self->priv->_preferred_geometry = _tmp0_; +#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" + g_object_notify ((GObject *) self, "preferred-geometry"); +#line 355 "BuilderPane.c" + } } gchar* shotwell_plugins_common_builder_pane_get_resource_path (ShotwellPluginsCommonBuilderPane* self) { gchar* result; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), NULL); #line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" @@ -366,32 +370,36 @@ gchar* shotwell_plugins_common_builder_pane_get_resource_path (ShotwellPluginsCo result = _tmp1_; #line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" return result; -#line 370 "BuilderPane.c" +#line 374 "BuilderPane.c" } static void shotwell_plugins_common_builder_pane_set_resource_path (ShotwellPluginsCommonBuilderPane* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; #line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self)); #line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - _tmp0_ = value; + if (g_strcmp0 (value, shotwell_plugins_common_builder_pane_get_resource_path (self)) != 0) { +#line 383 "BuilderPane.c" + const gchar* _tmp0_; + gchar* _tmp1_; #line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = value; #line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - _g_free0 (self->priv->_resource_path); + _tmp1_ = g_strdup (_tmp0_); #line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - self->priv->_resource_path = _tmp1_; + _g_free0 (self->priv->_resource_path); #line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - g_object_notify ((GObject *) self, "resource-path"); -#line 389 "BuilderPane.c" + self->priv->_resource_path = _tmp1_; +#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" + g_object_notify ((GObject *) self, "resource-path"); +#line 396 "BuilderPane.c" + } } gboolean shotwell_plugins_common_builder_pane_get_connect_signals (ShotwellPluginsCommonBuilderPane* self) { gboolean result; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), FALSE); #line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" @@ -400,28 +408,32 @@ gboolean shotwell_plugins_common_builder_pane_get_connect_signals (ShotwellPlugi result = _tmp0_; #line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" return result; -#line 404 "BuilderPane.c" +#line 412 "BuilderPane.c" } static void shotwell_plugins_common_builder_pane_set_connect_signals (ShotwellPluginsCommonBuilderPane* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self)); #line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - _tmp0_ = value; + if (shotwell_plugins_common_builder_pane_get_connect_signals (self) != value) { +#line 421 "BuilderPane.c" + gboolean _tmp0_; +#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" + _tmp0_ = value; #line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - self->priv->_connect_signals = _tmp0_; + self->priv->_connect_signals = _tmp0_; #line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - g_object_notify ((GObject *) self, "connect-signals"); -#line 418 "BuilderPane.c" + g_object_notify ((GObject *) self, "connect-signals"); +#line 429 "BuilderPane.c" + } } gchar* shotwell_plugins_common_builder_pane_get_default_id (ShotwellPluginsCommonBuilderPane* self) { gchar* result; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), NULL); #line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" @@ -432,26 +444,30 @@ gchar* shotwell_plugins_common_builder_pane_get_default_id (ShotwellPluginsCommo result = _tmp1_; #line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" return result; -#line 436 "BuilderPane.c" +#line 448 "BuilderPane.c" } static void shotwell_plugins_common_builder_pane_set_default_id (ShotwellPluginsCommonBuilderPane* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; #line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self)); #line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - _tmp0_ = value; + if (g_strcmp0 (value, shotwell_plugins_common_builder_pane_get_default_id (self)) != 0) { +#line 457 "BuilderPane.c" + const gchar* _tmp0_; + gchar* _tmp1_; #line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = value; #line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - _g_free0 (self->priv->_default_id); + _tmp1_ = g_strdup (_tmp0_); +#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" + _g_free0 (self->priv->_default_id); #line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - self->priv->_default_id = _tmp1_; + self->priv->_default_id = _tmp1_; #line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - g_object_notify ((GObject *) self, "default-id"); -#line 455 "BuilderPane.c" + g_object_notify ((GObject *) self, "default-id"); +#line 470 "BuilderPane.c" + } } @@ -461,13 +477,13 @@ static void shotwell_plugins_common_builder_pane_class_init (ShotwellPluginsComm #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" g_type_class_add_private (klass, sizeof (ShotwellPluginsCommonBuilderPanePrivate)); #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - ((GObjectClass *) klass)->constructed = (void (*)(GObject*)) shotwell_plugins_common_builder_pane_real_constructed; + ((GObjectClass *) klass)->constructed = (void (*) (GObject *)) shotwell_plugins_common_builder_pane_real_constructed; #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - ((ShotwellPluginsCommonBuilderPaneClass *) klass)->get_default_widget = (GtkWidget* (*)(ShotwellPluginsCommonBuilderPane*)) shotwell_plugins_common_builder_pane_real_get_default_widget; + ((ShotwellPluginsCommonBuilderPaneClass *) klass)->get_default_widget = (GtkWidget* (*) (ShotwellPluginsCommonBuilderPane *)) shotwell_plugins_common_builder_pane_real_get_default_widget; #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - ((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = (void (*)(ShotwellPluginsCommonBuilderPane*)) shotwell_plugins_common_builder_pane_real_on_pane_installed; + ((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = (void (*) (ShotwellPluginsCommonBuilderPane *)) shotwell_plugins_common_builder_pane_real_on_pane_installed; #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - ((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_uninstalled = (void (*)(ShotwellPluginsCommonBuilderPane*)) shotwell_plugins_common_builder_pane_real_on_pane_uninstalled; + ((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_uninstalled = (void (*) (ShotwellPluginsCommonBuilderPane *)) shotwell_plugins_common_builder_pane_real_on_pane_uninstalled; #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" G_OBJECT_CLASS (klass)->get_property = _vala_shotwell_plugins_common_builder_pane_get_property; #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" @@ -475,14 +491,14 @@ static void shotwell_plugins_common_builder_pane_class_init (ShotwellPluginsComm #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" G_OBJECT_CLASS (klass)->finalize = shotwell_plugins_common_builder_pane_finalize; #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY, g_param_spec_enum ("preferred-geometry", "preferred-geometry", "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_TYPE_GEOMETRY_OPTIONS, SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY_PROPERTY, g_param_spec_enum ("preferred-geometry", "preferred-geometry", "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_TYPE_GEOMETRY_OPTIONS, SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH, g_param_spec_string ("resource-path", "resource-path", "resource-path", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH_PROPERTY, g_param_spec_string ("resource-path", "resource-path", "resource-path", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS, g_param_spec_boolean ("connect-signals", "connect-signals", "connect-signals", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS_PROPERTY, g_param_spec_boolean ("connect-signals", "connect-signals", "connect-signals", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID, g_param_spec_string ("default-id", "default-id", "default-id", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); -#line 486 "BuilderPane.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID_PROPERTY, g_param_spec_string ("default-id", "default-id", "default-id", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); +#line 502 "BuilderPane.c" } @@ -490,19 +506,19 @@ static void shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_int #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface); #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_builder_pane_real_get_preferred_geometry; + iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) shotwell_plugins_common_builder_pane_real_get_preferred_geometry; #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_builder_pane_real_get_widget; + iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) shotwell_plugins_common_builder_pane_real_get_widget; #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_builder_pane_on_pane_installed; + iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) shotwell_plugins_common_builder_pane_on_pane_installed; #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_builder_pane_on_pane_uninstalled; -#line 501 "BuilderPane.c" + iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) shotwell_plugins_common_builder_pane_on_pane_uninstalled; +#line 517 "BuilderPane.c" } static void shotwell_plugins_common_builder_pane_instance_init (ShotwellPluginsCommonBuilderPane * self) { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" self->priv = SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_PRIVATE (self); #line 10 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" @@ -513,11 +529,11 @@ static void shotwell_plugins_common_builder_pane_instance_init (ShotwellPluginsC _tmp0_ = g_strdup ("default"); #line 15 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" self->priv->_default_id = _tmp0_; -#line 517 "BuilderPane.c" +#line 533 "BuilderPane.c" } -static void shotwell_plugins_common_builder_pane_finalize (GObject* obj) { +static void shotwell_plugins_common_builder_pane_finalize (GObject * obj) { ShotwellPluginsCommonBuilderPane * self; #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane); @@ -531,7 +547,7 @@ static void shotwell_plugins_common_builder_pane_finalize (GObject* obj) { _g_object_unref0 (self->priv->content); #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" G_OBJECT_CLASS (shotwell_plugins_common_builder_pane_parent_class)->finalize (obj); -#line 535 "BuilderPane.c" +#line 551 "BuilderPane.c" } @@ -555,36 +571,36 @@ static void _vala_shotwell_plugins_common_builder_pane_get_property (GObject * o #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" switch (property_id) { #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY: + case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY_PROPERTY: #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" g_value_set_enum (value, shotwell_plugins_common_builder_pane_get_preferred_geometry (self)); #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" break; #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH: + case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH_PROPERTY: #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" g_value_take_string (value, shotwell_plugins_common_builder_pane_get_resource_path (self)); #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" break; #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS: + case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS_PROPERTY: #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" g_value_set_boolean (value, shotwell_plugins_common_builder_pane_get_connect_signals (self)); #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" break; #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID: + case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID_PROPERTY: #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" g_value_take_string (value, shotwell_plugins_common_builder_pane_get_default_id (self)); #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" break; -#line 582 "BuilderPane.c" +#line 598 "BuilderPane.c" default: #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" break; -#line 588 "BuilderPane.c" +#line 604 "BuilderPane.c" } } @@ -595,36 +611,36 @@ static void _vala_shotwell_plugins_common_builder_pane_set_property (GObject * o #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" switch (property_id) { #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY: + case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY_PROPERTY: #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" shotwell_plugins_common_builder_pane_set_preferred_geometry (self, g_value_get_enum (value)); #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" break; #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH: + case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH_PROPERTY: #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" shotwell_plugins_common_builder_pane_set_resource_path (self, g_value_get_string (value)); #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" break; #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS: + case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS_PROPERTY: #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" shotwell_plugins_common_builder_pane_set_connect_signals (self, g_value_get_boolean (value)); #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" break; #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID: + case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID_PROPERTY: #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" shotwell_plugins_common_builder_pane_set_default_id (self, g_value_get_string (value)); #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" break; -#line 622 "BuilderPane.c" +#line 638 "BuilderPane.c" default: #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" break; -#line 628 "BuilderPane.c" +#line 644 "BuilderPane.c" } } diff --git a/plugins/common/RESTSupport.c b/plugins/common/RESTSupport.c index 5a5d29f..f30430a 100644 --- a/plugins/common/RESTSupport.c +++ b/plugins/common/RESTSupport.c @@ -1,4 +1,4 @@ -/* RESTSupport.c generated by valac 0.34.7, the Vala compiler +/* RESTSupport.c generated by valac 0.36.6, the Vala compiler * generated from RESTSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -38,6 +38,13 @@ typedef struct _PublishingRESTSupportSessionPrivate PublishingRESTSupportSession #define _g_free0(var) (var = (g_free (var), NULL)) #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) typedef struct _PublishingRESTSupportParamSpecSession PublishingRESTSupportParamSpecSession; +enum { + PUBLISHING_REST_SUPPORT_SESSION_WIRE_MESSAGE_UNQUEUED_SIGNAL, + PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATED_SIGNAL, + PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATION_FAILED_SIGNAL, + PUBLISHING_REST_SUPPORT_SESSION_LAST_SIGNAL +}; +static guint publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_LAST_SIGNAL] = {0}; #define PUBLISHING_REST_SUPPORT_TYPE_HTTP_METHOD (publishing_rest_support_http_method_get_type ()) @@ -68,6 +75,13 @@ typedef struct _PublishingRESTSupportTransactionPrivate PublishingRESTSupportTra #define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL))) #define __vala_SoupURI_free0(var) ((var == NULL) ? NULL : (var = (_vala_SoupURI_free (var), NULL))) typedef struct _PublishingRESTSupportParamSpecTransaction PublishingRESTSupportParamSpecTransaction; +enum { + PUBLISHING_REST_SUPPORT_TRANSACTION_CHUNK_TRANSMITTED_SIGNAL, + PUBLISHING_REST_SUPPORT_TRANSACTION_NETWORK_ERROR_SIGNAL, + PUBLISHING_REST_SUPPORT_TRANSACTION_COMPLETED_SIGNAL, + PUBLISHING_REST_SUPPORT_TRANSACTION_LAST_SIGNAL +}; +static guint publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_LAST_SIGNAL] = {0}; #define PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION (publishing_rest_support_upload_transaction_get_type ()) #define PUBLISHING_REST_SUPPORT_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)) @@ -109,6 +123,12 @@ typedef struct _PublishingRESTSupportBatchUploaderPrivate PublishingRESTSupportB #define _publishing_rest_support_session_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_session_unref (var), NULL))) #define _publishing_rest_support_transaction_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_transaction_unref (var), NULL))) typedef struct _PublishingRESTSupportParamSpecBatchUploader PublishingRESTSupportParamSpecBatchUploader; +enum { + PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_COMPLETE_SIGNAL, + PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_ERROR_SIGNAL, + PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_LAST_SIGNAL +}; +static guint publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_LAST_SIGNAL] = {0}; #define PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION (publishing_rest_support_google_session_get_type ()) #define PUBLISHING_REST_SUPPORT_GOOGLE_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession)) @@ -360,7 +380,7 @@ static gpointer publishing_rest_support_google_session_parent_class = NULL; static gpointer publishing_rest_support_google_publisher_parent_class = NULL; static gpointer publishing_rest_support_google_publisher_google_session_impl_parent_class = NULL; static gpointer publishing_rest_support_google_publisher_authenticated_transaction_parent_class = NULL; -static SpitPublishingPublisherIface* publishing_rest_support_google_publisher_spit_publishing_publisher_parent_iface = NULL; +static SpitPublishingPublisherIface * publishing_rest_support_google_publisher_spit_publishing_publisher_parent_iface = NULL; #define PUBLISHING_REST_SUPPORT_SHA1_HMAC_LENGTH 20 gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message); @@ -387,7 +407,7 @@ gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRES void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSession* self, SoupMessage* message); static void _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self); void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession* self); -static void publishing_rest_support_session_finalize (PublishingRESTSupportSession* obj); +static void publishing_rest_support_session_finalize (PublishingRESTSupportSession * obj); GType publishing_rest_support_http_method_get_type (void) G_GNUC_CONST; gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpMethod self); PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string (const gchar* str); @@ -407,7 +427,7 @@ gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* ar PublishingRESTSupportArgument** publishing_rest_support_argument_sort (PublishingRESTSupportArgument** inputArray, int inputArray_length1, int* result_length1); static gint _publishing_rest_support_argument_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self); -static void publishing_rest_support_argument_finalize (PublishingRESTSupportArgument* obj); +static void publishing_rest_support_argument_finalize (PublishingRESTSupportArgument * obj); gpointer publishing_rest_support_transaction_ref (gpointer instance); void publishing_rest_support_transaction_unref (gpointer instance); GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -428,7 +448,7 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_ static void publishing_rest_support_transaction_on_message_unqueued (PublishingRESTSupportTransaction* self, SoupMessage* message); void publishing_rest_support_transaction_check_response (PublishingRESTSupportTransaction* self, SoupMessage* message, GError** error); gchar* publishing_rest_support_transaction_get_response (PublishingRESTSupportTransaction* self); -gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self, GTlsCertificate** cert); +gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self, GTlsCertificate* * cert); gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSupportTransaction* self); PublishingRESTSupportArgument** publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self, int* result_length1); static PublishingRESTSupportArgument** _vala_array_dup1 (PublishingRESTSupportArgument** self, int length); @@ -449,10 +469,10 @@ static void _vala_SoupURI_free (SoupURI* self); SoupMessageHeaders* publishing_rest_support_transaction_get_response_headers (PublishingRESTSupportTransaction* self); SoupMessage* publishing_rest_support_transaction_get_message (PublishingRESTSupportTransaction* self); void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTransaction* self, const gchar* name, const gchar* value); -static void _vala_array_add1 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value); +static void _vala_array_add1 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value); PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_session (PublishingRESTSupportTransaction* self); static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void publishing_rest_support_transaction_finalize (PublishingRESTSupportTransaction* obj); +static void publishing_rest_support_transaction_finalize (PublishingRESTSupportTransaction * obj); GType publishing_rest_support_upload_transaction_get_type (void) G_GNUC_CONST; enum { PUBLISHING_REST_SUPPORT_UPLOAD_TRANSACTION_DUMMY_PROPERTY @@ -470,7 +490,7 @@ void publishing_rest_support_upload_transaction_set_binary_disposition_table (Pu static void publishing_rest_support_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error); static void _vala_SoupMultipart_free (SoupMultipart* self); static void _vala_SoupBuffer_free (SoupBuffer* self); -static void publishing_rest_support_upload_transaction_finalize (PublishingRESTSupportTransaction* obj); +static void publishing_rest_support_upload_transaction_finalize (PublishingRESTSupportTransaction * obj); gpointer publishing_rest_support_xml_document_ref (gpointer instance); void publishing_rest_support_xml_document_unref (gpointer instance); GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -488,7 +508,7 @@ xmlNode* publishing_rest_support_xml_document_get_root_node (PublishingRESTSuppo xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSupportXmlDocument* self, xmlNode* parent, const gchar* child_name, GError** error); gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSupportXmlDocument* self, xmlNode* node, const gchar* property_key, GError** error); PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_string (const gchar* input_string, PublishingRESTSupportXmlDocumentCheckForErrorResponse check_for_error_response, void* check_for_error_response_target, GError** error); -static void publishing_rest_support_xml_document_finalize (PublishingRESTSupportXmlDocument* obj); +static void publishing_rest_support_xml_document_finalize (PublishingRESTSupportXmlDocument * obj); gchar* publishing_rest_support_decimal_entity_encode (const gchar* source); gpointer publishing_rest_support_batch_uploader_ref (gpointer instance); void publishing_rest_support_batch_uploader_unref (gpointer instance); @@ -511,7 +531,7 @@ PublishingRESTSupportSession* publishing_rest_support_batch_uploader_get_session SpitPublishingPublishable* publishing_rest_support_batch_uploader_get_current_publishable (PublishingRESTSupportBatchUploader* self); static PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* self, SpitPublishingPublishable* publishable); void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUploader* self, SpitPublishingProgressCallback status_updated, void* status_updated_target); -static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSupportBatchUploader* obj); +static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSupportBatchUploader * obj); gchar* publishing_rest_support_asciify_string (const gchar* s); GType publishing_rest_support_google_session_get_type (void) G_GNUC_CONST; enum { @@ -560,7 +580,7 @@ static gboolean publishing_rest_support_google_publisher_google_session_impl_rea static gchar* publishing_rest_support_google_publisher_google_session_impl_real_get_user_name (PublishingRESTSupportGoogleSession* base); static gchar* publishing_rest_support_google_publisher_google_session_impl_real_get_access_token (PublishingRESTSupportGoogleSession* base); static void publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate (PublishingRESTSupportGoogleSession* base); -static void publishing_rest_support_google_publisher_google_session_impl_finalize (PublishingRESTSupportSession* obj); +static void publishing_rest_support_google_publisher_google_session_impl_finalize (PublishingRESTSupportSession * obj); GType publishing_rest_support_google_publisher_authenticated_transaction_get_type (void) G_GNUC_CONST; enum { PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_AUTHENTICATED_TRANSACTION_DUMMY_PROPERTY @@ -569,7 +589,7 @@ static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_ static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method); PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method); PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method); -static void publishing_rest_support_google_publisher_finalize (GObject* obj); +static void publishing_rest_support_google_publisher_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -577,50 +597,50 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify static guint8* string_get_data (const gchar* self, int* result_length1) { guint8* result; guint8* res = NULL; - gint res_length1 = 0; - gint _res_size_ = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - guint8* _tmp3_ = NULL; - gint _tmp3__length1 = 0; - guint8* _tmp4_ = NULL; - gint _tmp4__length1 = 0; -#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint res_length1; + gint _res_size_; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; + guint8* _tmp3_; + gint _tmp3__length1; + guint8* _tmp4_; + gint _tmp4__length1; +#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = (guint8*) self; -#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res_length1 = -1; -#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _res_size_ = res_length1; -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res_length1 = (gint) _tmp1_; -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = res_length1; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = res; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = res_length1; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4__length1 = _tmp3__length1; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (result_length1) { -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" *result_length1 = _tmp4__length1; -#line 617 "RESTSupport.c" +#line 637 "RESTSupport.c" } -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 623 "RESTSupport.c" +#line 643 "RESTSupport.c" } @@ -629,19 +649,19 @@ gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message guint8 buffer[PUBLISHING_REST_SUPPORT_SHA1_HMAC_LENGTH] = {0}; gsize len = 0UL; GHmac* mac = NULL; - const gchar* _tmp0_ = NULL; - guint8* _tmp1_ = NULL; - gint _tmp1__length1 = 0; - guint8* _tmp2_ = NULL; - gint _tmp2__length1 = 0; - GHmac* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - guint8* _tmp5_ = NULL; - gint _tmp5__length1 = 0; - guint8* _tmp6_ = NULL; - gint _tmp6__length1 = 0; - gsize _tmp7_ = 0UL; - gchar* _tmp8_ = NULL; + const gchar* _tmp0_; + guint8* _tmp1_; + gint _tmp1__length1; + guint8* _tmp2_; + gint _tmp2__length1; + GHmac* _tmp3_; + const gchar* _tmp4_; + guint8* _tmp5_; + gint _tmp5__length1; + guint8* _tmp6_; + gint _tmp6__length1; + gsize _tmp7_; + gchar* _tmp8_; #line 14 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (key != NULL, NULL); #line 14 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -682,16 +702,16 @@ gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message _g_hmac_unref0 (mac); #line 22 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 685 "RESTSupport.c" +#line 705 "RESTSupport.c" } PublishingRESTSupportSession* publishing_rest_support_session_construct (GType object_type, const gchar* endpoint_url) { PublishingRESTSupportSession* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - SoupSession* _tmp2_ = NULL; - SoupSession* _tmp3_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + SoupSession* _tmp2_; + SoupSession* _tmp3_; #line 34 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self = (PublishingRESTSupportSession*) g_type_create_instance (object_type); #line 35 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -714,12 +734,12 @@ PublishingRESTSupportSession* publishing_rest_support_session_construct (GType o g_object_set (_tmp3_, "ssl-use-system-ca-file", TRUE, NULL); #line 34 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 717 "RESTSupport.c" +#line 737 "RESTSupport.c" } void publishing_rest_support_session_notify_wire_message_unqueued (PublishingRESTSupportSession* self, SoupMessage* message) { - SoupMessage* _tmp0_ = NULL; + SoupMessage* _tmp0_; #line 40 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self)); #line 40 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -727,8 +747,8 @@ void publishing_rest_support_session_notify_wire_message_unqueued (PublishingRES #line 41 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp0_ = message; #line 41 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - g_signal_emit_by_name (self, "wire-message-unqueued", _tmp0_); -#line 731 "RESTSupport.c" + g_signal_emit (self, publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_WIRE_MESSAGE_UNQUEUED_SIGNAL], 0, _tmp0_); +#line 751 "RESTSupport.c" } @@ -736,20 +756,20 @@ void publishing_rest_support_session_notify_authenticated (PublishingRESTSupport #line 44 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self)); #line 45 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - g_signal_emit_by_name (self, "authenticated"); -#line 740 "RESTSupport.c" + g_signal_emit (self, publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATED_SIGNAL], 0); +#line 760 "RESTSupport.c" } void publishing_rest_support_session_notify_authentication_failed (PublishingRESTSupportSession* self, GError* err) { - GError* _tmp0_ = NULL; + GError* _tmp0_; #line 48 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self)); #line 49 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp0_ = err; #line 49 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - g_signal_emit_by_name (self, "authentication-failed", _tmp0_); -#line 752 "RESTSupport.c" + g_signal_emit (self, publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATION_FAILED_SIGNAL], 0, _tmp0_); +#line 772 "RESTSupport.c" } @@ -759,7 +779,7 @@ static gboolean publishing_rest_support_session_real_is_authenticated (Publishin g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_session_is_authenticated'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return _tmp0_; -#line 762 "RESTSupport.c" +#line 782 "RESTSupport.c" } @@ -768,14 +788,14 @@ gboolean publishing_rest_support_session_is_authenticated (PublishingRESTSupport g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self), FALSE); #line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return PUBLISHING_REST_SUPPORT_SESSION_GET_CLASS (self)->is_authenticated (self); -#line 771 "RESTSupport.c" +#line 791 "RESTSupport.c" } gchar* publishing_rest_support_session_get_endpoint_url (PublishingRESTSupportSession* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 54 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self), NULL); #line 55 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -786,12 +806,12 @@ gchar* publishing_rest_support_session_get_endpoint_url (PublishingRESTSupportSe result = _tmp1_; #line 55 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 789 "RESTSupport.c" +#line 809 "RESTSupport.c" } void publishing_rest_support_session_stop_transactions (PublishingRESTSupportSession* self) { - SoupSession* _tmp0_ = NULL; + SoupSession* _tmp0_; #line 58 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self)); #line 59 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -800,13 +820,13 @@ void publishing_rest_support_session_stop_transactions (PublishingRESTSupportSes _tmp0_ = self->priv->soup_session; #line 60 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" soup_session_abort (_tmp0_); -#line 803 "RESTSupport.c" +#line 823 "RESTSupport.c" } gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRESTSupportSession* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 63 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self), FALSE); #line 64 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -815,24 +835,24 @@ gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRES result = _tmp0_; #line 64 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 818 "RESTSupport.c" +#line 838 "RESTSupport.c" } static void _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self) { #line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_session_notify_wire_message_unqueued ((PublishingRESTSupportSession*) self, msg); -#line 825 "RESTSupport.c" +#line 845 "RESTSupport.c" } void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSession* self, SoupMessage* message) { - gboolean _tmp0_ = FALSE; - SoupSession* _tmp1_ = NULL; - SoupSession* _tmp2_ = NULL; - SoupMessage* _tmp3_ = NULL; - SoupSession* _tmp4_ = NULL; - guint _tmp5_ = 0U; + gboolean _tmp0_; + SoupSession* _tmp1_; + SoupSession* _tmp2_; + SoupMessage* _tmp3_; + SoupSession* _tmp4_; + guint _tmp5_; #line 67 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self)); #line 67 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -843,7 +863,7 @@ void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSes if (_tmp0_) { #line 69 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 846 "RESTSupport.c" +#line 866 "RESTSupport.c" } #line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp1_ = self->priv->soup_session; @@ -861,13 +881,13 @@ void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSes g_signal_parse_name ("request-unqueued", soup_session_get_type (), &_tmp5_, NULL, FALSE); #line 74 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued, self); -#line 864 "RESTSupport.c" +#line 884 "RESTSupport.c" } void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession* self) { - SoupSession* _tmp0_ = NULL; - SoupSession* _tmp1_ = NULL; + SoupSession* _tmp0_; + SoupSession* _tmp1_; #line 77 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self)); #line 78 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -878,14 +898,14 @@ void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession* _tmp1_ = self->priv->soup_session; #line 79 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_object_set (_tmp1_, "ssl-strict", FALSE, NULL); -#line 881 "RESTSupport.c" +#line 901 "RESTSupport.c" } static void publishing_rest_support_value_session_init (GValue* value) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 888 "RESTSupport.c" +#line 908 "RESTSupport.c" } @@ -894,7 +914,7 @@ static void publishing_rest_support_value_session_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_session_unref (value->data[0].v_pointer); -#line 897 "RESTSupport.c" +#line 917 "RESTSupport.c" } } @@ -904,11 +924,11 @@ static void publishing_rest_support_value_session_copy_value (const GValue* src_ if (src_value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" dest_value->data[0].v_pointer = publishing_rest_support_session_ref (src_value->data[0].v_pointer); -#line 907 "RESTSupport.c" +#line 927 "RESTSupport.c" } else { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" dest_value->data[0].v_pointer = NULL; -#line 911 "RESTSupport.c" +#line 931 "RESTSupport.c" } } @@ -916,66 +936,66 @@ static void publishing_rest_support_value_session_copy_value (const GValue* src_ static gpointer publishing_rest_support_value_session_peek_pointer (const GValue* value) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return value->data[0].v_pointer; -#line 919 "RESTSupport.c" +#line 939 "RESTSupport.c" } static gchar* publishing_rest_support_value_session_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (collect_values[0].v_pointer) { -#line 926 "RESTSupport.c" - PublishingRESTSupportSession* object; +#line 946 "RESTSupport.c" + PublishingRESTSupportSession * object; object = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (object->parent_instance.g_class == NULL) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 933 "RESTSupport.c" +#line 953 "RESTSupport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 937 "RESTSupport.c" +#line 957 "RESTSupport.c" } #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = publishing_rest_support_session_ref (object); -#line 941 "RESTSupport.c" +#line 961 "RESTSupport.c" } else { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 945 "RESTSupport.c" +#line 965 "RESTSupport.c" } #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 949 "RESTSupport.c" +#line 969 "RESTSupport.c" } static gchar* publishing_rest_support_value_session_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingRESTSupportSession** object_p; + PublishingRESTSupportSession ** object_p; object_p = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (!object_p) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 960 "RESTSupport.c" +#line 980 "RESTSupport.c" } #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (!value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = NULL; -#line 966 "RESTSupport.c" +#line 986 "RESTSupport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = value->data[0].v_pointer; -#line 970 "RESTSupport.c" +#line 990 "RESTSupport.c" } else { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = publishing_rest_support_session_ref (value->data[0].v_pointer); -#line 974 "RESTSupport.c" +#line 994 "RESTSupport.c" } #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 978 "RESTSupport.c" +#line 998 "RESTSupport.c" } @@ -989,7 +1009,7 @@ GParamSpec* publishing_rest_support_param_spec_session (const gchar* name, const G_PARAM_SPEC (spec)->value_type = object_type; #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return G_PARAM_SPEC (spec); -#line 992 "RESTSupport.c" +#line 1012 "RESTSupport.c" } @@ -998,12 +1018,12 @@ gpointer publishing_rest_support_value_get_session (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_SESSION), NULL); #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return value->data[0].v_pointer; -#line 1001 "RESTSupport.c" +#line 1021 "RESTSupport.c" } void publishing_rest_support_value_set_session (GValue* value, gpointer v_object) { - PublishingRESTSupportSession* old; + PublishingRESTSupportSession * old; #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_SESSION)); #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1018,23 +1038,23 @@ void publishing_rest_support_value_set_session (GValue* value, gpointer v_object value->data[0].v_pointer = v_object; #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_session_ref (value->data[0].v_pointer); -#line 1021 "RESTSupport.c" +#line 1041 "RESTSupport.c" } else { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 1025 "RESTSupport.c" +#line 1045 "RESTSupport.c" } #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (old) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_session_unref (old); -#line 1031 "RESTSupport.c" +#line 1051 "RESTSupport.c" } } void publishing_rest_support_value_take_session (GValue* value, gpointer v_object) { - PublishingRESTSupportSession* old; + PublishingRESTSupportSession * old; #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_SESSION)); #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1047,17 +1067,17 @@ void publishing_rest_support_value_take_session (GValue* value, gpointer v_objec g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = v_object; -#line 1050 "RESTSupport.c" +#line 1070 "RESTSupport.c" } else { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 1054 "RESTSupport.c" +#line 1074 "RESTSupport.c" } #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (old) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_session_unref (old); -#line 1060 "RESTSupport.c" +#line 1080 "RESTSupport.c" } } @@ -1070,14 +1090,14 @@ static void publishing_rest_support_session_class_init (PublishingRESTSupportSes #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_type_class_add_private (klass, sizeof (PublishingRESTSupportSessionPrivate)); #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_rest_support_session_real_is_authenticated; + ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_rest_support_session_real_is_authenticated; #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - g_signal_new ("wire_message_unqueued", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, soup_message_get_type ()); + publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_WIRE_MESSAGE_UNQUEUED_SIGNAL] = g_signal_new ("wire-message-unqueued", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, soup_message_get_type ()); #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - g_signal_new ("authenticated", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATED_SIGNAL] = g_signal_new ("authenticated", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - g_signal_new ("authentication_failed", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); -#line 1080 "RESTSupport.c" + publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATION_FAILED_SIGNAL] = g_signal_new ("authentication-failed", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); +#line 1100 "RESTSupport.c" } @@ -1092,11 +1112,11 @@ static void publishing_rest_support_session_instance_init (PublishingRESTSupport self->priv->transactions_stopped = FALSE; #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->ref_count = 1; -#line 1095 "RESTSupport.c" +#line 1115 "RESTSupport.c" } -static void publishing_rest_support_session_finalize (PublishingRESTSupportSession* obj) { +static void publishing_rest_support_session_finalize (PublishingRESTSupportSession * obj) { PublishingRESTSupportSession * self; #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession); @@ -1106,7 +1126,7 @@ static void publishing_rest_support_session_finalize (PublishingRESTSupportSessi _g_free0 (self->priv->endpoint_url); #line 27 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_object_unref0 (self->priv->soup_session); -#line 1109 "RESTSupport.c" +#line 1129 "RESTSupport.c" } @@ -1125,18 +1145,18 @@ GType publishing_rest_support_session_get_type (void) { gpointer publishing_rest_support_session_ref (gpointer instance) { - PublishingRESTSupportSession* self; + PublishingRESTSupportSession * self; self = instance; #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_atomic_int_inc (&self->ref_count); #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return instance; -#line 1134 "RESTSupport.c" +#line 1154 "RESTSupport.c" } void publishing_rest_support_session_unref (gpointer instance) { - PublishingRESTSupportSession* self; + PublishingRESTSupportSession * self; self = instance; #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1144,7 +1164,7 @@ void publishing_rest_support_session_unref (gpointer instance) { PUBLISHING_REST_SUPPORT_SESSION_GET_CLASS (self)->finalize (self); #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1147 "RESTSupport.c" +#line 1167 "RESTSupport.c" } } @@ -1155,48 +1175,48 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM switch (self) { #line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" case PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET: -#line 1158 "RESTSupport.c" +#line 1178 "RESTSupport.c" { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp0_ = g_strdup ("GET"); #line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" result = _tmp0_; #line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 1167 "RESTSupport.c" +#line 1187 "RESTSupport.c" } #line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" case PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT: -#line 1171 "RESTSupport.c" +#line 1191 "RESTSupport.c" { - gchar* _tmp1_ = NULL; + gchar* _tmp1_; #line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp1_ = g_strdup ("PUT"); #line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" result = _tmp1_; #line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 1180 "RESTSupport.c" +#line 1200 "RESTSupport.c" } #line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" case PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST: -#line 1184 "RESTSupport.c" +#line 1204 "RESTSupport.c" { - gchar* _tmp2_ = NULL; + gchar* _tmp2_; #line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp2_ = g_strdup ("POST"); #line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" result = _tmp2_; #line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 1193 "RESTSupport.c" +#line 1213 "RESTSupport.c" } default: { #line 100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_error ("RESTSupport.vala:100: unrecognized HTTP method enumeration value"); -#line 1199 "RESTSupport.c" +#line 1219 "RESTSupport.c" } } } @@ -1204,7 +1224,7 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string (const gchar* str) { PublishingRESTSupportHttpMethod result = 0; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 104 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (str != NULL, 0); #line 105 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1215,9 +1235,9 @@ PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET; #line 106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 1218 "RESTSupport.c" +#line 1238 "RESTSupport.c" } else { - const gchar* _tmp1_ = NULL; + const gchar* _tmp1_; #line 107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp1_ = str; #line 107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1226,9 +1246,9 @@ PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT; #line 108 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 1229 "RESTSupport.c" +#line 1249 "RESTSupport.c" } else { - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 109 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp2_ = str; #line 109 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1237,14 +1257,14 @@ PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST; #line 110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 1240 "RESTSupport.c" +#line 1260 "RESTSupport.c" } else { - const gchar* _tmp3_ = NULL; + const gchar* _tmp3_; #line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp3_ = str; #line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_error ("RESTSupport.vala:112: unrecognized HTTP method name: %s", _tmp3_); -#line 1247 "RESTSupport.c" +#line 1267 "RESTSupport.c" } } } @@ -1265,10 +1285,10 @@ GType publishing_rest_support_http_method_get_type (void) { PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType object_type, const gchar* key, const gchar* value) { PublishingRESTSupportArgument* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; #line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (key != NULL, NULL); #line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1293,25 +1313,25 @@ PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType self->value = _tmp3_; #line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 1296 "RESTSupport.c" +#line 1316 "RESTSupport.c" } PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key, const gchar* value) { #line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return publishing_rest_support_argument_construct (PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, key, value); -#line 1303 "RESTSupport.c" +#line 1323 "RESTSupport.c" } gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* arg1, PublishingRESTSupportArgument* arg2) { gint result = 0; - GCompareFunc _tmp0_ = NULL; - PublishingRESTSupportArgument* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PublishingRESTSupportArgument* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gint _tmp5_ = 0; + GCompareFunc _tmp0_; + PublishingRESTSupportArgument* _tmp1_; + const gchar* _tmp2_; + PublishingRESTSupportArgument* _tmp3_; + const gchar* _tmp4_; + gint _tmp5_; #line 126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_ARGUMENT (arg1), 0); #line 126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1332,7 +1352,7 @@ gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* ar result = _tmp5_; #line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 1335 "RESTSupport.c" +#line 1355 "RESTSupport.c" } @@ -1341,28 +1361,28 @@ static gint _publishing_rest_support_argument_compare_gcompare_data_func (gconst result = publishing_rest_support_argument_compare ((PublishingRESTSupportArgument*) a, (PublishingRESTSupportArgument*) b); #line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 1344 "RESTSupport.c" +#line 1364 "RESTSupport.c" } static gpointer _publishing_rest_support_argument_ref0 (gpointer self) { #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self ? publishing_rest_support_argument_ref (self) : NULL; -#line 1351 "RESTSupport.c" +#line 1371 "RESTSupport.c" } PublishingRESTSupportArgument** publishing_rest_support_argument_sort (PublishingRESTSupportArgument** inputArray, int inputArray_length1, int* result_length1) { PublishingRESTSupportArgument** result = NULL; GeeTreeSet* sorted_args = NULL; - GeeTreeSet* _tmp0_ = NULL; - PublishingRESTSupportArgument** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - GeeTreeSet* _tmp5_ = NULL; - gint _tmp6_ = 0; - gpointer* _tmp7_ = NULL; - PublishingRESTSupportArgument** _tmp8_ = NULL; - gint _tmp8__length1 = 0; + GeeTreeSet* _tmp0_; + PublishingRESTSupportArgument** _tmp1_; + gint _tmp1__length1; + GeeTreeSet* _tmp5_; + gint _tmp6_; + gpointer* _tmp7_; + PublishingRESTSupportArgument** _tmp8_; + gint _tmp8__length1; #line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp0_ = gee_tree_set_new (PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, (GBoxedCopyFunc) publishing_rest_support_argument_ref, (GDestroyNotify) publishing_rest_support_argument_unref, _publishing_rest_support_argument_compare_gcompare_data_func, NULL, NULL); #line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1371,7 +1391,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin _tmp1_ = inputArray; #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp1__length1 = inputArray_length1; -#line 1374 "RESTSupport.c" +#line 1394 "RESTSupport.c" { PublishingRESTSupportArgument** arg_collection = NULL; gint arg_collection_length1 = 0; @@ -1383,17 +1403,17 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin arg_collection_length1 = _tmp1__length1; #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" for (arg_it = 0; arg_it < _tmp1__length1; arg_it = arg_it + 1) { -#line 1386 "RESTSupport.c" - PublishingRESTSupportArgument* _tmp2_ = NULL; +#line 1406 "RESTSupport.c" + PublishingRESTSupportArgument* _tmp2_; PublishingRESTSupportArgument* arg = NULL; #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp2_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]); #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" arg = _tmp2_; -#line 1393 "RESTSupport.c" +#line 1413 "RESTSupport.c" { - GeeTreeSet* _tmp3_ = NULL; - PublishingRESTSupportArgument* _tmp4_ = NULL; + GeeTreeSet* _tmp3_; + PublishingRESTSupportArgument* _tmp4_; #line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp3_ = sorted_args; #line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1402,7 +1422,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_); #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _publishing_rest_support_argument_unref0 (arg); -#line 1405 "RESTSupport.c" +#line 1425 "RESTSupport.c" } } } @@ -1418,7 +1438,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin if (result_length1) { #line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *result_length1 = _tmp8__length1; -#line 1421 "RESTSupport.c" +#line 1441 "RESTSupport.c" } #line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" result = _tmp8_; @@ -1426,15 +1446,15 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin _g_object_unref0 (sorted_args); #line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 1429 "RESTSupport.c" +#line 1449 "RESTSupport.c" } gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; #line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_ARGUMENT (self), NULL); #line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1447,14 +1467,14 @@ gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument result = _tmp2_; #line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 1450 "RESTSupport.c" +#line 1470 "RESTSupport.c" } static void publishing_rest_support_value_argument_init (GValue* value) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 1457 "RESTSupport.c" +#line 1477 "RESTSupport.c" } @@ -1463,7 +1483,7 @@ static void publishing_rest_support_value_argument_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_argument_unref (value->data[0].v_pointer); -#line 1466 "RESTSupport.c" +#line 1486 "RESTSupport.c" } } @@ -1473,11 +1493,11 @@ static void publishing_rest_support_value_argument_copy_value (const GValue* src if (src_value->data[0].v_pointer) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" dest_value->data[0].v_pointer = publishing_rest_support_argument_ref (src_value->data[0].v_pointer); -#line 1476 "RESTSupport.c" +#line 1496 "RESTSupport.c" } else { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" dest_value->data[0].v_pointer = NULL; -#line 1480 "RESTSupport.c" +#line 1500 "RESTSupport.c" } } @@ -1485,66 +1505,66 @@ static void publishing_rest_support_value_argument_copy_value (const GValue* src static gpointer publishing_rest_support_value_argument_peek_pointer (const GValue* value) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return value->data[0].v_pointer; -#line 1488 "RESTSupport.c" +#line 1508 "RESTSupport.c" } static gchar* publishing_rest_support_value_argument_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (collect_values[0].v_pointer) { -#line 1495 "RESTSupport.c" - PublishingRESTSupportArgument* object; +#line 1515 "RESTSupport.c" + PublishingRESTSupportArgument * object; object = collect_values[0].v_pointer; #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (object->parent_instance.g_class == NULL) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1502 "RESTSupport.c" +#line 1522 "RESTSupport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1506 "RESTSupport.c" +#line 1526 "RESTSupport.c" } #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = publishing_rest_support_argument_ref (object); -#line 1510 "RESTSupport.c" +#line 1530 "RESTSupport.c" } else { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 1514 "RESTSupport.c" +#line 1534 "RESTSupport.c" } #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 1518 "RESTSupport.c" +#line 1538 "RESTSupport.c" } static gchar* publishing_rest_support_value_argument_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingRESTSupportArgument** object_p; + PublishingRESTSupportArgument ** object_p; object_p = collect_values[0].v_pointer; #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (!object_p) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1529 "RESTSupport.c" +#line 1549 "RESTSupport.c" } #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (!value->data[0].v_pointer) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = NULL; -#line 1535 "RESTSupport.c" +#line 1555 "RESTSupport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = value->data[0].v_pointer; -#line 1539 "RESTSupport.c" +#line 1559 "RESTSupport.c" } else { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = publishing_rest_support_argument_ref (value->data[0].v_pointer); -#line 1543 "RESTSupport.c" +#line 1563 "RESTSupport.c" } #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 1547 "RESTSupport.c" +#line 1567 "RESTSupport.c" } @@ -1558,7 +1578,7 @@ GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name, cons G_PARAM_SPEC (spec)->value_type = object_type; #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return G_PARAM_SPEC (spec); -#line 1561 "RESTSupport.c" +#line 1581 "RESTSupport.c" } @@ -1567,12 +1587,12 @@ gpointer publishing_rest_support_value_get_argument (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT), NULL); #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return value->data[0].v_pointer; -#line 1570 "RESTSupport.c" +#line 1590 "RESTSupport.c" } void publishing_rest_support_value_set_argument (GValue* value, gpointer v_object) { - PublishingRESTSupportArgument* old; + PublishingRESTSupportArgument * old; #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT)); #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1587,23 +1607,23 @@ void publishing_rest_support_value_set_argument (GValue* value, gpointer v_objec value->data[0].v_pointer = v_object; #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_argument_ref (value->data[0].v_pointer); -#line 1590 "RESTSupport.c" +#line 1610 "RESTSupport.c" } else { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 1594 "RESTSupport.c" +#line 1614 "RESTSupport.c" } #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (old) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_argument_unref (old); -#line 1600 "RESTSupport.c" +#line 1620 "RESTSupport.c" } } void publishing_rest_support_value_take_argument (GValue* value, gpointer v_object) { - PublishingRESTSupportArgument* old; + PublishingRESTSupportArgument * old; #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT)); #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1616,17 +1636,17 @@ void publishing_rest_support_value_take_argument (GValue* value, gpointer v_obje g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = v_object; -#line 1619 "RESTSupport.c" +#line 1639 "RESTSupport.c" } else { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 1623 "RESTSupport.c" +#line 1643 "RESTSupport.c" } #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (old) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_argument_unref (old); -#line 1629 "RESTSupport.c" +#line 1649 "RESTSupport.c" } } @@ -1636,18 +1656,18 @@ static void publishing_rest_support_argument_class_init (PublishingRESTSupportAr publishing_rest_support_argument_parent_class = g_type_class_peek_parent (klass); #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" ((PublishingRESTSupportArgumentClass *) klass)->finalize = publishing_rest_support_argument_finalize; -#line 1639 "RESTSupport.c" +#line 1659 "RESTSupport.c" } static void publishing_rest_support_argument_instance_init (PublishingRESTSupportArgument * self) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->ref_count = 1; -#line 1646 "RESTSupport.c" +#line 1666 "RESTSupport.c" } -static void publishing_rest_support_argument_finalize (PublishingRESTSupportArgument* obj) { +static void publishing_rest_support_argument_finalize (PublishingRESTSupportArgument * obj) { PublishingRESTSupportArgument * self; #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, PublishingRESTSupportArgument); @@ -1657,7 +1677,7 @@ static void publishing_rest_support_argument_finalize (PublishingRESTSupportArgu _g_free0 (self->key); #line 119 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_free0 (self->value); -#line 1660 "RESTSupport.c" +#line 1680 "RESTSupport.c" } @@ -1676,18 +1696,18 @@ GType publishing_rest_support_argument_get_type (void) { gpointer publishing_rest_support_argument_ref (gpointer instance) { - PublishingRESTSupportArgument* self; + PublishingRESTSupportArgument * self; self = instance; #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_atomic_int_inc (&self->ref_count); #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return instance; -#line 1685 "RESTSupport.c" +#line 1705 "RESTSupport.c" } void publishing_rest_support_argument_unref (gpointer instance) { - PublishingRESTSupportArgument* self; + PublishingRESTSupportArgument * self; self = instance; #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1695,7 +1715,7 @@ void publishing_rest_support_argument_unref (gpointer instance) { PUBLISHING_REST_SUPPORT_ARGUMENT_GET_CLASS (self)->finalize (self); #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1698 "RESTSupport.c" +#line 1718 "RESTSupport.c" } } @@ -1703,24 +1723,24 @@ void publishing_rest_support_argument_unref (gpointer instance) { static void _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender, SoupBuffer* chunk, gpointer self) { #line 166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_transaction_on_wrote_body_data ((PublishingRESTSupportTransaction*) self, chunk); -#line 1706 "RESTSupport.c" +#line 1726 "RESTSupport.c" } PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct (GType object_type, PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method) { PublishingRESTSupportTransaction* self = NULL; - PublishingRESTSupportSession* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - PublishingRESTSupportSession* _tmp3_ = NULL; - PublishingRESTSupportHttpMethod _tmp4_ = 0; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - PublishingRESTSupportSession* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - SoupMessage* _tmp10_ = NULL; - SoupMessage* _tmp11_ = NULL; + PublishingRESTSupportSession* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + PublishingRESTSupportSession* _tmp3_; + PublishingRESTSupportHttpMethod _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + PublishingRESTSupportSession* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + SoupMessage* _tmp10_; + SoupMessage* _tmp11_; #line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (parent_session), NULL); #line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1767,27 +1787,27 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct g_signal_connect (_tmp11_, "wrote-body-data", (GCallback) _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data, self); #line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 1770 "RESTSupport.c" +#line 1790 "RESTSupport.c" } PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method) { #line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return publishing_rest_support_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, parent_session, method); -#line 1777 "RESTSupport.c" +#line 1797 "RESTSupport.c" } PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) { PublishingRESTSupportTransaction* self = NULL; - PublishingRESTSupportSession* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - PublishingRESTSupportHttpMethod _tmp3_ = 0; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - SoupMessage* _tmp7_ = NULL; + PublishingRESTSupportSession* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + PublishingRESTSupportHttpMethod _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + const gchar* _tmp6_; + SoupMessage* _tmp7_; #line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (parent_session), NULL); #line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1824,25 +1844,25 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_ _g_free0 (_tmp5_); #line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 1827 "RESTSupport.c" +#line 1847 "RESTSupport.c" } PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) { #line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return publishing_rest_support_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, parent_session, endpoint_url, method); -#line 1834 "RESTSupport.c" +#line 1854 "RESTSupport.c" } static void publishing_rest_support_transaction_on_wrote_body_data (PublishingRESTSupportTransaction* self, SoupBuffer* written_data) { - gint _tmp0_ = 0; - SoupBuffer* _tmp1_ = NULL; - gsize _tmp2_ = 0UL; - gint _tmp3_ = 0; - SoupMessage* _tmp4_ = NULL; - SoupMessageBody* _tmp5_ = NULL; - gint64 _tmp6_ = 0LL; + gint _tmp0_; + SoupBuffer* _tmp1_; + gsize _tmp2_; + gint _tmp3_; + SoupMessage* _tmp4_; + SoupMessageBody* _tmp5_; + gint64 _tmp6_; #line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self)); #line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1864,21 +1884,21 @@ static void publishing_rest_support_transaction_on_wrote_body_data (PublishingRE #line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp6_ = _tmp5_->length; #line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - g_signal_emit_by_name (self, "chunk-transmitted", _tmp3_, (gint) _tmp6_); -#line 1868 "RESTSupport.c" + g_signal_emit (self, publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_CHUNK_TRANSMITTED_SIGNAL], 0, _tmp3_, (gint) _tmp6_); +#line 1888 "RESTSupport.c" } static gpointer _g_error_copy0 (gpointer self) { #line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self ? g_error_copy (self) : NULL; -#line 1875 "RESTSupport.c" +#line 1895 "RESTSupport.c" } static void publishing_rest_support_transaction_on_message_unqueued (PublishingRESTSupportTransaction* self, SoupMessage* message) { - SoupMessage* _tmp0_ = NULL; - SoupMessage* _tmp1_ = NULL; + SoupMessage* _tmp0_; + SoupMessage* _tmp1_; GError * _inner_error_ = NULL; #line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self)); @@ -1892,10 +1912,10 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR if (_tmp0_ != _tmp1_) { #line 183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 1895 "RESTSupport.c" +#line 1915 "RESTSupport.c" } { - SoupMessage* _tmp2_ = NULL; + SoupMessage* _tmp2_; #line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp2_ = message; #line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1904,7 +1924,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR if (G_UNLIKELY (_inner_error_ != NULL)) { #line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 1907 "RESTSupport.c" +#line 1927 "RESTSupport.c" goto __catch0_spit_publishing_publishing_error; } #line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1913,19 +1933,19 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR g_clear_error (&_inner_error_); #line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 1916 "RESTSupport.c" +#line 1936 "RESTSupport.c" } } goto __finally0; __catch0_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - GError* _tmp7_ = NULL; - GError* _tmp8_ = NULL; + GError* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + GError* _tmp7_; + GError* _tmp8_; #line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" err = _inner_error_; #line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1954,7 +1974,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR self->priv->err = _tmp8_; #line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_error_free0 (err); -#line 1957 "RESTSupport.c" +#line 1977 "RESTSupport.c" } __finally0: #line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1965,7 +1985,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR g_clear_error (&_inner_error_); #line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 1968 "RESTSupport.c" +#line 1988 "RESTSupport.c" } } @@ -1973,35 +1993,35 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR static gpointer _g_object_ref0 (gpointer self) { #line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self ? g_object_ref (self) : NULL; -#line 1976 "RESTSupport.c" +#line 1996 "RESTSupport.c" } -gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self, GTlsCertificate** cert) { +gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self, GTlsCertificate* * cert) { GTlsCertificate* _vala_cert = NULL; gchar* result = NULL; GTlsCertificateFlags tls_errors = 0; - SoupMessage* _tmp0_ = NULL; + SoupMessage* _tmp0_; GTlsCertificate* _tmp1_ = NULL; GTlsCertificateFlags _tmp2_ = 0; - GTlsCertificate* _tmp3_ = NULL; + GTlsCertificate* _tmp3_; GeeArrayList* list = NULL; - GeeArrayList* _tmp4_ = NULL; - GTlsCertificateFlags _tmp5_ = 0; - GTlsCertificateFlags _tmp8_ = 0; - GTlsCertificateFlags _tmp11_ = 0; - GTlsCertificateFlags _tmp14_ = 0; - GTlsCertificateFlags _tmp17_ = 0; - GTlsCertificateFlags _tmp20_ = 0; - GTlsCertificateFlags _tmp23_ = 0; + GeeArrayList* _tmp4_; + GTlsCertificateFlags _tmp5_; + GTlsCertificateFlags _tmp7_; + GTlsCertificateFlags _tmp9_; + GTlsCertificateFlags _tmp11_; + GTlsCertificateFlags _tmp13_; + GTlsCertificateFlags _tmp15_; + GTlsCertificateFlags _tmp17_; GString* builder = NULL; - GString* _tmp26_ = NULL; - GeeArrayList* _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; - GString* _tmp47_ = NULL; - const gchar* _tmp48_ = NULL; - gchar* _tmp49_ = NULL; + GString* _tmp19_; + GeeArrayList* _tmp20_; + gint _tmp21_; + gint _tmp22_; + GString* _tmp40_; + const gchar* _tmp41_; + gchar* _tmp42_; #line 195 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL); #line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2024,227 +2044,206 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis _tmp5_ = tls_errors; #line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if ((_tmp5_ & G_TLS_CERTIFICATE_BAD_IDENTITY) == G_TLS_CERTIFICATE_BAD_IDENTITY) { -#line 2027 "RESTSupport.c" - GeeArrayList* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; +#line 2047 "RESTSupport.c" + GeeArrayList* _tmp6_; #line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp6_ = list; #line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp7_ = _ ("⚫ This website presented identification that belongs to a different we" \ -"bsite."); -#line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_); -#line 2036 "RESTSupport.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website presented identification that belongs to a different we" \ +"bsite.")); +#line 2053 "RESTSupport.c" } #line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp8_ = tls_errors; + _tmp7_ = tls_errors; #line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - if ((_tmp8_ & G_TLS_CERTIFICATE_EXPIRED) == G_TLS_CERTIFICATE_EXPIRED) { -#line 2042 "RESTSupport.c" - GeeArrayList* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; -#line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp9_ = list; + if ((_tmp7_ & G_TLS_CERTIFICATE_EXPIRED) == G_TLS_CERTIFICATE_EXPIRED) { +#line 2059 "RESTSupport.c" + GeeArrayList* _tmp8_; #line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp10_ = _ ("⚫ This website’s identification is too old to trust. Check the date on" \ -" your computer’s calendar."); + _tmp8_ = list; #line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); -#line 2051 "RESTSupport.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification is too old to trust. Check the date on" \ +" your computer’s calendar.")); +#line 2065 "RESTSupport.c" } #line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp11_ = tls_errors; + _tmp9_ = tls_errors; #line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - if ((_tmp11_ & G_TLS_CERTIFICATE_UNKNOWN_CA) == G_TLS_CERTIFICATE_UNKNOWN_CA) { -#line 2057 "RESTSupport.c" - GeeArrayList* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; + if ((_tmp9_ & G_TLS_CERTIFICATE_UNKNOWN_CA) == G_TLS_CERTIFICATE_UNKNOWN_CA) { +#line 2071 "RESTSupport.c" + GeeArrayList* _tmp10_; #line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp12_ = list; + _tmp10_ = list; #line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp13_ = _ ("⚫ This website’s identification was not issued by a trusted organizati" \ -"on."); -#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_); -#line 2066 "RESTSupport.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification was not issued by a trusted organizati" \ +"on.")); +#line 2077 "RESTSupport.c" } #line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp14_ = tls_errors; + _tmp11_ = tls_errors; #line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - if ((_tmp14_ & G_TLS_CERTIFICATE_GENERIC_ERROR) == G_TLS_CERTIFICATE_GENERIC_ERROR) { -#line 2072 "RESTSupport.c" - GeeArrayList* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; -#line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp15_ = list; + if ((_tmp11_ & G_TLS_CERTIFICATE_GENERIC_ERROR) == G_TLS_CERTIFICATE_GENERIC_ERROR) { +#line 2083 "RESTSupport.c" + GeeArrayList* _tmp12_; #line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp16_ = _ ("⚫ This website’s identification could not be processed. It may be corr" \ -"upted."); + _tmp12_ = list; #line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_); -#line 2081 "RESTSupport.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification could not be processed. It may be corr" \ +"upted.")); +#line 2089 "RESTSupport.c" } #line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp17_ = tls_errors; + _tmp13_ = tls_errors; #line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - if ((_tmp17_ & G_TLS_CERTIFICATE_REVOKED) == G_TLS_CERTIFICATE_REVOKED) { -#line 2087 "RESTSupport.c" - GeeArrayList* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; -#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp18_ = list; + if ((_tmp13_ & G_TLS_CERTIFICATE_REVOKED) == G_TLS_CERTIFICATE_REVOKED) { +#line 2095 "RESTSupport.c" + GeeArrayList* _tmp14_; #line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp19_ = _ ("⚫ This website’s identification has been revoked by the trusted organi" \ -"zation that issued it."); + _tmp14_ = list; #line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_); -#line 2096 "RESTSupport.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification has been revoked by the trusted organi" \ +"zation that issued it.")); +#line 2101 "RESTSupport.c" } #line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp20_ = tls_errors; + _tmp15_ = tls_errors; #line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - if ((_tmp20_ & G_TLS_CERTIFICATE_INSECURE) == G_TLS_CERTIFICATE_INSECURE) { -#line 2102 "RESTSupport.c" - GeeArrayList* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; + if ((_tmp15_ & G_TLS_CERTIFICATE_INSECURE) == G_TLS_CERTIFICATE_INSECURE) { +#line 2107 "RESTSupport.c" + GeeArrayList* _tmp16_; #line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp21_ = list; + _tmp16_ = list; #line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp22_ = _ ("⚫ This website’s identification cannot be trusted because it uses very" \ -" weak encryption."); -#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_); -#line 2111 "RESTSupport.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification cannot be trusted because it uses very" \ +" weak encryption.")); +#line 2113 "RESTSupport.c" } #line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp23_ = tls_errors; + _tmp17_ = tls_errors; #line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - if ((_tmp23_ & G_TLS_CERTIFICATE_NOT_ACTIVATED) == G_TLS_CERTIFICATE_NOT_ACTIVATED) { -#line 2117 "RESTSupport.c" - GeeArrayList* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; -#line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp24_ = list; + if ((_tmp17_ & G_TLS_CERTIFICATE_NOT_ACTIVATED) == G_TLS_CERTIFICATE_NOT_ACTIVATED) { +#line 2119 "RESTSupport.c" + GeeArrayList* _tmp18_; #line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp25_ = _ ("⚫ This website’s identification is only valid for future dates. Check " \ -"the date on your computer’s calendar."); + _tmp18_ = list; #line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp25_); -#line 2126 "RESTSupport.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification is only valid for future dates. Check " \ +"the date on your computer’s calendar.")); +#line 2125 "RESTSupport.c" } #line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp26_ = g_string_new (""); + _tmp19_ = g_string_new (""); #line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - builder = _tmp26_; + builder = _tmp19_; #line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp27_ = list; + _tmp20_ = list; #line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp29_ = _tmp28_; + _tmp22_ = _tmp21_; #line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - if (_tmp29_ == 1) { -#line 2140 "RESTSupport.c" - GString* _tmp30_ = NULL; - GeeArrayList* _tmp31_ = NULL; - gpointer _tmp32_ = NULL; - gchar* _tmp33_ = NULL; + if (_tmp22_ == 1) { +#line 2139 "RESTSupport.c" + GString* _tmp23_; + GeeArrayList* _tmp24_; + gpointer _tmp25_; + gchar* _tmp26_; #line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp30_ = builder; + _tmp23_ = builder; #line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp31_ = list; + _tmp24_ = list; #line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp32_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); + _tmp25_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); #line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp33_ = (gchar*) _tmp32_; + _tmp26_ = (gchar*) _tmp25_; #line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - g_string_append (_tmp30_, _tmp33_); + g_string_append (_tmp23_, _tmp26_); #line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _g_free0 (_tmp33_); -#line 2157 "RESTSupport.c" + _g_free0 (_tmp26_); +#line 2156 "RESTSupport.c" } else { { GeeArrayList* _entry_list = NULL; - GeeArrayList* _tmp34_ = NULL; - GeeArrayList* _tmp35_ = NULL; + GeeArrayList* _tmp27_; + GeeArrayList* _tmp28_; gint _entry_size = 0; - GeeArrayList* _tmp36_ = NULL; - gint _tmp37_ = 0; - gint _tmp38_ = 0; + GeeArrayList* _tmp29_; + gint _tmp30_; + gint _tmp31_; gint _entry_index = 0; #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp34_ = list; + _tmp27_ = list; #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp35_ = _g_object_ref0 (_tmp34_); + _tmp28_ = _g_object_ref0 (_tmp27_); #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _entry_list = _tmp35_; + _entry_list = _tmp28_; #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp36_ = _entry_list; + _tmp29_ = _entry_list; #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp38_ = _tmp37_; + _tmp31_ = _tmp30_; #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _entry_size = _tmp38_; + _entry_size = _tmp31_; #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _entry_index = -1; #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" while (TRUE) { -#line 2186 "RESTSupport.c" - gint _tmp39_ = 0; - gint _tmp40_ = 0; - gint _tmp41_ = 0; +#line 2185 "RESTSupport.c" + gint _tmp32_; + gint _tmp33_; + gint _tmp34_; gchar* entry = NULL; - GeeArrayList* _tmp42_ = NULL; - gint _tmp43_ = 0; - gpointer _tmp44_ = NULL; - GString* _tmp45_ = NULL; - const gchar* _tmp46_ = NULL; + GeeArrayList* _tmp35_; + gint _tmp36_; + gpointer _tmp37_; + GString* _tmp38_; + const gchar* _tmp39_; #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp39_ = _entry_index; + _tmp32_ = _entry_index; #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _entry_index = _tmp39_ + 1; + _entry_index = _tmp32_ + 1; #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp40_ = _entry_index; + _tmp33_ = _entry_index; #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp41_ = _entry_size; + _tmp34_ = _entry_size; #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - if (!(_tmp40_ < _tmp41_)) { + if (!(_tmp33_ < _tmp34_)) { #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" break; -#line 2208 "RESTSupport.c" +#line 2207 "RESTSupport.c" } #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp42_ = _entry_list; + _tmp35_ = _entry_list; #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp43_ = _entry_index; + _tmp36_ = _entry_index; #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp44_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp43_); + _tmp37_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp36_); #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - entry = (gchar*) _tmp44_; + entry = (gchar*) _tmp37_; #line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp45_ = builder; + _tmp38_ = builder; #line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp46_ = entry; + _tmp39_ = entry; #line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - g_string_append_printf (_tmp45_, "%s\n", _tmp46_); + g_string_append_printf (_tmp38_, "%s\n", _tmp39_); #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_free0 (entry); -#line 2226 "RESTSupport.c" +#line 2225 "RESTSupport.c" } #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_object_unref0 (_entry_list); -#line 2230 "RESTSupport.c" +#line 2229 "RESTSupport.c" } } #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp47_ = builder; + _tmp40_ = builder; #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp48_ = _tmp47_->str; + _tmp41_ = _tmp40_->str; #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp49_ = g_strdup (_tmp48_); + _tmp42_ = g_strdup (_tmp41_); #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - result = _tmp49_; + result = _tmp42_; #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_string_free0 (builder); #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2253,27 +2252,27 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis if (cert) { #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *cert = _vala_cert; -#line 2249 "RESTSupport.c" +#line 2248 "RESTSupport.c" } else { #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_object_unref0 (_vala_cert); -#line 2253 "RESTSupport.c" +#line 2252 "RESTSupport.c" } #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 2257 "RESTSupport.c" +#line 2256 "RESTSupport.c" } void publishing_rest_support_transaction_check_response (PublishingRESTSupportTransaction* self, SoupMessage* message, GError** error) { - SoupMessage* _tmp0_ = NULL; - guint _tmp1_ = 0U; - guint _tmp2_ = 0U; + SoupMessage* _tmp0_; + guint _tmp1_; + guint _tmp2_; gboolean _tmp42_ = FALSE; - SoupMessage* _tmp43_ = NULL; - SoupMessageBody* _tmp44_ = NULL; - guint8* _tmp45_ = NULL; - gint _tmp45__length1 = 0; + SoupMessage* _tmp43_; + SoupMessageBody* _tmp44_; + guint8* _tmp45_; + gint _tmp45__length1; GError * _inner_error_ = NULL; #line 247 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self)); @@ -2291,25 +2290,25 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr case SOUP_STATUS_OK: #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" case SOUP_STATUS_CREATED: -#line 2287 "RESTSupport.c" +#line 2286 "RESTSupport.c" { #line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" break; -#line 2291 "RESTSupport.c" +#line 2290 "RESTSupport.c" } #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" case SOUP_STATUS_CANT_RESOLVE: #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" case SOUP_STATUS_CANT_RESOLVE_PROXY: -#line 2297 "RESTSupport.c" +#line 2296 "RESTSupport.c" { - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - SoupMessage* _tmp5_ = NULL; - guint _tmp6_ = 0U; - guint _tmp7_ = 0U; - GError* _tmp8_ = NULL; - GError* _tmp9_ = NULL; + gchar* _tmp3_; + gchar* _tmp4_; + SoupMessage* _tmp5_; + guint _tmp6_; + guint _tmp7_; + GError* _tmp8_; + GError* _tmp9_; #line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp3_ = publishing_rest_support_transaction_get_endpoint_url (self); #line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2334,7 +2333,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_propagate_error (error, _inner_error_); #line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2330 "RESTSupport.c" +#line 2329 "RESTSupport.c" } else { #line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2342,22 +2341,22 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_clear_error (&_inner_error_); #line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2338 "RESTSupport.c" +#line 2337 "RESTSupport.c" } } #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" case SOUP_STATUS_CANT_CONNECT: #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" case SOUP_STATUS_CANT_CONNECT_PROXY: -#line 2345 "RESTSupport.c" +#line 2344 "RESTSupport.c" { - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - SoupMessage* _tmp12_ = NULL; - guint _tmp13_ = 0U; - guint _tmp14_ = 0U; - GError* _tmp15_ = NULL; - GError* _tmp16_ = NULL; + gchar* _tmp10_; + gchar* _tmp11_; + SoupMessage* _tmp12_; + guint _tmp13_; + guint _tmp14_; + GError* _tmp15_; + GError* _tmp16_; #line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp10_ = publishing_rest_support_transaction_get_endpoint_url (self); #line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2382,7 +2381,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_propagate_error (error, _inner_error_); #line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2378 "RESTSupport.c" +#line 2377 "RESTSupport.c" } else { #line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2390,17 +2389,17 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_clear_error (&_inner_error_); #line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2386 "RESTSupport.c" +#line 2385 "RESTSupport.c" } } #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" case SOUP_STATUS_SSL_FAILED: -#line 2391 "RESTSupport.c" +#line 2390 "RESTSupport.c" { - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - GError* _tmp19_ = NULL; - GError* _tmp20_ = NULL; + gchar* _tmp17_; + gchar* _tmp18_; + GError* _tmp19_; + GError* _tmp20_; #line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp17_ = publishing_rest_support_transaction_get_endpoint_url (self); #line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2419,7 +2418,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_propagate_error (error, _inner_error_); #line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2415 "RESTSupport.c" +#line 2414 "RESTSupport.c" } else { #line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2427,14 +2426,14 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_clear_error (&_inner_error_); #line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2423 "RESTSupport.c" +#line 2422 "RESTSupport.c" } } default: { - SoupMessage* _tmp21_ = NULL; - guint _tmp22_ = 0U; - guint _tmp23_ = 0U; + SoupMessage* _tmp21_; + guint _tmp22_; + guint _tmp23_; #line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp21_ = message; #line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2443,18 +2442,18 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr _tmp23_ = _tmp22_; #line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp23_ >= ((guint) 100)) { -#line 2439 "RESTSupport.c" - gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - SoupMessage* _tmp26_ = NULL; - guint _tmp27_ = 0U; - guint _tmp28_ = 0U; - SoupMessage* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; - GError* _tmp33_ = NULL; - GError* _tmp34_ = NULL; +#line 2438 "RESTSupport.c" + gchar* _tmp24_; + gchar* _tmp25_; + SoupMessage* _tmp26_; + guint _tmp27_; + guint _tmp28_; + SoupMessage* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; + GError* _tmp33_; + GError* _tmp34_; #line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp24_ = publishing_rest_support_transaction_get_endpoint_url (self); #line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2489,7 +2488,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_propagate_error (error, _inner_error_); #line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2485 "RESTSupport.c" +#line 2484 "RESTSupport.c" } else { #line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2497,16 +2496,16 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_clear_error (&_inner_error_); #line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2493 "RESTSupport.c" +#line 2492 "RESTSupport.c" } } else { - gchar* _tmp35_ = NULL; - gchar* _tmp36_ = NULL; - SoupMessage* _tmp37_ = NULL; - guint _tmp38_ = 0U; - guint _tmp39_ = 0U; - GError* _tmp40_ = NULL; - GError* _tmp41_ = NULL; + gchar* _tmp35_; + gchar* _tmp36_; + SoupMessage* _tmp37_; + guint _tmp38_; + guint _tmp39_; + GError* _tmp40_; + GError* _tmp41_; #line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp35_ = publishing_rest_support_transaction_get_endpoint_url (self); #line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2531,7 +2530,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_propagate_error (error, _inner_error_); #line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2527 "RESTSupport.c" +#line 2526 "RESTSupport.c" } else { #line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2539,7 +2538,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_clear_error (&_inner_error_); #line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2535 "RESTSupport.c" +#line 2534 "RESTSupport.c" } } } @@ -2556,12 +2555,12 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr if (_tmp45_ == NULL) { #line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp42_ = TRUE; -#line 2552 "RESTSupport.c" +#line 2551 "RESTSupport.c" } else { - SoupMessage* _tmp46_ = NULL; - SoupMessageBody* _tmp47_ = NULL; - guint8* _tmp48_ = NULL; - gint _tmp48__length1 = 0; + SoupMessage* _tmp46_; + SoupMessageBody* _tmp47_; + guint8* _tmp48_; + gint _tmp48__length1; #line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp46_ = message; #line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2572,15 +2571,15 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr _tmp48__length1 = (gint) _tmp47_->length; #line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp42_ = _tmp48__length1 == 0; -#line 2568 "RESTSupport.c" +#line 2567 "RESTSupport.c" } #line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp42_) { -#line 2572 "RESTSupport.c" - gchar* _tmp49_ = NULL; - gchar* _tmp50_ = NULL; - GError* _tmp51_ = NULL; - GError* _tmp52_ = NULL; +#line 2571 "RESTSupport.c" + gchar* _tmp49_; + gchar* _tmp50_; + GError* _tmp51_; + GError* _tmp52_; #line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp49_ = publishing_rest_support_transaction_get_endpoint_url (self); #line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2599,7 +2598,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_propagate_error (error, _inner_error_); #line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2595 "RESTSupport.c" +#line 2594 "RESTSupport.c" } else { #line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2607,7 +2606,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_clear_error (&_inner_error_); #line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2603 "RESTSupport.c" +#line 2602 "RESTSupport.c" } } } @@ -2620,28 +2619,28 @@ static PublishingRESTSupportArgument** _vala_array_dup1 (PublishingRESTSupportAr result = g_new0 (PublishingRESTSupportArgument*, length + 1); #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" for (i = 0; i < length; i++) { -#line 2616 "RESTSupport.c" - PublishingRESTSupportArgument* _tmp0_ = NULL; +#line 2615 "RESTSupport.c" + PublishingRESTSupportArgument* _tmp0_; #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp0_ = _publishing_rest_support_argument_ref0 (self[i]); #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" result[i] = _tmp0_; -#line 2622 "RESTSupport.c" +#line 2621 "RESTSupport.c" } #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 2626 "RESTSupport.c" +#line 2625 "RESTSupport.c" } PublishingRESTSupportArgument** publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self, int* result_length1) { PublishingRESTSupportArgument** result = NULL; - PublishingRESTSupportArgument** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - PublishingRESTSupportArgument** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - PublishingRESTSupportArgument** _tmp2_ = NULL; - gint _tmp2__length1 = 0; + PublishingRESTSupportArgument** _tmp0_; + gint _tmp0__length1; + PublishingRESTSupportArgument** _tmp1_; + gint _tmp1__length1; + PublishingRESTSupportArgument** _tmp2_; + gint _tmp2__length1; #line 284 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL); #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2660,28 +2659,28 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_argument if (result_length1) { #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *result_length1 = _tmp2__length1; -#line 2656 "RESTSupport.c" +#line 2655 "RESTSupport.c" } #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" result = _tmp2_; #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 2662 "RESTSupport.c" +#line 2661 "RESTSupport.c" } PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_arguments (PublishingRESTSupportTransaction* self, int* result_length1) { PublishingRESTSupportArgument** result = NULL; - gint _tmp0_ = 0; - PublishingRESTSupportArgument** _tmp1_ = NULL; - PublishingRESTSupportArgument** _tmp2_ = NULL; - gint _tmp2__length1 = 0; - gint _tmp3_ = 0; - PublishingRESTSupportArgument** _tmp4_ = NULL; - PublishingRESTSupportArgument** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - PublishingRESTSupportArgument** _tmp6_ = NULL; - gint _tmp6__length1 = 0; + gint _tmp0_; + PublishingRESTSupportArgument** _tmp1_; + PublishingRESTSupportArgument** _tmp2_; + gint _tmp2__length1; + gint _tmp3_; + PublishingRESTSupportArgument** _tmp4_; + PublishingRESTSupportArgument** _tmp5_; + gint _tmp5__length1; + PublishingRESTSupportArgument** _tmp6_; + gint _tmp6__length1; #line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL); #line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2706,46 +2705,46 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_a if (result_length1) { #line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *result_length1 = _tmp6__length1; -#line 2702 "RESTSupport.c" +#line 2701 "RESTSupport.c" } #line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" result = _tmp6_; #line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 2708 "RESTSupport.c" +#line 2707 "RESTSupport.c" } void publishing_rest_support_transaction_set_is_executed (PublishingRESTSupportTransaction* self, gboolean is_executed) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 292 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self)); #line 293 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp0_ = is_executed; #line 293 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->priv->is_executed = _tmp0_; -#line 2720 "RESTSupport.c" +#line 2719 "RESTSupport.c" } static void _publishing_rest_support_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued (PublishingRESTSupportSession* _sender, SoupMessage* message, gpointer self) { #line 297 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_transaction_on_message_unqueued ((PublishingRESTSupportTransaction*) self, message); -#line 2727 "RESTSupport.c" +#line 2726 "RESTSupport.c" } void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction* self, GError** error) { - PublishingRESTSupportSession* _tmp0_ = NULL; - SoupMessage* _tmp1_ = NULL; - PublishingRESTSupportSession* _tmp2_ = NULL; - SoupMessage* _tmp3_ = NULL; - PublishingRESTSupportSession* _tmp4_ = NULL; - guint _tmp5_ = 0U; - SoupMessage* _tmp6_ = NULL; - guint _tmp7_ = 0U; - GError* _tmp8_ = NULL; - GError* _tmp10_ = NULL; + PublishingRESTSupportSession* _tmp0_; + SoupMessage* _tmp1_; + PublishingRESTSupportSession* _tmp2_; + SoupMessage* _tmp3_; + PublishingRESTSupportSession* _tmp4_; + guint _tmp5_; + SoupMessage* _tmp6_; + guint _tmp7_; + GError* _tmp8_; + GError* _tmp10_; GError * _inner_error_ = NULL; #line 296 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self)); @@ -2779,25 +2778,25 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction* _tmp8_ = self->priv->err; #line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp8_ != NULL) { -#line 2775 "RESTSupport.c" - GError* _tmp9_ = NULL; +#line 2774 "RESTSupport.c" + GError* _tmp9_; #line 305 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp9_ = self->priv->err; #line 305 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - g_signal_emit_by_name (self, "network-error", _tmp9_); -#line 2781 "RESTSupport.c" + g_signal_emit (self, publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_NETWORK_ERROR_SIGNAL], 0, _tmp9_); +#line 2780 "RESTSupport.c" } else { #line 307 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - g_signal_emit_by_name (self, "completed"); -#line 2785 "RESTSupport.c" + g_signal_emit (self, publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_COMPLETED_SIGNAL], 0); +#line 2784 "RESTSupport.c" } #line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp10_ = self->priv->err; #line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp10_ != NULL) { -#line 2791 "RESTSupport.c" - GError* _tmp11_ = NULL; - GError* _tmp12_ = NULL; +#line 2790 "RESTSupport.c" + GError* _tmp11_; + GError* _tmp12_; #line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp11_ = self->priv->err; #line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2810,7 +2809,7 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction* g_propagate_error (error, _inner_error_); #line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2806 "RESTSupport.c" +#line 2805 "RESTSupport.c" } else { #line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2818,7 +2817,7 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction* g_clear_error (&_inner_error_); #line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2814 "RESTSupport.c" +#line 2813 "RESTSupport.c" } } } @@ -2826,12 +2825,12 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction* PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method (PublishingRESTSupportTransaction* self) { PublishingRESTSupportHttpMethod result = 0; - SoupMessage* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - PublishingRESTSupportHttpMethod _tmp4_ = 0; - PublishingRESTSupportHttpMethod _tmp5_ = 0; + SoupMessage* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + PublishingRESTSupportHttpMethod _tmp4_; + PublishingRESTSupportHttpMethod _tmp5_; #line 313 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), 0); #line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2852,15 +2851,15 @@ PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method ( result = _tmp5_; #line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 2848 "RESTSupport.c" +#line 2847 "RESTSupport.c" } static void publishing_rest_support_transaction_real_add_header (PublishingRESTSupportTransaction* self, const gchar* key, const gchar* value) { - SoupMessage* _tmp0_ = NULL; - SoupMessageHeaders* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; + SoupMessage* _tmp0_; + SoupMessageHeaders* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; #line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (key != NULL); #line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2875,7 +2874,7 @@ static void publishing_rest_support_transaction_real_add_header (PublishingRESTS _tmp3_ = value; #line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" soup_message_headers_append (_tmp1_, _tmp2_, _tmp3_); -#line 2871 "RESTSupport.c" +#line 2870 "RESTSupport.c" } @@ -2884,24 +2883,24 @@ void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransa g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self)); #line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->add_header (self, key, value); -#line 2880 "RESTSupport.c" +#line 2879 "RESTSupport.c" } void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSupportTransaction* self, const gchar* custom_payload, const gchar* payload_content_type, gulong payload_length) { - PublishingRESTSupportHttpMethod _tmp0_ = 0; - const gchar* _tmp1_ = NULL; + PublishingRESTSupportHttpMethod _tmp0_; + const gchar* _tmp1_; gulong _tmp2_ = 0UL; - gulong _tmp3_ = 0UL; + gulong _tmp3_; gulong length = 0UL; - SoupMessage* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - guint8* _tmp11_ = NULL; - gint _tmp11__length1 = 0; - guint8* _tmp12_ = NULL; - gint _tmp12__length1 = 0; - gulong _tmp13_ = 0UL; + SoupMessage* _tmp8_; + const gchar* _tmp9_; + const gchar* _tmp10_; + guint8* _tmp11_; + gint _tmp11__length1; + guint8* _tmp12_; + gint _tmp12__length1; + gulong _tmp13_; #line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self)); #line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2918,23 +2917,23 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo self->priv->use_custom_payload = FALSE; #line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2914 "RESTSupport.c" +#line 2913 "RESTSupport.c" } #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp3_ = payload_length; #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp3_ > ((gulong) 0)) { -#line 2920 "RESTSupport.c" - gulong _tmp4_ = 0UL; +#line 2919 "RESTSupport.c" + gulong _tmp4_; #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp4_ = payload_length; #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp2_ = _tmp4_; -#line 2926 "RESTSupport.c" +#line 2925 "RESTSupport.c" } else { - const gchar* _tmp5_ = NULL; - gint _tmp6_ = 0; - gint _tmp7_ = 0; + const gchar* _tmp5_; + gint _tmp6_; + gint _tmp7_; #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp5_ = custom_payload; #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2943,7 +2942,7 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo _tmp7_ = _tmp6_; #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp2_ = (gulong) _tmp7_; -#line 2939 "RESTSupport.c" +#line 2938 "RESTSupport.c" } #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" length = _tmp2_; @@ -2965,13 +2964,13 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo soup_message_set_request (_tmp8_, _tmp9_, SOUP_MEMORY_COPY, _tmp12_ + 0, (gsize) (((gint) _tmp13_) - 0)); #line 341 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->priv->use_custom_payload = TRUE; -#line 2961 "RESTSupport.c" +#line 2960 "RESTSupport.c" } void publishing_rest_support_transaction_set_message (PublishingRESTSupportTransaction* self, SoupMessage* message) { - SoupMessage* _tmp0_ = NULL; - SoupMessage* _tmp1_ = NULL; + SoupMessage* _tmp0_; + SoupMessage* _tmp1_; #line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self)); #line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2984,13 +2983,13 @@ void publishing_rest_support_transaction_set_message (PublishingRESTSupportTrans _g_object_unref0 (self->priv->message); #line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->priv->message = _tmp1_; -#line 2980 "RESTSupport.c" +#line 2979 "RESTSupport.c" } gboolean publishing_rest_support_transaction_get_is_executed (PublishingRESTSupportTransaction* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), FALSE); #line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2999,16 +2998,16 @@ gboolean publishing_rest_support_transaction_get_is_executed (PublishingRESTSupp result = _tmp0_; #line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 2995 "RESTSupport.c" +#line 2994 "RESTSupport.c" } guint publishing_rest_support_transaction_get_status_code (PublishingRESTSupportTransaction* self) { guint result = 0U; - gboolean _tmp0_ = FALSE; - SoupMessage* _tmp1_ = NULL; - guint _tmp2_ = 0U; - guint _tmp3_ = 0U; + gboolean _tmp0_; + SoupMessage* _tmp1_; + guint _tmp2_; + guint _tmp3_; #line 357 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), 0U); #line 358 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3025,26 +3024,26 @@ guint publishing_rest_support_transaction_get_status_code (PublishingRESTSupport result = _tmp3_; #line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 3021 "RESTSupport.c" +#line 3020 "RESTSupport.c" } static void _vala_SoupURI_free (SoupURI* self) { #line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_boxed_free (soup_uri_get_type (), self); -#line 3028 "RESTSupport.c" +#line 3027 "RESTSupport.c" } static void publishing_rest_support_transaction_real_execute (PublishingRESTSupportTransaction* self, GError** error) { - gboolean _tmp0_ = FALSE; - PublishingRESTSupportHttpMethod _tmp1_ = 0; + gboolean _tmp0_; + PublishingRESTSupportHttpMethod _tmp1_; gchar* formdata_string = NULL; - gchar* _tmp3_ = NULL; + gchar* _tmp3_; gchar* old_url = NULL; gchar* url_with_query = NULL; gboolean _tmp19_ = FALSE; - PublishingRESTSupportHttpMethod _tmp20_ = 0; + PublishingRESTSupportHttpMethod _tmp20_; GError * _inner_error_ = NULL; #line 366 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp0_ = self->priv->use_custom_payload; @@ -3062,7 +3061,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp g_propagate_error (error, _inner_error_); #line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 3058 "RESTSupport.c" +#line 3057 "RESTSupport.c" } else { #line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3070,68 +3069,68 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp g_clear_error (&_inner_error_); #line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 3066 "RESTSupport.c" +#line 3065 "RESTSupport.c" } } #line 370 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 3071 "RESTSupport.c" +#line 3070 "RESTSupport.c" } #line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp1_ = publishing_rest_support_transaction_get_method (self); #line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp1_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST) { -#line 3077 "RESTSupport.c" - PublishingRESTSupportArgument** _tmp2_ = NULL; - gint _tmp2__length1 = 0; +#line 3076 "RESTSupport.c" + PublishingRESTSupportArgument** _tmp2_; + gint _tmp2__length1; #line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp2_ = self->priv->arguments; #line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp2__length1 = self->priv->arguments_length1; #line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _vala_assert (_tmp2__length1 > 0, "arguments.length > 0"); -#line 3086 "RESTSupport.c" +#line 3085 "RESTSupport.c" } #line 378 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp3_ = g_strdup (""); #line 378 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" formdata_string = _tmp3_; -#line 3092 "RESTSupport.c" +#line 3091 "RESTSupport.c" { gint i = 0; #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" i = 0; -#line 3097 "RESTSupport.c" +#line 3096 "RESTSupport.c" { gboolean _tmp4_ = FALSE; #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp4_ = TRUE; #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" while (TRUE) { -#line 3104 "RESTSupport.c" - gint _tmp6_ = 0; - PublishingRESTSupportArgument** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - const gchar* _tmp8_ = NULL; - PublishingRESTSupportArgument** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - gint _tmp10_ = 0; - PublishingRESTSupportArgument* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gint _tmp15_ = 0; - PublishingRESTSupportArgument** _tmp16_ = NULL; - gint _tmp16__length1 = 0; +#line 3103 "RESTSupport.c" + gint _tmp6_; + PublishingRESTSupportArgument** _tmp7_; + gint _tmp7__length1; + const gchar* _tmp8_; + PublishingRESTSupportArgument** _tmp9_; + gint _tmp9__length1; + gint _tmp10_; + PublishingRESTSupportArgument* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + gint _tmp15_; + PublishingRESTSupportArgument** _tmp16_; + gint _tmp16__length1; #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (!_tmp4_) { -#line 3121 "RESTSupport.c" - gint _tmp5_ = 0; +#line 3120 "RESTSupport.c" + gint _tmp5_; #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp5_ = i; #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" i = _tmp5_ + 1; -#line 3127 "RESTSupport.c" +#line 3126 "RESTSupport.c" } #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp4_ = FALSE; @@ -3145,7 +3144,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp if (!(_tmp6_ < _tmp7__length1)) { #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" break; -#line 3141 "RESTSupport.c" +#line 3140 "RESTSupport.c" } #line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp8_ = formdata_string; @@ -3177,9 +3176,9 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp _tmp16__length1 = self->priv->arguments_length1; #line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp15_ < (_tmp16__length1 - 1)) { -#line 3173 "RESTSupport.c" - const gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; +#line 3172 "RESTSupport.c" + const gchar* _tmp17_; + gchar* _tmp18_; #line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp17_ = formdata_string; #line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3188,7 +3187,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp _g_free0 (formdata_string); #line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" formdata_string = _tmp18_; -#line 3184 "RESTSupport.c" +#line 3183 "RESTSupport.c" } } } @@ -3201,37 +3200,37 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp _tmp20_ = publishing_rest_support_transaction_get_method (self); #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp20_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET) { -#line 3197 "RESTSupport.c" - PublishingRESTSupportArgument** _tmp21_ = NULL; - gint _tmp21__length1 = 0; +#line 3196 "RESTSupport.c" + PublishingRESTSupportArgument** _tmp21_; + gint _tmp21__length1; #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp21_ = self->priv->arguments; #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp21__length1 = self->priv->arguments_length1; #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp19_ = _tmp21__length1 > 0; -#line 3206 "RESTSupport.c" +#line 3205 "RESTSupport.c" } else { #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp19_ = FALSE; -#line 3210 "RESTSupport.c" +#line 3209 "RESTSupport.c" } #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp19_) { -#line 3214 "RESTSupport.c" - SoupMessage* _tmp22_ = NULL; - SoupURI* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - const gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - SoupMessage* _tmp31_ = NULL; - const gchar* _tmp32_ = NULL; - SoupURI* _tmp33_ = NULL; - SoupURI* _tmp34_ = NULL; +#line 3213 "RESTSupport.c" + SoupMessage* _tmp22_; + SoupURI* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + const gchar* _tmp29_; + gchar* _tmp30_; + SoupMessage* _tmp31_; + const gchar* _tmp32_; + SoupURI* _tmp33_; + SoupURI* _tmp34_; #line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp22_ = self->priv->message; #line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3274,14 +3273,14 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp soup_message_set_uri (_tmp31_, _tmp34_); #line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" __vala_SoupURI_free0 (_tmp34_); -#line 3270 "RESTSupport.c" +#line 3269 "RESTSupport.c" } else { - SoupMessage* _tmp35_ = NULL; - const gchar* _tmp36_ = NULL; - guint8* _tmp37_ = NULL; - gint _tmp37__length1 = 0; - guint8* _tmp38_ = NULL; - gint _tmp38__length1 = 0; + SoupMessage* _tmp35_; + const gchar* _tmp36_; + guint8* _tmp37_; + gint _tmp37__length1; + guint8* _tmp38_; + gint _tmp38__length1; #line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp35_ = self->priv->message; #line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3294,16 +3293,16 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp _tmp38__length1 = _tmp37__length1; #line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" soup_message_set_request (_tmp35_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp38_, (gsize) _tmp38__length1); -#line 3290 "RESTSupport.c" +#line 3289 "RESTSupport.c" } #line 399 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->priv->is_executed = TRUE; -#line 3294 "RESTSupport.c" +#line 3293 "RESTSupport.c" { - SoupMessage* _tmp39_ = NULL; - SoupURI* _tmp40_ = NULL; - gchar* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; + SoupMessage* _tmp39_; + SoupURI* _tmp40_; + gchar* _tmp41_; + gchar* _tmp42_; #line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp39_ = self->priv->message; #line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3320,22 +3319,22 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp publishing_rest_support_transaction_send (self, &_inner_error_); #line 403 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3316 "RESTSupport.c" +#line 3315 "RESTSupport.c" goto __finally1; } } __finally1: { - const gchar* _tmp43_ = NULL; + const gchar* _tmp43_; #line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp43_ = old_url; #line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp43_ != NULL) { -#line 3327 "RESTSupport.c" - SoupMessage* _tmp44_ = NULL; - const gchar* _tmp45_ = NULL; - SoupURI* _tmp46_ = NULL; - SoupURI* _tmp47_ = NULL; +#line 3326 "RESTSupport.c" + SoupMessage* _tmp44_; + const gchar* _tmp45_; + SoupURI* _tmp46_; + SoupURI* _tmp47_; #line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp44_ = self->priv->message; #line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3348,7 +3347,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp soup_message_set_uri (_tmp44_, _tmp47_); #line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" __vala_SoupURI_free0 (_tmp47_); -#line 3344 "RESTSupport.c" +#line 3343 "RESTSupport.c" } } #line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3365,7 +3364,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp _g_free0 (formdata_string); #line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 3361 "RESTSupport.c" +#line 3360 "RESTSupport.c" } else { #line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_free0 (url_with_query); @@ -3379,7 +3378,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp g_clear_error (&_inner_error_); #line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 3375 "RESTSupport.c" +#line 3374 "RESTSupport.c" } } #line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3388,7 +3387,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp _g_free0 (old_url); #line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_free0 (formdata_string); -#line 3384 "RESTSupport.c" +#line 3383 "RESTSupport.c" } @@ -3397,18 +3396,18 @@ void publishing_rest_support_transaction_execute (PublishingRESTSupportTransacti g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self)); #line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->execute (self, error); -#line 3393 "RESTSupport.c" +#line 3392 "RESTSupport.c" } gchar* publishing_rest_support_transaction_get_response (PublishingRESTSupportTransaction* self) { gchar* result = NULL; - gboolean _tmp0_ = FALSE; - SoupMessage* _tmp1_ = NULL; - SoupMessageBody* _tmp2_ = NULL; - guint8* _tmp3_ = NULL; - gint _tmp3__length1 = 0; - gchar* _tmp4_ = NULL; + gboolean _tmp0_; + SoupMessage* _tmp1_; + SoupMessageBody* _tmp2_; + guint8* _tmp3_; + gint _tmp3__length1; + gchar* _tmp4_; #line 411 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL); #line 412 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3429,15 +3428,15 @@ gchar* publishing_rest_support_transaction_get_response (PublishingRESTSupportTr result = _tmp4_; #line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 3425 "RESTSupport.c" +#line 3424 "RESTSupport.c" } SoupMessageHeaders* publishing_rest_support_transaction_get_response_headers (PublishingRESTSupportTransaction* self) { SoupMessageHeaders* result = NULL; - gboolean _tmp0_ = FALSE; - SoupMessage* _tmp1_ = NULL; - SoupMessageHeaders* _tmp2_ = NULL; + gboolean _tmp0_; + SoupMessage* _tmp1_; + SoupMessageHeaders* _tmp2_; #line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL); #line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3452,15 +3451,15 @@ SoupMessageHeaders* publishing_rest_support_transaction_get_response_headers (Pu result = _tmp2_; #line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 3448 "RESTSupport.c" +#line 3447 "RESTSupport.c" } SoupMessage* publishing_rest_support_transaction_get_message (PublishingRESTSupportTransaction* self) { SoupMessage* result = NULL; - gboolean _tmp0_ = FALSE; - SoupMessage* _tmp1_ = NULL; - SoupMessage* _tmp2_ = NULL; + gboolean _tmp0_; + SoupMessage* _tmp1_; + SoupMessage* _tmp2_; #line 421 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL); #line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3475,33 +3474,33 @@ SoupMessage* publishing_rest_support_transaction_get_message (PublishingRESTSupp result = _tmp2_; #line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 3471 "RESTSupport.c" +#line 3470 "RESTSupport.c" } -static void _vala_array_add1 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) { +static void _vala_array_add1 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) { #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if ((*length) == (*size)) { #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *size = (*size) ? (2 * (*size)) : 4; #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1); -#line 3482 "RESTSupport.c" +#line 3481 "RESTSupport.c" } #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" (*array)[(*length)++] = value; #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" (*array)[*length] = NULL; -#line 3488 "RESTSupport.c" +#line 3487 "RESTSupport.c" } void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTransaction* self, const gchar* name, const gchar* value) { - PublishingRESTSupportArgument** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PublishingRESTSupportArgument* _tmp3_ = NULL; + PublishingRESTSupportArgument** _tmp0_; + gint _tmp0__length1; + const gchar* _tmp1_; + const gchar* _tmp2_; + PublishingRESTSupportArgument* _tmp3_; #line 426 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self)); #line 426 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3520,23 +3519,23 @@ void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTran _tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_); #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _vala_array_add1 (&self->priv->arguments, &self->priv->arguments_length1, &self->priv->_arguments_size_, _tmp3_); -#line 3516 "RESTSupport.c" +#line 3515 "RESTSupport.c" } gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSupportTransaction* self) { gchar* result = NULL; gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + const gchar* _tmp1_; #line 430 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL); #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp1_ = self->priv->endpoint_url; #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp1_ != NULL) { -#line 3530 "RESTSupport.c" - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; +#line 3529 "RESTSupport.c" + const gchar* _tmp2_; + gchar* _tmp3_; #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp2_ = self->priv->endpoint_url; #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3545,10 +3544,10 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo _g_free0 (_tmp0_); #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp0_ = _tmp3_; -#line 3541 "RESTSupport.c" +#line 3540 "RESTSupport.c" } else { - PublishingRESTSupportSession* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + PublishingRESTSupportSession* _tmp4_; + gchar* _tmp5_; #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp4_ = self->priv->parent_session; #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3557,27 +3556,27 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo _g_free0 (_tmp0_); #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp0_ = _tmp5_; -#line 3553 "RESTSupport.c" +#line 3552 "RESTSupport.c" } #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" result = _tmp0_; #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 3559 "RESTSupport.c" +#line 3558 "RESTSupport.c" } static gpointer _publishing_rest_support_session_ref0 (gpointer self) { #line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self ? publishing_rest_support_session_ref (self) : NULL; -#line 3566 "RESTSupport.c" +#line 3565 "RESTSupport.c" } PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_session (PublishingRESTSupportTransaction* self) { PublishingRESTSupportSession* result = NULL; - PublishingRESTSupportSession* _tmp0_ = NULL; - PublishingRESTSupportSession* _tmp1_ = NULL; + PublishingRESTSupportSession* _tmp0_; + PublishingRESTSupportSession* _tmp1_; #line 434 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL); #line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3588,7 +3587,7 @@ PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_ses result = _tmp1_; #line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 3584 "RESTSupport.c" +#line 3583 "RESTSupport.c" } @@ -3607,26 +3606,26 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue * data1 = closure->data; #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" data2 = param_values->data[0].v_pointer; -#line 3603 "RESTSupport.c" +#line 3602 "RESTSupport.c" } else { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" data1 = param_values->data[0].v_pointer; #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" data2 = closure->data; -#line 3609 "RESTSupport.c" +#line 3608 "RESTSupport.c" } #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback); #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" callback (data1, g_value_get_int (param_values + 1), g_value_get_int (param_values + 2), data2); -#line 3615 "RESTSupport.c" +#line 3614 "RESTSupport.c" } static void publishing_rest_support_value_transaction_init (GValue* value) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 3622 "RESTSupport.c" +#line 3621 "RESTSupport.c" } @@ -3635,7 +3634,7 @@ static void publishing_rest_support_value_transaction_free_value (GValue* value) if (value->data[0].v_pointer) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_transaction_unref (value->data[0].v_pointer); -#line 3631 "RESTSupport.c" +#line 3630 "RESTSupport.c" } } @@ -3645,11 +3644,11 @@ static void publishing_rest_support_value_transaction_copy_value (const GValue* if (src_value->data[0].v_pointer) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" dest_value->data[0].v_pointer = publishing_rest_support_transaction_ref (src_value->data[0].v_pointer); -#line 3641 "RESTSupport.c" +#line 3640 "RESTSupport.c" } else { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" dest_value->data[0].v_pointer = NULL; -#line 3645 "RESTSupport.c" +#line 3644 "RESTSupport.c" } } @@ -3657,66 +3656,66 @@ static void publishing_rest_support_value_transaction_copy_value (const GValue* static gpointer publishing_rest_support_value_transaction_peek_pointer (const GValue* value) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return value->data[0].v_pointer; -#line 3653 "RESTSupport.c" +#line 3652 "RESTSupport.c" } static gchar* publishing_rest_support_value_transaction_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (collect_values[0].v_pointer) { -#line 3660 "RESTSupport.c" - PublishingRESTSupportTransaction* object; +#line 3659 "RESTSupport.c" + PublishingRESTSupportTransaction * object; object = collect_values[0].v_pointer; #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (object->parent_instance.g_class == NULL) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3667 "RESTSupport.c" +#line 3666 "RESTSupport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3671 "RESTSupport.c" +#line 3670 "RESTSupport.c" } #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = publishing_rest_support_transaction_ref (object); -#line 3675 "RESTSupport.c" +#line 3674 "RESTSupport.c" } else { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 3679 "RESTSupport.c" +#line 3678 "RESTSupport.c" } #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 3683 "RESTSupport.c" +#line 3682 "RESTSupport.c" } static gchar* publishing_rest_support_value_transaction_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingRESTSupportTransaction** object_p; + PublishingRESTSupportTransaction ** object_p; object_p = collect_values[0].v_pointer; #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (!object_p) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3694 "RESTSupport.c" +#line 3693 "RESTSupport.c" } #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (!value->data[0].v_pointer) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = NULL; -#line 3700 "RESTSupport.c" +#line 3699 "RESTSupport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = value->data[0].v_pointer; -#line 3704 "RESTSupport.c" +#line 3703 "RESTSupport.c" } else { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = publishing_rest_support_transaction_ref (value->data[0].v_pointer); -#line 3708 "RESTSupport.c" +#line 3707 "RESTSupport.c" } #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 3712 "RESTSupport.c" +#line 3711 "RESTSupport.c" } @@ -3730,7 +3729,7 @@ GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name, c G_PARAM_SPEC (spec)->value_type = object_type; #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return G_PARAM_SPEC (spec); -#line 3726 "RESTSupport.c" +#line 3725 "RESTSupport.c" } @@ -3739,12 +3738,12 @@ gpointer publishing_rest_support_value_get_transaction (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION), NULL); #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return value->data[0].v_pointer; -#line 3735 "RESTSupport.c" +#line 3734 "RESTSupport.c" } void publishing_rest_support_value_set_transaction (GValue* value, gpointer v_object) { - PublishingRESTSupportTransaction* old; + PublishingRESTSupportTransaction * old; #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION)); #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3759,23 +3758,23 @@ void publishing_rest_support_value_set_transaction (GValue* value, gpointer v_ob value->data[0].v_pointer = v_object; #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_transaction_ref (value->data[0].v_pointer); -#line 3755 "RESTSupport.c" +#line 3754 "RESTSupport.c" } else { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 3759 "RESTSupport.c" +#line 3758 "RESTSupport.c" } #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (old) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_transaction_unref (old); -#line 3765 "RESTSupport.c" +#line 3764 "RESTSupport.c" } } void publishing_rest_support_value_take_transaction (GValue* value, gpointer v_object) { - PublishingRESTSupportTransaction* old; + PublishingRESTSupportTransaction * old; #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION)); #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3788,17 +3787,17 @@ void publishing_rest_support_value_take_transaction (GValue* value, gpointer v_o g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = v_object; -#line 3784 "RESTSupport.c" +#line 3783 "RESTSupport.c" } else { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 3788 "RESTSupport.c" +#line 3787 "RESTSupport.c" } #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (old) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_transaction_unref (old); -#line 3794 "RESTSupport.c" +#line 3793 "RESTSupport.c" } } @@ -3811,16 +3810,16 @@ static void publishing_rest_support_transaction_class_init (PublishingRESTSuppor #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_type_class_add_private (klass, sizeof (PublishingRESTSupportTransactionPrivate)); #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportTransactionClass *) klass)->add_header = (void (*)(PublishingRESTSupportTransaction*, const gchar*, const gchar*)) publishing_rest_support_transaction_real_add_header; + ((PublishingRESTSupportTransactionClass *) klass)->add_header = (void (*) (PublishingRESTSupportTransaction *, const gchar*, const gchar*)) publishing_rest_support_transaction_real_add_header; #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_rest_support_transaction_real_execute; + ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_rest_support_transaction_real_execute; #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - g_signal_new ("chunk_transmitted", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); + publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_CHUNK_TRANSMITTED_SIGNAL] = g_signal_new ("chunk-transmitted", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - g_signal_new ("network_error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); + publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_NETWORK_ERROR_SIGNAL] = g_signal_new ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - g_signal_new ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 3816 "RESTSupport.c" + publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_COMPLETED_SIGNAL] = g_signal_new ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 3815 "RESTSupport.c" } @@ -3841,11 +3840,11 @@ static void publishing_rest_support_transaction_instance_init (PublishingRESTSup self->priv->endpoint_url = NULL; #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->ref_count = 1; -#line 3837 "RESTSupport.c" +#line 3836 "RESTSupport.c" } -static void publishing_rest_support_transaction_finalize (PublishingRESTSupportTransaction* obj) { +static void publishing_rest_support_transaction_finalize (PublishingRESTSupportTransaction * obj) { PublishingRESTSupportTransaction * self; #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction); @@ -3859,7 +3858,7 @@ static void publishing_rest_support_transaction_finalize (PublishingRESTSupportT _g_error_free0 (self->priv->err); #line 151 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_free0 (self->priv->endpoint_url); -#line 3855 "RESTSupport.c" +#line 3854 "RESTSupport.c" } @@ -3878,18 +3877,18 @@ GType publishing_rest_support_transaction_get_type (void) { gpointer publishing_rest_support_transaction_ref (gpointer instance) { - PublishingRESTSupportTransaction* self; + PublishingRESTSupportTransaction * self; self = instance; #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_atomic_int_inc (&self->ref_count); #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return instance; -#line 3880 "RESTSupport.c" +#line 3879 "RESTSupport.c" } void publishing_rest_support_transaction_unref (gpointer instance) { - PublishingRESTSupportTransaction* self; + PublishingRESTSupportTransaction * self; self = instance; #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -3897,21 +3896,21 @@ void publishing_rest_support_transaction_unref (gpointer instance) { PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->finalize (self); #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3893 "RESTSupport.c" +#line 3892 "RESTSupport.c" } } PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable) { PublishingRESTSupportUploadTransaction* self = NULL; - PublishingRESTSupportSession* _tmp0_ = NULL; - SpitPublishingPublishable* _tmp1_ = NULL; - SpitPublishingPublishable* _tmp2_ = NULL; - SpitPublishingPublishable* _tmp3_ = NULL; - SpitPublishingPublisherMediaType _tmp4_ = 0; - gchar* _tmp5_ = NULL; - GHashTable* _tmp6_ = NULL; - GeeHashMap* _tmp7_ = NULL; + PublishingRESTSupportSession* _tmp0_; + SpitPublishingPublishable* _tmp1_; + SpitPublishingPublishable* _tmp2_; + SpitPublishingPublishable* _tmp3_; + SpitPublishingPublisherMediaType _tmp4_; + gchar* _tmp5_; + GHashTable* _tmp6_; + GeeHashMap* _tmp7_; #line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL); #line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3952,28 +3951,28 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti self->message_headers = _tmp7_; #line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 3948 "RESTSupport.c" +#line 3947 "RESTSupport.c" } PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable) { #line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return publishing_rest_support_upload_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, session, publishable); -#line 3955 "RESTSupport.c" +#line 3954 "RESTSupport.c" } PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url) { PublishingRESTSupportUploadTransaction* self = NULL; - PublishingRESTSupportSession* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - SpitPublishingPublishable* _tmp2_ = NULL; - SpitPublishingPublishable* _tmp3_ = NULL; - SpitPublishingPublishable* _tmp4_ = NULL; - SpitPublishingPublisherMediaType _tmp5_ = 0; - gchar* _tmp6_ = NULL; - GHashTable* _tmp7_ = NULL; - GeeHashMap* _tmp8_ = NULL; + PublishingRESTSupportSession* _tmp0_; + const gchar* _tmp1_; + SpitPublishingPublishable* _tmp2_; + SpitPublishingPublishable* _tmp3_; + SpitPublishingPublishable* _tmp4_; + SpitPublishingPublisherMediaType _tmp5_; + gchar* _tmp6_; + GHashTable* _tmp7_; + GeeHashMap* _tmp8_; #line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL); #line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -4018,22 +4017,22 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti self->message_headers = _tmp8_; #line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 4014 "RESTSupport.c" +#line 4013 "RESTSupport.c" } PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url) { #line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return publishing_rest_support_upload_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, session, publishable, endpoint_url); -#line 4021 "RESTSupport.c" +#line 4020 "RESTSupport.c" } static void publishing_rest_support_upload_transaction_real_add_header (PublishingRESTSupportTransaction* base, const gchar* key, const gchar* value) { PublishingRESTSupportUploadTransaction * self; - GeeHashMap* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + GeeHashMap* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; #line 466 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction); #line 466 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -4048,43 +4047,43 @@ static void publishing_rest_support_upload_transaction_real_add_header (Publishi _tmp2_ = value; #line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, _tmp2_); -#line 4044 "RESTSupport.c" +#line 4043 "RESTSupport.c" } static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type (SpitPublishingPublisherMediaType media_type) { gchar* result = NULL; - SpitPublishingPublisherMediaType _tmp0_ = 0; + SpitPublishingPublisherMediaType _tmp0_; #line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp0_ = media_type; #line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp0_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) { -#line 4055 "RESTSupport.c" - gchar* _tmp1_ = NULL; +#line 4054 "RESTSupport.c" + gchar* _tmp1_; #line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp1_ = g_strdup ("image/jpeg"); #line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" result = _tmp1_; #line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 4063 "RESTSupport.c" +#line 4062 "RESTSupport.c" } else { - SpitPublishingPublisherMediaType _tmp2_ = 0; + SpitPublishingPublisherMediaType _tmp2_; #line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp2_ = media_type; #line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp2_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { -#line 4070 "RESTSupport.c" - gchar* _tmp3_ = NULL; +#line 4069 "RESTSupport.c" + gchar* _tmp3_; #line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp3_ = g_strdup ("video/mpeg"); #line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" result = _tmp3_; #line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 4078 "RESTSupport.c" +#line 4077 "RESTSupport.c" } else { - SpitPublishingPublisherMediaType _tmp4_ = 0; + SpitPublishingPublisherMediaType _tmp4_; GEnumValue* _tmp5_; #line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp4_ = media_type; @@ -4092,7 +4091,7 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type _tmp5_ = g_enum_get_value (g_type_class_ref (SPIT_PUBLISHING_PUBLISHER_TYPE_MEDIA_TYPE), _tmp4_); #line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_error ("RESTSupport.vala:476: UploadTransaction: unknown media type %s.", (_tmp5_ != NULL) ? _tmp5_->value_name : NULL); -#line 4088 "RESTSupport.c" +#line 4087 "RESTSupport.c" } } } @@ -4101,23 +4100,23 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type static void _g_free0_ (gpointer var) { #line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" var = (g_free (var), NULL); -#line 4097 "RESTSupport.c" +#line 4096 "RESTSupport.c" } static GHashTable* publishing_rest_support_upload_transaction_create_default_binary_disposition_table (PublishingRESTSupportUploadTransaction* self) { GHashTable* result = NULL; GHashTable* _result_ = NULL; - GHashFunc _tmp0_ = NULL; - GEqualFunc _tmp1_ = NULL; - GHashTable* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - SpitPublishingPublishable* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; + GHashFunc _tmp0_; + GEqualFunc _tmp1_; + GHashTable* _tmp2_; + gchar* _tmp3_; + SpitPublishingPublishable* _tmp4_; + GFile* _tmp5_; + GFile* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 479 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_UPLOAD_TRANSACTION (self), NULL); #line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -4152,20 +4151,20 @@ static GHashTable* publishing_rest_support_upload_transaction_create_default_bin result = _result_; #line 486 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 4148 "RESTSupport.c" +#line 4147 "RESTSupport.c" } static gpointer _g_hash_table_ref0 (gpointer self) { #line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self ? g_hash_table_ref (self) : NULL; -#line 4155 "RESTSupport.c" +#line 4154 "RESTSupport.c" } void publishing_rest_support_upload_transaction_set_binary_disposition_table (PublishingRESTSupportUploadTransaction* self, GHashTable* new_disp_table) { - GHashTable* _tmp0_ = NULL; - GHashTable* _tmp1_ = NULL; + GHashTable* _tmp0_; + GHashTable* _tmp1_; #line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_UPLOAD_TRANSACTION (self)); #line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -4178,79 +4177,79 @@ void publishing_rest_support_upload_transaction_set_binary_disposition_table (Pu _g_hash_table_unref0 (self->binary_disposition_table); #line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->binary_disposition_table = _tmp1_; -#line 4174 "RESTSupport.c" +#line 4173 "RESTSupport.c" } static void _vala_SoupMultipart_free (SoupMultipart* self) { #line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_boxed_free (soup_multipart_get_type (), self); -#line 4181 "RESTSupport.c" +#line 4180 "RESTSupport.c" } static void _vala_SoupBuffer_free (SoupBuffer* self) { #line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_boxed_free (soup_buffer_get_type (), self); -#line 4188 "RESTSupport.c" +#line 4187 "RESTSupport.c" } static void publishing_rest_support_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) { PublishingRESTSupportUploadTransaction * self; PublishingRESTSupportArgument** request_arguments = NULL; - gint _tmp0_ = 0; - PublishingRESTSupportArgument** _tmp1_ = NULL; - gint request_arguments_length1 = 0; - gint _request_arguments_size_ = 0; - PublishingRESTSupportArgument** _tmp2_ = NULL; - gint _tmp2__length1 = 0; + gint _tmp0_; + PublishingRESTSupportArgument** _tmp1_; + gint request_arguments_length1; + gint _request_arguments_size_; + PublishingRESTSupportArgument** _tmp2_; + gint _tmp2__length1; SoupMultipart* message_parts = NULL; - SoupMultipart* _tmp3_ = NULL; - PublishingRESTSupportArgument** _tmp4_ = NULL; - gint _tmp4__length1 = 0; + SoupMultipart* _tmp3_; + PublishingRESTSupportArgument** _tmp4_; + gint _tmp4__length1; gchar* payload = NULL; gsize payload_length = 0UL; gint payload_part_num = 0; - SoupMultipart* _tmp20_ = NULL; - gint _tmp21_ = 0; + SoupMultipart* _tmp19_; + gint _tmp20_; SoupBuffer* bindable_data = NULL; - const gchar* _tmp22_ = NULL; - guint8* _tmp23_ = NULL; - gint _tmp23__length1 = 0; - guint8* _tmp24_ = NULL; - gint _tmp24__length1 = 0; - gsize _tmp25_ = 0UL; - SoupBuffer* _tmp26_ = NULL; - SoupMultipart* _tmp27_ = NULL; - SpitPublishingPublishable* _tmp28_ = NULL; - GFile* _tmp29_ = NULL; - GFile* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; - const gchar* _tmp33_ = NULL; - SoupBuffer* _tmp34_ = NULL; + const gchar* _tmp21_; + guint8* _tmp22_; + gint _tmp22__length1; + guint8* _tmp23_; + gint _tmp23__length1; + gsize _tmp24_; + SoupBuffer* _tmp25_; + SoupMultipart* _tmp26_; + SpitPublishingPublishable* _tmp27_; + GFile* _tmp28_; + GFile* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; + const gchar* _tmp32_; + SoupBuffer* _tmp33_; SoupMessageHeaders* image_part_header = NULL; SoupBuffer* image_part_body = NULL; - SoupMultipart* _tmp35_ = NULL; - gint _tmp36_ = 0; - SoupMessageHeaders* _tmp37_ = NULL; - SoupBuffer* _tmp38_ = NULL; - SoupMessageHeaders* _tmp39_ = NULL; - GHashTable* _tmp40_ = NULL; + SoupMultipart* _tmp34_; + gint _tmp35_; + SoupMessageHeaders* _tmp36_ = NULL; + SoupBuffer* _tmp37_ = NULL; + SoupMessageHeaders* _tmp38_; + GHashTable* _tmp39_; SoupMessage* outbound_message = NULL; - gchar* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; - SoupMultipart* _tmp43_ = NULL; - SoupMessage* _tmp44_ = NULL; - SoupMessage* _tmp45_ = NULL; + gchar* _tmp40_; + gchar* _tmp41_; + SoupMultipart* _tmp42_; + SoupMessage* _tmp43_; + SoupMessage* _tmp44_; GeeMapIterator* i = NULL; - GeeHashMap* _tmp46_ = NULL; - GeeMapIterator* _tmp47_ = NULL; + GeeHashMap* _tmp45_; + GeeMapIterator* _tmp46_; gboolean cont = FALSE; - GeeMapIterator* _tmp48_ = NULL; - gboolean _tmp49_ = FALSE; - SoupMessage* _tmp61_ = NULL; + GeeMapIterator* _tmp47_; + gboolean _tmp48_; + SoupMessage* _tmp60_; GError * _inner_error_ = NULL; #line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction); @@ -4276,7 +4275,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR _tmp4_ = request_arguments; #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp4__length1 = request_arguments_length1; -#line 4272 "RESTSupport.c" +#line 4271 "RESTSupport.c" { PublishingRESTSupportArgument** arg_collection = NULL; gint arg_collection_length1 = 0; @@ -4288,20 +4287,20 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR arg_collection_length1 = _tmp4__length1; #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" for (arg_it = 0; arg_it < _tmp4__length1; arg_it = arg_it + 1) { -#line 4284 "RESTSupport.c" - PublishingRESTSupportArgument* _tmp5_ = NULL; +#line 4283 "RESTSupport.c" + PublishingRESTSupportArgument* _tmp5_; PublishingRESTSupportArgument* arg = NULL; #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp5_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]); #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" arg = _tmp5_; -#line 4291 "RESTSupport.c" +#line 4290 "RESTSupport.c" { - SoupMultipart* _tmp6_ = NULL; - PublishingRESTSupportArgument* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - PublishingRESTSupportArgument* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; + SoupMultipart* _tmp6_; + PublishingRESTSupportArgument* _tmp7_; + const gchar* _tmp8_; + PublishingRESTSupportArgument* _tmp9_; + const gchar* _tmp10_; #line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp6_ = message_parts; #line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -4316,16 +4315,16 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR soup_multipart_append_form_string (_tmp6_, _tmp8_, _tmp10_); #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _publishing_rest_support_argument_unref0 (arg); -#line 4312 "RESTSupport.c" +#line 4311 "RESTSupport.c" } } } { - SpitPublishingPublishable* _tmp11_ = NULL; - GFile* _tmp12_ = NULL; - GFile* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; + SpitPublishingPublishable* _tmp11_; + GFile* _tmp12_; + GFile* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; gchar* _tmp16_ = NULL; gsize _tmp17_ = 0UL; #line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -4354,7 +4353,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR if (G_UNLIKELY (_inner_error_ != NULL)) { #line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_inner_error_->domain == G_FILE_ERROR) { -#line 4350 "RESTSupport.c" +#line 4349 "RESTSupport.c" goto __catch2_g_file_error; } #line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -4369,28 +4368,25 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR g_clear_error (&_inner_error_); #line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 4365 "RESTSupport.c" +#line 4364 "RESTSupport.c" } } goto __finally2; __catch2_g_file_error: { GError* e = NULL; - const gchar* _tmp18_ = NULL; - GError* _tmp19_ = NULL; + GError* _tmp18_; #line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" e = _inner_error_; #line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _inner_error_ = NULL; #line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp18_ = _ ("A temporary file needed for publishing is unavailable"); + _tmp18_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _ ("A temporary file needed for publishing is unavailable")); #line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp19_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp18_); -#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _inner_error_ = _tmp19_; + _inner_error_ = _tmp18_; #line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_error_free0 (e); -#line 4386 "RESTSupport.c" +#line 4382 "RESTSupport.c" goto __finally2; } __finally2: @@ -4408,7 +4404,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); #line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 4404 "RESTSupport.c" +#line 4400 "RESTSupport.c" } else { #line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_free0 (payload); @@ -4422,149 +4418,149 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR g_clear_error (&_inner_error_); #line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 4418 "RESTSupport.c" +#line 4414 "RESTSupport.c" } } #line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp20_ = message_parts; + _tmp19_ = message_parts; #line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp21_ = soup_multipart_get_length (_tmp20_); + _tmp20_ = soup_multipart_get_length (_tmp19_); #line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - payload_part_num = _tmp21_; + payload_part_num = _tmp20_; #line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp22_ = payload; + _tmp21_ = payload; #line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp23_ = string_get_data (_tmp22_, &_tmp23__length1); + _tmp22_ = string_get_data (_tmp21_, &_tmp22__length1); #line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp24__length1 = _tmp23__length1; + _tmp23__length1 = _tmp22__length1; #line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp25_ = payload_length; + _tmp24_ = payload_length; #line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp26_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp24_ + 0, ((gint) _tmp25_) - 0); + _tmp25_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp23_ + 0, ((gint) _tmp24_) - 0); #line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - bindable_data = _tmp26_; + bindable_data = _tmp25_; #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp27_ = message_parts; + _tmp26_ = message_parts; #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp28_ = self->publishable; + _tmp27_ = self->publishable; #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp29_ = spit_publishing_publishable_get_serialized_file (_tmp28_); + _tmp28_ = spit_publishing_publishable_get_serialized_file (_tmp27_); #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp30_ = _tmp29_; + _tmp29_ = _tmp28_; #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp31_ = g_file_get_path (_tmp30_); + _tmp30_ = g_file_get_path (_tmp29_); #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp32_ = _tmp31_; + _tmp31_ = _tmp30_; #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp33_ = self->mime_type; + _tmp32_ = self->mime_type; #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp34_ = bindable_data; + _tmp33_ = bindable_data; #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - soup_multipart_append_form_file (_tmp27_, "", _tmp32_, _tmp33_, _tmp34_); + soup_multipart_append_form_file (_tmp26_, "", _tmp31_, _tmp32_, _tmp33_); #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _g_free0 (_tmp32_); + _g_free0 (_tmp31_); #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _g_object_unref0 (_tmp30_); + _g_object_unref0 (_tmp29_); #line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp35_ = message_parts; + _tmp34_ = message_parts; #line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp36_ = payload_part_num; + _tmp35_ = payload_part_num; #line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - soup_multipart_get_part (_tmp35_, _tmp36_, &_tmp37_, &_tmp38_); + soup_multipart_get_part (_tmp34_, _tmp35_, &_tmp36_, &_tmp37_); #line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - image_part_header = _tmp37_; + image_part_header = _tmp36_; #line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - image_part_body = _tmp38_; + image_part_body = _tmp37_; #line 521 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp39_ = image_part_header; + _tmp38_ = image_part_header; #line 521 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp40_ = self->binary_disposition_table; + _tmp39_ = self->binary_disposition_table; #line 521 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - soup_message_headers_set_content_disposition (_tmp39_, "form-data", _tmp40_); + soup_message_headers_set_content_disposition (_tmp38_, "form-data", _tmp39_); #line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp41_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); + _tmp40_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); #line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp42_ = _tmp41_; + _tmp41_ = _tmp40_; #line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp43_ = message_parts; + _tmp42_ = message_parts; #line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp44_ = soup_form_request_new_from_multipart (_tmp42_, _tmp43_); + _tmp43_ = soup_form_request_new_from_multipart (_tmp41_, _tmp42_); #line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp45_ = _tmp44_; + _tmp44_ = _tmp43_; #line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _g_free0 (_tmp42_); + _g_free0 (_tmp41_); #line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - outbound_message = _tmp45_; + outbound_message = _tmp44_; #line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp46_ = self->message_headers; + _tmp45_ = self->message_headers; #line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp47_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp46_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - i = _tmp47_; + i = _tmp46_; #line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp48_ = i; + _tmp47_ = i; #line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp49_ = gee_map_iterator_next (_tmp48_); + _tmp48_ = gee_map_iterator_next (_tmp47_); #line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - cont = _tmp49_; + cont = _tmp48_; #line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" while (TRUE) { -#line 4507 "RESTSupport.c" - gboolean _tmp50_ = FALSE; - SoupMessage* _tmp51_ = NULL; - SoupMessageHeaders* _tmp52_ = NULL; - GeeMapIterator* _tmp53_ = NULL; - gpointer _tmp54_ = NULL; - gchar* _tmp55_ = NULL; - GeeMapIterator* _tmp56_ = NULL; - gpointer _tmp57_ = NULL; - gchar* _tmp58_ = NULL; - GeeMapIterator* _tmp59_ = NULL; - gboolean _tmp60_ = FALSE; +#line 4503 "RESTSupport.c" + gboolean _tmp49_; + SoupMessage* _tmp50_; + SoupMessageHeaders* _tmp51_; + GeeMapIterator* _tmp52_; + gpointer _tmp53_; + gchar* _tmp54_; + GeeMapIterator* _tmp55_; + gpointer _tmp56_; + gchar* _tmp57_; + GeeMapIterator* _tmp58_; + gboolean _tmp59_; #line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp50_ = cont; + _tmp49_ = cont; #line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - if (!_tmp50_) { + if (!_tmp49_) { #line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" break; -#line 4525 "RESTSupport.c" +#line 4521 "RESTSupport.c" } #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp51_ = outbound_message; + _tmp50_ = outbound_message; #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp52_ = _tmp51_->request_headers; + _tmp51_ = _tmp50_->request_headers; #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp53_ = i; + _tmp52_ = i; #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp54_ = gee_map_iterator_get_key (_tmp53_); + _tmp53_ = gee_map_iterator_get_key (_tmp52_); #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp55_ = (gchar*) _tmp54_; + _tmp54_ = (gchar*) _tmp53_; #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp56_ = i; + _tmp55_ = i; #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp57_ = gee_map_iterator_get_value (_tmp56_); + _tmp56_ = gee_map_iterator_get_value (_tmp55_); #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp58_ = (gchar*) _tmp57_; + _tmp57_ = (gchar*) _tmp56_; #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - soup_message_headers_append (_tmp52_, _tmp55_, _tmp58_); + soup_message_headers_append (_tmp51_, _tmp54_, _tmp57_); #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _g_free0 (_tmp58_); + _g_free0 (_tmp57_); #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _g_free0 (_tmp55_); + _g_free0 (_tmp54_); #line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp59_ = i; + _tmp58_ = i; #line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp60_ = gee_map_iterator_next (_tmp59_); + _tmp59_ = gee_map_iterator_next (_tmp58_); #line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - cont = _tmp60_; -#line 4555 "RESTSupport.c" + cont = _tmp59_; +#line 4551 "RESTSupport.c" } #line 532 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp61_ = outbound_message; + _tmp60_ = outbound_message; #line 532 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp61_); + publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp60_); #line 534 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE); #line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -4589,7 +4585,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); #line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 4585 "RESTSupport.c" +#line 4581 "RESTSupport.c" } else { #line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_object_unref0 (i); @@ -4609,7 +4605,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR g_clear_error (&_inner_error_); #line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 4605 "RESTSupport.c" +#line 4601 "RESTSupport.c" } } #line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -4624,7 +4620,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR __vala_SoupMultipart_free0 (message_parts); #line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); -#line 4620 "RESTSupport.c" +#line 4616 "RESTSupport.c" } @@ -4634,10 +4630,10 @@ static void publishing_rest_support_upload_transaction_class_init (PublishingRES #line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" ((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_rest_support_upload_transaction_finalize; #line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportTransactionClass *) klass)->add_header = (void (*)(PublishingRESTSupportTransaction*, const gchar*, const gchar*)) publishing_rest_support_upload_transaction_real_add_header; + ((PublishingRESTSupportTransactionClass *) klass)->add_header = (void (*) (PublishingRESTSupportTransaction *, const gchar*, const gchar*)) publishing_rest_support_upload_transaction_real_add_header; #line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_rest_support_upload_transaction_real_execute; -#line 4633 "RESTSupport.c" + ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_rest_support_upload_transaction_real_execute; +#line 4629 "RESTSupport.c" } @@ -4648,11 +4644,11 @@ static void publishing_rest_support_upload_transaction_instance_init (Publishing self->publishable = NULL; #line 443 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->message_headers = NULL; -#line 4644 "RESTSupport.c" +#line 4640 "RESTSupport.c" } -static void publishing_rest_support_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) { +static void publishing_rest_support_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) { PublishingRESTSupportUploadTransaction * self; #line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction); @@ -4666,7 +4662,7 @@ static void publishing_rest_support_upload_transaction_finalize (PublishingRESTS _g_object_unref0 (self->message_headers); #line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_rest_support_upload_transaction_parent_class)->finalize (obj); -#line 4662 "RESTSupport.c" +#line 4658 "RESTSupport.c" } @@ -4684,7 +4680,7 @@ GType publishing_rest_support_upload_transaction_get_type (void) { static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_construct (GType object_type, xmlDoc* doc) { PublishingRESTSupportXmlDocument* self = NULL; - xmlDoc* _tmp0_ = NULL; + xmlDoc* _tmp0_; #line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self = (PublishingRESTSupportXmlDocument*) g_type_create_instance (object_type); #line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -4693,21 +4689,21 @@ static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_co self->priv->document = _tmp0_; #line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 4689 "RESTSupport.c" +#line 4685 "RESTSupport.c" } static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_new (xmlDoc* doc) { #line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return publishing_rest_support_xml_document_construct (PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT, doc); -#line 4696 "RESTSupport.c" +#line 4692 "RESTSupport.c" } xmlNode* publishing_rest_support_xml_document_get_root_node (PublishingRESTSupportXmlDocument* self) { xmlNode* result = NULL; - xmlDoc* _tmp0_ = NULL; - xmlNode* _tmp1_ = NULL; + xmlDoc* _tmp0_; + xmlNode* _tmp1_; #line 555 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (self), NULL); #line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -4718,17 +4714,17 @@ xmlNode* publishing_rest_support_xml_document_get_root_node (PublishingRESTSuppo result = _tmp1_; #line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 4714 "RESTSupport.c" +#line 4710 "RESTSupport.c" } xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSupportXmlDocument* self, xmlNode* parent, const gchar* child_name, GError** error) { xmlNode* result = NULL; xmlNode* doc_node_iter = NULL; - xmlNode* _tmp0_ = NULL; - xmlNode* _tmp1_ = NULL; - const gchar* _tmp10_ = NULL; - GError* _tmp11_ = NULL; + xmlNode* _tmp0_; + xmlNode* _tmp1_; + const gchar* _tmp10_; + GError* _tmp11_; GError * _inner_error_ = NULL; #line 559 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (self), NULL); @@ -4740,30 +4736,30 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup _tmp1_ = _tmp0_->children; #line 561 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" doc_node_iter = _tmp1_; -#line 4736 "RESTSupport.c" +#line 4732 "RESTSupport.c" { gboolean _tmp2_ = FALSE; #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp2_ = TRUE; #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" while (TRUE) { -#line 4743 "RESTSupport.c" - xmlNode* _tmp5_ = NULL; - xmlNode* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; +#line 4739 "RESTSupport.c" + xmlNode* _tmp5_; + xmlNode* _tmp6_; + const gchar* _tmp7_; + const gchar* _tmp8_; #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (!_tmp2_) { -#line 4750 "RESTSupport.c" - xmlNode* _tmp3_ = NULL; - xmlNode* _tmp4_ = NULL; +#line 4746 "RESTSupport.c" + xmlNode* _tmp3_; + xmlNode* _tmp4_; #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp3_ = doc_node_iter; #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp4_ = _tmp3_->next; #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" doc_node_iter = _tmp4_; -#line 4759 "RESTSupport.c" +#line 4755 "RESTSupport.c" } #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp2_ = FALSE; @@ -4773,7 +4769,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup if (!(_tmp5_ != NULL)) { #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" break; -#line 4769 "RESTSupport.c" +#line 4765 "RESTSupport.c" } #line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp6_ = doc_node_iter; @@ -4783,15 +4779,15 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup _tmp8_ = child_name; #line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (g_strcmp0 (_tmp7_, _tmp8_) == 0) { -#line 4779 "RESTSupport.c" - xmlNode* _tmp9_ = NULL; +#line 4775 "RESTSupport.c" + xmlNode* _tmp9_; #line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp9_ = doc_node_iter; #line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" result = _tmp9_; #line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 4787 "RESTSupport.c" +#line 4783 "RESTSupport.c" } } } @@ -4807,7 +4803,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup g_propagate_error (error, _inner_error_); #line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 4803 "RESTSupport.c" +#line 4799 "RESTSupport.c" } else { #line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4815,7 +4811,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup g_clear_error (&_inner_error_); #line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 4811 "RESTSupport.c" +#line 4807 "RESTSupport.c" } } @@ -4823,10 +4819,10 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSupportXmlDocument* self, xmlNode* node, const gchar* property_key, GError** error) { gchar* result = NULL; gchar* value_string = NULL; - xmlNode* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; + xmlNode* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + const gchar* _tmp3_; GError * _inner_error_ = NULL; #line 572 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (self), NULL); @@ -4844,11 +4840,11 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu _tmp3_ = value_string; #line 575 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp3_ == NULL) { -#line 4840 "RESTSupport.c" - const gchar* _tmp4_ = NULL; - xmlNode* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - GError* _tmp7_ = NULL; +#line 4836 "RESTSupport.c" + const gchar* _tmp4_; + xmlNode* _tmp5_; + const gchar* _tmp6_; + GError* _tmp7_; #line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp4_ = property_key; #line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -4867,7 +4863,7 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu _g_free0 (value_string); #line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 4863 "RESTSupport.c" +#line 4859 "RESTSupport.c" } else { #line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_free0 (value_string); @@ -4877,93 +4873,93 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu g_clear_error (&_inner_error_); #line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 4873 "RESTSupport.c" +#line 4869 "RESTSupport.c" } } #line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" result = value_string; #line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 4880 "RESTSupport.c" +#line 4876 "RESTSupport.c" } static gchar* string_chug (const gchar* self) { gchar* result = NULL; gchar* _result_ = NULL; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; -#line 1199 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + const gchar* _tmp1_; +#line 1226 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1200 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1227 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1200 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1227 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1201 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1228 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1201 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1228 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_strchug (_tmp1_); -#line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1229 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _result_; -#line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1229 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 4903 "RESTSupport.c" +#line 4899 "RESTSupport.c" } static gchar* string_chomp (const gchar* self) { gchar* result = NULL; gchar* _result_ = NULL; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; -#line 1191 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + const gchar* _tmp1_; +#line 1218 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1220 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1220 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_strchomp (_tmp1_); -#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _result_; -#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 4926 "RESTSupport.c" +#line 4922 "RESTSupport.c" } PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_string (const gchar* input_string, PublishingRESTSupportXmlDocumentCheckForErrorResponse check_for_error_response, void* check_for_error_response_target, GError** error) { PublishingRESTSupportXmlDocument* result = NULL; gboolean _tmp0_ = FALSE; - const gchar* _tmp1_ = NULL; + const gchar* _tmp1_; gboolean _tmp6_ = FALSE; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - gboolean _tmp13_ = FALSE; + const gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + gboolean _tmp12_; + gboolean _tmp13_; xmlDoc* doc = NULL; - const gchar* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; - gint _tmp23_ = 0; - gint _tmp24_ = 0; - xmlDoc* _tmp25_ = NULL; - xmlDoc* _tmp26_ = NULL; - xmlDoc* _tmp28_ = NULL; - xmlNode* _tmp29_ = NULL; + const gchar* _tmp21_; + const gchar* _tmp22_; + gint _tmp23_; + gint _tmp24_; + xmlDoc* _tmp25_; + xmlDoc* _tmp26_; + xmlDoc* _tmp28_; + xmlNode* _tmp29_; PublishingRESTSupportXmlDocument* rest_doc = NULL; - xmlDoc* _tmp31_ = NULL; - PublishingRESTSupportXmlDocument* _tmp32_ = NULL; + xmlDoc* _tmp31_; + PublishingRESTSupportXmlDocument* _tmp32_; gchar* _result_ = NULL; - PublishingRESTSupportXmlDocumentCheckForErrorResponse _tmp33_ = NULL; - void* _tmp33__target = NULL; - PublishingRESTSupportXmlDocument* _tmp34_ = NULL; - gchar* _tmp35_ = NULL; - const gchar* _tmp36_ = NULL; + PublishingRESTSupportXmlDocumentCheckForErrorResponse _tmp33_; + void* _tmp33__target; + PublishingRESTSupportXmlDocument* _tmp34_; + gchar* _tmp35_; + const gchar* _tmp36_; GError * _inner_error_ = NULL; #line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp1_ = input_string; @@ -4971,11 +4967,11 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str if (_tmp1_ == NULL) { #line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp0_ = TRUE; -#line 4967 "RESTSupport.c" +#line 4963 "RESTSupport.c" } else { - const gchar* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + const gchar* _tmp2_; + gint _tmp3_; + gint _tmp4_; #line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp2_ = input_string; #line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -4984,12 +4980,12 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str _tmp4_ = _tmp3_; #line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp0_ = _tmp4_ == 0; -#line 4980 "RESTSupport.c" +#line 4976 "RESTSupport.c" } #line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp0_) { -#line 4984 "RESTSupport.c" - GError* _tmp5_ = NULL; +#line 4980 "RESTSupport.c" + GError* _tmp5_; #line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp5_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Empty XML string"); #line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5000,7 +4996,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str g_propagate_error (error, _inner_error_); #line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 4996 "RESTSupport.c" +#line 4992 "RESTSupport.c" } else { #line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -5008,7 +5004,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str g_clear_error (&_inner_error_); #line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 5004 "RESTSupport.c" +#line 5000 "RESTSupport.c" } } #line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5033,14 +5029,14 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str if (_tmp13_) { #line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp6_ = TRUE; -#line 5029 "RESTSupport.c" +#line 5025 "RESTSupport.c" } else { - const gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gboolean _tmp19_ = FALSE; + const gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + gboolean _tmp19_; #line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp14_ = input_string; #line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5059,12 +5055,12 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str _g_free0 (_tmp18_); #line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_free0 (_tmp16_); -#line 5055 "RESTSupport.c" +#line 5051 "RESTSupport.c" } #line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp6_) { -#line 5059 "RESTSupport.c" - GError* _tmp20_ = NULL; +#line 5055 "RESTSupport.c" + GError* _tmp20_; #line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp20_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document"); #line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5075,7 +5071,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str g_propagate_error (error, _inner_error_); #line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 5071 "RESTSupport.c" +#line 5067 "RESTSupport.c" } else { #line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -5083,7 +5079,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str g_clear_error (&_inner_error_); #line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 5079 "RESTSupport.c" +#line 5075 "RESTSupport.c" } } #line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5102,8 +5098,8 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str _tmp26_ = doc; #line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp26_ == NULL) { -#line 5098 "RESTSupport.c" - GError* _tmp27_ = NULL; +#line 5094 "RESTSupport.c" + GError* _tmp27_; #line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp27_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document"); #line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5114,7 +5110,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str g_propagate_error (error, _inner_error_); #line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 5110 "RESTSupport.c" +#line 5106 "RESTSupport.c" } else { #line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -5122,7 +5118,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str g_clear_error (&_inner_error_); #line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 5118 "RESTSupport.c" +#line 5114 "RESTSupport.c" } } #line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5131,8 +5127,8 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str _tmp29_ = _tmp28_->children; #line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp29_ == NULL) { -#line 5127 "RESTSupport.c" - GError* _tmp30_ = NULL; +#line 5123 "RESTSupport.c" + GError* _tmp30_; #line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp30_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document"); #line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5143,7 +5139,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str g_propagate_error (error, _inner_error_); #line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 5139 "RESTSupport.c" +#line 5135 "RESTSupport.c" } else { #line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -5151,7 +5147,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str g_clear_error (&_inner_error_); #line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 5147 "RESTSupport.c" +#line 5143 "RESTSupport.c" } } #line 610 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5174,9 +5170,9 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str _tmp36_ = _result_; #line 613 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp36_ != NULL) { -#line 5170 "RESTSupport.c" - const gchar* _tmp37_ = NULL; - GError* _tmp38_ = NULL; +#line 5166 "RESTSupport.c" + const gchar* _tmp37_; + GError* _tmp38_; #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp37_ = _result_; #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5193,7 +5189,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str _publishing_rest_support_xml_document_unref0 (rest_doc); #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 5189 "RESTSupport.c" +#line 5185 "RESTSupport.c" } else { #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_free0 (_result_); @@ -5205,7 +5201,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str g_clear_error (&_inner_error_); #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 5201 "RESTSupport.c" +#line 5197 "RESTSupport.c" } } #line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5214,14 +5210,14 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str _g_free0 (_result_); #line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 5210 "RESTSupport.c" +#line 5206 "RESTSupport.c" } static void publishing_rest_support_value_xml_document_init (GValue* value) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 5217 "RESTSupport.c" +#line 5213 "RESTSupport.c" } @@ -5230,7 +5226,7 @@ static void publishing_rest_support_value_xml_document_free_value (GValue* value if (value->data[0].v_pointer) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_xml_document_unref (value->data[0].v_pointer); -#line 5226 "RESTSupport.c" +#line 5222 "RESTSupport.c" } } @@ -5240,11 +5236,11 @@ static void publishing_rest_support_value_xml_document_copy_value (const GValue* if (src_value->data[0].v_pointer) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" dest_value->data[0].v_pointer = publishing_rest_support_xml_document_ref (src_value->data[0].v_pointer); -#line 5236 "RESTSupport.c" +#line 5232 "RESTSupport.c" } else { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" dest_value->data[0].v_pointer = NULL; -#line 5240 "RESTSupport.c" +#line 5236 "RESTSupport.c" } } @@ -5252,66 +5248,66 @@ static void publishing_rest_support_value_xml_document_copy_value (const GValue* static gpointer publishing_rest_support_value_xml_document_peek_pointer (const GValue* value) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return value->data[0].v_pointer; -#line 5248 "RESTSupport.c" +#line 5244 "RESTSupport.c" } static gchar* publishing_rest_support_value_xml_document_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (collect_values[0].v_pointer) { -#line 5255 "RESTSupport.c" - PublishingRESTSupportXmlDocument* object; +#line 5251 "RESTSupport.c" + PublishingRESTSupportXmlDocument * object; object = collect_values[0].v_pointer; #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (object->parent_instance.g_class == NULL) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 5262 "RESTSupport.c" +#line 5258 "RESTSupport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 5266 "RESTSupport.c" +#line 5262 "RESTSupport.c" } #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = publishing_rest_support_xml_document_ref (object); -#line 5270 "RESTSupport.c" +#line 5266 "RESTSupport.c" } else { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 5274 "RESTSupport.c" +#line 5270 "RESTSupport.c" } #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 5278 "RESTSupport.c" +#line 5274 "RESTSupport.c" } static gchar* publishing_rest_support_value_xml_document_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingRESTSupportXmlDocument** object_p; + PublishingRESTSupportXmlDocument ** object_p; object_p = collect_values[0].v_pointer; #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (!object_p) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 5289 "RESTSupport.c" +#line 5285 "RESTSupport.c" } #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (!value->data[0].v_pointer) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = NULL; -#line 5295 "RESTSupport.c" +#line 5291 "RESTSupport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = value->data[0].v_pointer; -#line 5299 "RESTSupport.c" +#line 5295 "RESTSupport.c" } else { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = publishing_rest_support_xml_document_ref (value->data[0].v_pointer); -#line 5303 "RESTSupport.c" +#line 5299 "RESTSupport.c" } #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 5307 "RESTSupport.c" +#line 5303 "RESTSupport.c" } @@ -5325,7 +5321,7 @@ GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name, G_PARAM_SPEC (spec)->value_type = object_type; #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return G_PARAM_SPEC (spec); -#line 5321 "RESTSupport.c" +#line 5317 "RESTSupport.c" } @@ -5334,12 +5330,12 @@ gpointer publishing_rest_support_value_get_xml_document (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT), NULL); #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return value->data[0].v_pointer; -#line 5330 "RESTSupport.c" +#line 5326 "RESTSupport.c" } void publishing_rest_support_value_set_xml_document (GValue* value, gpointer v_object) { - PublishingRESTSupportXmlDocument* old; + PublishingRESTSupportXmlDocument * old; #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT)); #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5354,23 +5350,23 @@ void publishing_rest_support_value_set_xml_document (GValue* value, gpointer v_o value->data[0].v_pointer = v_object; #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_xml_document_ref (value->data[0].v_pointer); -#line 5350 "RESTSupport.c" +#line 5346 "RESTSupport.c" } else { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 5354 "RESTSupport.c" +#line 5350 "RESTSupport.c" } #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (old) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_xml_document_unref (old); -#line 5360 "RESTSupport.c" +#line 5356 "RESTSupport.c" } } void publishing_rest_support_value_take_xml_document (GValue* value, gpointer v_object) { - PublishingRESTSupportXmlDocument* old; + PublishingRESTSupportXmlDocument * old; #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT)); #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5383,17 +5379,17 @@ void publishing_rest_support_value_take_xml_document (GValue* value, gpointer v_ g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = v_object; -#line 5379 "RESTSupport.c" +#line 5375 "RESTSupport.c" } else { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 5383 "RESTSupport.c" +#line 5379 "RESTSupport.c" } #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (old) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_xml_document_unref (old); -#line 5389 "RESTSupport.c" +#line 5385 "RESTSupport.c" } } @@ -5405,7 +5401,7 @@ static void publishing_rest_support_xml_document_class_init (PublishingRESTSuppo ((PublishingRESTSupportXmlDocumentClass *) klass)->finalize = publishing_rest_support_xml_document_finalize; #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_type_class_add_private (klass, sizeof (PublishingRESTSupportXmlDocumentPrivate)); -#line 5401 "RESTSupport.c" +#line 5397 "RESTSupport.c" } @@ -5414,13 +5410,13 @@ static void publishing_rest_support_xml_document_instance_init (PublishingRESTSu self->priv = PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_PRIVATE (self); #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->ref_count = 1; -#line 5410 "RESTSupport.c" +#line 5406 "RESTSupport.c" } -static void publishing_rest_support_xml_document_finalize (PublishingRESTSupportXmlDocument* obj) { +static void publishing_rest_support_xml_document_finalize (PublishingRESTSupportXmlDocument * obj) { PublishingRESTSupportXmlDocument * self; - xmlDoc* _tmp0_ = NULL; + xmlDoc* _tmp0_; #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT, PublishingRESTSupportXmlDocument); #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5429,7 +5425,7 @@ static void publishing_rest_support_xml_document_finalize (PublishingRESTSupport _tmp0_ = self->priv->document; #line 552 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" xmlFreeDoc (_tmp0_); -#line 5425 "RESTSupport.c" +#line 5421 "RESTSupport.c" } @@ -5448,18 +5444,18 @@ GType publishing_rest_support_xml_document_get_type (void) { gpointer publishing_rest_support_xml_document_ref (gpointer instance) { - PublishingRESTSupportXmlDocument* self; + PublishingRESTSupportXmlDocument * self; self = instance; #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_atomic_int_inc (&self->ref_count); #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return instance; -#line 5450 "RESTSupport.c" +#line 5446 "RESTSupport.c" } void publishing_rest_support_xml_document_unref (gpointer instance) { - PublishingRESTSupportXmlDocument* self; + PublishingRESTSupportXmlDocument * self; self = instance; #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -5467,7 +5463,7 @@ void publishing_rest_support_xml_document_unref (gpointer instance) { PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_CLASS (self)->finalize (self); #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 5463 "RESTSupport.c" +#line 5459 "RESTSupport.c" } } @@ -5475,13 +5471,13 @@ void publishing_rest_support_xml_document_unref (gpointer instance) { gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) { gchar* result = NULL; GString* encoded_str_builder = NULL; - GString* _tmp0_ = NULL; + GString* _tmp0_; gchar* current_char = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - GString* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; + const gchar* _tmp1_; + gchar* _tmp2_; + GString* _tmp23_; + const gchar* _tmp24_; + gchar* _tmp25_; #line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (source != NULL, NULL); #line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5496,18 +5492,18 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) { current_char = _tmp2_; #line 628 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" while (TRUE) { -#line 5492 "RESTSupport.c" +#line 5488 "RESTSupport.c" gint current_char_value = 0; - const gchar* _tmp3_ = NULL; - gunichar _tmp4_ = 0U; - gint _tmp5_ = 0; + const gchar* _tmp3_; + gunichar _tmp4_; + gint _tmp5_; gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; gboolean _tmp8_ = FALSE; - gint _tmp9_ = 0; - const gchar* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; + gint _tmp9_; + const gchar* _tmp20_; + const gchar* _tmp21_; + gchar* _tmp22_; #line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp3_ = current_char; #line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5520,58 +5516,58 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) { if (_tmp5_ < 1) { #line 633 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" break; -#line 5516 "RESTSupport.c" +#line 5512 "RESTSupport.c" } #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp9_ = current_char_value; #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp9_ < 128) { -#line 5522 "RESTSupport.c" - gint _tmp10_ = 0; +#line 5518 "RESTSupport.c" + gint _tmp10_; #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp10_ = current_char_value; #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp8_ = _tmp10_ != ((gint) '&'); -#line 5528 "RESTSupport.c" +#line 5524 "RESTSupport.c" } else { #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp8_ = FALSE; -#line 5532 "RESTSupport.c" +#line 5528 "RESTSupport.c" } #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp8_) { -#line 5536 "RESTSupport.c" - gint _tmp11_ = 0; +#line 5532 "RESTSupport.c" + gint _tmp11_; #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp11_ = current_char_value; #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp7_ = _tmp11_ != ((gint) '<'); -#line 5542 "RESTSupport.c" +#line 5538 "RESTSupport.c" } else { #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp7_ = FALSE; -#line 5546 "RESTSupport.c" +#line 5542 "RESTSupport.c" } #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp7_) { -#line 5550 "RESTSupport.c" - gint _tmp12_ = 0; +#line 5546 "RESTSupport.c" + gint _tmp12_; #line 638 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp12_ = current_char_value; #line 638 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp6_ = _tmp12_ != ((gint) '>'); -#line 5556 "RESTSupport.c" +#line 5552 "RESTSupport.c" } else { #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp6_ = FALSE; -#line 5560 "RESTSupport.c" +#line 5556 "RESTSupport.c" } #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp6_) { -#line 5564 "RESTSupport.c" - GString* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - gunichar _tmp15_ = 0U; +#line 5560 "RESTSupport.c" + GString* _tmp13_; + const gchar* _tmp14_; + gunichar _tmp15_; #line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp13_ = encoded_str_builder; #line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5580,12 +5576,12 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) { _tmp15_ = g_utf8_get_char_validated (_tmp14_, (gssize) -1); #line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_string_append_unichar (_tmp13_, _tmp15_); -#line 5576 "RESTSupport.c" +#line 5572 "RESTSupport.c" } else { - GString* _tmp16_ = NULL; - gint _tmp17_ = 0; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; + GString* _tmp16_; + gint _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; #line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp16_ = encoded_str_builder; #line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5598,7 +5594,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) { g_string_append (_tmp16_, _tmp19_); #line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_free0 (_tmp19_); -#line 5594 "RESTSupport.c" +#line 5590 "RESTSupport.c" } #line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp20_ = current_char; @@ -5610,7 +5606,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) { _g_free0 (current_char); #line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" current_char = _tmp22_; -#line 5606 "RESTSupport.c" +#line 5602 "RESTSupport.c" } #line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp23_ = encoded_str_builder; @@ -5626,7 +5622,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) { _g_string_free0 (encoded_str_builder); #line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 5622 "RESTSupport.c" +#line 5618 "RESTSupport.c" } @@ -5637,28 +5633,28 @@ static SpitPublishingPublishable** _vala_array_dup2 (SpitPublishingPublishable** result = g_new0 (SpitPublishingPublishable*, length + 1); #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" for (i = 0; i < length; i++) { -#line 5633 "RESTSupport.c" - SpitPublishingPublishable* _tmp0_ = NULL; +#line 5629 "RESTSupport.c" + SpitPublishingPublishable* _tmp0_; #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" result[i] = _tmp0_; -#line 5639 "RESTSupport.c" +#line 5635 "RESTSupport.c" } #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 5643 "RESTSupport.c" +#line 5639 "RESTSupport.c" } PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_construct (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable** publishables, int publishables_length1) { PublishingRESTSupportBatchUploader* self = NULL; - SpitPublishingPublishable** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - SpitPublishingPublishable** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - PublishingRESTSupportSession* _tmp2_ = NULL; - PublishingRESTSupportSession* _tmp3_ = NULL; + SpitPublishingPublishable** _tmp0_; + gint _tmp0__length1; + SpitPublishingPublishable** _tmp1_; + gint _tmp1__length1; + PublishingRESTSupportSession* _tmp2_; + PublishingRESTSupportSession* _tmp3_; #line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL); #line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5689,22 +5685,22 @@ PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_const self->priv->session = _tmp3_; #line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 5685 "RESTSupport.c" +#line 5681 "RESTSupport.c" } static void _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted (PublishingRESTSupportTransaction* _sender, gint bytes_written_so_far, gint total_bytes, gpointer self) { #line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_batch_uploader_on_chunk_transmitted ((PublishingRESTSupportBatchUploader*) self, bytes_written_so_far, total_bytes); -#line 5692 "RESTSupport.c" +#line 5688 "RESTSupport.c" } static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSupportBatchUploader* self) { gboolean stop = FALSE; - SpitPublishingPublishable** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - gboolean _tmp23_ = FALSE; + SpitPublishingPublishable** _tmp0_; + gint _tmp0__length1; + gboolean _tmp23_; GError * _inner_error_ = NULL; #line 663 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self)); @@ -5716,7 +5712,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup _tmp0_ = self->priv->publishables; #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp0__length1 = self->priv->publishables_length1; -#line 5712 "RESTSupport.c" +#line 5708 "RESTSupport.c" { SpitPublishingPublishable** publishable_collection = NULL; gint publishable_collection_length1 = 0; @@ -5728,36 +5724,36 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup publishable_collection_length1 = _tmp0__length1; #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" for (publishable_it = 0; publishable_it < _tmp0__length1; publishable_it = publishable_it + 1) { -#line 5724 "RESTSupport.c" - SpitPublishingPublishable* _tmp1_ = NULL; +#line 5720 "RESTSupport.c" + SpitPublishingPublishable* _tmp1_; SpitPublishingPublishable* publishable = NULL; #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp1_ = _g_object_ref0 (publishable_collection[publishable_it]); #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishable = _tmp1_; -#line 5731 "RESTSupport.c" +#line 5727 "RESTSupport.c" { GFile* file = NULL; - SpitPublishingPublishable* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; + SpitPublishingPublishable* _tmp2_; + GFile* _tmp3_; + GFile* _tmp4_; gdouble fraction_complete = 0.0; - gint _tmp6_ = 0; - SpitPublishingPublishable** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - SpitPublishingProgressCallback _tmp8_ = NULL; - void* _tmp8__target = NULL; + gint _tmp6_; + SpitPublishingPublishable** _tmp7_; + gint _tmp7__length1; + SpitPublishingProgressCallback _tmp8_; + void* _tmp8__target; PublishingRESTSupportTransaction* txn = NULL; - SpitPublishingPublishable** _tmp12_ = NULL; - gint _tmp12__length1 = 0; - gint _tmp13_ = 0; - SpitPublishingPublishable* _tmp14_ = NULL; - PublishingRESTSupportTransaction* _tmp15_ = NULL; - PublishingRESTSupportTransaction* _tmp16_ = NULL; - PublishingRESTSupportTransaction* _tmp19_ = NULL; - guint _tmp20_ = 0U; - gboolean _tmp21_ = FALSE; - gint _tmp22_ = 0; + SpitPublishingPublishable** _tmp12_; + gint _tmp12__length1; + gint _tmp13_; + SpitPublishingPublishable* _tmp14_; + PublishingRESTSupportTransaction* _tmp15_; + PublishingRESTSupportTransaction* _tmp16_; + PublishingRESTSupportTransaction* _tmp19_; + guint _tmp20_; + gboolean _tmp21_; + gint _tmp22_; #line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp2_ = publishable; #line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5768,8 +5764,8 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup _tmp4_ = file; #line 670 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp4_ == NULL) { -#line 5764 "RESTSupport.c" - gint _tmp5_ = 0; +#line 5760 "RESTSupport.c" + gint _tmp5_; #line 671 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp5_ = self->priv->current_file; #line 671 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5780,7 +5776,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup _g_object_unref0 (publishable); #line 672 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" continue; -#line 5776 "RESTSupport.c" +#line 5772 "RESTSupport.c" } #line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp6_ = self->priv->current_file; @@ -5796,11 +5792,11 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup _tmp8__target = self->priv->status_updated_target; #line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp8_ != NULL) { -#line 5792 "RESTSupport.c" - SpitPublishingProgressCallback _tmp9_ = NULL; - void* _tmp9__target = NULL; - gint _tmp10_ = 0; - gdouble _tmp11_ = 0.0; +#line 5788 "RESTSupport.c" + SpitPublishingProgressCallback _tmp9_; + void* _tmp9__target; + gint _tmp10_; + gdouble _tmp11_; #line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp9_ = self->priv->status_updated; #line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5811,7 +5807,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup _tmp11_ = fraction_complete; #line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp9_ (_tmp10_ + 1, _tmp11_, _tmp9__target); -#line 5807 "RESTSupport.c" +#line 5803 "RESTSupport.c" } #line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp12_ = self->priv->publishables; @@ -5829,9 +5825,9 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup _tmp16_ = txn; #line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_signal_connect (_tmp16_, "chunk-transmitted", (GCallback) _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted, self); -#line 5825 "RESTSupport.c" +#line 5821 "RESTSupport.c" { - PublishingRESTSupportTransaction* _tmp17_ = NULL; + PublishingRESTSupportTransaction* _tmp17_; #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp17_ = txn; #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5840,7 +5836,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup if (G_UNLIKELY (_inner_error_ != NULL)) { #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 5836 "RESTSupport.c" +#line 5832 "RESTSupport.c" goto __catch3_spit_publishing_publishing_error; } #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5855,14 +5851,14 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup g_clear_error (&_inner_error_); #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 5851 "RESTSupport.c" +#line 5847 "RESTSupport.c" } } goto __finally3; __catch3_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp18_ = NULL; + GError* _tmp18_; #line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" err = _inner_error_; #line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5870,12 +5866,12 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup #line 686 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp18_ = err; #line 686 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - g_signal_emit_by_name (self, "upload-error", _tmp18_); + g_signal_emit (self, publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_ERROR_SIGNAL], 0, _tmp18_); #line 687 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" stop = TRUE; #line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_error_free0 (err); -#line 5871 "RESTSupport.c" +#line 5867 "RESTSupport.c" } __finally3: #line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5892,7 +5888,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup g_clear_error (&_inner_error_); #line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 5888 "RESTSupport.c" +#line 5884 "RESTSupport.c" } #line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp19_ = txn; @@ -5912,7 +5908,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup _g_object_unref0 (publishable); #line 693 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" break; -#line 5908 "RESTSupport.c" +#line 5904 "RESTSupport.c" } #line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp22_ = self->priv->current_file; @@ -5924,7 +5920,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup _g_object_unref0 (file); #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_object_unref0 (publishable); -#line 5920 "RESTSupport.c" +#line 5916 "RESTSupport.c" } } } @@ -5932,31 +5928,31 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup _tmp23_ = stop; #line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (!_tmp23_) { -#line 5928 "RESTSupport.c" - gint _tmp24_ = 0; +#line 5924 "RESTSupport.c" + gint _tmp24_; #line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp24_ = self->priv->current_file; #line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - g_signal_emit_by_name (self, "upload-complete", _tmp24_); -#line 5934 "RESTSupport.c" + g_signal_emit (self, publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_COMPLETE_SIGNAL], 0, _tmp24_); +#line 5930 "RESTSupport.c" } } static void publishing_rest_support_batch_uploader_on_chunk_transmitted (PublishingRESTSupportBatchUploader* self, gint bytes_written_so_far, gint total_bytes) { gdouble file_span = 0.0; - SpitPublishingPublishable** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + SpitPublishingPublishable** _tmp0_; + gint _tmp0__length1; gdouble this_file_fraction_complete = 0.0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp1_; + gint _tmp2_; gdouble fraction_complete = 0.0; - gint _tmp3_ = 0; - gdouble _tmp4_ = 0.0; - gdouble _tmp5_ = 0.0; - gdouble _tmp6_ = 0.0; - SpitPublishingProgressCallback _tmp7_ = NULL; - void* _tmp7__target = NULL; + gint _tmp3_; + gdouble _tmp4_; + gdouble _tmp5_; + gdouble _tmp6_; + SpitPublishingProgressCallback _tmp7_; + void* _tmp7__target; #line 702 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self)); #line 703 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5987,11 +5983,11 @@ static void publishing_rest_support_batch_uploader_on_chunk_transmitted (Publish _tmp7__target = self->priv->status_updated_target; #line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp7_ != NULL) { -#line 5983 "RESTSupport.c" - SpitPublishingProgressCallback _tmp8_ = NULL; - void* _tmp8__target = NULL; - gint _tmp9_ = 0; - gdouble _tmp10_ = 0.0; +#line 5979 "RESTSupport.c" + SpitPublishingProgressCallback _tmp8_; + void* _tmp8__target; + gint _tmp9_; + gdouble _tmp10_; #line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp8_ = self->priv->status_updated; #line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -6002,15 +5998,15 @@ static void publishing_rest_support_batch_uploader_on_chunk_transmitted (Publish _tmp10_ = fraction_complete; #line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp8_ (_tmp9_ + 1, _tmp10_, _tmp8__target); -#line 5998 "RESTSupport.c" +#line 5994 "RESTSupport.c" } } PublishingRESTSupportSession* publishing_rest_support_batch_uploader_get_session (PublishingRESTSupportBatchUploader* self) { PublishingRESTSupportSession* result = NULL; - PublishingRESTSupportSession* _tmp0_ = NULL; - PublishingRESTSupportSession* _tmp1_ = NULL; + PublishingRESTSupportSession* _tmp0_; + PublishingRESTSupportSession* _tmp1_; #line 712 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL); #line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -6021,17 +6017,17 @@ PublishingRESTSupportSession* publishing_rest_support_batch_uploader_get_session result = _tmp1_; #line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 6017 "RESTSupport.c" +#line 6013 "RESTSupport.c" } SpitPublishingPublishable* publishing_rest_support_batch_uploader_get_current_publishable (PublishingRESTSupportBatchUploader* self) { SpitPublishingPublishable* result = NULL; - SpitPublishingPublishable** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - gint _tmp1_ = 0; - SpitPublishingPublishable* _tmp2_ = NULL; - SpitPublishingPublishable* _tmp3_ = NULL; + SpitPublishingPublishable** _tmp0_; + gint _tmp0__length1; + gint _tmp1_; + SpitPublishingPublishable* _tmp2_; + SpitPublishingPublishable* _tmp3_; #line 716 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL); #line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -6048,7 +6044,7 @@ SpitPublishingPublishable* publishing_rest_support_batch_uploader_get_current_pu result = _tmp3_; #line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 6044 "RESTSupport.c" +#line 6040 "RESTSupport.c" } @@ -6057,7 +6053,7 @@ static PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_ g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_batch_uploader_create_transaction'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 6053 "RESTSupport.c" +#line 6049 "RESTSupport.c" } @@ -6066,15 +6062,15 @@ PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_create_ g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL); #line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->create_transaction (self, publishable); -#line 6062 "RESTSupport.c" +#line 6058 "RESTSupport.c" } void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUploader* self, SpitPublishingProgressCallback status_updated, void* status_updated_target) { - SpitPublishingProgressCallback _tmp0_ = NULL; - void* _tmp0__target = NULL; - SpitPublishingPublishable** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + SpitPublishingProgressCallback _tmp0_; + void* _tmp0__target; + SpitPublishingPublishable** _tmp1_; + gint _tmp1__length1; #line 722 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self)); #line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -6093,7 +6089,7 @@ void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUp if (_tmp1__length1 > 0) { #line 726 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_batch_uploader_send_files (self); -#line 6089 "RESTSupport.c" +#line 6085 "RESTSupport.c" } } @@ -6101,7 +6097,7 @@ void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUp static void publishing_rest_support_value_batch_uploader_init (GValue* value) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 6097 "RESTSupport.c" +#line 6093 "RESTSupport.c" } @@ -6110,7 +6106,7 @@ static void publishing_rest_support_value_batch_uploader_free_value (GValue* val if (value->data[0].v_pointer) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_batch_uploader_unref (value->data[0].v_pointer); -#line 6106 "RESTSupport.c" +#line 6102 "RESTSupport.c" } } @@ -6120,11 +6116,11 @@ static void publishing_rest_support_value_batch_uploader_copy_value (const GValu if (src_value->data[0].v_pointer) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" dest_value->data[0].v_pointer = publishing_rest_support_batch_uploader_ref (src_value->data[0].v_pointer); -#line 6116 "RESTSupport.c" +#line 6112 "RESTSupport.c" } else { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" dest_value->data[0].v_pointer = NULL; -#line 6120 "RESTSupport.c" +#line 6116 "RESTSupport.c" } } @@ -6132,66 +6128,66 @@ static void publishing_rest_support_value_batch_uploader_copy_value (const GValu static gpointer publishing_rest_support_value_batch_uploader_peek_pointer (const GValue* value) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return value->data[0].v_pointer; -#line 6128 "RESTSupport.c" +#line 6124 "RESTSupport.c" } static gchar* publishing_rest_support_value_batch_uploader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (collect_values[0].v_pointer) { -#line 6135 "RESTSupport.c" - PublishingRESTSupportBatchUploader* object; +#line 6131 "RESTSupport.c" + PublishingRESTSupportBatchUploader * object; object = collect_values[0].v_pointer; #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (object->parent_instance.g_class == NULL) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6142 "RESTSupport.c" +#line 6138 "RESTSupport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6146 "RESTSupport.c" +#line 6142 "RESTSupport.c" } #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = publishing_rest_support_batch_uploader_ref (object); -#line 6150 "RESTSupport.c" +#line 6146 "RESTSupport.c" } else { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 6154 "RESTSupport.c" +#line 6150 "RESTSupport.c" } #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 6158 "RESTSupport.c" +#line 6154 "RESTSupport.c" } static gchar* publishing_rest_support_value_batch_uploader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingRESTSupportBatchUploader** object_p; + PublishingRESTSupportBatchUploader ** object_p; object_p = collect_values[0].v_pointer; #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (!object_p) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 6169 "RESTSupport.c" +#line 6165 "RESTSupport.c" } #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (!value->data[0].v_pointer) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = NULL; -#line 6175 "RESTSupport.c" +#line 6171 "RESTSupport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = value->data[0].v_pointer; -#line 6179 "RESTSupport.c" +#line 6175 "RESTSupport.c" } else { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer); -#line 6183 "RESTSupport.c" +#line 6179 "RESTSupport.c" } #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 6187 "RESTSupport.c" +#line 6183 "RESTSupport.c" } @@ -6205,7 +6201,7 @@ GParamSpec* publishing_rest_support_param_spec_batch_uploader (const gchar* name G_PARAM_SPEC (spec)->value_type = object_type; #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return G_PARAM_SPEC (spec); -#line 6201 "RESTSupport.c" +#line 6197 "RESTSupport.c" } @@ -6214,12 +6210,12 @@ gpointer publishing_rest_support_value_get_batch_uploader (const GValue* value) g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER), NULL); #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return value->data[0].v_pointer; -#line 6210 "RESTSupport.c" +#line 6206 "RESTSupport.c" } void publishing_rest_support_value_set_batch_uploader (GValue* value, gpointer v_object) { - PublishingRESTSupportBatchUploader* old; + PublishingRESTSupportBatchUploader * old; #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER)); #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -6234,23 +6230,23 @@ void publishing_rest_support_value_set_batch_uploader (GValue* value, gpointer v value->data[0].v_pointer = v_object; #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer); -#line 6230 "RESTSupport.c" +#line 6226 "RESTSupport.c" } else { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 6234 "RESTSupport.c" +#line 6230 "RESTSupport.c" } #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (old) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_batch_uploader_unref (old); -#line 6240 "RESTSupport.c" +#line 6236 "RESTSupport.c" } } void publishing_rest_support_value_take_batch_uploader (GValue* value, gpointer v_object) { - PublishingRESTSupportBatchUploader* old; + PublishingRESTSupportBatchUploader * old; #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER)); #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -6263,17 +6259,17 @@ void publishing_rest_support_value_take_batch_uploader (GValue* value, gpointer g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = v_object; -#line 6259 "RESTSupport.c" +#line 6255 "RESTSupport.c" } else { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 6263 "RESTSupport.c" +#line 6259 "RESTSupport.c" } #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (old) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_batch_uploader_unref (old); -#line 6269 "RESTSupport.c" +#line 6265 "RESTSupport.c" } } @@ -6286,12 +6282,12 @@ static void publishing_rest_support_batch_uploader_class_init (PublishingRESTSup #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_type_class_add_private (klass, sizeof (PublishingRESTSupportBatchUploaderPrivate)); #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_rest_support_batch_uploader_real_create_transaction; + ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_rest_support_batch_uploader_real_create_transaction; #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - g_signal_new ("upload_complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); + publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_COMPLETE_SIGNAL] = g_signal_new ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - g_signal_new ("upload_error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); -#line 6287 "RESTSupport.c" + publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_ERROR_SIGNAL] = g_signal_new ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); +#line 6283 "RESTSupport.c" } @@ -6310,13 +6306,15 @@ static void publishing_rest_support_batch_uploader_instance_init (PublishingREST self->priv->session = NULL; #line 653 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->priv->status_updated = NULL; +#line 653 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" + self->priv->status_updated_target = self; #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->ref_count = 1; -#line 6308 "RESTSupport.c" +#line 6306 "RESTSupport.c" } -static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSupportBatchUploader* obj) { +static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSupportBatchUploader * obj) { PublishingRESTSupportBatchUploader * self; #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader); @@ -6326,7 +6324,7 @@ static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSuppo self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL); #line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _publishing_rest_support_session_unref0 (self->priv->session); -#line 6322 "RESTSupport.c" +#line 6320 "RESTSupport.c" } @@ -6345,18 +6343,18 @@ GType publishing_rest_support_batch_uploader_get_type (void) { gpointer publishing_rest_support_batch_uploader_ref (gpointer instance) { - PublishingRESTSupportBatchUploader* self; + PublishingRESTSupportBatchUploader * self; self = instance; #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_atomic_int_inc (&self->ref_count); #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return instance; -#line 6347 "RESTSupport.c" +#line 6345 "RESTSupport.c" } void publishing_rest_support_batch_uploader_unref (gpointer instance) { - PublishingRESTSupportBatchUploader* self; + PublishingRESTSupportBatchUploader * self; self = instance; #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -6364,39 +6362,39 @@ void publishing_rest_support_batch_uploader_unref (gpointer instance) { PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->finalize (self); #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 6360 "RESTSupport.c" +#line 6358 "RESTSupport.c" } } static gunichar string_get_char (const gchar* self, glong index) { gunichar result = 0U; - glong _tmp0_ = 0L; - gunichar _tmp1_ = 0U; -#line 1116 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp0_; + gunichar _tmp1_; +#line 1140 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0U); -#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = index; -#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_); -#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_; -#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 6379 "RESTSupport.c" +#line 6377 "RESTSupport.c" } gchar* publishing_rest_support_asciify_string (const gchar* s) { gchar* result = NULL; gchar* t = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; GString* b = NULL; - GString* _tmp2_ = NULL; - GString* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; + GString* _tmp2_; + GString* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; #line 733 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (s != NULL, NULL); #line 734 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -6409,40 +6407,40 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) { _tmp2_ = g_string_new (""); #line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" b = _tmp2_; -#line 6405 "RESTSupport.c" +#line 6403 "RESTSupport.c" { const gchar* u = NULL; - const gchar* _tmp3_ = NULL; + const gchar* _tmp3_; #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp3_ = t; #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" u = _tmp3_; -#line 6413 "RESTSupport.c" +#line 6411 "RESTSupport.c" { gboolean _tmp4_ = FALSE; #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp4_ = TRUE; #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" while (TRUE) { -#line 6420 "RESTSupport.c" - const gchar* _tmp7_ = NULL; - gunichar _tmp8_ = 0U; +#line 6418 "RESTSupport.c" + const gchar* _tmp7_; + gunichar _tmp8_; gunichar c = 0U; - const gchar* _tmp9_ = NULL; - gunichar _tmp10_ = 0U; - gunichar _tmp11_ = 0U; + const gchar* _tmp9_; + gunichar _tmp10_; + gunichar _tmp11_; #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (!_tmp4_) { -#line 6429 "RESTSupport.c" - const gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; +#line 6427 "RESTSupport.c" + const gchar* _tmp5_; + const gchar* _tmp6_; #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp5_ = u; #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp6_ = g_utf8_next_char (_tmp5_); #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" u = _tmp6_; -#line 6438 "RESTSupport.c" +#line 6436 "RESTSupport.c" } #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp4_ = FALSE; @@ -6454,7 +6452,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) { if (!(_tmp8_ != ((gunichar) 0))) { #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" break; -#line 6450 "RESTSupport.c" +#line 6448 "RESTSupport.c" } #line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp9_ = u; @@ -6466,16 +6464,16 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) { _tmp11_ = c; #line 739 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (((gint) _tmp11_) < 128) { -#line 6462 "RESTSupport.c" - GString* _tmp12_ = NULL; - gunichar _tmp13_ = 0U; +#line 6460 "RESTSupport.c" + GString* _tmp12_; + gunichar _tmp13_; #line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp12_ = b; #line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp13_ = c; #line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_string_append_unichar (_tmp12_, _tmp13_); -#line 6471 "RESTSupport.c" +#line 6469 "RESTSupport.c" } } } @@ -6494,7 +6492,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) { _g_free0 (t); #line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 6490 "RESTSupport.c" +#line 6488 "RESTSupport.c" } @@ -6503,7 +6501,7 @@ static gchar* publishing_rest_support_google_session_real_get_user_name (Publish g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_user_name'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 6499 "RESTSupport.c" +#line 6497 "RESTSupport.c" } @@ -6512,7 +6510,7 @@ gchar* publishing_rest_support_google_session_get_user_name (PublishingRESTSuppo g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL); #line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_user_name (self); -#line 6508 "RESTSupport.c" +#line 6506 "RESTSupport.c" } @@ -6521,7 +6519,7 @@ static gchar* publishing_rest_support_google_session_real_get_access_token (Publ g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_access_token'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 6517 "RESTSupport.c" +#line 6515 "RESTSupport.c" } @@ -6530,7 +6528,7 @@ gchar* publishing_rest_support_google_session_get_access_token (PublishingRESTSu g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL); #line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_access_token (self); -#line 6526 "RESTSupport.c" +#line 6524 "RESTSupport.c" } @@ -6539,7 +6537,7 @@ static void publishing_rest_support_google_session_real_deauthenticate (Publishi g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_deauthenticate'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 6535 "RESTSupport.c" +#line 6533 "RESTSupport.c" } @@ -6548,7 +6546,7 @@ void publishing_rest_support_google_session_deauthenticate (PublishingRESTSuppor g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self)); #line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->deauthenticate (self); -#line 6544 "RESTSupport.c" +#line 6542 "RESTSupport.c" } @@ -6558,7 +6556,7 @@ PublishingRESTSupportGoogleSession* publishing_rest_support_google_session_const self = (PublishingRESTSupportGoogleSession*) publishing_rest_support_session_construct (object_type, NULL); #line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 6554 "RESTSupport.c" +#line 6552 "RESTSupport.c" } @@ -6566,12 +6564,12 @@ static void publishing_rest_support_google_session_class_init (PublishingRESTSup #line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_google_session_parent_class = g_type_class_peek_parent (klass); #line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGoogleSessionClass *) klass)->get_user_name = (gchar* (*)(PublishingRESTSupportGoogleSession*)) publishing_rest_support_google_session_real_get_user_name; + ((PublishingRESTSupportGoogleSessionClass *) klass)->get_user_name = (gchar* (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_session_real_get_user_name; #line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = (gchar* (*)(PublishingRESTSupportGoogleSession*)) publishing_rest_support_google_session_real_get_access_token; + ((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = (gchar* (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_session_real_get_access_token; #line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = (void (*)(PublishingRESTSupportGoogleSession*)) publishing_rest_support_google_session_real_deauthenticate; -#line 6567 "RESTSupport.c" + ((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = (void (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_session_real_deauthenticate; +#line 6565 "RESTSupport.c" } @@ -6594,19 +6592,19 @@ GType publishing_rest_support_google_session_get_type (void) { static void _publishing_rest_support_google_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self) { #line 816 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_google_publisher_on_authenticator_authenticated ((PublishingRESTSupportGooglePublisher*) self); -#line 6590 "RESTSupport.c" +#line 6588 "RESTSupport.c" } PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host, const gchar* scope) { PublishingRESTSupportGooglePublisher * self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp2_ = NULL; - SpitPublishingService* _tmp3_ = NULL; - SpitPublishingPluginHost* _tmp4_ = NULL; - SpitPublishingAuthenticator* _tmp5_ = NULL; - SpitPublishingAuthenticator* _tmp6_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp2_; + SpitPublishingService* _tmp3_; + SpitPublishingPluginHost* _tmp4_; + SpitPublishingAuthenticator* _tmp5_; + SpitPublishingAuthenticator* _tmp6_; #line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL); #line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -6649,7 +6647,7 @@ PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_c g_signal_connect_object (_tmp6_, "authenticated", (GCallback) _publishing_rest_support_google_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated, self, 0); #line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 6645 "RESTSupport.c" +#line 6643 "RESTSupport.c" } @@ -6658,7 +6656,7 @@ static SpitPublishingAuthenticator* publishing_rest_support_google_publisher_rea g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_get_authenticator'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 819 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 6654 "RESTSupport.c" +#line 6652 "RESTSupport.c" } @@ -6667,13 +6665,13 @@ SpitPublishingAuthenticator* publishing_rest_support_google_publisher_get_authen g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), NULL); #line 819 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->get_authenticator (self); -#line 6663 "RESTSupport.c" +#line 6661 "RESTSupport.c" } SpitPublishingPluginHost* publishing_rest_support_google_publisher_get_host (PublishingRESTSupportGooglePublisher* self) { SpitPublishingPluginHost* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; + SpitPublishingPluginHost* _tmp0_; #line 821 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), NULL); #line 822 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -6682,14 +6680,14 @@ SpitPublishingPluginHost* publishing_rest_support_google_publisher_get_host (Pub result = _tmp0_; #line 822 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 6678 "RESTSupport.c" +#line 6676 "RESTSupport.c" } PublishingRESTSupportGoogleSession* publishing_rest_support_google_publisher_get_session (PublishingRESTSupportGooglePublisher* self) { PublishingRESTSupportGoogleSession* result = NULL; - PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp0_ = NULL; - PublishingRESTSupportGoogleSession* _tmp1_ = NULL; + PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp0_; + PublishingRESTSupportGoogleSession* _tmp1_; #line 825 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), NULL); #line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -6700,7 +6698,7 @@ PublishingRESTSupportGoogleSession* publishing_rest_support_google_publisher_get result = _tmp1_; #line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 6696 "RESTSupport.c" +#line 6694 "RESTSupport.c" } @@ -6709,7 +6707,7 @@ static void publishing_rest_support_google_publisher_real_on_login_flow_complete g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_on_login_flow_complete'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 6705 "RESTSupport.c" +#line 6703 "RESTSupport.c" } @@ -6718,7 +6716,7 @@ void publishing_rest_support_google_publisher_on_login_flow_complete (Publishing g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self)); #line 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->on_login_flow_complete (self); -#line 6714 "RESTSupport.c" +#line 6712 "RESTSupport.c" } @@ -6727,7 +6725,7 @@ static void publishing_rest_support_google_publisher_real_do_logout (PublishingR g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_do_logout'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 6723 "RESTSupport.c" +#line 6721 "RESTSupport.c" } @@ -6736,7 +6734,7 @@ void publishing_rest_support_google_publisher_do_logout (PublishingRESTSupportGo g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self)); #line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->do_logout (self); -#line 6732 "RESTSupport.c" +#line 6730 "RESTSupport.c" } @@ -6746,7 +6744,7 @@ static gboolean publishing_rest_support_google_publisher_real_is_running (Publis g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_is_running'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 833 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return _tmp0_; -#line 6742 "RESTSupport.c" +#line 6740 "RESTSupport.c" } @@ -6755,7 +6753,7 @@ gboolean publishing_rest_support_google_publisher_is_running (PublishingRESTSupp g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), FALSE); #line 833 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->is_running (self); -#line 6751 "RESTSupport.c" +#line 6749 "RESTSupport.c" } @@ -6764,7 +6762,7 @@ static void publishing_rest_support_google_publisher_real_start (PublishingRESTS g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_start'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 835 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 6760 "RESTSupport.c" +#line 6758 "RESTSupport.c" } @@ -6773,7 +6771,7 @@ void publishing_rest_support_google_publisher_start (PublishingRESTSupportGoogle g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self)); #line 835 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->start (self); -#line 6769 "RESTSupport.c" +#line 6767 "RESTSupport.c" } @@ -6782,7 +6780,7 @@ static void publishing_rest_support_google_publisher_real_stop (PublishingRESTSu g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_stop'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 6778 "RESTSupport.c" +#line 6776 "RESTSupport.c" } @@ -6791,15 +6789,15 @@ void publishing_rest_support_google_publisher_stop (PublishingRESTSupportGoogleP g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self)); #line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->stop (self); -#line 6787 "RESTSupport.c" +#line 6785 "RESTSupport.c" } static SpitPublishingService* publishing_rest_support_google_publisher_real_get_service (SpitPublishingPublisher* base) { PublishingRESTSupportGooglePublisher * self; SpitPublishingService* result = NULL; - SpitPublishingService* _tmp0_ = NULL; - SpitPublishingService* _tmp1_ = NULL; + SpitPublishingService* _tmp0_; + SpitPublishingService* _tmp1_; #line 839 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher); #line 840 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -6810,42 +6808,42 @@ static SpitPublishingService* publishing_rest_support_google_publisher_real_get_ result = _tmp1_; #line 840 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 6806 "RESTSupport.c" +#line 6804 "RESTSupport.c" } static gpointer _g_variant_ref0 (gpointer self) { #line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self ? g_variant_ref (self) : NULL; -#line 6813 "RESTSupport.c" +#line 6811 "RESTSupport.c" } static void publishing_rest_support_google_publisher_on_authenticator_authenticated (PublishingRESTSupportGooglePublisher* self) { GHashTable* params = NULL; - SpitPublishingAuthenticator* _tmp0_ = NULL; - GHashTable* _tmp1_ = NULL; + SpitPublishingAuthenticator* _tmp0_; + GHashTable* _tmp1_; GVariant* refresh_token = NULL; GVariant* access_token = NULL; GVariant* user_name = NULL; gconstpointer _tmp2_ = NULL; - GVariant* _tmp3_ = NULL; + GVariant* _tmp3_; gconstpointer _tmp4_ = NULL; - GVariant* _tmp5_ = NULL; + GVariant* _tmp5_; gconstpointer _tmp6_ = NULL; - GVariant* _tmp7_ = NULL; - PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp8_ = NULL; - GVariant* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp12_ = NULL; - GVariant* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp16_ = NULL; - GVariant* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; + GVariant* _tmp7_; + PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp8_; + GVariant* _tmp9_; + const gchar* _tmp10_; + gchar* _tmp11_; + PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp12_; + GVariant* _tmp13_; + const gchar* _tmp14_; + gchar* _tmp15_; + PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp16_; + GVariant* _tmp17_; + const gchar* _tmp18_; + gchar* _tmp19_; #line 843 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self)); #line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -6930,7 +6928,7 @@ static void publishing_rest_support_google_publisher_on_authenticator_authentica _g_variant_unref0 (refresh_token); #line 843 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_hash_table_unref0 (params); -#line 6926 "RESTSupport.c" +#line 6924 "RESTSupport.c" } @@ -6952,21 +6950,21 @@ static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_su self->refresh_token = NULL; #line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 6948 "RESTSupport.c" +#line 6946 "RESTSupport.c" } static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_new (void) { #line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return publishing_rest_support_google_publisher_google_session_impl_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL); -#line 6955 "RESTSupport.c" +#line 6953 "RESTSupport.c" } static gboolean publishing_rest_support_google_publisher_google_session_impl_real_is_authenticated (PublishingRESTSupportSession* base) { PublishingRESTSupportGooglePublisherGoogleSessionImpl * self; gboolean result = FALSE; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl); #line 768 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -6975,16 +6973,16 @@ static gboolean publishing_rest_support_google_publisher_google_session_impl_rea result = _tmp0_ != NULL; #line 768 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 6971 "RESTSupport.c" +#line 6969 "RESTSupport.c" } static gchar* publishing_rest_support_google_publisher_google_session_impl_real_get_user_name (PublishingRESTSupportGoogleSession* base) { PublishingRESTSupportGooglePublisherGoogleSessionImpl * self; gchar* result = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; #line 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl); #line 772 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -6999,16 +6997,16 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_ result = _tmp2_; #line 773 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 6995 "RESTSupport.c" +#line 6993 "RESTSupport.c" } static gchar* publishing_rest_support_google_publisher_google_session_impl_real_get_access_token (PublishingRESTSupportGoogleSession* base) { PublishingRESTSupportGooglePublisherGoogleSessionImpl * self; gchar* result = NULL; - gboolean _tmp0_ = FALSE; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + gboolean _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; #line 776 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl); #line 777 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -7023,7 +7021,7 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_ result = _tmp2_; #line 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 7019 "RESTSupport.c" +#line 7017 "RESTSupport.c" } @@ -7043,7 +7041,7 @@ static void publishing_rest_support_google_publisher_google_session_impl_real_de _g_free0 (self->refresh_token); #line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->refresh_token = NULL; -#line 7039 "RESTSupport.c" +#line 7037 "RESTSupport.c" } @@ -7053,14 +7051,14 @@ static void publishing_rest_support_google_publisher_google_session_impl_class_i #line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" ((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_rest_support_google_publisher_google_session_impl_finalize; #line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_rest_support_google_publisher_google_session_impl_real_is_authenticated; + ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_rest_support_google_publisher_google_session_impl_real_is_authenticated; #line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGoogleSessionClass *) klass)->get_user_name = (gchar* (*)(PublishingRESTSupportGoogleSession*)) publishing_rest_support_google_publisher_google_session_impl_real_get_user_name; + ((PublishingRESTSupportGoogleSessionClass *) klass)->get_user_name = (gchar* (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_publisher_google_session_impl_real_get_user_name; #line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = (gchar* (*)(PublishingRESTSupportGoogleSession*)) publishing_rest_support_google_publisher_google_session_impl_real_get_access_token; + ((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = (gchar* (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_publisher_google_session_impl_real_get_access_token; #line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = (void (*)(PublishingRESTSupportGoogleSession*)) publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate; -#line 7056 "RESTSupport.c" + ((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = (void (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate; +#line 7054 "RESTSupport.c" } @@ -7068,7 +7066,7 @@ static void publishing_rest_support_google_publisher_google_session_impl_instanc } -static void publishing_rest_support_google_publisher_google_session_impl_finalize (PublishingRESTSupportSession* obj) { +static void publishing_rest_support_google_publisher_google_session_impl_finalize (PublishingRESTSupportSession * obj) { PublishingRESTSupportGooglePublisherGoogleSessionImpl * self; #line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl); @@ -7080,7 +7078,7 @@ static void publishing_rest_support_google_publisher_google_session_impl_finaliz _g_free0 (self->refresh_token); #line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_rest_support_google_publisher_google_session_impl_parent_class)->finalize (obj); -#line 7076 "RESTSupport.c" +#line 7074 "RESTSupport.c" } @@ -7098,9 +7096,9 @@ static GType publishing_rest_support_google_publisher_google_session_impl_get_ty static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) { PublishingRESTSupportGooglePublisherAuthenticatedTransaction* self = NULL; - PublishingRESTSupportGoogleSession* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - PublishingRESTSupportHttpMethod _tmp2_ = 0; + PublishingRESTSupportGoogleSession* _tmp0_; + const gchar* _tmp1_; + PublishingRESTSupportHttpMethod _tmp2_; #line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL); #line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -7115,29 +7113,29 @@ static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_ self = (PublishingRESTSupportGooglePublisherAuthenticatedTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_); #line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 7111 "RESTSupport.c" +#line 7109 "RESTSupport.c" } static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new_with_endpoint_url (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) { #line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, session, endpoint_url, method); -#line 7118 "RESTSupport.c" +#line 7116 "RESTSupport.c" } PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) { PublishingRESTSupportGooglePublisherAuthenticatedTransaction* self = NULL; - PublishingRESTSupportGoogleSession* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - PublishingRESTSupportHttpMethod _tmp2_ = 0; - PublishingRESTSupportGoogleSession* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; - PublishingRESTSupportGoogleSession* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; + PublishingRESTSupportGoogleSession* _tmp0_; + const gchar* _tmp1_; + PublishingRESTSupportHttpMethod _tmp2_; + PublishingRESTSupportGoogleSession* _tmp3_; + gboolean _tmp4_; + PublishingRESTSupportGoogleSession* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL); #line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -7174,21 +7172,21 @@ PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_su _g_free0 (_tmp7_); #line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 7170 "RESTSupport.c" +#line 7168 "RESTSupport.c" } PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) { #line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return publishing_rest_support_google_publisher_authenticated_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, session, endpoint_url, method); -#line 7177 "RESTSupport.c" +#line 7175 "RESTSupport.c" } static void publishing_rest_support_google_publisher_authenticated_transaction_class_init (PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass * klass) { #line 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_google_publisher_authenticated_transaction_parent_class = g_type_class_peek_parent (klass); -#line 7184 "RESTSupport.c" +#line 7182 "RESTSupport.c" } @@ -7214,20 +7212,20 @@ static void publishing_rest_support_google_publisher_class_init (PublishingRESTS #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_type_class_add_private (klass, sizeof (PublishingRESTSupportGooglePublisherPrivate)); #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = (SpitPublishingAuthenticator* (*)(PublishingRESTSupportGooglePublisher*)) publishing_rest_support_google_publisher_real_get_authenticator; + ((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = (SpitPublishingAuthenticator* (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_get_authenticator; #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_rest_support_google_publisher_real_on_login_flow_complete; + ((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_on_login_flow_complete; #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_rest_support_google_publisher_real_do_logout; + ((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_do_logout; #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = (gboolean (*)(PublishingRESTSupportGooglePublisher*)) publishing_rest_support_google_publisher_real_is_running; + ((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = (gboolean (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_is_running; #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->start = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_rest_support_google_publisher_real_start; + ((PublishingRESTSupportGooglePublisherClass *) klass)->start = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_start; #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->stop = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_rest_support_google_publisher_real_stop; + ((PublishingRESTSupportGooglePublisherClass *) klass)->stop = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_stop; #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" G_OBJECT_CLASS (klass)->finalize = publishing_rest_support_google_publisher_finalize; -#line 7223 "RESTSupport.c" +#line 7221 "RESTSupport.c" } @@ -7235,25 +7233,25 @@ static void publishing_rest_support_google_publisher_spit_publishing_publisher_i #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_google_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface); #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_is_running; + iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_rest_support_google_publisher_is_running; #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - iface->start = (void (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_start; + iface->start = (void (*) (SpitPublishingPublisher *)) publishing_rest_support_google_publisher_start; #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_stop; + iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_rest_support_google_publisher_stop; #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_real_get_service; -#line 7238 "RESTSupport.c" + iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_rest_support_google_publisher_real_get_service; +#line 7236 "RESTSupport.c" } static void publishing_rest_support_google_publisher_instance_init (PublishingRESTSupportGooglePublisher * self) { #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->priv = PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_PRIVATE (self); -#line 7245 "RESTSupport.c" +#line 7243 "RESTSupport.c" } -static void publishing_rest_support_google_publisher_finalize (GObject* obj) { +static void publishing_rest_support_google_publisher_finalize (GObject * obj) { PublishingRESTSupportGooglePublisher * self; #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher); @@ -7265,7 +7263,7 @@ static void publishing_rest_support_google_publisher_finalize (GObject* obj) { _g_object_unref0 (self->priv->authenticator); #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" G_OBJECT_CLASS (publishing_rest_support_google_publisher_parent_class)->finalize (obj); -#line 7261 "RESTSupport.c" +#line 7259 "RESTSupport.c" } diff --git a/plugins/common/Resources.c b/plugins/common/Resources.c index d3b92c0..fa81657 100644 --- a/plugins/common/Resources.c +++ b/plugins/common/Resources.c @@ -1,4 +1,4 @@ -/* Resources.c generated by valac 0.34.7, the Vala compiler +/* Resources.c generated by valac 0.36.6, the Vala compiler * generated from Resources.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -47,9 +47,9 @@ "51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n" #define RESOURCES_TRANSLATORS _ ("translator-credits") GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1); -static void _vala_array_add2 (GdkPixbuf*** array, int* length, int* size, GdkPixbuf* value); +static void _vala_array_add2 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value); GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* result_length1); -static void _vala_array_add3 (GdkPixbuf*** array, int* length, int* size, GdkPixbuf* value); +static void _vala_array_add3 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -61,7 +61,7 @@ static gpointer _g_object_ref0 (gpointer self) { } -static void _vala_array_add2 (GdkPixbuf*** array, int* length, int* size, GdkPixbuf* value) { +static void _vala_array_add2 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value) { #line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala" if ((*length) == (*size)) { #line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala" @@ -81,9 +81,9 @@ static void _vala_array_add2 (GdkPixbuf*** array, int* length, int* size, GdkPix GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) { GdkPixbuf** result = NULL; GdkPixbuf* icon = NULL; - GdkPixbuf* _tmp10_ = NULL; - GdkPixbuf** _tmp16_ = NULL; - gint _tmp16__length1 = 0; + GdkPixbuf* _tmp10_; + GdkPixbuf** _tmp16_; + gint _tmp16__length1; GError * _inner_error_ = NULL; #line 40 "/home/jens/Source/shotwell/plugins/common/Resources.vala" g_return_val_if_fail ((icon_file == NULL) || G_IS_FILE (icon_file), NULL); @@ -92,12 +92,12 @@ GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) { #line 72 "Resources.c" { GdkPixbuf* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - GdkPixbuf* _tmp4_ = NULL; - GdkPixbuf* _tmp5_ = NULL; - GdkPixbuf* _tmp6_ = NULL; + GFile* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + GdkPixbuf* _tmp4_; + GdkPixbuf* _tmp5_; + GdkPixbuf* _tmp6_; #line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _tmp1_ = icon_file; #line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala" @@ -133,9 +133,9 @@ GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) { __catch4_g_error: { GError* err = NULL; - GFile* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; + GFile* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala" err = _inner_error_; #line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala" @@ -173,15 +173,15 @@ GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) { if (_tmp10_ != NULL) { #line 154 "Resources.c" GdkPixbuf** icon_pixbuf_set = NULL; - GdkPixbuf** _tmp11_ = NULL; - gint icon_pixbuf_set_length1 = 0; - gint _icon_pixbuf_set_size_ = 0; - GdkPixbuf** _tmp12_ = NULL; - gint _tmp12__length1 = 0; - GdkPixbuf* _tmp13_ = NULL; - GdkPixbuf* _tmp14_ = NULL; - GdkPixbuf** _tmp15_ = NULL; - gint _tmp15__length1 = 0; + GdkPixbuf** _tmp11_; + gint icon_pixbuf_set_length1; + gint _icon_pixbuf_set_size_; + GdkPixbuf** _tmp12_; + gint _tmp12__length1; + GdkPixbuf* _tmp13_; + GdkPixbuf* _tmp14_; + GdkPixbuf** _tmp15_; + gint _tmp15__length1; #line 49 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _tmp11_ = g_new0 (GdkPixbuf*, 0 + 1); #line 49 "/home/jens/Source/shotwell/plugins/common/Resources.vala" @@ -238,7 +238,7 @@ GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) { } -static void _vala_array_add3 (GdkPixbuf*** array, int* length, int* size, GdkPixbuf* value) { +static void _vala_array_add3 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value) { #line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala" if ((*length) == (*size)) { #line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala" @@ -258,9 +258,9 @@ static void _vala_array_add3 (GdkPixbuf*** array, int* length, int* size, GdkPix GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* result_length1) { GdkPixbuf** result = NULL; GdkPixbuf* icon = NULL; - GdkPixbuf* _tmp5_ = NULL; - GdkPixbuf** _tmp11_ = NULL; - gint _tmp11__length1 = 0; + GdkPixbuf* _tmp5_; + GdkPixbuf** _tmp11_; + gint _tmp11__length1; GError * _inner_error_ = NULL; #line 57 "/home/jens/Source/shotwell/plugins/common/Resources.vala" g_return_val_if_fail (resource_path != NULL, NULL); @@ -269,9 +269,9 @@ GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* resul #line 249 "Resources.c" { GdkPixbuf* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - GdkPixbuf* _tmp2_ = NULL; - GdkPixbuf* _tmp3_ = NULL; + const gchar* _tmp1_; + GdkPixbuf* _tmp2_; + GdkPixbuf* _tmp3_; #line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _tmp1_ = resource_path; #line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala" @@ -299,7 +299,7 @@ GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* resul __catch5_g_error: { GError* _error_ = NULL; - const gchar* _tmp4_ = NULL; + const gchar* _tmp4_; #line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _error_ = _inner_error_; #line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala" @@ -331,15 +331,15 @@ GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* resul if (_tmp5_ != NULL) { #line 312 "Resources.c" GdkPixbuf** icon_pixbuf_set = NULL; - GdkPixbuf** _tmp6_ = NULL; - gint icon_pixbuf_set_length1 = 0; - gint _icon_pixbuf_set_size_ = 0; - GdkPixbuf** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - GdkPixbuf* _tmp8_ = NULL; - GdkPixbuf* _tmp9_ = NULL; - GdkPixbuf** _tmp10_ = NULL; - gint _tmp10__length1 = 0; + GdkPixbuf** _tmp6_; + gint icon_pixbuf_set_length1; + gint _icon_pixbuf_set_size_; + GdkPixbuf** _tmp7_; + gint _tmp7__length1; + GdkPixbuf* _tmp8_; + GdkPixbuf* _tmp9_; + GdkPixbuf** _tmp10_; + gint _tmp10__length1; #line 66 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _tmp6_ = g_new0 (GdkPixbuf*, 0 + 1); #line 66 "/home/jens/Source/shotwell/plugins/common/Resources.vala" diff --git a/plugins/common/WebAuthenticationPane.c b/plugins/common/WebAuthenticationPane.c index 329f57c..8b6c4c9 100644 --- a/plugins/common/WebAuthenticationPane.c +++ b/plugins/common/WebAuthenticationPane.c @@ -1,4 +1,4 @@ -/* WebAuthenticationPane.c generated by valac 0.34.7, the Vala compiler +/* WebAuthenticationPane.c generated by valac 0.36.6, the Vala compiler * generated from WebAuthenticationPane.vala, do not modify */ /* Copyright 2016 Jens Georg <mail@jensge.org> @@ -48,14 +48,14 @@ struct _ShotwellPluginsCommonWebAuthenticationPanePrivate { static gpointer shotwell_plugins_common_web_authentication_pane_parent_class = NULL; -static SpitPublishingDialogPaneIface* shotwell_plugins_common_web_authentication_pane_spit_publishing_dialog_pane_parent_iface = NULL; +static SpitPublishingDialogPaneIface * shotwell_plugins_common_web_authentication_pane_spit_publishing_dialog_pane_parent_iface = NULL; GType shotwell_plugins_common_web_authentication_pane_get_type (void) G_GNUC_CONST; #define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPanePrivate)) enum { SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_DUMMY_PROPERTY, - SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY, - SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI + SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY_PROPERTY, + SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI_PROPERTY }; static void shotwell_plugins_common_web_authentication_pane_real_constructed (GObject* base); static void shotwell_plugins_common_web_authentication_pane_on_page_load_changed (ShotwellPluginsCommonWebAuthenticationPane* self, WebKitLoadEvent load_event); @@ -75,7 +75,7 @@ static void shotwell_plugins_common_web_authentication_pane_real_on_pane_uninsta ShotwellPluginsCommonWebAuthenticationPane* shotwell_plugins_common_web_authentication_pane_construct (GType object_type); static void shotwell_plugins_common_web_authentication_pane_set_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self, SpitPublishingDialogPaneGeometryOptions value); static void shotwell_plugins_common_web_authentication_pane_set_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self, const gchar* value); -static void shotwell_plugins_common_web_authentication_pane_finalize (GObject* obj); +static void shotwell_plugins_common_web_authentication_pane_finalize (GObject * obj); static void _vala_shotwell_plugins_common_web_authentication_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_shotwell_plugins_common_web_authentication_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -108,11 +108,11 @@ static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender static void shotwell_plugins_common_web_authentication_pane_real_constructed (GObject* base) { ShotwellPluginsCommonWebAuthenticationPane * self; - WebKitWebView* _tmp0_ = NULL; - WebKitWebView* _tmp1_ = NULL; - WebKitSettings* _tmp2_ = NULL; - WebKitWebView* _tmp3_ = NULL; - WebKitWebView* _tmp4_ = NULL; + WebKitWebView* _tmp0_; + WebKitWebView* _tmp1_; + WebKitSettings* _tmp2_; + WebKitWebView* _tmp3_; + WebKitWebView* _tmp4_; #line 18 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane); #line 19 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" @@ -170,15 +170,15 @@ static gpointer _g_object_ref0 (gpointer self) { void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPluginsCommonWebAuthenticationPane* self, GdkCursorType type) { GdkWindow* window = NULL; - WebKitWebView* _tmp0_ = NULL; - GdkWindow* _tmp1_ = NULL; - GdkWindow* _tmp2_ = NULL; + WebKitWebView* _tmp0_; + GdkWindow* _tmp1_; + GdkWindow* _tmp2_; GdkDisplay* display = NULL; - GdkDisplay* _tmp3_ = NULL; - GdkDisplay* _tmp4_ = NULL; + GdkDisplay* _tmp3_; + GdkDisplay* _tmp4_; GdkCursor* cursor = NULL; - GdkCursorType _tmp5_ = 0; - GdkCursor* _tmp6_ = NULL; + GdkCursorType _tmp5_; + GdkCursor* _tmp6_; #line 30 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self)); #line 31 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" @@ -214,7 +214,7 @@ void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPlugins static void shotwell_plugins_common_web_authentication_pane_on_page_load_changed (ShotwellPluginsCommonWebAuthenticationPane* self, WebKitLoadEvent load_event) { - WebKitLoadEvent _tmp0_ = 0; + WebKitLoadEvent _tmp0_; #line 37 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self)); #line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" @@ -257,8 +257,8 @@ static void shotwell_plugins_common_web_authentication_pane_on_page_load_changed WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (ShotwellPluginsCommonWebAuthenticationPane* self) { WebKitWebView* result = NULL; - WebKitWebView* _tmp0_ = NULL; - WebKitWebView* _tmp1_ = NULL; + WebKitWebView* _tmp0_; + WebKitWebView* _tmp1_; #line 52 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self), NULL); #line 53 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" @@ -276,7 +276,7 @@ WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (Shotwel static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) { ShotwellPluginsCommonWebAuthenticationPane * self; SpitPublishingDialogPaneGeometryOptions result = 0; - SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0; + SpitPublishingDialogPaneGeometryOptions _tmp0_; #line 56 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane); #line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" @@ -292,8 +292,8 @@ static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authe static GtkWidget* shotwell_plugins_common_web_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) { ShotwellPluginsCommonWebAuthenticationPane * self; GtkWidget* result = NULL; - WebKitWebView* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + WebKitWebView* _tmp0_; + GtkWidget* _tmp1_; #line 60 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane); #line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" @@ -310,11 +310,11 @@ static GtkWidget* shotwell_plugins_common_web_authentication_pane_real_get_widge static void shotwell_plugins_common_web_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base) { ShotwellPluginsCommonWebAuthenticationPane * self; - WebKitWebView* _tmp0_ = NULL; - WebKitWebView* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + WebKitWebView* _tmp0_; + WebKitWebView* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #line 64 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane); #line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" @@ -357,7 +357,7 @@ ShotwellPluginsCommonWebAuthenticationPane* shotwell_plugins_common_web_authenti SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self) { SpitPublishingDialogPaneGeometryOptions result; - SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0; + SpitPublishingDialogPaneGeometryOptions _tmp0_; #line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self), 0); #line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" @@ -371,23 +371,27 @@ SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authenticati static void shotwell_plugins_common_web_authentication_pane_set_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self, SpitPublishingDialogPaneGeometryOptions value) { - SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0; #line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self)); #line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" - _tmp0_ = value; + if (shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (self) != value) { +#line 379 "WebAuthenticationPane.c" + SpitPublishingDialogPaneGeometryOptions _tmp0_; #line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" - self->priv->_preferred_geometry = _tmp0_; + _tmp0_ = value; #line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" - g_object_notify ((GObject *) self, "preferred-geometry"); -#line 384 "WebAuthenticationPane.c" + self->priv->_preferred_geometry = _tmp0_; +#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" + g_object_notify ((GObject *) self, "preferred-geometry"); +#line 387 "WebAuthenticationPane.c" + } } gchar* shotwell_plugins_common_web_authentication_pane_get_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self) { gchar* result; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self), NULL); #line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" @@ -398,26 +402,30 @@ gchar* shotwell_plugins_common_web_authentication_pane_get_login_uri (ShotwellPl result = _tmp1_; #line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" return result; -#line 402 "WebAuthenticationPane.c" +#line 406 "WebAuthenticationPane.c" } static void shotwell_plugins_common_web_authentication_pane_set_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; #line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self)); #line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" - _tmp0_ = value; + if (g_strcmp0 (value, shotwell_plugins_common_web_authentication_pane_get_login_uri (self)) != 0) { +#line 415 "WebAuthenticationPane.c" + const gchar* _tmp0_; + gchar* _tmp1_; #line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = value; #line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" - _g_free0 (self->priv->_login_uri); + _tmp1_ = g_strdup (_tmp0_); +#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" + _g_free0 (self->priv->_login_uri); #line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" - self->priv->_login_uri = _tmp1_; + self->priv->_login_uri = _tmp1_; #line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" - g_object_notify ((GObject *) self, "login-uri"); -#line 421 "WebAuthenticationPane.c" + g_object_notify ((GObject *) self, "login-uri"); +#line 428 "WebAuthenticationPane.c" + } } @@ -427,9 +435,9 @@ static void shotwell_plugins_common_web_authentication_pane_class_init (Shotwell #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" g_type_class_add_private (klass, sizeof (ShotwellPluginsCommonWebAuthenticationPanePrivate)); #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" - ((GObjectClass *) klass)->constructed = (void (*)(GObject*)) shotwell_plugins_common_web_authentication_pane_real_constructed; + ((GObjectClass *) klass)->constructed = (void (*) (GObject *)) shotwell_plugins_common_web_authentication_pane_real_constructed; #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" - ((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*)(ShotwellPluginsCommonWebAuthenticationPane*)) shotwell_plugins_common_web_authentication_pane_real_on_page_load; + ((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*) (ShotwellPluginsCommonWebAuthenticationPane *)) shotwell_plugins_common_web_authentication_pane_real_on_page_load; #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" G_OBJECT_CLASS (klass)->get_property = _vala_shotwell_plugins_common_web_authentication_pane_get_property; #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" @@ -437,10 +445,10 @@ static void shotwell_plugins_common_web_authentication_pane_class_init (Shotwell #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" G_OBJECT_CLASS (klass)->finalize = shotwell_plugins_common_web_authentication_pane_finalize; #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY, g_param_spec_enum ("preferred-geometry", "preferred-geometry", "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_TYPE_GEOMETRY_OPTIONS, SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY_PROPERTY, g_param_spec_enum ("preferred-geometry", "preferred-geometry", "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_TYPE_GEOMETRY_OPTIONS, SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI, g_param_spec_string ("login-uri", "login-uri", "login-uri", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); -#line 444 "WebAuthenticationPane.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI_PROPERTY, g_param_spec_string ("login-uri", "login-uri", "login-uri", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); +#line 452 "WebAuthenticationPane.c" } @@ -448,14 +456,14 @@ static void shotwell_plugins_common_web_authentication_pane_spit_publishing_dial #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" shotwell_plugins_common_web_authentication_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface); #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" - iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_web_authentication_pane_real_get_preferred_geometry; + iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) shotwell_plugins_common_web_authentication_pane_real_get_preferred_geometry; #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" - iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_web_authentication_pane_real_get_widget; + iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) shotwell_plugins_common_web_authentication_pane_real_get_widget; #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" - iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_web_authentication_pane_real_on_pane_installed; + iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) shotwell_plugins_common_web_authentication_pane_real_on_pane_installed; #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" - iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_web_authentication_pane_real_on_pane_uninstalled; -#line 459 "WebAuthenticationPane.c" + iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) shotwell_plugins_common_web_authentication_pane_real_on_pane_uninstalled; +#line 467 "WebAuthenticationPane.c" } @@ -464,11 +472,11 @@ static void shotwell_plugins_common_web_authentication_pane_instance_init (Shotw self->priv = SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_PRIVATE (self); #line 10 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" self->priv->_preferred_geometry = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; -#line 468 "WebAuthenticationPane.c" +#line 476 "WebAuthenticationPane.c" } -static void shotwell_plugins_common_web_authentication_pane_finalize (GObject* obj) { +static void shotwell_plugins_common_web_authentication_pane_finalize (GObject * obj) { ShotwellPluginsCommonWebAuthenticationPane * self; #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane); @@ -478,7 +486,7 @@ static void shotwell_plugins_common_web_authentication_pane_finalize (GObject* o _g_object_unref0 (self->priv->webview); #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" G_OBJECT_CLASS (shotwell_plugins_common_web_authentication_pane_parent_class)->finalize (obj); -#line 482 "WebAuthenticationPane.c" +#line 490 "WebAuthenticationPane.c" } @@ -502,24 +510,24 @@ static void _vala_shotwell_plugins_common_web_authentication_pane_get_property ( #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" switch (property_id) { #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" - case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY: + case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY_PROPERTY: #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" g_value_set_enum (value, shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (self)); #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" break; #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" - case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI: + case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI_PROPERTY: #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" g_value_take_string (value, shotwell_plugins_common_web_authentication_pane_get_login_uri (self)); #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" break; -#line 517 "WebAuthenticationPane.c" +#line 525 "WebAuthenticationPane.c" default: #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" break; -#line 523 "WebAuthenticationPane.c" +#line 531 "WebAuthenticationPane.c" } } @@ -530,24 +538,24 @@ static void _vala_shotwell_plugins_common_web_authentication_pane_set_property ( #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" switch (property_id) { #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" - case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY: + case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY_PROPERTY: #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" shotwell_plugins_common_web_authentication_pane_set_preferred_geometry (self, g_value_get_enum (value)); #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" break; #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" - case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI: + case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI_PROPERTY: #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" shotwell_plugins_common_web_authentication_pane_set_login_uri (self, g_value_get_string (value)); #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" break; -#line 545 "WebAuthenticationPane.c" +#line 553 "WebAuthenticationPane.c" default: #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" break; -#line 551 "WebAuthenticationPane.c" +#line 559 "WebAuthenticationPane.c" } } diff --git a/plugins/shotwell-data-imports/FSpotDatabase.c b/plugins/shotwell-data-imports/FSpotDatabase.c index 9dd325a..617edb9 100644 --- a/plugins/shotwell-data-imports/FSpotDatabase.c +++ b/plugins/shotwell-data-imports/FSpotDatabase.c @@ -1,4 +1,4 @@ -/* FSpotDatabase.c generated by valac 0.34.7, the Vala compiler +/* FSpotDatabase.c generated by valac 0.36.6, the Vala compiler * generated from FSpotDatabase.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -196,7 +196,7 @@ DataImportsFSpotDbFSpotRollsTable* data_imports_fspot_db_fspot_rolls_table_const gchar* data_imports_fspot_db_fspot_meta_table_get_db_version (DataImportsFSpotDbFSpotMetaTable* self, GError** error); UtilsVersionNumber* utils_version_number_new_from_string (const gchar* str_version, const gchar* separator); UtilsVersionNumber* utils_version_number_construct_from_string (GType object_type, const gchar* str_version, const gchar* separator); -static void data_imports_fspot_db_fspot_database_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_database_finalize (GObject * obj); /** @@ -212,32 +212,32 @@ void data_imports_fspot_db_init (void) { DataImportsFSpotDbFSpotDatabase* data_imports_fspot_db_fspot_database_construct (GType object_type, GFile* db_file, GError** error) { DataImportsFSpotDbFSpotDatabase * self = NULL; gchar* filename = NULL; - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; gint res = 0; sqlite3* _tmp2_ = NULL; - gint _tmp3_ = 0; - sqlite3* _tmp5_ = NULL; - DataImportsFSpotDbFSpotMetaTable* _tmp6_ = NULL; + gint _tmp3_; + sqlite3* _tmp5_; + DataImportsFSpotDbFSpotMetaTable* _tmp6_; gint64 _tmp7_ = 0LL; - DataImportsFSpotDbFSpotMetaTable* _tmp8_ = NULL; - gint64 _tmp9_ = 0LL; + DataImportsFSpotDbFSpotMetaTable* _tmp8_; + gint64 _tmp9_; UtilsVersionNumber* _tmp10_ = NULL; - UtilsVersionNumber* _tmp11_ = NULL; + UtilsVersionNumber* _tmp11_; DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior = NULL; - DataImportsFSpotDbFSpotDatabaseBehavior* _tmp12_ = NULL; - sqlite3* _tmp13_ = NULL; - DataImportsFSpotDbFSpotDatabaseBehavior* _tmp14_ = NULL; - DataImportsFSpotDbFSpotPhotosTable* _tmp15_ = NULL; - sqlite3* _tmp16_ = NULL; - DataImportsFSpotDbFSpotDatabaseBehavior* _tmp17_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionsTable* _tmp18_ = NULL; - sqlite3* _tmp19_ = NULL; - DataImportsFSpotDbFSpotDatabaseBehavior* _tmp20_ = NULL; - DataImportsFSpotDbFSpotTagsTable* _tmp21_ = NULL; - sqlite3* _tmp22_ = NULL; - DataImportsFSpotDbFSpotDatabaseBehavior* _tmp23_ = NULL; - DataImportsFSpotDbFSpotRollsTable* _tmp24_ = NULL; + DataImportsFSpotDbFSpotDatabaseBehavior* _tmp12_; + sqlite3* _tmp13_; + DataImportsFSpotDbFSpotDatabaseBehavior* _tmp14_; + DataImportsFSpotDbFSpotPhotosTable* _tmp15_; + sqlite3* _tmp16_; + DataImportsFSpotDbFSpotDatabaseBehavior* _tmp17_; + DataImportsFSpotDbFSpotPhotoVersionsTable* _tmp18_; + sqlite3* _tmp19_; + DataImportsFSpotDbFSpotDatabaseBehavior* _tmp20_; + DataImportsFSpotDbFSpotTagsTable* _tmp21_; + sqlite3* _tmp22_; + DataImportsFSpotDbFSpotDatabaseBehavior* _tmp23_; + DataImportsFSpotDbFSpotRollsTable* _tmp24_; GError * _inner_error_ = NULL; #line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala" g_return_val_if_fail (G_IS_FILE (db_file), NULL); @@ -260,7 +260,7 @@ DataImportsFSpotDbFSpotDatabase* data_imports_fspot_db_fspot_database_construct #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala" if (res != SQLITE_OK) { #line 263 "FSpotDatabase.c" - GError* _tmp4_ = NULL; + GError* _tmp4_; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala" _tmp4_ = g_error_new (DATABASE_ERROR, DATABASE_ERROR_ERROR, "Unable to open F-Spot database %s: %d", filename, res); #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala" @@ -453,9 +453,9 @@ DataImportsFSpotDbFSpotDatabase* data_imports_fspot_db_fspot_database_new (GFile static UtilsVersionNumber* data_imports_fspot_db_fspot_database_get_version (DataImportsFSpotDbFSpotDatabase* self, GError** error) { UtilsVersionNumber* result = NULL; gchar* _tmp0_ = NULL; - DataImportsFSpotDbFSpotMetaTable* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - UtilsVersionNumber* _tmp3_ = NULL; + DataImportsFSpotDbFSpotMetaTable* _tmp1_; + gchar* _tmp2_; + UtilsVersionNumber* _tmp3_; GError * _inner_error_ = NULL; #line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE (self), NULL); @@ -514,7 +514,7 @@ static void data_imports_fspot_db_fspot_database_instance_init (DataImportsFSpot } -static void data_imports_fspot_db_fspot_database_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_database_finalize (GObject * obj) { DataImportsFSpotDbFSpotDatabase * self; #line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE, DataImportsFSpotDbFSpotDatabase); diff --git a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c index ed13500..74516f1 100644 --- a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c +++ b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c @@ -1,4 +1,4 @@ -/* FSpotDatabaseBehavior.c generated by valac 0.34.7, the Vala compiler +/* FSpotDatabaseBehavior.c generated by valac 0.36.6, the Vala compiler * generated from FSpotDatabaseBehavior.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -340,7 +340,7 @@ DataImportsFSpotDbFSpotBehaviorEntry* data_imports_fspot_db_fspot_behavior_entry DataImportsFSpotDbFSpotBehaviorEntry* data_imports_fspot_db_fspot_behavior_entry_construct (GType object_type, UtilsVersionNumber* version, DataImportsFSpotDbFSpotTableBehavior* behavior); UtilsVersionNumber* data_imports_fspot_db_fspot_behavior_entry_get_version (DataImportsFSpotDbFSpotBehaviorEntry* self); DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_behavior_entry_get_behavior (DataImportsFSpotDbFSpotBehaviorEntry* self); -static void data_imports_fspot_db_fspot_behavior_entry_finalize (DataImportsFSpotDbFSpotBehaviorEntry* obj); +static void data_imports_fspot_db_fspot_behavior_entry_finalize (DataImportsFSpotDbFSpotBehaviorEntry * obj); GType data_imports_fspot_db_fspot_database_behavior_get_type (void) G_GNUC_CONST; GType data_imports_fspot_db_fspot_photo_row_get_type (void) G_GNUC_CONST; GType data_imports_fspot_db_fspot_tag_row_get_type (void) G_GNUC_CONST; @@ -400,7 +400,7 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photo_tags_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self); DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photo_versions_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self); DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_rolls_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self); -static void data_imports_fspot_db_fspot_database_behavior_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_database_behavior_finalize (GObject * obj); static gpointer _g_object_ref0 (gpointer self) { @@ -412,10 +412,10 @@ static gpointer _g_object_ref0 (gpointer self) { DataImportsFSpotDbFSpotBehaviorEntry* data_imports_fspot_db_fspot_behavior_entry_construct (GType object_type, UtilsVersionNumber* version, DataImportsFSpotDbFSpotTableBehavior* behavior) { DataImportsFSpotDbFSpotBehaviorEntry* self = NULL; - UtilsVersionNumber* _tmp0_ = NULL; - UtilsVersionNumber* _tmp1_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp2_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp3_ = NULL; + UtilsVersionNumber* _tmp0_; + UtilsVersionNumber* _tmp1_; + DataImportsFSpotDbFSpotTableBehavior* _tmp2_; + DataImportsFSpotDbFSpotTableBehavior* _tmp3_; #line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" g_return_val_if_fail (UTILS_IS_VERSION_NUMBER (version), NULL); #line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -453,8 +453,8 @@ DataImportsFSpotDbFSpotBehaviorEntry* data_imports_fspot_db_fspot_behavior_entry UtilsVersionNumber* data_imports_fspot_db_fspot_behavior_entry_get_version (DataImportsFSpotDbFSpotBehaviorEntry* self) { UtilsVersionNumber* result = NULL; - UtilsVersionNumber* _tmp0_ = NULL; - UtilsVersionNumber* _tmp1_ = NULL; + UtilsVersionNumber* _tmp0_; + UtilsVersionNumber* _tmp1_; #line 18 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_BEHAVIOR_ENTRY (self), NULL); #line 19 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -471,8 +471,8 @@ UtilsVersionNumber* data_imports_fspot_db_fspot_behavior_entry_get_version (Data DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_behavior_entry_get_behavior (DataImportsFSpotDbFSpotBehaviorEntry* self) { DataImportsFSpotDbFSpotTableBehavior* result = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp0_; + DataImportsFSpotDbFSpotTableBehavior* _tmp1_; #line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_BEHAVIOR_ENTRY (self), NULL); #line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -529,7 +529,7 @@ static gchar* data_imports_fspot_db_value_fspot_behavior_entry_collect_value (GV #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" if (collect_values[0].v_pointer) { #line 532 "FSpotDatabaseBehavior.c" - DataImportsFSpotDbFSpotBehaviorEntry* object; + DataImportsFSpotDbFSpotBehaviorEntry * object; object = collect_values[0].v_pointer; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" if (object->parent_instance.g_class == NULL) { @@ -556,7 +556,7 @@ static gchar* data_imports_fspot_db_value_fspot_behavior_entry_collect_value (GV static gchar* data_imports_fspot_db_value_fspot_behavior_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - DataImportsFSpotDbFSpotBehaviorEntry** object_p; + DataImportsFSpotDbFSpotBehaviorEntry ** object_p; object_p = collect_values[0].v_pointer; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" if (!object_p) { @@ -608,7 +608,7 @@ gpointer data_imports_fspot_db_value_get_fspot_behavior_entry (const GValue* val void data_imports_fspot_db_value_set_fspot_behavior_entry (GValue* value, gpointer v_object) { - DataImportsFSpotDbFSpotBehaviorEntry* old; + DataImportsFSpotDbFSpotBehaviorEntry * old; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY)); #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -639,7 +639,7 @@ void data_imports_fspot_db_value_set_fspot_behavior_entry (GValue* value, gpoint void data_imports_fspot_db_value_take_fspot_behavior_entry (GValue* value, gpointer v_object) { - DataImportsFSpotDbFSpotBehaviorEntry* old; + DataImportsFSpotDbFSpotBehaviorEntry * old; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY)); #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -687,7 +687,7 @@ static void data_imports_fspot_db_fspot_behavior_entry_instance_init (DataImport } -static void data_imports_fspot_db_fspot_behavior_entry_finalize (DataImportsFSpotDbFSpotBehaviorEntry* obj) { +static void data_imports_fspot_db_fspot_behavior_entry_finalize (DataImportsFSpotDbFSpotBehaviorEntry * obj) { DataImportsFSpotDbFSpotBehaviorEntry * self; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, DataImportsFSpotDbFSpotBehaviorEntry); @@ -716,7 +716,7 @@ GType data_imports_fspot_db_fspot_behavior_entry_get_type (void) { gpointer data_imports_fspot_db_fspot_behavior_entry_ref (gpointer instance) { - DataImportsFSpotDbFSpotBehaviorEntry* self; + DataImportsFSpotDbFSpotBehaviorEntry * self; self = instance; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" g_atomic_int_inc (&self->ref_count); @@ -727,7 +727,7 @@ gpointer data_imports_fspot_db_fspot_behavior_entry_ref (gpointer instance) { void data_imports_fspot_db_fspot_behavior_entry_unref (gpointer instance) { - DataImportsFSpotDbFSpotBehaviorEntry* self; + DataImportsFSpotDbFSpotBehaviorEntry * self; self = instance; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -741,166 +741,166 @@ void data_imports_fspot_db_fspot_behavior_entry_unref (gpointer instance) { void data_imports_fspot_db_fspot_database_behavior_create_behavior_map (void) { - GeeHashMap* _tmp0_ = NULL; + GeeHashMap* _tmp0_; GeeList* photos_list = NULL; - GeeArrayList* _tmp1_ = NULL; - gint* _tmp2_ = NULL; - gint* _tmp3_ = NULL; - gint _tmp3__length1 = 0; - UtilsVersionNumber* _tmp4_ = NULL; - UtilsVersionNumber* _tmp5_ = NULL; - DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp6_ = NULL; - DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp7_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp8_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp9_ = NULL; - gint* _tmp10_ = NULL; - gint* _tmp11_ = NULL; - gint _tmp11__length1 = 0; - UtilsVersionNumber* _tmp12_ = NULL; - UtilsVersionNumber* _tmp13_ = NULL; - DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp14_ = NULL; - DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp15_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp16_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp17_ = NULL; - gint* _tmp18_ = NULL; - gint* _tmp19_ = NULL; - gint _tmp19__length1 = 0; - UtilsVersionNumber* _tmp20_ = NULL; - UtilsVersionNumber* _tmp21_ = NULL; - DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp22_ = NULL; - DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp23_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp24_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp25_ = NULL; - gint* _tmp26_ = NULL; - gint* _tmp27_ = NULL; - gint _tmp27__length1 = 0; - UtilsVersionNumber* _tmp28_ = NULL; - UtilsVersionNumber* _tmp29_ = NULL; - DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp30_ = NULL; - DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp31_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp32_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp33_ = NULL; - gint* _tmp34_ = NULL; - gint* _tmp35_ = NULL; - gint _tmp35__length1 = 0; - UtilsVersionNumber* _tmp36_ = NULL; - UtilsVersionNumber* _tmp37_ = NULL; - DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp38_ = NULL; - DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp39_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp40_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp41_ = NULL; - gint* _tmp42_ = NULL; - gint* _tmp43_ = NULL; - gint _tmp43__length1 = 0; - UtilsVersionNumber* _tmp44_ = NULL; - UtilsVersionNumber* _tmp45_ = NULL; - DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp46_ = NULL; - DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp47_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp48_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp49_ = NULL; - gint* _tmp50_ = NULL; - gint* _tmp51_ = NULL; - gint _tmp51__length1 = 0; - UtilsVersionNumber* _tmp52_ = NULL; - UtilsVersionNumber* _tmp53_ = NULL; - DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp54_ = NULL; - DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp55_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp56_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp57_ = NULL; - GeeMap* _tmp58_ = NULL; + GeeArrayList* _tmp1_; + gint* _tmp2_; + gint* _tmp3_; + gint _tmp3__length1; + UtilsVersionNumber* _tmp4_; + UtilsVersionNumber* _tmp5_; + DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp6_; + DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp7_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp8_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp9_; + gint* _tmp10_; + gint* _tmp11_; + gint _tmp11__length1; + UtilsVersionNumber* _tmp12_; + UtilsVersionNumber* _tmp13_; + DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp14_; + DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp15_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp16_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp17_; + gint* _tmp18_; + gint* _tmp19_; + gint _tmp19__length1; + UtilsVersionNumber* _tmp20_; + UtilsVersionNumber* _tmp21_; + DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp22_; + DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp23_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp24_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp25_; + gint* _tmp26_; + gint* _tmp27_; + gint _tmp27__length1; + UtilsVersionNumber* _tmp28_; + UtilsVersionNumber* _tmp29_; + DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp30_; + DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp31_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp32_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp33_; + gint* _tmp34_; + gint* _tmp35_; + gint _tmp35__length1; + UtilsVersionNumber* _tmp36_; + UtilsVersionNumber* _tmp37_; + DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp38_; + DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp39_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp40_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp41_; + gint* _tmp42_; + gint* _tmp43_; + gint _tmp43__length1; + UtilsVersionNumber* _tmp44_; + UtilsVersionNumber* _tmp45_; + DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp46_; + DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp47_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp48_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp49_; + gint* _tmp50_; + gint* _tmp51_; + gint _tmp51__length1; + UtilsVersionNumber* _tmp52_; + UtilsVersionNumber* _tmp53_; + DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp54_; + DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp55_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp56_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp57_; + GeeMap* _tmp58_; GeeList* tags_list = NULL; - GeeArrayList* _tmp59_ = NULL; - gint* _tmp60_ = NULL; - gint* _tmp61_ = NULL; - gint _tmp61__length1 = 0; - UtilsVersionNumber* _tmp62_ = NULL; - UtilsVersionNumber* _tmp63_ = NULL; - DataImportsFSpotDbFSpotTagsV0Behavior* _tmp64_ = NULL; - DataImportsFSpotDbFSpotTagsV0Behavior* _tmp65_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp66_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp67_ = NULL; - GeeMap* _tmp68_ = NULL; + GeeArrayList* _tmp59_; + gint* _tmp60_; + gint* _tmp61_; + gint _tmp61__length1; + UtilsVersionNumber* _tmp62_; + UtilsVersionNumber* _tmp63_; + DataImportsFSpotDbFSpotTagsV0Behavior* _tmp64_; + DataImportsFSpotDbFSpotTagsV0Behavior* _tmp65_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp66_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp67_; + GeeMap* _tmp68_; GeeList* photo_tags_list = NULL; - GeeArrayList* _tmp69_ = NULL; - gint* _tmp70_ = NULL; - gint* _tmp71_ = NULL; - gint _tmp71__length1 = 0; - UtilsVersionNumber* _tmp72_ = NULL; - UtilsVersionNumber* _tmp73_ = NULL; - DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp74_ = NULL; - DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp75_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp76_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp77_ = NULL; - GeeMap* _tmp78_ = NULL; + GeeArrayList* _tmp69_; + gint* _tmp70_; + gint* _tmp71_; + gint _tmp71__length1; + UtilsVersionNumber* _tmp72_; + UtilsVersionNumber* _tmp73_; + DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp74_; + DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp75_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp76_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp77_; + GeeMap* _tmp78_; GeeList* photo_versions_list = NULL; - GeeArrayList* _tmp79_ = NULL; - gint* _tmp80_ = NULL; - gint* _tmp81_ = NULL; - gint _tmp81__length1 = 0; - UtilsVersionNumber* _tmp82_ = NULL; - UtilsVersionNumber* _tmp83_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp84_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp85_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp86_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp87_ = NULL; - gint* _tmp88_ = NULL; - gint* _tmp89_ = NULL; - gint _tmp89__length1 = 0; - UtilsVersionNumber* _tmp90_ = NULL; - UtilsVersionNumber* _tmp91_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp92_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp93_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp94_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp95_ = NULL; - gint* _tmp96_ = NULL; - gint* _tmp97_ = NULL; - gint _tmp97__length1 = 0; - UtilsVersionNumber* _tmp98_ = NULL; - UtilsVersionNumber* _tmp99_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp100_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp101_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp102_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp103_ = NULL; - gint* _tmp104_ = NULL; - gint* _tmp105_ = NULL; - gint _tmp105__length1 = 0; - UtilsVersionNumber* _tmp106_ = NULL; - UtilsVersionNumber* _tmp107_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp108_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp109_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp110_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp111_ = NULL; - gint* _tmp112_ = NULL; - gint* _tmp113_ = NULL; - gint _tmp113__length1 = 0; - UtilsVersionNumber* _tmp114_ = NULL; - UtilsVersionNumber* _tmp115_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp116_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp117_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp118_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp119_ = NULL; - GeeMap* _tmp120_ = NULL; + GeeArrayList* _tmp79_; + gint* _tmp80_; + gint* _tmp81_; + gint _tmp81__length1; + UtilsVersionNumber* _tmp82_; + UtilsVersionNumber* _tmp83_; + DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp84_; + DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp85_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp86_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp87_; + gint* _tmp88_; + gint* _tmp89_; + gint _tmp89__length1; + UtilsVersionNumber* _tmp90_; + UtilsVersionNumber* _tmp91_; + DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp92_; + DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp93_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp94_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp95_; + gint* _tmp96_; + gint* _tmp97_; + gint _tmp97__length1; + UtilsVersionNumber* _tmp98_; + UtilsVersionNumber* _tmp99_; + DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp100_; + DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp101_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp102_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp103_; + gint* _tmp104_; + gint* _tmp105_; + gint _tmp105__length1; + UtilsVersionNumber* _tmp106_; + UtilsVersionNumber* _tmp107_; + DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp108_; + DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp109_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp110_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp111_; + gint* _tmp112_; + gint* _tmp113_; + gint _tmp113__length1; + UtilsVersionNumber* _tmp114_; + UtilsVersionNumber* _tmp115_; + DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp116_; + DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp117_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp118_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp119_; + GeeMap* _tmp120_; GeeList* rolls_list = NULL; - GeeArrayList* _tmp121_ = NULL; - gint* _tmp122_ = NULL; - gint* _tmp123_ = NULL; - gint _tmp123__length1 = 0; - UtilsVersionNumber* _tmp124_ = NULL; - UtilsVersionNumber* _tmp125_ = NULL; - DataImportsFSpotDbFSpotRollsV0Behavior* _tmp126_ = NULL; - DataImportsFSpotDbFSpotRollsV0Behavior* _tmp127_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp128_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp129_ = NULL; - gint* _tmp130_ = NULL; - gint* _tmp131_ = NULL; - gint _tmp131__length1 = 0; - UtilsVersionNumber* _tmp132_ = NULL; - UtilsVersionNumber* _tmp133_ = NULL; - DataImportsFSpotDbFSpotRollsV5Behavior* _tmp134_ = NULL; - DataImportsFSpotDbFSpotRollsV5Behavior* _tmp135_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp136_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp137_ = NULL; - GeeMap* _tmp138_ = NULL; + GeeArrayList* _tmp121_; + gint* _tmp122_; + gint* _tmp123_; + gint _tmp123__length1; + UtilsVersionNumber* _tmp124_; + UtilsVersionNumber* _tmp125_; + DataImportsFSpotDbFSpotRollsV0Behavior* _tmp126_; + DataImportsFSpotDbFSpotRollsV0Behavior* _tmp127_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp128_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp129_; + gint* _tmp130_; + gint* _tmp131_; + gint _tmp131__length1; + UtilsVersionNumber* _tmp132_; + UtilsVersionNumber* _tmp133_; + DataImportsFSpotDbFSpotRollsV5Behavior* _tmp134_; + DataImportsFSpotDbFSpotRollsV5Behavior* _tmp135_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp136_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp137_; + GeeMap* _tmp138_; #line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1445,10 +1445,10 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav DataImportsFSpotDbFSpotTableBehavior* result = NULL; DataImportsFSpotDbFSpotTableBehavior* behavior = NULL; GeeList* behavior_list = NULL; - GeeMap* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; - GeeList* _tmp3_ = NULL; + GeeMap* _tmp0_; + const gchar* _tmp1_; + gpointer _tmp2_; + GeeList* _tmp3_; #line 146 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" g_return_val_if_fail (table_name != NULL, NULL); #line 146 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1470,12 +1470,12 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav #line 1471 "FSpotDatabaseBehavior.c" { GeeList* _entry_list = NULL; - GeeList* _tmp4_ = NULL; - GeeList* _tmp5_ = NULL; + GeeList* _tmp4_; + GeeList* _tmp5_; gint _entry_size = 0; - GeeList* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; + GeeList* _tmp6_; + gint _tmp7_; + gint _tmp8_; gint _entry_index = 0; #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" _tmp4_ = behavior_list; @@ -1496,19 +1496,19 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" while (TRUE) { #line 1499 "FSpotDatabaseBehavior.c" - gint _tmp9_ = 0; - gint _tmp10_ = 0; - gint _tmp11_ = 0; + gint _tmp9_; + gint _tmp10_; + gint _tmp11_; DataImportsFSpotDbFSpotBehaviorEntry* entry = NULL; - GeeList* _tmp12_ = NULL; - gint _tmp13_ = 0; - gpointer _tmp14_ = NULL; - UtilsVersionNumber* _tmp15_ = NULL; - DataImportsFSpotDbFSpotBehaviorEntry* _tmp16_ = NULL; - UtilsVersionNumber* _tmp17_ = NULL; - UtilsVersionNumber* _tmp18_ = NULL; - gint _tmp19_ = 0; - gboolean _tmp20_ = FALSE; + GeeList* _tmp12_; + gint _tmp13_; + gpointer _tmp14_; + UtilsVersionNumber* _tmp15_; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp16_; + UtilsVersionNumber* _tmp17_; + UtilsVersionNumber* _tmp18_; + gint _tmp19_; + gboolean _tmp20_; #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" _tmp9_ = _entry_index; #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1548,8 +1548,8 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav #line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" if (_tmp20_) { #line 1551 "FSpotDatabaseBehavior.c" - DataImportsFSpotDbFSpotBehaviorEntry* _tmp21_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp22_ = NULL; + DataImportsFSpotDbFSpotBehaviorEntry* _tmp21_; + DataImportsFSpotDbFSpotTableBehavior* _tmp22_; #line 152 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" _tmp21_ = entry; #line 152 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1569,7 +1569,7 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav #line 1570 "FSpotDatabaseBehavior.c" } } else { - const gchar* _tmp23_ = NULL; + const gchar* _tmp23_; #line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" _tmp23_ = table_name; #line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1589,34 +1589,34 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_behavior_construct (GType object_type, UtilsVersionNumber* version, GError** error) { DataImportsFSpotDbFSpotDatabaseBehavior * self = NULL; - UtilsVersionNumber* _tmp0_ = NULL; - UtilsVersionNumber* _tmp1_ = NULL; - gint _tmp2_ = 0; + UtilsVersionNumber* _tmp0_; + UtilsVersionNumber* _tmp1_; + gint _tmp2_; DataImportsFSpotDbFSpotTableBehavior* photos_generic_behavior = NULL; - UtilsVersionNumber* _tmp8_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp9_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp10_ = NULL; + UtilsVersionNumber* _tmp8_; + DataImportsFSpotDbFSpotTableBehavior* _tmp9_; + DataImportsFSpotDbFSpotTableBehavior* _tmp10_; DataImportsFSpotDbFSpotTableBehavior* tags_generic_behavior = NULL; - UtilsVersionNumber* _tmp13_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp14_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp15_ = NULL; + UtilsVersionNumber* _tmp13_; + DataImportsFSpotDbFSpotTableBehavior* _tmp14_; + DataImportsFSpotDbFSpotTableBehavior* _tmp15_; DataImportsFSpotDbFSpotTableBehavior* photo_tags_generic_behavior = NULL; - UtilsVersionNumber* _tmp18_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp19_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp20_ = NULL; + UtilsVersionNumber* _tmp18_; + DataImportsFSpotDbFSpotTableBehavior* _tmp19_; + DataImportsFSpotDbFSpotTableBehavior* _tmp20_; DataImportsFSpotDbFSpotTableBehavior* photo_versions_generic_behavior = NULL; - UtilsVersionNumber* _tmp23_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp24_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp25_ = NULL; + UtilsVersionNumber* _tmp23_; + DataImportsFSpotDbFSpotTableBehavior* _tmp24_; + DataImportsFSpotDbFSpotTableBehavior* _tmp25_; DataImportsFSpotDbFSpotTableBehavior* rolls_generic_behavior = NULL; - UtilsVersionNumber* _tmp28_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp29_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp30_ = NULL; + UtilsVersionNumber* _tmp28_; + DataImportsFSpotDbFSpotTableBehavior* _tmp29_; + DataImportsFSpotDbFSpotTableBehavior* _tmp30_; gboolean _tmp33_ = FALSE; gboolean _tmp34_ = FALSE; gboolean _tmp35_ = FALSE; gboolean _tmp36_ = FALSE; - DataImportsFSpotDbFSpotTableBehavior* _tmp37_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp37_; GError * _inner_error_ = NULL; #line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" g_return_val_if_fail (UTILS_IS_VERSION_NUMBER (version), NULL); @@ -1631,11 +1631,11 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be #line 160 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" if (_tmp2_ >= 0) { #line 1633 "FSpotDatabaseBehavior.c" - UtilsVersionNumber* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - GError* _tmp6_ = NULL; - GError* _tmp7_ = NULL; + UtilsVersionNumber* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + GError* _tmp6_; + GError* _tmp7_; #line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" _tmp3_ = version; #line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1680,8 +1680,8 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be #line 164 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" if (_tmp10_ != NULL) { #line 1682 "FSpotDatabaseBehavior.c" - DataImportsFSpotDbFSpotTableBehavior* _tmp11_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp12_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp11_; + DataImportsFSpotDbFSpotTableBehavior* _tmp12_; #line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" _tmp11_ = photos_generic_behavior; #line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1703,8 +1703,8 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" if (_tmp15_ != NULL) { #line 1705 "FSpotDatabaseBehavior.c" - DataImportsFSpotDbFSpotTableBehavior* _tmp16_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp17_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp16_; + DataImportsFSpotDbFSpotTableBehavior* _tmp17_; #line 168 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" _tmp16_ = tags_generic_behavior; #line 168 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1726,8 +1726,8 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be #line 170 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" if (_tmp20_ != NULL) { #line 1728 "FSpotDatabaseBehavior.c" - DataImportsFSpotDbFSpotTableBehavior* _tmp21_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp22_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp21_; + DataImportsFSpotDbFSpotTableBehavior* _tmp22_; #line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" _tmp21_ = photo_tags_generic_behavior; #line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1749,8 +1749,8 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be #line 173 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" if (_tmp25_ != NULL) { #line 1751 "FSpotDatabaseBehavior.c" - DataImportsFSpotDbFSpotTableBehavior* _tmp26_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp27_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp26_; + DataImportsFSpotDbFSpotTableBehavior* _tmp27_; #line 174 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" _tmp26_ = photo_versions_generic_behavior; #line 174 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1772,8 +1772,8 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be #line 176 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" if (_tmp30_ != NULL) { #line 1774 "FSpotDatabaseBehavior.c" - DataImportsFSpotDbFSpotTableBehavior* _tmp31_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp32_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp31_; + DataImportsFSpotDbFSpotTableBehavior* _tmp32_; #line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" _tmp31_ = rolls_generic_behavior; #line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1792,7 +1792,7 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be _tmp36_ = TRUE; #line 1793 "FSpotDatabaseBehavior.c" } else { - DataImportsFSpotDbFSpotTableBehavior* _tmp38_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp38_; #line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" _tmp38_ = self->priv->tags_behavior; #line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1805,7 +1805,7 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be _tmp35_ = TRUE; #line 1806 "FSpotDatabaseBehavior.c" } else { - DataImportsFSpotDbFSpotTableBehavior* _tmp39_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp39_; #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" _tmp39_ = self->priv->photo_tags_behavior; #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1818,7 +1818,7 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be _tmp34_ = TRUE; #line 1819 "FSpotDatabaseBehavior.c" } else { - DataImportsFSpotDbFSpotTableBehavior* _tmp40_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp40_; #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" _tmp40_ = self->priv->photo_versions_behavior; #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1831,7 +1831,7 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be _tmp33_ = TRUE; #line 1832 "FSpotDatabaseBehavior.c" } else { - DataImportsFSpotDbFSpotTableBehavior* _tmp41_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp41_; #line 181 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" _tmp41_ = self->priv->rolls_behavior; #line 181 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1841,11 +1841,11 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be #line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" if (_tmp33_) { #line 1843 "FSpotDatabaseBehavior.c" - UtilsVersionNumber* _tmp42_ = NULL; - gchar* _tmp43_ = NULL; - gchar* _tmp44_ = NULL; - GError* _tmp45_ = NULL; - GError* _tmp46_ = NULL; + UtilsVersionNumber* _tmp42_; + gchar* _tmp43_; + gchar* _tmp44_; + GError* _tmp45_; + GError* _tmp46_; #line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" _tmp42_ = version; #line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1924,8 +1924,8 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photos_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self) { DataImportsFSpotDbFSpotTableBehavior* result = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp0_; + DataImportsFSpotDbFSpotTableBehavior* _tmp1_; #line 186 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (self), NULL); #line 187 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1942,8 +1942,8 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_tags_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self) { DataImportsFSpotDbFSpotTableBehavior* result = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp0_; + DataImportsFSpotDbFSpotTableBehavior* _tmp1_; #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (self), NULL); #line 191 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1960,8 +1960,8 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photo_tags_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self) { DataImportsFSpotDbFSpotTableBehavior* result = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp0_; + DataImportsFSpotDbFSpotTableBehavior* _tmp1_; #line 194 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (self), NULL); #line 195 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1978,8 +1978,8 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photo_versions_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self) { DataImportsFSpotDbFSpotTableBehavior* result = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp0_; + DataImportsFSpotDbFSpotTableBehavior* _tmp1_; #line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (self), NULL); #line 199 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1996,8 +1996,8 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_rolls_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self) { DataImportsFSpotDbFSpotTableBehavior* result = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp0_; + DataImportsFSpotDbFSpotTableBehavior* _tmp1_; #line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (self), NULL); #line 203 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -2013,10 +2013,10 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav static void data_imports_fspot_db_fspot_database_behavior_class_init (DataImportsFSpotDbFSpotDatabaseBehaviorClass * klass) { - gint* _tmp0_ = NULL; - gint* _tmp1_ = NULL; - gint _tmp1__length1 = 0; - UtilsVersionNumber* _tmp2_ = NULL; + gint* _tmp0_; + gint* _tmp1_; + gint _tmp1__length1; + UtilsVersionNumber* _tmp2_; #line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" data_imports_fspot_db_fspot_database_behavior_parent_class = g_type_class_peek_parent (klass); #line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -2046,7 +2046,7 @@ static void data_imports_fspot_db_fspot_database_behavior_instance_init (DataImp } -static void data_imports_fspot_db_fspot_database_behavior_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_database_behavior_finalize (GObject * obj) { DataImportsFSpotDbFSpotDatabaseBehavior * self; #line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehavior); diff --git a/plugins/shotwell-data-imports/FSpotDatabaseTable.c b/plugins/shotwell-data-imports/FSpotDatabaseTable.c index 1583846..129b3c7 100644 --- a/plugins/shotwell-data-imports/FSpotDatabaseTable.c +++ b/plugins/shotwell-data-imports/FSpotDatabaseTable.c @@ -1,4 +1,4 @@ -/* FSpotDatabaseTable.c generated by valac 0.34.7, the Vala compiler +/* FSpotDatabaseTable.c generated by valac 0.36.6, the Vala compiler * generated from FSpotDatabaseTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -117,16 +117,16 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_table gchar* data_imports_fspot_db_fspot_database_table_get_joined_column_list (DataImportsFSpotDbFSpotDatabaseTable* self, gboolean with_table); gchar** data_imports_fspot_db_fspot_table_behavior_list_columns (DataImportsFSpotDbFSpotTableBehavior* self, int* result_length1); GQuark database_error_quark (void); -gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFSpotDatabaseTable* self, sqlite3_stmt** stmt, GError** error); +gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFSpotDatabaseTable* self, sqlite3_stmt* * stmt, GError** error); void importable_database_table_throw_error (const gchar* method, gint res, GError** error); -static void data_imports_fspot_db_fspot_database_table_finalize (ImportableDatabaseTable* obj); +static void data_imports_fspot_db_fspot_database_table_finalize (ImportableDatabaseTable * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); DataImportsFSpotDbFSpotDatabaseTable* data_imports_fspot_db_fspot_database_table_construct (GType object_type, GType t_type, GBoxedCopyFunc t_dup_func, GDestroyNotify t_destroy_func, sqlite3* db) { DataImportsFSpotDbFSpotDatabaseTable* self = NULL; - sqlite3* _tmp0_ = NULL; + sqlite3* _tmp0_; #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" g_return_val_if_fail (db != NULL, NULL); #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" @@ -155,11 +155,11 @@ static gpointer _g_object_ref0 (gpointer self) { void data_imports_fspot_db_fspot_database_table_set_behavior (DataImportsFSpotDbFSpotDatabaseTable* self, DataImportsFSpotDbFSpotTableBehavior* behavior) { - DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp1_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp0_; + DataImportsFSpotDbFSpotTableBehavior* _tmp1_; + DataImportsFSpotDbFSpotTableBehavior* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" g_return_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE (self)); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" @@ -188,8 +188,8 @@ void data_imports_fspot_db_fspot_database_table_set_behavior (DataImportsFSpotDb DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_table_get_behavior (DataImportsFSpotDbFSpotDatabaseTable* self) { DataImportsFSpotDbFSpotTableBehavior* result = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp0_; + DataImportsFSpotDbFSpotTableBehavior* _tmp1_; #line 25 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE (self), NULL); #line 26 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" @@ -206,408 +206,408 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_table static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; - gchar** _tmp3_ = NULL; - gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp3_; + gint _tmp3__length1; +#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" separator = ""; #line 221 "FSpotDatabaseTable.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = TRUE; #line 231 "FSpotDatabaseTable.c" } else { - gchar** _tmp4_ = NULL; - gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp4_; + gint _tmp4__length1; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; #line 241 "FSpotDatabaseTable.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = TRUE; #line 247 "FSpotDatabaseTable.c" } else { gboolean _tmp5_ = FALSE; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp6_; + gint _tmp6__length1; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { #line 258 "FSpotDatabaseTable.c" - gchar** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp7_; + gint _tmp7__length1; + const gchar* _tmp8_; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; #line 270 "FSpotDatabaseTable.c" } else { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = FALSE; #line 274 "FSpotDatabaseTable.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; #line 278 "FSpotDatabaseTable.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_) { #line 282 "FSpotDatabaseTable.c" gint i = 0; gsize len = 0UL; - gint _tmp31_ = 0; - gint _tmp33_ = 0; - gint _tmp34_ = 0; - gsize _tmp35_ = 0UL; - const gchar* _tmp36_ = NULL; - gint _tmp37_ = 0; - gint _tmp38_ = 0; - gint _tmp39_ = 0; + gint _tmp31_; + gint _tmp33_; + gint _tmp34_; + gsize _tmp35_; + const gchar* _tmp36_; + gint _tmp37_; + gint _tmp38_; + gint _tmp39_; const gchar* res = NULL; - gsize _tmp40_ = 0UL; - void* _tmp41_ = NULL; + gsize _tmp40_; + void* _tmp41_; void* ptr = NULL; - const gchar* _tmp42_ = NULL; - gchar** _tmp43_ = NULL; - gint _tmp43__length1 = 0; - const gchar* _tmp44_ = NULL; - void* _tmp45_ = NULL; - const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp42_; + gchar** _tmp43_; + gint _tmp43__length1; + const gchar* _tmp44_; + void* _tmp45_; + const gchar* _tmp62_; +#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = (gsize) 1; #line 305 "FSpotDatabaseTable.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { #line 314 "FSpotDatabaseTable.c" gboolean _tmp11_ = FALSE; gboolean _tmp12_ = FALSE; - gchar** _tmp13_ = NULL; - gint _tmp13__length1 = 0; + gchar** _tmp13_; + gint _tmp13__length1; gint _tmp21_ = 0; - gchar** _tmp22_ = NULL; - gint _tmp22__length1 = 0; - gint _tmp23_ = 0; - const gchar* _tmp24_ = NULL; - gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp22_; + gint _tmp22__length1; + gint _tmp23_; + const gchar* _tmp24_; + gsize _tmp30_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp9_) { #line 327 "FSpotDatabaseTable.c" - gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint _tmp10_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp10_ + 1; #line 333 "FSpotDatabaseTable.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { #line 343 "FSpotDatabaseTable.c" - gint _tmp14_ = 0; - gchar** _tmp15_ = NULL; - gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint _tmp14_; + gchar** _tmp15_; + gint _tmp15__length1; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; #line 355 "FSpotDatabaseTable.c" } else { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 359 "FSpotDatabaseTable.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = TRUE; #line 365 "FSpotDatabaseTable.c" } else { gboolean _tmp16_ = FALSE; - gchar** _tmp17_ = NULL; - gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp17_; + gint _tmp17__length1; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { #line 376 "FSpotDatabaseTable.c" - gchar** _tmp18_ = NULL; - gint _tmp18__length1 = 0; - gint _tmp19_ = 0; - const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp18_; + gint _tmp18__length1; + gint _tmp19_; + const gchar* _tmp20_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; #line 391 "FSpotDatabaseTable.c" } else { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = FALSE; #line 395 "FSpotDatabaseTable.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; #line 399 "FSpotDatabaseTable.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" break; #line 405 "FSpotDatabaseTable.c" } -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { #line 417 "FSpotDatabaseTable.c" - gchar** _tmp25_ = NULL; - gint _tmp25__length1 = 0; - gint _tmp26_ = 0; - const gchar* _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp25_; + gint _tmp25__length1; + gint _tmp26_; + const gchar* _tmp27_; + gint _tmp28_; + gint _tmp29_; +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; #line 438 "FSpotDatabaseTable.c" } else { -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = 0; #line 442 "FSpotDatabaseTable.c" } -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; #line 448 "FSpotDatabaseTable.c" } } -#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { #line 455 "FSpotDatabaseTable.c" - gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp32_; +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 463 "FSpotDatabaseTable.c" } -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp45_; #line 501 "FSpotDatabaseTable.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { #line 510 "FSpotDatabaseTable.c" - gint _tmp48_ = 0; - gchar** _tmp49_ = NULL; - gint _tmp49__length1 = 0; - void* _tmp50_ = NULL; - const gchar* _tmp51_ = NULL; - void* _tmp52_ = NULL; + gint _tmp48_; + gchar** _tmp49_; + gint _tmp49__length1; + void* _tmp50_; + const gchar* _tmp51_; + void* _tmp52_; const gchar* _tmp53_ = NULL; - gchar** _tmp54_ = NULL; - gint _tmp54__length1 = 0; - gint _tmp55_ = 0; - const gchar* _tmp56_ = NULL; - void* _tmp60_ = NULL; - void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp54_; + gint _tmp54__length1; + gint _tmp55_; + const gchar* _tmp56_; + void* _tmp60_; + void* _tmp61_; +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp46_) { #line 526 "FSpotDatabaseTable.c" - gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint _tmp47_; +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp47_ + 1; #line 532 "FSpotDatabaseTable.c" } -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" break; #line 546 "FSpotDatabaseTable.c" } -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { #line 566 "FSpotDatabaseTable.c" - gchar** _tmp57_ = NULL; - gint _tmp57__length1 = 0; - gint _tmp58_ = 0; - const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp57_; + gint _tmp57__length1; + gint _tmp58_; + const gchar* _tmp59_; +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; #line 581 "FSpotDatabaseTable.c" } else { -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = ""; #line 585 "FSpotDatabaseTable.c" } -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp61_; #line 593 "FSpotDatabaseTable.c" } } -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 604 "FSpotDatabaseTable.c" } else { - gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp63_; +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 613 "FSpotDatabaseTable.c" } @@ -617,15 +617,15 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gchar* data_imports_fspot_db_fspot_database_table_get_joined_column_list (DataImportsFSpotDbFSpotDatabaseTable* self, gboolean with_table) { gchar* result = NULL; gchar** columns = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL; - gint _tmp1_ = 0; - gchar** _tmp2_ = NULL; - gint columns_length1 = 0; - gint _columns_size_ = 0; - gboolean _tmp3_ = FALSE; - gchar** _tmp16_ = NULL; - gint _tmp16__length1 = 0; - gchar* _tmp17_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp0_; + gint _tmp1_; + gchar** _tmp2_; + gint columns_length1; + gint _columns_size_; + gboolean _tmp3_; + gchar** _tmp16_; + gint _tmp16__length1; + gchar* _tmp17_; #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE (self), NULL); #line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" @@ -655,23 +655,23 @@ gchar* data_imports_fspot_db_fspot_database_table_get_joined_column_list (DataIm #line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" while (TRUE) { #line 658 "FSpotDatabaseTable.c" - gint _tmp6_ = 0; - gchar** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - gchar** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - gint _tmp9_ = 0; - const gchar* _tmp10_ = NULL; - gchar** _tmp11_ = NULL; - gint _tmp11__length1 = 0; - gint _tmp12_ = 0; - const gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; + gint _tmp6_; + gchar** _tmp7_; + gint _tmp7__length1; + gchar** _tmp8_; + gint _tmp8__length1; + gint _tmp9_; + const gchar* _tmp10_; + gchar** _tmp11_; + gint _tmp11__length1; + gint _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; #line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" if (!_tmp4_) { #line 674 "FSpotDatabaseTable.c" - gint _tmp5_ = 0; + gint _tmp5_; #line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" _tmp5_ = i; #line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" @@ -737,25 +737,25 @@ gchar* data_imports_fspot_db_fspot_database_table_get_joined_column_list (DataIm } -gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFSpotDatabaseTable* self, sqlite3_stmt** stmt, GError** error) { +gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFSpotDatabaseTable* self, sqlite3_stmt* * stmt, GError** error) { sqlite3_stmt* _vala_stmt = NULL; gint result = 0; gchar* column_list = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; gchar* sql = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + const gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; gint res = 0; - sqlite3* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; + sqlite3* _tmp4_; + const gchar* _tmp5_; sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - sqlite3_stmt* _tmp15_ = NULL; - gint _tmp16_ = 0; + gint _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp15_; + gint _tmp16_; gboolean _tmp17_ = FALSE; - gint _tmp18_ = 0; + gint _tmp18_; GError * _inner_error_ = NULL; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE (self), 0); @@ -788,10 +788,10 @@ gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFS #line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" if (_tmp8_ != SQLITE_OK) { #line 791 "FSpotDatabaseTable.c" - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gint _tmp12_ = 0; + const gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + gint _tmp12_; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" _tmp9_ = sql; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" @@ -846,7 +846,7 @@ gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFS #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" if (_tmp18_ != SQLITE_ROW) { #line 849 "FSpotDatabaseTable.c" - gint _tmp19_ = 0; + gint _tmp19_; #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" _tmp19_ = res; #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" @@ -860,11 +860,11 @@ gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFS #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" if (_tmp17_) { #line 863 "FSpotDatabaseTable.c" - const gchar* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - gint _tmp24_ = 0; + const gchar* _tmp20_; + const gchar* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + gint _tmp24_; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" _tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable)->table_name; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" @@ -950,7 +950,7 @@ static void data_imports_fspot_db_fspot_database_table_instance_init (DataImport } -static void data_imports_fspot_db_fspot_database_table_finalize (ImportableDatabaseTable* obj) { +static void data_imports_fspot_db_fspot_database_table_finalize (ImportableDatabaseTable * obj) { DataImportsFSpotDbFSpotDatabaseTable * self; #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable); diff --git a/plugins/shotwell-data-imports/FSpotImporter.c b/plugins/shotwell-data-imports/FSpotImporter.c index c0fc03a..cc05c99 100644 --- a/plugins/shotwell-data-imports/FSpotImporter.c +++ b/plugins/shotwell-data-imports/FSpotImporter.c @@ -1,4 +1,4 @@ -/* FSpotImporter.c generated by valac 0.34.7, the Vala compiler +/* FSpotImporter.c generated by valac 0.36.6, the Vala compiler * generated from FSpotImporter.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -422,21 +422,21 @@ static gint fspot_service_icon_pixbuf_set_length1; static GdkPixbuf** fspot_service_icon_pixbuf_set = NULL; static gint fspot_service_icon_pixbuf_set_length1 = 0; static gint _fspot_service_icon_pixbuf_set_size_ = 0; -static SpitPluggableIface* fspot_service_spit_pluggable_parent_iface = NULL; -static SpitDataImportsServiceIface* fspot_service_spit_data_imports_service_parent_iface = NULL; +static SpitPluggableIface * fspot_service_spit_pluggable_parent_iface = NULL; +static SpitDataImportsServiceIface * fspot_service_spit_data_imports_service_parent_iface = NULL; static gpointer data_imports_fspot_fspot_importable_library_parent_class = NULL; -static SpitDataImportsImportableLibraryIface* data_imports_fspot_fspot_importable_library_spit_data_imports_importable_library_parent_iface = NULL; +static SpitDataImportsImportableLibraryIface * data_imports_fspot_fspot_importable_library_spit_data_imports_importable_library_parent_iface = NULL; static gpointer data_imports_fspot_fspot_importable_item_parent_class = NULL; -static SpitDataImportsImportableMediaItemIface* data_imports_fspot_fspot_importable_item_spit_data_imports_importable_media_item_parent_iface = NULL; +static SpitDataImportsImportableMediaItemIface * data_imports_fspot_fspot_importable_item_spit_data_imports_importable_media_item_parent_iface = NULL; static gpointer data_imports_fspot_fspot_importable_tag_parent_class = NULL; -static SpitDataImportsImportableTagIface* data_imports_fspot_fspot_importable_tag_spit_data_imports_importable_tag_parent_iface = NULL; +static SpitDataImportsImportableTagIface * data_imports_fspot_fspot_importable_tag_spit_data_imports_importable_tag_parent_iface = NULL; static gpointer data_imports_fspot_fspot_importable_event_parent_class = NULL; -static SpitDataImportsImportableEventIface* data_imports_fspot_fspot_importable_event_spit_data_imports_importable_event_parent_iface = NULL; +static SpitDataImportsImportableEventIface * data_imports_fspot_fspot_importable_event_spit_data_imports_importable_event_parent_iface = NULL; static gpointer data_imports_fspot_fspot_importable_rating_parent_class = NULL; -static SpitDataImportsImportableRatingIface* data_imports_fspot_fspot_importable_rating_spit_data_imports_importable_rating_parent_iface = NULL; +static SpitDataImportsImportableRatingIface * data_imports_fspot_fspot_importable_rating_spit_data_imports_importable_rating_parent_iface = NULL; static gpointer data_imports_fspot_fspot_tags_cache_parent_class = NULL; static gpointer data_imports_fspot_fspot_data_importer_parent_class = NULL; -static SpitDataImportsDataImporterIface* data_imports_fspot_fspot_data_importer_spit_data_imports_data_importer_parent_iface = NULL; +static SpitDataImportsDataImporterIface * data_imports_fspot_fspot_data_importer_spit_data_imports_data_importer_parent_iface = NULL; GType fspot_service_get_type (void) G_GNUC_CONST; enum { @@ -456,7 +456,7 @@ static SpitDataImportsDataImporter* fspot_service_real_create_data_importer (Spi DataImportsFSpotFSpotDataImporter* data_imports_fspot_fspot_data_importer_new (SpitDataImportsService* service, SpitDataImportsPluginHost* host); DataImportsFSpotFSpotDataImporter* data_imports_fspot_fspot_data_importer_construct (GType object_type, SpitDataImportsService* service, SpitDataImportsPluginHost* host); GType data_imports_fspot_fspot_data_importer_get_type (void) G_GNUC_CONST; -static void fspot_service_finalize (GObject* obj); +static void fspot_service_finalize (GObject * obj); #define DATA_IMPORTS_FSPOT_SERVICE_NAME "F-Spot" #define DATA_IMPORTS_FSPOT_SERVICE_WELCOME_MESSAGE _ ("Welcome to the F-Spot library import service.\n" \ "\n" \ @@ -489,7 +489,7 @@ DataImportsFSpotFSpotImportableLibrary* data_imports_fspot_fspot_importable_libr DataImportsFSpotFSpotImportableLibrary* data_imports_fspot_fspot_importable_library_construct (GType object_type, GFile* db_file); GFile* data_imports_fspot_fspot_importable_library_get_db_file (DataImportsFSpotFSpotImportableLibrary* self); static gchar* data_imports_fspot_fspot_importable_library_real_get_display_name (SpitDataImportsImportableLibrary* base); -static void data_imports_fspot_fspot_importable_library_finalize (GObject* obj); +static void data_imports_fspot_fspot_importable_library_finalize (GObject * obj); GType data_imports_fspot_fspot_importable_item_get_type (void) G_GNUC_CONST; GType data_imports_fspot_db_fspot_photo_row_get_type (void) G_GNUC_CONST; GType data_imports_fspot_db_fspot_photo_version_row_get_type (void) G_GNUC_CONST; @@ -511,14 +511,14 @@ DataImportsFSpotFSpotImportableRating* data_imports_fspot_fspot_importable_ratin #define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_UNRATED 0 static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFSpotFSpotImportableItem* self, const gchar* url); static SpitDataImportsImportableTag** data_imports_fspot_fspot_importable_item_real_get_tags (SpitDataImportsImportableMediaItem* base, int* result_length1); -static void _vala_array_add1 (SpitDataImportsImportableTag*** array, int* length, int* size, SpitDataImportsImportableTag* value); +static void _vala_array_add1 (SpitDataImportsImportableTag** * array, int* length, int* size, SpitDataImportsImportableTag* value); static SpitDataImportsImportableEvent* data_imports_fspot_fspot_importable_item_real_get_event (SpitDataImportsImportableMediaItem* base); static gchar* data_imports_fspot_fspot_importable_item_real_get_folder_path (SpitDataImportsImportableMediaItem* base); static gchar* data_imports_fspot_fspot_importable_item_real_get_filename (SpitDataImportsImportableMediaItem* base); static gchar* data_imports_fspot_fspot_importable_item_real_get_title (SpitDataImportsImportableMediaItem* base); static SpitDataImportsImportableRating* data_imports_fspot_fspot_importable_item_real_get_rating (SpitDataImportsImportableMediaItem* base); static time_t* data_imports_fspot_fspot_importable_item_real_get_exposure_time (SpitDataImportsImportableMediaItem* base); -static void data_imports_fspot_fspot_importable_item_finalize (GObject* obj); +static void data_imports_fspot_fspot_importable_item_finalize (GObject * obj); GType data_imports_fspot_db_fspot_tag_row_get_type (void) G_GNUC_CONST; #define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_TAG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, DataImportsFSpotFSpotImportableTagPrivate)) enum { @@ -536,13 +536,13 @@ gboolean data_imports_fspot_fspot_importable_tag_is_stock (DataImportsFSpotFSpot DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_tag_to_event (DataImportsFSpotFSpotImportableTag* self); DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_event_new (DataImportsFSpotDbFSpotTagRow* row); DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_event_construct (GType object_type, DataImportsFSpotDbFSpotTagRow* row); -static void data_imports_fspot_fspot_importable_tag_finalize (GObject* obj); +static void data_imports_fspot_fspot_importable_tag_finalize (GObject * obj); #define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_EVENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_EVENT, DataImportsFSpotFSpotImportableEventPrivate)) enum { DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_EVENT_DUMMY_PROPERTY }; static gchar* data_imports_fspot_fspot_importable_event_real_get_name (SpitDataImportsImportableEvent* base); -static void data_imports_fspot_fspot_importable_event_finalize (GObject* obj); +static void data_imports_fspot_fspot_importable_event_finalize (GObject * obj); #define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, DataImportsFSpotFSpotImportableRatingPrivate)) enum { DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_DUMMY_PROPERTY @@ -550,7 +550,7 @@ enum { static gboolean data_imports_fspot_fspot_importable_rating_real_is_rejected (SpitDataImportsImportableRating* base); static gboolean data_imports_fspot_fspot_importable_rating_real_is_unrated (SpitDataImportsImportableRating* base); static gint data_imports_fspot_fspot_importable_rating_real_get_value (SpitDataImportsImportableRating* base); -static void data_imports_fspot_fspot_importable_rating_finalize (GObject* obj); +static void data_imports_fspot_fspot_importable_rating_finalize (GObject * obj); GType data_imports_fspot_fspot_tags_cache_get_type (void) G_GNUC_CONST; gpointer importable_database_table_ref (gpointer instance); void importable_database_table_unref (gpointer instance); @@ -572,7 +572,7 @@ static gint64* _int64_dup (gint64* self); DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag (DataImportsFSpotFSpotTagsCache* self, DataImportsFSpotDbFSpotTagRow* tag_row, GError** error); static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag_from_id (DataImportsFSpotFSpotTagsCache* self, gint64 tag_id, GError** error); DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tags_table_get_by_id (DataImportsFSpotDbFSpotTagsTable* self, gint64 tag_id, GError** error); -static void data_imports_fspot_fspot_tags_cache_finalize (GObject* obj); +static void data_imports_fspot_fspot_tags_cache_finalize (GObject * obj); #define DATA_IMPORTS_FSPOT_FSPOT_DATA_IMPORTER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporterPrivate)) enum { DATA_IMPORTS_FSPOT_FSPOT_DATA_IMPORTER_DUMMY_PROPERTY @@ -582,7 +582,7 @@ static SpitDataImportsService* data_imports_fspot_fspot_data_importer_real_get_s static void data_imports_fspot_fspot_data_importer_real_start (SpitDataImportsDataImporter* base); static void data_imports_fspot_fspot_data_importer_do_discover_importable_libraries (DataImportsFSpotFSpotDataImporter* self); static void data_imports_fspot_fspot_data_importer_real_stop (SpitDataImportsDataImporter* base); -static void _vala_array_add2 (SpitDataImportsImportableLibrary*** array, int* length, int* size, SpitDataImportsImportableLibrary* value); +static void _vala_array_add2 (SpitDataImportsImportableLibrary** * array, int* length, int* size, SpitDataImportsImportableLibrary* value); static void data_imports_fspot_fspot_data_importer_real_on_library_selected (SpitDataImportsDataImporter* base, SpitDataImportsImportableLibrary* library); static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDataImportsDataImporter* base, GFile* file); GType data_imports_fspot_db_fspot_database_get_type (void) G_GNUC_CONST; @@ -595,26 +595,26 @@ GeeArrayList* data_imports_fspot_db_fspot_photos_table_get_all (DataImportsFSpot GeeArrayList* data_imports_fspot_db_fspot_tags_table_get_by_photo_id (DataImportsFSpotDbFSpotTagsTable* self, gint64 photo_id, GError** error); static gboolean data_imports_fspot_fspot_data_importer_is_tag_hidden (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag, gint64 hidden_tag_id); static gboolean data_imports_fspot_fspot_data_importer_is_tag_favorite (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag); -static void _vala_array_add3 (DataImportsFSpotFSpotImportableTag*** array, int* length, int* size, DataImportsFSpotFSpotImportableTag* value); +static void _vala_array_add3 (DataImportsFSpotFSpotImportableTag** * array, int* length, int* size, DataImportsFSpotFSpotImportableTag* value); DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_rolls_table_get_by_id (DataImportsFSpotDbFSpotRollsTable* self, gint64 roll_id, GError** error); GeeArrayList* data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id (DataImportsFSpotDbFSpotPhotoVersionsTable* self, gint64 photo_id, GError** error); -static void _vala_array_add4 (SpitDataImportsImportableMediaItem*** array, int* length, int* size, SpitDataImportsImportableMediaItem* value); -static void _vala_array_add5 (SpitDataImportsImportableMediaItem*** array, int* length, int* size, SpitDataImportsImportableMediaItem* value); -static void _vala_array_add6 (SpitDataImportsImportableMediaItem*** array, int* length, int* size, SpitDataImportsImportableMediaItem* value); +static void _vala_array_add4 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value); +static void _vala_array_add5 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value); +static void _vala_array_add6 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value); void data_imports_fspot_fspot_data_importer_on_imported_items_count (DataImportsFSpotFSpotDataImporter* self, gint imported_items_count); static void _data_imports_fspot_fspot_data_importer_on_imported_items_count_spit_data_imports_imported_items_count_callback (gint imported_items_count, gpointer self); static gboolean data_imports_fspot_fspot_data_importer_is_tag_event (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag); #define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_STOCK_ICON_EVENTS "stock_icon:emblem-event" #define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_STOCK_ICON_FAV "stock_icon:emblem-favorite" -static void data_imports_fspot_fspot_data_importer_finalize (GObject* obj); +static void data_imports_fspot_fspot_data_importer_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); FSpotService* fspot_service_construct (GType object_type, GFile* resource_directory) { FSpotService * self = NULL; - GdkPixbuf** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + GdkPixbuf** _tmp0_; + gint _tmp0__length1; #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_return_val_if_fail (G_IS_FILE (resource_directory), NULL); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -628,8 +628,8 @@ FSpotService* fspot_service_construct (GType object_type, GFile* resource_direct #line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_tmp0_ == NULL) { #line 617 "FSpotImporter.c" - gint _tmp1_ = 0; - GdkPixbuf** _tmp2_ = NULL; + gint _tmp1_; + GdkPixbuf** _tmp2_; #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp2_ = resources_load_from_resource ("/org/gnome/Shotwell/Imports/" FSPOT_SERVICE_ICON_FILENAME, &_tmp1_); #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -658,9 +658,9 @@ FSpotService* fspot_service_new (GFile* resource_directory) { static gint fspot_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) { FSpotService * self; gint result = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 21 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FSPOT_SERVICE, FSpotService); #line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -718,7 +718,7 @@ static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) { #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" for (i = 0; i < length; i++) { #line 707 "FSpotImporter.c" - GdkPixbuf* _tmp0_ = NULL; + GdkPixbuf* _tmp0_; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -733,18 +733,17 @@ static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) { static void fspot_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) { FSpotService * self; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GdkPixbuf** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - GdkPixbuf** _tmp9_ = NULL; - gint _tmp9__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + GdkPixbuf** _tmp7_; + gint _tmp7__length1; + GdkPixbuf** _tmp8_; + gint _tmp8__length1; #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FSPOT_SERVICE, FSpotService); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -756,60 +755,58 @@ static void fspot_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* #line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" (*info).authors = _tmp0_; #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp1_ = _ ("Copyright 2016 Software Freedom Conservancy Inc."); -#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp1_ = g_strdup (_ ("Copyright 2016 Software Freedom Conservancy Inc.")); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_free0 ((*info).copyright); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - (*info).copyright = _tmp2_; + (*info).copyright = _tmp1_; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp3_ = g_strdup (RESOURCES_TRANSLATORS); + _tmp2_ = g_strdup (RESOURCES_TRANSLATORS); #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_free0 ((*info).translators); #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - (*info).translators = _tmp3_; + (*info).translators = _tmp2_; #line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp4_ = g_strdup (_VERSION); + _tmp3_ = g_strdup (_VERSION); #line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_free0 ((*info).version); #line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - (*info).version = _tmp4_; + (*info).version = _tmp3_; #line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp5_ = g_strdup (RESOURCES_WEBSITE_NAME); + _tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME); #line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_free0 ((*info).website_name); #line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - (*info).website_name = _tmp5_; + (*info).website_name = _tmp4_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp6_ = g_strdup (RESOURCES_WEBSITE_URL); + _tmp5_ = g_strdup (RESOURCES_WEBSITE_URL); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_free0 ((*info).website_url); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - (*info).website_url = _tmp6_; + (*info).website_url = _tmp5_; #line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" (*info).is_license_wordwrapped = FALSE; #line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp7_ = g_strdup (RESOURCES_LICENSE); + _tmp6_ = g_strdup (RESOURCES_LICENSE); #line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_free0 ((*info).license); #line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - (*info).license = _tmp7_; + (*info).license = _tmp6_; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp8_ = fspot_service_icon_pixbuf_set; + _tmp7_ = fspot_service_icon_pixbuf_set; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp8__length1 = fspot_service_icon_pixbuf_set_length1; + _tmp7__length1 = fspot_service_icon_pixbuf_set_length1; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup1 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_); + _tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup1 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp9__length1 = _tmp8__length1; + _tmp8__length1 = _tmp7__length1; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" (*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - (*info).icons = _tmp9_; + (*info).icons = _tmp8_; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - (*info).icons_length1 = _tmp9__length1; -#line 799 "FSpotImporter.c" + (*info).icons_length1 = _tmp8__length1; +#line 796 "FSpotImporter.c" } @@ -817,15 +814,15 @@ static void fspot_service_real_activation (SpitPluggable* base, gboolean enabled FSpotService * self; #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FSPOT_SERVICE, FSpotService); -#line 807 "FSpotImporter.c" +#line 804 "FSpotImporter.c" } static SpitDataImportsDataImporter* fspot_service_real_create_data_importer (SpitDataImportsService* base, SpitDataImportsPluginHost* host) { FSpotService * self; SpitDataImportsDataImporter* result = NULL; - SpitDataImportsPluginHost* _tmp0_ = NULL; - DataImportsFSpotFSpotDataImporter* _tmp1_ = NULL; + SpitDataImportsPluginHost* _tmp0_; + DataImportsFSpotFSpotDataImporter* _tmp1_; #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FSPOT_SERVICE, FSpotService); #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -838,7 +835,7 @@ static SpitDataImportsDataImporter* fspot_service_real_create_data_importer (Spi result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORTER, SpitDataImportsDataImporter); #line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 828 "FSpotImporter.c" +#line 825 "FSpotImporter.c" } @@ -847,7 +844,7 @@ static void fspot_service_class_init (FSpotServiceClass * klass) { fspot_service_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" G_OBJECT_CLASS (klass)->finalize = fspot_service_finalize; -#line 837 "FSpotImporter.c" +#line 834 "FSpotImporter.c" } @@ -855,16 +852,16 @@ static void fspot_service_spit_pluggable_interface_init (SpitPluggableIface * if #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" fspot_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) fspot_service_real_get_pluggable_interface; + iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) fspot_service_real_get_pluggable_interface; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->get_id = (const gchar* (*)(SpitPluggable*)) fspot_service_real_get_id; + iface->get_id = (const gchar* (*) (SpitPluggable *)) fspot_service_real_get_id; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) fspot_service_real_get_pluggable_name; + iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) fspot_service_real_get_pluggable_name; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) fspot_service_real_get_info; + iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) fspot_service_real_get_info; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->activation = (void (*)(SpitPluggable*, gboolean)) fspot_service_real_activation; -#line 854 "FSpotImporter.c" + iface->activation = (void (*) (SpitPluggable *, gboolean)) fspot_service_real_activation; +#line 851 "FSpotImporter.c" } @@ -872,8 +869,8 @@ static void fspot_service_spit_data_imports_service_interface_init (SpitDataImpo #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" fspot_service_spit_data_imports_service_parent_iface = g_type_interface_peek_parent (iface); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->create_data_importer = (SpitDataImportsDataImporter* (*)(SpitDataImportsService*, SpitDataImportsPluginHost*)) fspot_service_real_create_data_importer; -#line 863 "FSpotImporter.c" + iface->create_data_importer = (SpitDataImportsDataImporter* (*) (SpitDataImportsService *, SpitDataImportsPluginHost*)) fspot_service_real_create_data_importer; +#line 860 "FSpotImporter.c" } @@ -881,13 +878,13 @@ static void fspot_service_instance_init (FSpotService * self) { } -static void fspot_service_finalize (GObject* obj) { +static void fspot_service_finalize (GObject * obj) { FSpotService * self; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FSPOT_SERVICE, FSpotService); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" G_OBJECT_CLASS (fspot_service_parent_class)->finalize (obj); -#line 877 "FSpotImporter.c" +#line 874 "FSpotImporter.c" } @@ -909,8 +906,8 @@ GType fspot_service_get_type (void) { DataImportsFSpotFSpotImportableLibrary* data_imports_fspot_fspot_importable_library_construct (GType object_type, GFile* db_file) { DataImportsFSpotFSpotImportableLibrary * self = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; #line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_return_val_if_fail (G_IS_FILE (db_file), NULL); #line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -925,21 +922,21 @@ DataImportsFSpotFSpotImportableLibrary* data_imports_fspot_fspot_importable_libr self->priv->db_file = _tmp1_; #line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return self; -#line 915 "FSpotImporter.c" +#line 912 "FSpotImporter.c" } DataImportsFSpotFSpotImportableLibrary* data_imports_fspot_fspot_importable_library_new (GFile* db_file) { #line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return data_imports_fspot_fspot_importable_library_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_LIBRARY, db_file); -#line 922 "FSpotImporter.c" +#line 919 "FSpotImporter.c" } GFile* data_imports_fspot_fspot_importable_library_get_db_file (DataImportsFSpotFSpotImportableLibrary* self) { GFile* result = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; #line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_LIBRARY (self), NULL); #line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -950,40 +947,37 @@ GFile* data_imports_fspot_fspot_importable_library_get_db_file (DataImportsFSpot result = _tmp1_; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 940 "FSpotImporter.c" +#line 937 "FSpotImporter.c" } static gchar* data_imports_fspot_fspot_importable_library_real_get_display_name (SpitDataImportsImportableLibrary* base) { DataImportsFSpotFSpotImportableLibrary * self; gchar* result = NULL; - const gchar* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #line 85 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_LIBRARY, DataImportsFSpotFSpotImportableLibrary); #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp0_ = _ ("F-Spot library: %s"); -#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp1_ = self->priv->db_file; + _tmp0_ = self->priv->db_file; #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp2_ = g_file_get_path (_tmp1_); + _tmp1_ = g_file_get_path (_tmp0_); #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp4_ = g_strdup_printf (_tmp0_, _tmp3_); + _tmp3_ = g_strdup_printf (_ ("F-Spot library: %s"), _tmp2_); #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - result = _tmp5_; + result = _tmp4_; #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 973 "FSpotImporter.c" +#line 967 "FSpotImporter.c" } @@ -994,7 +988,7 @@ static void data_imports_fspot_fspot_importable_library_class_init (DataImportsF g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotImportableLibraryPrivate)); #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_importable_library_finalize; -#line 984 "FSpotImporter.c" +#line 978 "FSpotImporter.c" } @@ -1002,19 +996,19 @@ static void data_imports_fspot_fspot_importable_library_spit_data_imports_import #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" data_imports_fspot_fspot_importable_library_spit_data_imports_importable_library_parent_iface = g_type_interface_peek_parent (iface); #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->get_display_name = (gchar* (*)(SpitDataImportsImportableLibrary*)) data_imports_fspot_fspot_importable_library_real_get_display_name; -#line 993 "FSpotImporter.c" + iface->get_display_name = (gchar* (*) (SpitDataImportsImportableLibrary *)) data_imports_fspot_fspot_importable_library_real_get_display_name; +#line 987 "FSpotImporter.c" } static void data_imports_fspot_fspot_importable_library_instance_init (DataImportsFSpotFSpotImportableLibrary * self) { #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self->priv = DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_LIBRARY_GET_PRIVATE (self); -#line 1000 "FSpotImporter.c" +#line 994 "FSpotImporter.c" } -static void data_imports_fspot_fspot_importable_library_finalize (GObject* obj) { +static void data_imports_fspot_fspot_importable_library_finalize (GObject * obj) { DataImportsFSpotFSpotImportableLibrary * self; #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_LIBRARY, DataImportsFSpotFSpotImportableLibrary); @@ -1022,7 +1016,7 @@ static void data_imports_fspot_fspot_importable_library_finalize (GObject* obj) _g_object_unref0 (self->priv->db_file); #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" G_OBJECT_CLASS (data_imports_fspot_fspot_importable_library_parent_class)->finalize (obj); -#line 1012 "FSpotImporter.c" +#line 1006 "FSpotImporter.c" } @@ -1047,17 +1041,17 @@ static DataImportsFSpotFSpotImportableTag** _vala_array_dup2 (DataImportsFSpotFS result = g_new0 (DataImportsFSpotFSpotImportableTag*, length + 1); #line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" for (i = 0; i < length; i++) { -#line 1037 "FSpotImporter.c" - DataImportsFSpotFSpotImportableTag* _tmp0_ = NULL; +#line 1031 "FSpotImporter.c" + DataImportsFSpotFSpotImportableTag* _tmp0_; #line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" result[i] = _tmp0_; -#line 1043 "FSpotImporter.c" +#line 1037 "FSpotImporter.c" } #line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 1047 "FSpotImporter.c" +#line 1041 "FSpotImporter.c" } @@ -1069,44 +1063,44 @@ static time_t* _time_t_dup (time_t* self) { memcpy (dup, self, sizeof (time_t)); #line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return dup; -#line 1059 "FSpotImporter.c" +#line 1053 "FSpotImporter.c" } static gpointer __time_t_dup0 (gpointer self) { #line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return self ? _time_t_dup (self) : NULL; -#line 1066 "FSpotImporter.c" +#line 1060 "FSpotImporter.c" } DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_construct (GType object_type, DataImportsFSpotDbFSpotPhotoRow* photo_row, DataImportsFSpotDbFSpotPhotoVersionRow* photo_version_row, DataImportsFSpotDbFSpotRollRow* roll_row, DataImportsFSpotFSpotImportableTag** tags, int tags_length1, DataImportsFSpotFSpotImportableEvent* event, gboolean is_hidden, gboolean is_favorite) { DataImportsFSpotFSpotImportableItem * self = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp2_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp3_ = NULL; - DataImportsFSpotDbFSpotRollRow* _tmp4_ = NULL; - DataImportsFSpotDbFSpotRollRow* _tmp5_ = NULL; - DataImportsFSpotFSpotImportableTag** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - DataImportsFSpotFSpotImportableTag** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - DataImportsFSpotFSpotImportableEvent* _tmp8_ = NULL; - DataImportsFSpotFSpotImportableEvent* _tmp9_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp10_ = NULL; - time_t _tmp11_ = 0; - time_t* _tmp12_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp13_ = NULL; - gint _tmp14_ = 0; + DataImportsFSpotDbFSpotPhotoRow* _tmp0_; + DataImportsFSpotDbFSpotPhotoRow* _tmp1_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp2_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp3_; + DataImportsFSpotDbFSpotRollRow* _tmp4_; + DataImportsFSpotDbFSpotRollRow* _tmp5_; + DataImportsFSpotFSpotImportableTag** _tmp6_; + gint _tmp6__length1; + DataImportsFSpotFSpotImportableTag** _tmp7_; + gint _tmp7__length1; + DataImportsFSpotFSpotImportableEvent* _tmp8_; + DataImportsFSpotFSpotImportableEvent* _tmp9_; + DataImportsFSpotDbFSpotPhotoRow* _tmp10_; + time_t _tmp11_; + time_t* _tmp12_; + DataImportsFSpotDbFSpotPhotoRow* _tmp13_; + gint _tmp14_; gchar* _tmp23_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_ = NULL; - gchar* _tmp31_ = NULL; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_; + gchar* _tmp31_; const gchar* _tmp32_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp33_ = NULL; - gchar* _tmp38_ = NULL; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp33_; + gchar* _tmp38_; gboolean _tmp39_ = FALSE; - const gchar* _tmp40_ = NULL; + const gchar* _tmp40_; #line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_ROW (photo_row), NULL); #line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -1181,10 +1175,10 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co _tmp14_ = _tmp13_->rating; #line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_tmp14_ > 0) { -#line 1171 "FSpotImporter.c" - DataImportsFSpotDbFSpotPhotoRow* _tmp15_ = NULL; - gint _tmp16_ = 0; - DataImportsFSpotFSpotImportableRating* _tmp17_ = NULL; +#line 1165 "FSpotImporter.c" + DataImportsFSpotDbFSpotPhotoRow* _tmp15_; + gint _tmp16_; + DataImportsFSpotFSpotImportableRating* _tmp17_; #line 117 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp15_ = photo_row; #line 117 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -1195,46 +1189,46 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co _g_object_unref0 (self->priv->rating); #line 117 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self->priv->rating = _tmp17_; -#line 1185 "FSpotImporter.c" +#line 1179 "FSpotImporter.c" } else { - gboolean _tmp18_ = FALSE; + gboolean _tmp18_; #line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp18_ = is_hidden; #line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_tmp18_) { -#line 1192 "FSpotImporter.c" - DataImportsFSpotFSpotImportableRating* _tmp19_ = NULL; +#line 1186 "FSpotImporter.c" + DataImportsFSpotFSpotImportableRating* _tmp19_; #line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp19_ = data_imports_fspot_fspot_importable_rating_new (DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_REJECTED); #line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (self->priv->rating); #line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self->priv->rating = _tmp19_; -#line 1200 "FSpotImporter.c" +#line 1194 "FSpotImporter.c" } else { - gboolean _tmp20_ = FALSE; + gboolean _tmp20_; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp20_ = is_favorite; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_tmp20_) { -#line 1207 "FSpotImporter.c" - DataImportsFSpotFSpotImportableRating* _tmp21_ = NULL; +#line 1201 "FSpotImporter.c" + DataImportsFSpotFSpotImportableRating* _tmp21_; #line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp21_ = data_imports_fspot_fspot_importable_rating_new (5); #line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (self->priv->rating); #line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self->priv->rating = _tmp21_; -#line 1215 "FSpotImporter.c" +#line 1209 "FSpotImporter.c" } else { - DataImportsFSpotFSpotImportableRating* _tmp22_ = NULL; + DataImportsFSpotFSpotImportableRating* _tmp22_; #line 123 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp22_ = data_imports_fspot_fspot_importable_rating_new (DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_UNRATED); #line 123 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (self->priv->rating); #line 123 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self->priv->rating = _tmp22_; -#line 1224 "FSpotImporter.c" +#line 1218 "FSpotImporter.c" } } } @@ -1242,10 +1236,10 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co _tmp24_ = photo_version_row; #line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_tmp24_ != NULL) { -#line 1232 "FSpotImporter.c" - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp25_ = NULL; - GFile* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; +#line 1226 "FSpotImporter.c" + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp25_; + GFile* _tmp26_; + gchar* _tmp27_; #line 127 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp25_ = photo_version_row; #line 127 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -1256,11 +1250,11 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co _g_free0 (_tmp23_); #line 127 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp23_ = _tmp27_; -#line 1246 "FSpotImporter.c" +#line 1240 "FSpotImporter.c" } else { - DataImportsFSpotDbFSpotPhotoRow* _tmp28_ = NULL; - GFile* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; + DataImportsFSpotDbFSpotPhotoRow* _tmp28_; + GFile* _tmp29_; + gchar* _tmp30_; #line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp28_ = photo_row; #line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -1271,7 +1265,7 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co _g_free0 (_tmp23_); #line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp23_ = _tmp30_; -#line 1261 "FSpotImporter.c" +#line 1255 "FSpotImporter.c" } #line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp31_ = g_strdup (_tmp23_); @@ -1283,26 +1277,26 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co _tmp33_ = photo_version_row; #line 129 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_tmp33_ != NULL) { -#line 1273 "FSpotImporter.c" - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp34_ = NULL; - const gchar* _tmp35_ = NULL; +#line 1267 "FSpotImporter.c" + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp34_; + const gchar* _tmp35_; #line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp34_ = photo_version_row; #line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp35_ = _tmp34_->filename; #line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp32_ = _tmp35_; -#line 1282 "FSpotImporter.c" +#line 1276 "FSpotImporter.c" } else { - DataImportsFSpotDbFSpotPhotoRow* _tmp36_ = NULL; - const gchar* _tmp37_ = NULL; + DataImportsFSpotDbFSpotPhotoRow* _tmp36_; + const gchar* _tmp37_; #line 131 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp36_ = photo_row; #line 131 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp37_ = _tmp36_->filename; #line 131 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp32_ = _tmp37_; -#line 1292 "FSpotImporter.c" +#line 1286 "FSpotImporter.c" } #line 129 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp38_ = g_strdup (_tmp32_); @@ -1314,30 +1308,30 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co _tmp40_ = self->priv->folder_path; #line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_tmp40_ != NULL) { -#line 1304 "FSpotImporter.c" - const gchar* _tmp41_ = NULL; +#line 1298 "FSpotImporter.c" + const gchar* _tmp41_; #line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp41_ = self->priv->filename; #line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp39_ = _tmp41_ != NULL; -#line 1310 "FSpotImporter.c" +#line 1304 "FSpotImporter.c" } else { #line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp39_ = FALSE; -#line 1314 "FSpotImporter.c" +#line 1308 "FSpotImporter.c" } #line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_tmp39_) { -#line 1318 "FSpotImporter.c" +#line 1312 "FSpotImporter.c" GFile* photo = NULL; - const gchar* _tmp42_ = NULL; - GFile* _tmp43_ = NULL; - GFile* _tmp44_ = NULL; - const gchar* _tmp45_ = NULL; - GFile* _tmp46_ = NULL; - GFile* _tmp47_ = NULL; - GFile* _tmp48_ = NULL; - gboolean _tmp49_ = FALSE; + const gchar* _tmp42_; + GFile* _tmp43_; + GFile* _tmp44_; + const gchar* _tmp45_; + GFile* _tmp46_; + GFile* _tmp47_; + GFile* _tmp48_; + gboolean _tmp49_; #line 137 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp42_ = self->priv->folder_path; #line 137 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -1360,11 +1354,11 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co _tmp49_ = g_file_query_exists (_tmp48_, NULL); #line 140 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (!_tmp49_) { -#line 1350 "FSpotImporter.c" - const gchar* _tmp50_ = NULL; - gchar* _tmp51_ = NULL; - const gchar* _tmp52_ = NULL; - gchar* _tmp53_ = NULL; +#line 1344 "FSpotImporter.c" + const gchar* _tmp50_; + gchar* _tmp51_; + const gchar* _tmp52_; + gchar* _tmp53_; #line 141 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp50_ = self->priv->folder_path; #line 141 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -1381,41 +1375,41 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co _g_free0 (self->priv->filename); #line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self->priv->filename = _tmp53_; -#line 1371 "FSpotImporter.c" +#line 1365 "FSpotImporter.c" } #line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (photo); -#line 1375 "FSpotImporter.c" +#line 1369 "FSpotImporter.c" } #line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_free0 (_tmp23_); #line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return self; -#line 1381 "FSpotImporter.c" +#line 1375 "FSpotImporter.c" } DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_new (DataImportsFSpotDbFSpotPhotoRow* photo_row, DataImportsFSpotDbFSpotPhotoVersionRow* photo_version_row, DataImportsFSpotDbFSpotRollRow* roll_row, DataImportsFSpotFSpotImportableTag** tags, int tags_length1, DataImportsFSpotFSpotImportableEvent* event, gboolean is_hidden, gboolean is_favorite) { #line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return data_imports_fspot_fspot_importable_item_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, photo_row, photo_version_row, roll_row, tags, tags_length1, event, is_hidden, is_favorite); -#line 1388 "FSpotImporter.c" +#line 1382 "FSpotImporter.c" } -static void _vala_array_add1 (SpitDataImportsImportableTag*** array, int* length, int* size, SpitDataImportsImportableTag* value) { +static void _vala_array_add1 (SpitDataImportsImportableTag** * array, int* length, int* size, SpitDataImportsImportableTag* value) { #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if ((*length) == (*size)) { #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" *size = (*size) ? (2 * (*size)) : 4; #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" *array = g_renew (SpitDataImportsImportableTag*, *array, (*size) + 1); -#line 1399 "FSpotImporter.c" +#line 1393 "FSpotImporter.c" } #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" (*array)[(*length)++] = value; #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" (*array)[*length] = NULL; -#line 1405 "FSpotImporter.c" +#line 1399 "FSpotImporter.c" } @@ -1423,13 +1417,13 @@ static SpitDataImportsImportableTag** data_imports_fspot_fspot_importable_item_r DataImportsFSpotFSpotImportableItem * self; SpitDataImportsImportableTag** result = NULL; SpitDataImportsImportableTag** importable_tags = NULL; - SpitDataImportsImportableTag** _tmp0_ = NULL; - gint importable_tags_length1 = 0; - gint _importable_tags_size_ = 0; - DataImportsFSpotFSpotImportableTag** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - SpitDataImportsImportableTag** _tmp6_ = NULL; - gint _tmp6__length1 = 0; + SpitDataImportsImportableTag** _tmp0_; + gint importable_tags_length1; + gint _importable_tags_size_; + DataImportsFSpotFSpotImportableTag** _tmp1_; + gint _tmp1__length1; + SpitDataImportsImportableTag** _tmp6_; + gint _tmp6__length1; #line 147 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem); #line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -1444,7 +1438,7 @@ static SpitDataImportsImportableTag** data_imports_fspot_fspot_importable_item_r _tmp1_ = self->priv->tags; #line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp1__length1 = self->priv->tags_length1; -#line 1434 "FSpotImporter.c" +#line 1428 "FSpotImporter.c" { DataImportsFSpotFSpotImportableTag** tag_collection = NULL; gint tag_collection_length1 = 0; @@ -1456,19 +1450,19 @@ static SpitDataImportsImportableTag** data_imports_fspot_fspot_importable_item_r tag_collection_length1 = _tmp1__length1; #line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" for (tag_it = 0; tag_it < _tmp1__length1; tag_it = tag_it + 1) { -#line 1446 "FSpotImporter.c" - DataImportsFSpotFSpotImportableTag* _tmp2_ = NULL; +#line 1440 "FSpotImporter.c" + DataImportsFSpotFSpotImportableTag* _tmp2_; DataImportsFSpotFSpotImportableTag* tag = NULL; #line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp2_ = _g_object_ref0 (tag_collection[tag_it]); #line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" tag = _tmp2_; -#line 1453 "FSpotImporter.c" +#line 1447 "FSpotImporter.c" { - SpitDataImportsImportableTag** _tmp3_ = NULL; - gint _tmp3__length1 = 0; - DataImportsFSpotFSpotImportableTag* _tmp4_ = NULL; - SpitDataImportsImportableTag* _tmp5_ = NULL; + SpitDataImportsImportableTag** _tmp3_; + gint _tmp3__length1; + DataImportsFSpotFSpotImportableTag* _tmp4_; + SpitDataImportsImportableTag* _tmp5_; #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp3_ = importable_tags; #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -1481,7 +1475,7 @@ static SpitDataImportsImportableTag** data_imports_fspot_fspot_importable_item_r _vala_array_add1 (&importable_tags, &importable_tags_length1, &_importable_tags_size_, _tmp5_); #line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (tag); -#line 1471 "FSpotImporter.c" +#line 1465 "FSpotImporter.c" } } } @@ -1493,21 +1487,21 @@ static SpitDataImportsImportableTag** data_imports_fspot_fspot_importable_item_r if (result_length1) { #line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" *result_length1 = _tmp6__length1; -#line 1483 "FSpotImporter.c" +#line 1477 "FSpotImporter.c" } #line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" result = _tmp6_; #line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 1489 "FSpotImporter.c" +#line 1483 "FSpotImporter.c" } static SpitDataImportsImportableEvent* data_imports_fspot_fspot_importable_item_real_get_event (SpitDataImportsImportableMediaItem* base) { DataImportsFSpotFSpotImportableItem * self; SpitDataImportsImportableEvent* result = NULL; - DataImportsFSpotFSpotImportableEvent* _tmp0_ = NULL; - SpitDataImportsImportableEvent* _tmp1_ = NULL; + DataImportsFSpotFSpotImportableEvent* _tmp0_; + SpitDataImportsImportableEvent* _tmp1_; #line 154 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem); #line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -1518,15 +1512,15 @@ static SpitDataImportsImportableEvent* data_imports_fspot_fspot_importable_item_ result = _tmp1_; #line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 1508 "FSpotImporter.c" +#line 1502 "FSpotImporter.c" } static gchar* data_imports_fspot_fspot_importable_item_real_get_folder_path (SpitDataImportsImportableMediaItem* base) { DataImportsFSpotFSpotImportableItem * self; gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 158 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem); #line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -1537,15 +1531,15 @@ static gchar* data_imports_fspot_fspot_importable_item_real_get_folder_path (Spi result = _tmp1_; #line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 1527 "FSpotImporter.c" +#line 1521 "FSpotImporter.c" } static gchar* data_imports_fspot_fspot_importable_item_real_get_filename (SpitDataImportsImportableMediaItem* base) { DataImportsFSpotFSpotImportableItem * self; gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 162 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem); #line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -1556,7 +1550,7 @@ static gchar* data_imports_fspot_fspot_importable_item_real_get_filename (SpitDa result = _tmp1_; #line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 1546 "FSpotImporter.c" +#line 1540 "FSpotImporter.c" } @@ -1565,9 +1559,9 @@ static gchar* data_imports_fspot_fspot_importable_item_real_get_title (SpitDataI gchar* result = NULL; const gchar* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; - DataImportsFSpotDbFSpotPhotoRow* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp8_ = NULL; + DataImportsFSpotDbFSpotPhotoRow* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp8_; #line 166 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem); #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -1578,33 +1572,33 @@ static gchar* data_imports_fspot_fspot_importable_item_real_get_title (SpitDataI if (_tmp3_ == NULL) { #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp1_ = TRUE; -#line 1568 "FSpotImporter.c" +#line 1562 "FSpotImporter.c" } else { - DataImportsFSpotDbFSpotPhotoRow* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; + DataImportsFSpotDbFSpotPhotoRow* _tmp4_; + const gchar* _tmp5_; #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp4_ = self->priv->photo_row; #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp5_ = _tmp4_->description; #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp1_ = g_strcmp0 (_tmp5_, "") == 0; -#line 1578 "FSpotImporter.c" +#line 1572 "FSpotImporter.c" } #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_tmp1_) { #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp0_ = NULL; -#line 1584 "FSpotImporter.c" +#line 1578 "FSpotImporter.c" } else { - DataImportsFSpotDbFSpotPhotoRow* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; + DataImportsFSpotDbFSpotPhotoRow* _tmp6_; + const gchar* _tmp7_; #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp6_ = self->priv->photo_row; #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp7_ = _tmp6_->description; #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp0_ = _tmp7_; -#line 1594 "FSpotImporter.c" +#line 1588 "FSpotImporter.c" } #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp8_ = g_strdup (_tmp0_); @@ -1612,15 +1606,15 @@ static gchar* data_imports_fspot_fspot_importable_item_real_get_title (SpitDataI result = _tmp8_; #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 1602 "FSpotImporter.c" +#line 1596 "FSpotImporter.c" } static SpitDataImportsImportableRating* data_imports_fspot_fspot_importable_item_real_get_rating (SpitDataImportsImportableMediaItem* base) { DataImportsFSpotFSpotImportableItem * self; SpitDataImportsImportableRating* result = NULL; - DataImportsFSpotFSpotImportableRating* _tmp0_ = NULL; - SpitDataImportsImportableRating* _tmp1_ = NULL; + DataImportsFSpotFSpotImportableRating* _tmp0_; + SpitDataImportsImportableRating* _tmp1_; #line 170 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem); #line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -1631,15 +1625,15 @@ static SpitDataImportsImportableRating* data_imports_fspot_fspot_importable_item result = _tmp1_; #line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 1621 "FSpotImporter.c" +#line 1615 "FSpotImporter.c" } static time_t* data_imports_fspot_fspot_importable_item_real_get_exposure_time (SpitDataImportsImportableMediaItem* base) { DataImportsFSpotFSpotImportableItem * self; time_t* result = NULL; - time_t* _tmp0_ = NULL; - time_t* _tmp1_ = NULL; + time_t* _tmp0_; + time_t* _tmp1_; #line 174 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem); #line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -1650,46 +1644,46 @@ static time_t* data_imports_fspot_fspot_importable_item_real_get_exposure_time ( result = _tmp1_; #line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 1640 "FSpotImporter.c" +#line 1634 "FSpotImporter.c" } static gint string_index_of_char (const gchar* self, gunichar c, gint start_index) { gint result = 0; gchar* _result_ = NULL; - gint _tmp0_ = 0; - gunichar _tmp1_ = 0U; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; -#line 1007 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint _tmp0_; + gunichar _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; +#line 1031 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = c; -#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_); -#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1665 "FSpotImporter.c" - gchar* _tmp4_ = NULL; -#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1659 "FSpotImporter.c" + gchar* _tmp4_; +#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1673 "FSpotImporter.c" +#line 1667 "FSpotImporter.c" } else { -#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = -1; -#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1679 "FSpotImporter.c" +#line 1673 "FSpotImporter.c" } } @@ -1697,180 +1691,180 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde static gchar* string_slice (const gchar* self, glong start, glong end) { gchar* result = NULL; glong string_length = 0L; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - glong _tmp2_ = 0L; - glong _tmp5_ = 0L; + gint _tmp0_; + gint _tmp1_; + glong _tmp2_; + glong _tmp5_; gboolean _tmp8_ = FALSE; - glong _tmp9_ = 0L; + glong _tmp9_; gboolean _tmp12_ = FALSE; - glong _tmp13_ = 0L; - glong _tmp16_ = 0L; - glong _tmp17_ = 0L; - glong _tmp18_ = 0L; - glong _tmp19_ = 0L; - glong _tmp20_ = 0L; - gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp13_; + glong _tmp16_; + glong _tmp17_; + glong _tmp18_; + glong _tmp19_; + glong _tmp20_; + gchar* _tmp21_; +#line 1355 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { -#line 1713 "FSpotImporter.c" - glong _tmp3_ = 0L; - glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1707 "FSpotImporter.c" + glong _tmp3_; + glong _tmp4_; +#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; -#line 1722 "FSpotImporter.c" +#line 1716 "FSpotImporter.c" } -#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { -#line 1728 "FSpotImporter.c" - glong _tmp6_ = 0L; - glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1722 "FSpotImporter.c" + glong _tmp6_; + glong _tmp7_; +#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; -#line 1737 "FSpotImporter.c" +#line 1731 "FSpotImporter.c" } -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { -#line 1743 "FSpotImporter.c" - glong _tmp10_ = 0L; - glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1737 "FSpotImporter.c" + glong _tmp10_; + glong _tmp11_; +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; -#line 1752 "FSpotImporter.c" +#line 1746 "FSpotImporter.c" } else { -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = FALSE; -#line 1756 "FSpotImporter.c" +#line 1750 "FSpotImporter.c" } -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { -#line 1764 "FSpotImporter.c" - glong _tmp14_ = 0L; - glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1758 "FSpotImporter.c" + glong _tmp14_; + glong _tmp15_; +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; -#line 1773 "FSpotImporter.c" +#line 1767 "FSpotImporter.c" } else { -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 1777 "FSpotImporter.c" +#line 1771 "FSpotImporter.c" } -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1799 "FSpotImporter.c" +#line 1793 "FSpotImporter.c" } static gchar string_get (const gchar* self, glong index) { gchar result = '\0'; - glong _tmp0_ = 0L; - gchar _tmp1_ = '\0'; -#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp0_; + gchar _tmp1_; +#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = index; -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_; -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1817 "FSpotImporter.c" +#line 1811 "FSpotImporter.c" } static glong string_strnlen (gchar* str, glong maxlen) { glong result = 0L; gchar* end = NULL; - gchar* _tmp0_ = NULL; - glong _tmp1_ = 0L; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + glong _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = maxlen; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp2_; -#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = end; -#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { -#line 1840 "FSpotImporter.c" - glong _tmp4_ = 0L; -#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1834 "FSpotImporter.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 1848 "FSpotImporter.c" +#line 1842 "FSpotImporter.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 1860 "FSpotImporter.c" +#line 1854 "FSpotImporter.c" } } @@ -1879,133 +1873,133 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_ = 0L; - glong _tmp8_ = 0L; - glong _tmp14_ = 0L; - glong _tmp17_ = 0L; - glong _tmp18_ = 0L; - glong _tmp19_ = 0L; - glong _tmp20_ = 0L; - glong _tmp21_ = 0L; - gchar* _tmp22_ = NULL; -#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp1_; + glong _tmp8_; + glong _tmp14_; + glong _tmp17_; + glong _tmp18_; + glong _tmp19_; + glong _tmp20_; + glong _tmp21_; + gchar* _tmp22_; +#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = offset; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { -#line 1884 "FSpotImporter.c" - glong _tmp2_ = 0L; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1878 "FSpotImporter.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 1890 "FSpotImporter.c" +#line 1884 "FSpotImporter.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 1894 "FSpotImporter.c" +#line 1888 "FSpotImporter.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 1898 "FSpotImporter.c" - glong _tmp3_ = 0L; - glong _tmp4_ = 0L; - glong _tmp5_ = 0L; -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1892 "FSpotImporter.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 1910 "FSpotImporter.c" +#line 1904 "FSpotImporter.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 1920 "FSpotImporter.c" +#line 1914 "FSpotImporter.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 1926 "FSpotImporter.c" - glong _tmp9_ = 0L; - glong _tmp10_ = 0L; - glong _tmp11_ = 0L; -#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1920 "FSpotImporter.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 1940 "FSpotImporter.c" +#line 1934 "FSpotImporter.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 1950 "FSpotImporter.c" +#line 1944 "FSpotImporter.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 1956 "FSpotImporter.c" - glong _tmp15_ = 0L; - glong _tmp16_ = 0L; -#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1950 "FSpotImporter.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 1965 "FSpotImporter.c" +#line 1959 "FSpotImporter.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 1985 "FSpotImporter.c" +#line 1979 "FSpotImporter.c" } static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFSpotFSpotImportableItem* self, const gchar* url) { gchar* result = NULL; GString* builder = NULL; - GString* _tmp0_ = NULL; - GString* _tmp49_ = NULL; - const gchar* _tmp50_ = NULL; - gchar* _tmp51_ = NULL; + GString* _tmp0_; + GString* _tmp49_; + const gchar* _tmp50_; + gchar* _tmp51_; #line 178 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_ITEM (self), NULL); #line 178 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2014,33 +2008,33 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS _tmp0_ = g_string_new (""); #line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" builder = _tmp0_; -#line 2004 "FSpotImporter.c" +#line 1998 "FSpotImporter.c" { gint idx = 0; #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" idx = 0; -#line 2009 "FSpotImporter.c" +#line 2003 "FSpotImporter.c" { gboolean _tmp1_ = FALSE; #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp1_ = TRUE; #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" while (TRUE) { -#line 2016 "FSpotImporter.c" - gint _tmp2_ = 0; - const gchar* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; +#line 2010 "FSpotImporter.c" + gint _tmp2_; + const gchar* _tmp3_; + gint _tmp4_; + gint _tmp5_; gint cidx = 0; - const gchar* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - gint _tmp9_ = 0; - gint _tmp10_ = 0; - gint _tmp17_ = 0; + const gchar* _tmp6_; + gint _tmp7_; + gint _tmp8_; + gint _tmp9_; + gint _tmp10_; + gint _tmp17_; #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (!_tmp1_) { -#line 2030 "FSpotImporter.c" +#line 2024 "FSpotImporter.c" } #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp1_ = FALSE; @@ -2056,7 +2050,7 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS if (!(_tmp2_ < _tmp5_)) { #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" break; -#line 2046 "FSpotImporter.c" +#line 2040 "FSpotImporter.c" } #line 181 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp6_ = url; @@ -2072,13 +2066,13 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS _tmp10_ = idx; #line 182 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_tmp9_ > _tmp10_) { -#line 2062 "FSpotImporter.c" - GString* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; - gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; +#line 2056 "FSpotImporter.c" + GString* _tmp11_; + const gchar* _tmp12_; + gint _tmp13_; + gint _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; #line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp11_ = builder; #line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2095,17 +2089,17 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS g_string_append (_tmp11_, _tmp16_); #line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_free0 (_tmp16_); -#line 2085 "FSpotImporter.c" +#line 2079 "FSpotImporter.c" } #line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp17_ = cidx; #line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_tmp17_ >= 0) { -#line 2091 "FSpotImporter.c" - gint _tmp18_ = 0; - const gchar* _tmp19_ = NULL; - gint _tmp20_ = 0; - gint _tmp21_ = 0; +#line 2085 "FSpotImporter.c" + gint _tmp18_; + const gchar* _tmp19_; + gint _tmp20_; + gint _tmp21_; #line 186 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp18_ = cidx; #line 186 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2116,19 +2110,19 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS _tmp21_ = _tmp20_; #line 186 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_tmp18_ < (_tmp21_ - 2)) { -#line 2106 "FSpotImporter.c" +#line 2100 "FSpotImporter.c" gchar c1 = '\0'; - const gchar* _tmp22_ = NULL; - gint _tmp23_ = 0; - gchar _tmp24_ = '\0'; + const gchar* _tmp22_; + gint _tmp23_; + gchar _tmp24_; gchar c2 = '\0'; - const gchar* _tmp25_ = NULL; - gint _tmp26_ = 0; - gchar _tmp27_ = '\0'; + const gchar* _tmp25_; + gint _tmp26_; + gchar _tmp27_; gboolean _tmp28_ = FALSE; - gchar _tmp29_ = '\0'; - gboolean _tmp30_ = FALSE; - gint _tmp39_ = 0; + gchar _tmp29_; + gboolean _tmp30_; + gint _tmp39_; #line 187 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp22_ = url; #line 187 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2151,31 +2145,31 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS _tmp30_ = g_ascii_isxdigit (_tmp29_); #line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_tmp30_) { -#line 2141 "FSpotImporter.c" - gchar _tmp31_ = '\0'; - gboolean _tmp32_ = FALSE; +#line 2135 "FSpotImporter.c" + gchar _tmp31_; + gboolean _tmp32_; #line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp31_ = c1; #line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp32_ = g_ascii_isxdigit (_tmp31_); #line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp28_ = _tmp32_; -#line 2150 "FSpotImporter.c" +#line 2144 "FSpotImporter.c" } else { #line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp28_ = FALSE; -#line 2154 "FSpotImporter.c" +#line 2148 "FSpotImporter.c" } #line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_tmp28_) { -#line 2158 "FSpotImporter.c" +#line 2152 "FSpotImporter.c" gint ccode = 0; - gchar _tmp33_ = '\0'; - gint _tmp34_ = 0; - gchar _tmp35_ = '\0'; - gint _tmp36_ = 0; - GString* _tmp37_ = NULL; - gint _tmp38_ = 0; + gchar _tmp33_; + gint _tmp34_; + gchar _tmp35_; + gint _tmp36_; + GString* _tmp37_; + gint _tmp38_; #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp33_ = c1; #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2192,30 +2186,30 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS _tmp38_ = ccode; #line 191 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_string_append_c (_tmp37_, (gchar) _tmp38_); -#line 2182 "FSpotImporter.c" +#line 2176 "FSpotImporter.c" } #line 193 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp39_ = cidx; #line 193 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" idx = _tmp39_ + 3; -#line 2188 "FSpotImporter.c" +#line 2182 "FSpotImporter.c" } else { - gint _tmp40_ = 0; + gint _tmp40_; #line 195 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp40_ = cidx; #line 195 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" idx = _tmp40_ + 1; -#line 2195 "FSpotImporter.c" +#line 2189 "FSpotImporter.c" } } else { - GString* _tmp41_ = NULL; - const gchar* _tmp42_ = NULL; - gint _tmp43_ = 0; - gchar* _tmp44_ = NULL; - gchar* _tmp45_ = NULL; - const gchar* _tmp46_ = NULL; - gint _tmp47_ = 0; - gint _tmp48_ = 0; + GString* _tmp41_; + const gchar* _tmp42_; + gint _tmp43_; + gchar* _tmp44_; + gchar* _tmp45_; + const gchar* _tmp46_; + gint _tmp47_; + gint _tmp48_; #line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp41_ = builder; #line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2238,7 +2232,7 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS _tmp48_ = _tmp47_; #line 199 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" idx = _tmp48_; -#line 2228 "FSpotImporter.c" +#line 2222 "FSpotImporter.c" } } } @@ -2255,7 +2249,7 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS _g_string_free0 (builder); #line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 2245 "FSpotImporter.c" +#line 2239 "FSpotImporter.c" } @@ -2266,7 +2260,7 @@ static void data_imports_fspot_fspot_importable_item_class_init (DataImportsFSpo g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotImportableItemPrivate)); #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_importable_item_finalize; -#line 2256 "FSpotImporter.c" +#line 2250 "FSpotImporter.c" } @@ -2274,31 +2268,31 @@ static void data_imports_fspot_fspot_importable_item_spit_data_imports_importabl #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" data_imports_fspot_fspot_importable_item_spit_data_imports_importable_media_item_parent_iface = g_type_interface_peek_parent (iface); #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->get_tags = (SpitDataImportsImportableTag** (*)(SpitDataImportsImportableMediaItem*, int*)) data_imports_fspot_fspot_importable_item_real_get_tags; + iface->get_tags = (SpitDataImportsImportableTag** (*) (SpitDataImportsImportableMediaItem *, int*)) data_imports_fspot_fspot_importable_item_real_get_tags; #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->get_event = (SpitDataImportsImportableEvent* (*)(SpitDataImportsImportableMediaItem*)) data_imports_fspot_fspot_importable_item_real_get_event; + iface->get_event = (SpitDataImportsImportableEvent* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_event; #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->get_folder_path = (gchar* (*)(SpitDataImportsImportableMediaItem*)) data_imports_fspot_fspot_importable_item_real_get_folder_path; + iface->get_folder_path = (gchar* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_folder_path; #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->get_filename = (gchar* (*)(SpitDataImportsImportableMediaItem*)) data_imports_fspot_fspot_importable_item_real_get_filename; + iface->get_filename = (gchar* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_filename; #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->get_title = (gchar* (*)(SpitDataImportsImportableMediaItem*)) data_imports_fspot_fspot_importable_item_real_get_title; + iface->get_title = (gchar* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_title; #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->get_rating = (SpitDataImportsImportableRating* (*)(SpitDataImportsImportableMediaItem*)) data_imports_fspot_fspot_importable_item_real_get_rating; + iface->get_rating = (SpitDataImportsImportableRating* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_rating; #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->get_exposure_time = (time_t* (*)(SpitDataImportsImportableMediaItem*)) data_imports_fspot_fspot_importable_item_real_get_exposure_time; -#line 2277 "FSpotImporter.c" + iface->get_exposure_time = (time_t* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_exposure_time; +#line 2271 "FSpotImporter.c" } static void data_imports_fspot_fspot_importable_item_instance_init (DataImportsFSpotFSpotImportableItem * self) { #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self->priv = DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_ITEM_GET_PRIVATE (self); -#line 2284 "FSpotImporter.c" +#line 2278 "FSpotImporter.c" } -static void data_imports_fspot_fspot_importable_item_finalize (GObject* obj) { +static void data_imports_fspot_fspot_importable_item_finalize (GObject * obj) { DataImportsFSpotFSpotImportableItem * self; #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem); @@ -2322,7 +2316,7 @@ static void data_imports_fspot_fspot_importable_item_finalize (GObject* obj) { _g_free0 (self->priv->date_time); #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" G_OBJECT_CLASS (data_imports_fspot_fspot_importable_item_parent_class)->finalize (obj); -#line 2312 "FSpotImporter.c" +#line 2306 "FSpotImporter.c" } @@ -2342,10 +2336,10 @@ GType data_imports_fspot_fspot_importable_item_get_type (void) { DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_importable_tag_construct (GType object_type, DataImportsFSpotDbFSpotTagRow* row, DataImportsFSpotFSpotImportableTag* parent) { DataImportsFSpotFSpotImportableTag * self = NULL; - DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL; - DataImportsFSpotDbFSpotTagRow* _tmp1_ = NULL; - DataImportsFSpotFSpotImportableTag* _tmp2_ = NULL; - DataImportsFSpotFSpotImportableTag* _tmp3_ = NULL; + DataImportsFSpotDbFSpotTagRow* _tmp0_; + DataImportsFSpotDbFSpotTagRow* _tmp1_; + DataImportsFSpotFSpotImportableTag* _tmp2_; + DataImportsFSpotFSpotImportableTag* _tmp3_; #line 210 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAG_ROW (row), NULL); #line 210 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2370,21 +2364,21 @@ DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_importable_tag_cons self->priv->parent = _tmp3_; #line 210 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return self; -#line 2360 "FSpotImporter.c" +#line 2354 "FSpotImporter.c" } DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_importable_tag_new (DataImportsFSpotDbFSpotTagRow* row, DataImportsFSpotFSpotImportableTag* parent) { #line 210 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return data_imports_fspot_fspot_importable_tag_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, row, parent); -#line 2367 "FSpotImporter.c" +#line 2361 "FSpotImporter.c" } gint64 data_imports_fspot_fspot_importable_tag_get_id (DataImportsFSpotFSpotImportableTag* self) { gint64 result = 0LL; - DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL; - gint64 _tmp1_ = 0LL; + DataImportsFSpotDbFSpotTagRow* _tmp0_; + gint64 _tmp1_; #line 215 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (self), 0LL); #line 216 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2395,16 +2389,16 @@ gint64 data_imports_fspot_fspot_importable_tag_get_id (DataImportsFSpotFSpotImpo result = _tmp1_; #line 216 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 2385 "FSpotImporter.c" +#line 2379 "FSpotImporter.c" } static gchar* data_imports_fspot_fspot_importable_tag_real_get_name (SpitDataImportsImportableTag* base) { DataImportsFSpotFSpotImportableTag * self; gchar* result = NULL; - DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + DataImportsFSpotDbFSpotTagRow* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; #line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, DataImportsFSpotFSpotImportableTag); #line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2417,15 +2411,15 @@ static gchar* data_imports_fspot_fspot_importable_tag_real_get_name (SpitDataImp result = _tmp2_; #line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 2407 "FSpotImporter.c" +#line 2401 "FSpotImporter.c" } static SpitDataImportsImportableTag* data_imports_fspot_fspot_importable_tag_real_get_parent (SpitDataImportsImportableTag* base) { DataImportsFSpotFSpotImportableTag * self; SpitDataImportsImportableTag* result = NULL; - DataImportsFSpotFSpotImportableTag* _tmp0_ = NULL; - SpitDataImportsImportableTag* _tmp1_ = NULL; + DataImportsFSpotFSpotImportableTag* _tmp0_; + SpitDataImportsImportableTag* _tmp1_; #line 223 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, DataImportsFSpotFSpotImportableTag); #line 224 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2436,14 +2430,14 @@ static SpitDataImportsImportableTag* data_imports_fspot_fspot_importable_tag_rea result = _tmp1_; #line 224 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 2426 "FSpotImporter.c" +#line 2420 "FSpotImporter.c" } DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_importable_tag_get_fspot_parent (DataImportsFSpotFSpotImportableTag* self) { DataImportsFSpotFSpotImportableTag* result = NULL; - DataImportsFSpotFSpotImportableTag* _tmp0_ = NULL; - DataImportsFSpotFSpotImportableTag* _tmp1_ = NULL; + DataImportsFSpotFSpotImportableTag* _tmp0_; + DataImportsFSpotFSpotImportableTag* _tmp1_; #line 227 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (self), NULL); #line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2454,15 +2448,15 @@ DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_importable_tag_get_ result = _tmp1_; #line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 2444 "FSpotImporter.c" +#line 2438 "FSpotImporter.c" } gchar* data_imports_fspot_fspot_importable_tag_get_stock_icon (DataImportsFSpotFSpotImportableTag* self) { gchar* result = NULL; - DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + DataImportsFSpotDbFSpotTagRow* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; #line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (self), NULL); #line 232 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2475,15 +2469,15 @@ gchar* data_imports_fspot_fspot_importable_tag_get_stock_icon (DataImportsFSpotF result = _tmp2_; #line 232 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 2465 "FSpotImporter.c" +#line 2459 "FSpotImporter.c" } gboolean data_imports_fspot_fspot_importable_tag_is_stock (DataImportsFSpotFSpotImportableTag* self) { gboolean result = FALSE; - DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + DataImportsFSpotDbFSpotTagRow* _tmp0_; + const gchar* _tmp1_; + gboolean _tmp2_; #line 235 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (self), FALSE); #line 236 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2496,14 +2490,14 @@ gboolean data_imports_fspot_fspot_importable_tag_is_stock (DataImportsFSpotFSpot result = _tmp2_; #line 236 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 2486 "FSpotImporter.c" +#line 2480 "FSpotImporter.c" } DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_tag_to_event (DataImportsFSpotFSpotImportableTag* self) { DataImportsFSpotFSpotImportableEvent* result = NULL; - DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL; - DataImportsFSpotFSpotImportableEvent* _tmp1_ = NULL; + DataImportsFSpotDbFSpotTagRow* _tmp0_; + DataImportsFSpotFSpotImportableEvent* _tmp1_; #line 239 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (self), NULL); #line 240 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2514,7 +2508,7 @@ DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_tag_to result = _tmp1_; #line 240 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 2504 "FSpotImporter.c" +#line 2498 "FSpotImporter.c" } @@ -2525,7 +2519,7 @@ static void data_imports_fspot_fspot_importable_tag_class_init (DataImportsFSpot g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotImportableTagPrivate)); #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_importable_tag_finalize; -#line 2515 "FSpotImporter.c" +#line 2509 "FSpotImporter.c" } @@ -2533,21 +2527,21 @@ static void data_imports_fspot_fspot_importable_tag_spit_data_imports_importable #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" data_imports_fspot_fspot_importable_tag_spit_data_imports_importable_tag_parent_iface = g_type_interface_peek_parent (iface); #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->get_name = (gchar* (*)(SpitDataImportsImportableTag*)) data_imports_fspot_fspot_importable_tag_real_get_name; + iface->get_name = (gchar* (*) (SpitDataImportsImportableTag *)) data_imports_fspot_fspot_importable_tag_real_get_name; #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->get_parent = (SpitDataImportsImportableTag* (*)(SpitDataImportsImportableTag*)) data_imports_fspot_fspot_importable_tag_real_get_parent; -#line 2526 "FSpotImporter.c" + iface->get_parent = (SpitDataImportsImportableTag* (*) (SpitDataImportsImportableTag *)) data_imports_fspot_fspot_importable_tag_real_get_parent; +#line 2520 "FSpotImporter.c" } static void data_imports_fspot_fspot_importable_tag_instance_init (DataImportsFSpotFSpotImportableTag * self) { #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self->priv = DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_TAG_GET_PRIVATE (self); -#line 2533 "FSpotImporter.c" +#line 2527 "FSpotImporter.c" } -static void data_imports_fspot_fspot_importable_tag_finalize (GObject* obj) { +static void data_imports_fspot_fspot_importable_tag_finalize (GObject * obj) { DataImportsFSpotFSpotImportableTag * self; #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, DataImportsFSpotFSpotImportableTag); @@ -2557,7 +2551,7 @@ static void data_imports_fspot_fspot_importable_tag_finalize (GObject* obj) { _g_object_unref0 (self->priv->parent); #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" G_OBJECT_CLASS (data_imports_fspot_fspot_importable_tag_parent_class)->finalize (obj); -#line 2547 "FSpotImporter.c" +#line 2541 "FSpotImporter.c" } @@ -2577,8 +2571,8 @@ GType data_imports_fspot_fspot_importable_tag_get_type (void) { DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_event_construct (GType object_type, DataImportsFSpotDbFSpotTagRow* row) { DataImportsFSpotFSpotImportableEvent * self = NULL; - DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL; - DataImportsFSpotDbFSpotTagRow* _tmp1_ = NULL; + DataImportsFSpotDbFSpotTagRow* _tmp0_; + DataImportsFSpotDbFSpotTagRow* _tmp1_; #line 247 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAG_ROW (row), NULL); #line 247 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2593,23 +2587,23 @@ DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_event_ self->priv->row = _tmp1_; #line 247 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return self; -#line 2583 "FSpotImporter.c" +#line 2577 "FSpotImporter.c" } DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_event_new (DataImportsFSpotDbFSpotTagRow* row) { #line 247 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return data_imports_fspot_fspot_importable_event_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_EVENT, row); -#line 2590 "FSpotImporter.c" +#line 2584 "FSpotImporter.c" } static gchar* data_imports_fspot_fspot_importable_event_real_get_name (SpitDataImportsImportableEvent* base) { DataImportsFSpotFSpotImportableEvent * self; gchar* result = NULL; - DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + DataImportsFSpotDbFSpotTagRow* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; #line 251 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_EVENT, DataImportsFSpotFSpotImportableEvent); #line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2622,7 +2616,7 @@ static gchar* data_imports_fspot_fspot_importable_event_real_get_name (SpitDataI result = _tmp2_; #line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 2612 "FSpotImporter.c" +#line 2606 "FSpotImporter.c" } @@ -2633,7 +2627,7 @@ static void data_imports_fspot_fspot_importable_event_class_init (DataImportsFSp g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotImportableEventPrivate)); #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_importable_event_finalize; -#line 2623 "FSpotImporter.c" +#line 2617 "FSpotImporter.c" } @@ -2641,19 +2635,19 @@ static void data_imports_fspot_fspot_importable_event_spit_data_imports_importab #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" data_imports_fspot_fspot_importable_event_spit_data_imports_importable_event_parent_iface = g_type_interface_peek_parent (iface); #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->get_name = (gchar* (*)(SpitDataImportsImportableEvent*)) data_imports_fspot_fspot_importable_event_real_get_name; -#line 2632 "FSpotImporter.c" + iface->get_name = (gchar* (*) (SpitDataImportsImportableEvent *)) data_imports_fspot_fspot_importable_event_real_get_name; +#line 2626 "FSpotImporter.c" } static void data_imports_fspot_fspot_importable_event_instance_init (DataImportsFSpotFSpotImportableEvent * self) { #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self->priv = DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_EVENT_GET_PRIVATE (self); -#line 2639 "FSpotImporter.c" +#line 2633 "FSpotImporter.c" } -static void data_imports_fspot_fspot_importable_event_finalize (GObject* obj) { +static void data_imports_fspot_fspot_importable_event_finalize (GObject * obj) { DataImportsFSpotFSpotImportableEvent * self; #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_EVENT, DataImportsFSpotFSpotImportableEvent); @@ -2661,7 +2655,7 @@ static void data_imports_fspot_fspot_importable_event_finalize (GObject* obj) { _g_object_unref0 (self->priv->row); #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" G_OBJECT_CLASS (data_imports_fspot_fspot_importable_event_parent_class)->finalize (obj); -#line 2651 "FSpotImporter.c" +#line 2645 "FSpotImporter.c" } @@ -2681,8 +2675,8 @@ GType data_imports_fspot_fspot_importable_event_get_type (void) { DataImportsFSpotFSpotImportableRating* data_imports_fspot_fspot_importable_rating_construct (GType object_type, gint rating_value) { DataImportsFSpotFSpotImportableRating * self = NULL; - gint _tmp0_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp2_; #line 262 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = (DataImportsFSpotFSpotImportableRating*) g_object_new (object_type, NULL); #line 263 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2691,16 +2685,16 @@ DataImportsFSpotFSpotImportableRating* data_imports_fspot_fspot_importable_ratin if (_tmp0_ < -1) { #line 264 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" rating_value = -1; -#line 2681 "FSpotImporter.c" +#line 2675 "FSpotImporter.c" } else { - gint _tmp1_ = 0; + gint _tmp1_; #line 265 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp1_ = rating_value; #line 265 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_tmp1_ > 5) { #line 266 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" rating_value = 5; -#line 2690 "FSpotImporter.c" +#line 2684 "FSpotImporter.c" } } #line 267 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2709,21 +2703,21 @@ DataImportsFSpotFSpotImportableRating* data_imports_fspot_fspot_importable_ratin self->priv->rating_value = _tmp2_; #line 262 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return self; -#line 2699 "FSpotImporter.c" +#line 2693 "FSpotImporter.c" } DataImportsFSpotFSpotImportableRating* data_imports_fspot_fspot_importable_rating_new (gint rating_value) { #line 262 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return data_imports_fspot_fspot_importable_rating_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, rating_value); -#line 2706 "FSpotImporter.c" +#line 2700 "FSpotImporter.c" } static gboolean data_imports_fspot_fspot_importable_rating_real_is_rejected (SpitDataImportsImportableRating* base) { DataImportsFSpotFSpotImportableRating * self; gboolean result = FALSE; - gint _tmp0_ = 0; + gint _tmp0_; #line 270 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, DataImportsFSpotFSpotImportableRating); #line 271 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2732,14 +2726,14 @@ static gboolean data_imports_fspot_fspot_importable_rating_real_is_rejected (Spi result = _tmp0_ == DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_REJECTED; #line 271 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 2722 "FSpotImporter.c" +#line 2716 "FSpotImporter.c" } static gboolean data_imports_fspot_fspot_importable_rating_real_is_unrated (SpitDataImportsImportableRating* base) { DataImportsFSpotFSpotImportableRating * self; gboolean result = FALSE; - gint _tmp0_ = 0; + gint _tmp0_; #line 274 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, DataImportsFSpotFSpotImportableRating); #line 275 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2748,14 +2742,14 @@ static gboolean data_imports_fspot_fspot_importable_rating_real_is_unrated (Spit result = _tmp0_ == DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_UNRATED; #line 275 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 2738 "FSpotImporter.c" +#line 2732 "FSpotImporter.c" } static gint data_imports_fspot_fspot_importable_rating_real_get_value (SpitDataImportsImportableRating* base) { DataImportsFSpotFSpotImportableRating * self; gint result = 0; - gint _tmp0_ = 0; + gint _tmp0_; #line 278 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, DataImportsFSpotFSpotImportableRating); #line 279 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2764,7 +2758,7 @@ static gint data_imports_fspot_fspot_importable_rating_real_get_value (SpitDataI result = _tmp0_; #line 279 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 2754 "FSpotImporter.c" +#line 2748 "FSpotImporter.c" } @@ -2775,7 +2769,7 @@ static void data_imports_fspot_fspot_importable_rating_class_init (DataImportsFS g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotImportableRatingPrivate)); #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_importable_rating_finalize; -#line 2765 "FSpotImporter.c" +#line 2759 "FSpotImporter.c" } @@ -2783,29 +2777,29 @@ static void data_imports_fspot_fspot_importable_rating_spit_data_imports_importa #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" data_imports_fspot_fspot_importable_rating_spit_data_imports_importable_rating_parent_iface = g_type_interface_peek_parent (iface); #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->is_rejected = (gboolean (*)(SpitDataImportsImportableRating*)) data_imports_fspot_fspot_importable_rating_real_is_rejected; + iface->is_rejected = (gboolean (*) (SpitDataImportsImportableRating *)) data_imports_fspot_fspot_importable_rating_real_is_rejected; #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->is_unrated = (gboolean (*)(SpitDataImportsImportableRating*)) data_imports_fspot_fspot_importable_rating_real_is_unrated; + iface->is_unrated = (gboolean (*) (SpitDataImportsImportableRating *)) data_imports_fspot_fspot_importable_rating_real_is_unrated; #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->get_value = (gint (*)(SpitDataImportsImportableRating*)) data_imports_fspot_fspot_importable_rating_real_get_value; -#line 2778 "FSpotImporter.c" + iface->get_value = (gint (*) (SpitDataImportsImportableRating *)) data_imports_fspot_fspot_importable_rating_real_get_value; +#line 2772 "FSpotImporter.c" } static void data_imports_fspot_fspot_importable_rating_instance_init (DataImportsFSpotFSpotImportableRating * self) { #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self->priv = DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_GET_PRIVATE (self); -#line 2785 "FSpotImporter.c" +#line 2779 "FSpotImporter.c" } -static void data_imports_fspot_fspot_importable_rating_finalize (GObject* obj) { +static void data_imports_fspot_fspot_importable_rating_finalize (GObject * obj) { DataImportsFSpotFSpotImportableRating * self; #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, DataImportsFSpotFSpotImportableRating); #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" G_OBJECT_CLASS (data_imports_fspot_fspot_importable_rating_parent_class)->finalize (obj); -#line 2795 "FSpotImporter.c" +#line 2789 "FSpotImporter.c" } @@ -2826,7 +2820,7 @@ GType data_imports_fspot_fspot_importable_rating_get_type (void) { static gpointer _importable_database_table_ref0 (gpointer self) { #line 288 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return self ? importable_database_table_ref (self) : NULL; -#line 2816 "FSpotImporter.c" +#line 2810 "FSpotImporter.c" } @@ -2838,15 +2832,15 @@ static gint64* _int64_dup (gint64* self) { memcpy (dup, self, sizeof (gint64)); #line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return dup; -#line 2828 "FSpotImporter.c" +#line 2822 "FSpotImporter.c" } DataImportsFSpotFSpotTagsCache* data_imports_fspot_fspot_tags_cache_construct (GType object_type, DataImportsFSpotDbFSpotTagsTable* tags_table, GError** error) { DataImportsFSpotFSpotTagsCache * self = NULL; - DataImportsFSpotDbFSpotTagsTable* _tmp0_ = NULL; - DataImportsFSpotDbFSpotTagsTable* _tmp1_ = NULL; - GeeHashMap* _tmp2_ = NULL; + DataImportsFSpotDbFSpotTagsTable* _tmp0_; + DataImportsFSpotDbFSpotTagsTable* _tmp1_; + GeeHashMap* _tmp2_; #line 287 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAGS_TABLE (tags_table), NULL); #line 287 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2867,25 +2861,25 @@ DataImportsFSpotFSpotTagsCache* data_imports_fspot_fspot_tags_cache_construct (G self->priv->tags_map = _tmp2_; #line 287 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return self; -#line 2857 "FSpotImporter.c" +#line 2851 "FSpotImporter.c" } DataImportsFSpotFSpotTagsCache* data_imports_fspot_fspot_tags_cache_new (DataImportsFSpotDbFSpotTagsTable* tags_table, GError** error) { #line 287 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return data_imports_fspot_fspot_tags_cache_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_TAGS_CACHE, tags_table, error); -#line 2864 "FSpotImporter.c" +#line 2858 "FSpotImporter.c" } DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag (DataImportsFSpotFSpotTagsCache* self, DataImportsFSpotDbFSpotTagRow* tag_row, GError** error) { DataImportsFSpotFSpotImportableTag* result = NULL; DataImportsFSpotFSpotImportableTag* tag = NULL; - GeeHashMap* _tmp0_ = NULL; - DataImportsFSpotDbFSpotTagRow* _tmp1_ = NULL; - gint64 _tmp2_ = 0LL; - gpointer _tmp3_ = NULL; - DataImportsFSpotFSpotImportableTag* _tmp4_ = NULL; + GeeHashMap* _tmp0_; + DataImportsFSpotDbFSpotTagRow* _tmp1_; + gint64 _tmp2_; + gpointer _tmp3_; + DataImportsFSpotFSpotImportableTag* _tmp4_; GError * _inner_error_ = NULL; #line 292 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_TAGS_CACHE (self), NULL); @@ -2909,20 +2903,20 @@ DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag result = tag; #line 295 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 2899 "FSpotImporter.c" +#line 2893 "FSpotImporter.c" } else { DataImportsFSpotFSpotImportableTag* parent_tag = NULL; - DataImportsFSpotDbFSpotTagRow* _tmp5_ = NULL; - gint64 _tmp6_ = 0LL; - DataImportsFSpotFSpotImportableTag* _tmp7_ = NULL; + DataImportsFSpotDbFSpotTagRow* _tmp5_; + gint64 _tmp6_; + DataImportsFSpotFSpotImportableTag* _tmp7_; DataImportsFSpotFSpotImportableTag* new_tag = NULL; - DataImportsFSpotDbFSpotTagRow* _tmp8_ = NULL; - DataImportsFSpotFSpotImportableTag* _tmp9_ = NULL; - DataImportsFSpotFSpotImportableTag* _tmp10_ = NULL; - GeeHashMap* _tmp11_ = NULL; - DataImportsFSpotDbFSpotTagRow* _tmp12_ = NULL; - gint64 _tmp13_ = 0LL; - DataImportsFSpotFSpotImportableTag* _tmp14_ = NULL; + DataImportsFSpotDbFSpotTagRow* _tmp8_; + DataImportsFSpotFSpotImportableTag* _tmp9_; + DataImportsFSpotFSpotImportableTag* _tmp10_; + GeeHashMap* _tmp11_; + DataImportsFSpotDbFSpotTagRow* _tmp12_; + gint64 _tmp13_; + DataImportsFSpotFSpotImportableTag* _tmp14_; #line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp5_ = tag_row; #line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2941,7 +2935,7 @@ DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag _g_object_unref0 (tag); #line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return NULL; -#line 2931 "FSpotImporter.c" +#line 2925 "FSpotImporter.c" } else { #line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (tag); @@ -2951,7 +2945,7 @@ DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag g_clear_error (&_inner_error_); #line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return NULL; -#line 2941 "FSpotImporter.c" +#line 2935 "FSpotImporter.c" } } #line 298 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -2980,27 +2974,27 @@ DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag _g_object_unref0 (tag); #line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 2970 "FSpotImporter.c" +#line 2964 "FSpotImporter.c" } #line 292 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (tag); -#line 2974 "FSpotImporter.c" +#line 2968 "FSpotImporter.c" } static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag_from_id (DataImportsFSpotFSpotTagsCache* self, gint64 tag_id, GError** error) { DataImportsFSpotFSpotImportableTag* result = NULL; - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; DataImportsFSpotFSpotImportableTag* tag = NULL; - GeeHashMap* _tmp1_ = NULL; - gint64 _tmp2_ = 0LL; - gpointer _tmp3_ = NULL; - DataImportsFSpotFSpotImportableTag* _tmp4_ = NULL; + GeeHashMap* _tmp1_; + gint64 _tmp2_; + gpointer _tmp3_; + DataImportsFSpotFSpotImportableTag* _tmp4_; DataImportsFSpotDbFSpotTagRow* tag_row = NULL; - DataImportsFSpotDbFSpotTagsTable* _tmp5_ = NULL; - gint64 _tmp6_ = 0LL; - DataImportsFSpotDbFSpotTagRow* _tmp7_ = NULL; - DataImportsFSpotDbFSpotTagRow* _tmp8_ = NULL; + DataImportsFSpotDbFSpotTagsTable* _tmp5_; + gint64 _tmp6_; + DataImportsFSpotDbFSpotTagRow* _tmp7_; + DataImportsFSpotDbFSpotTagRow* _tmp8_; GError * _inner_error_ = NULL; #line 304 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_TAGS_CACHE (self), NULL); @@ -3012,7 +3006,7 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g result = NULL; #line 307 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 3002 "FSpotImporter.c" +#line 2996 "FSpotImporter.c" } #line 308 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp1_ = self->priv->tags_map; @@ -3030,7 +3024,7 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g result = tag; #line 310 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 3020 "FSpotImporter.c" +#line 3014 "FSpotImporter.c" } #line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp5_ = self->priv->tags_table; @@ -3050,7 +3044,7 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g _g_object_unref0 (tag); #line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return NULL; -#line 3040 "FSpotImporter.c" +#line 3034 "FSpotImporter.c" } else { #line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (tag); @@ -3060,25 +3054,25 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g g_clear_error (&_inner_error_); #line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return NULL; -#line 3050 "FSpotImporter.c" +#line 3044 "FSpotImporter.c" } } #line 312 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp8_ = tag_row; #line 312 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_tmp8_ != NULL) { -#line 3057 "FSpotImporter.c" +#line 3051 "FSpotImporter.c" DataImportsFSpotFSpotImportableTag* parent_tag = NULL; - DataImportsFSpotDbFSpotTagRow* _tmp9_ = NULL; - gint64 _tmp10_ = 0LL; - DataImportsFSpotFSpotImportableTag* _tmp11_ = NULL; + DataImportsFSpotDbFSpotTagRow* _tmp9_; + gint64 _tmp10_; + DataImportsFSpotFSpotImportableTag* _tmp11_; DataImportsFSpotFSpotImportableTag* new_tag = NULL; - DataImportsFSpotDbFSpotTagRow* _tmp12_ = NULL; - DataImportsFSpotFSpotImportableTag* _tmp13_ = NULL; - DataImportsFSpotFSpotImportableTag* _tmp14_ = NULL; - GeeHashMap* _tmp15_ = NULL; - gint64 _tmp16_ = 0LL; - DataImportsFSpotFSpotImportableTag* _tmp17_ = NULL; + DataImportsFSpotDbFSpotTagRow* _tmp12_; + DataImportsFSpotFSpotImportableTag* _tmp13_; + DataImportsFSpotFSpotImportableTag* _tmp14_; + GeeHashMap* _tmp15_; + gint64 _tmp16_; + DataImportsFSpotFSpotImportableTag* _tmp17_; #line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp9_ = tag_row; #line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -3099,7 +3093,7 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g _g_object_unref0 (tag); #line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return NULL; -#line 3089 "FSpotImporter.c" +#line 3083 "FSpotImporter.c" } else { #line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (tag_row); @@ -3111,7 +3105,7 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g g_clear_error (&_inner_error_); #line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return NULL; -#line 3101 "FSpotImporter.c" +#line 3095 "FSpotImporter.c" } } #line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -3140,7 +3134,7 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g _g_object_unref0 (tag); #line 316 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 3130 "FSpotImporter.c" +#line 3124 "FSpotImporter.c" } #line 318 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" result = NULL; @@ -3150,7 +3144,7 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g _g_object_unref0 (tag); #line 318 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 3140 "FSpotImporter.c" +#line 3134 "FSpotImporter.c" } @@ -3161,18 +3155,18 @@ static void data_imports_fspot_fspot_tags_cache_class_init (DataImportsFSpotFSpo g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotTagsCachePrivate)); #line 283 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_tags_cache_finalize; -#line 3151 "FSpotImporter.c" +#line 3145 "FSpotImporter.c" } static void data_imports_fspot_fspot_tags_cache_instance_init (DataImportsFSpotFSpotTagsCache * self) { #line 283 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self->priv = DATA_IMPORTS_FSPOT_FSPOT_TAGS_CACHE_GET_PRIVATE (self); -#line 3158 "FSpotImporter.c" +#line 3152 "FSpotImporter.c" } -static void data_imports_fspot_fspot_tags_cache_finalize (GObject* obj) { +static void data_imports_fspot_fspot_tags_cache_finalize (GObject * obj) { DataImportsFSpotFSpotTagsCache * self; #line 283 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_TAGS_CACHE, DataImportsFSpotFSpotTagsCache); @@ -3182,7 +3176,7 @@ static void data_imports_fspot_fspot_tags_cache_finalize (GObject* obj) { _g_object_unref0 (self->priv->tags_map); #line 283 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" G_OBJECT_CLASS (data_imports_fspot_fspot_tags_cache_parent_class)->finalize (obj); -#line 3172 "FSpotImporter.c" +#line 3166 "FSpotImporter.c" } @@ -3200,8 +3194,8 @@ GType data_imports_fspot_fspot_tags_cache_get_type (void) { DataImportsFSpotFSpotDataImporter* data_imports_fspot_fspot_data_importer_construct (GType object_type, SpitDataImportsService* service, SpitDataImportsPluginHost* host) { DataImportsFSpotFSpotDataImporter * self = NULL; - SpitDataImportsService* _tmp0_ = NULL; - SpitDataImportsPluginHost* _tmp1_ = NULL; + SpitDataImportsService* _tmp0_; + SpitDataImportsPluginHost* _tmp1_; #line 328 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (service), NULL); #line 328 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -3220,21 +3214,21 @@ DataImportsFSpotFSpotDataImporter* data_imports_fspot_fspot_data_importer_constr self->priv->host = _tmp1_; #line 328 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return self; -#line 3210 "FSpotImporter.c" +#line 3204 "FSpotImporter.c" } DataImportsFSpotFSpotDataImporter* data_imports_fspot_fspot_data_importer_new (SpitDataImportsService* service, SpitDataImportsPluginHost* host) { #line 328 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return data_imports_fspot_fspot_data_importer_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, service, host); -#line 3217 "FSpotImporter.c" +#line 3211 "FSpotImporter.c" } static gboolean data_imports_fspot_fspot_data_importer_real_is_running (SpitDataImportsDataImporter* base) { DataImportsFSpotFSpotDataImporter * self; gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 335 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter); #line 336 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -3243,15 +3237,15 @@ static gboolean data_imports_fspot_fspot_data_importer_real_is_running (SpitData result = _tmp0_; #line 336 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 3233 "FSpotImporter.c" +#line 3227 "FSpotImporter.c" } static SpitDataImportsService* data_imports_fspot_fspot_data_importer_real_get_service (SpitDataImportsDataImporter* base) { DataImportsFSpotFSpotDataImporter * self; SpitDataImportsService* result = NULL; - SpitDataImportsService* _tmp0_ = NULL; - SpitDataImportsService* _tmp1_ = NULL; + SpitDataImportsService* _tmp0_; + SpitDataImportsService* _tmp1_; #line 339 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter); #line 340 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -3262,13 +3256,13 @@ static SpitDataImportsService* data_imports_fspot_fspot_data_importer_real_get_s result = _tmp1_; #line 340 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 3252 "FSpotImporter.c" +#line 3246 "FSpotImporter.c" } static void data_imports_fspot_fspot_data_importer_real_start (SpitDataImportsDataImporter* base) { DataImportsFSpotFSpotDataImporter * self; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 343 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter); #line 344 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -3277,7 +3271,7 @@ static void data_imports_fspot_fspot_data_importer_real_start (SpitDataImportsDa if (_tmp0_) { #line 345 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return; -#line 3267 "FSpotImporter.c" +#line 3261 "FSpotImporter.c" } #line 347 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_debug ("FSpotImporter.vala:347: FSpotDataImporter: starting interaction."); @@ -3285,7 +3279,7 @@ static void data_imports_fspot_fspot_data_importer_real_start (SpitDataImportsDa self->priv->running = TRUE; #line 351 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" data_imports_fspot_fspot_data_importer_do_discover_importable_libraries (self); -#line 3275 "FSpotImporter.c" +#line 3269 "FSpotImporter.c" } @@ -3297,69 +3291,69 @@ static void data_imports_fspot_fspot_data_importer_real_stop (SpitDataImportsDat g_debug ("FSpotImporter.vala:355: FSpotDataImporter: stopping interaction."); #line 357 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self->priv->running = FALSE; -#line 3287 "FSpotImporter.c" +#line 3281 "FSpotImporter.c" } /** * Action that discovers importable libraries based on standard locations. */ -static void _vala_array_add2 (SpitDataImportsImportableLibrary*** array, int* length, int* size, SpitDataImportsImportableLibrary* value) { +static void _vala_array_add2 (SpitDataImportsImportableLibrary** * array, int* length, int* size, SpitDataImportsImportableLibrary* value) { #line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if ((*length) == (*size)) { #line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" *size = (*size) ? (2 * (*size)) : 4; #line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" *array = g_renew (SpitDataImportsImportableLibrary*, *array, (*size) + 1); -#line 3301 "FSpotImporter.c" +#line 3295 "FSpotImporter.c" } #line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" (*array)[(*length)++] = value; #line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" (*array)[*length] = NULL; -#line 3307 "FSpotImporter.c" +#line 3301 "FSpotImporter.c" } static void data_imports_fspot_fspot_data_importer_do_discover_importable_libraries (DataImportsFSpotFSpotDataImporter* self) { SpitDataImportsImportableLibrary** discovered_libraries = NULL; - SpitDataImportsImportableLibrary** _tmp0_ = NULL; - gint discovered_libraries_length1 = 0; - gint _discovered_libraries_size_ = 0; + SpitDataImportsImportableLibrary** _tmp0_; + gint discovered_libraries_length1; + gint _discovered_libraries_size_; GFile** db_files = NULL; - const gchar* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - GFile* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; - GFile* _tmp12_ = NULL; - GFile* _tmp13_ = NULL; - GFile* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - GFile* _tmp16_ = NULL; - GFile* _tmp17_ = NULL; - GFile* _tmp18_ = NULL; - GFile* _tmp19_ = NULL; - GFile* _tmp20_ = NULL; - GFile** _tmp21_ = NULL; - GFile** _tmp22_ = NULL; - gint _tmp22__length1 = 0; - gint db_files_length1 = 0; - gint _db_files_size_ = 0; - GFile** _tmp23_ = NULL; - gint _tmp23__length1 = 0; + const gchar* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; + GFile* _tmp4_; + GFile* _tmp5_; + GFile* _tmp6_; + const gchar* _tmp7_; + GFile* _tmp8_; + GFile* _tmp9_; + GFile* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; + GFile* _tmp13_; + GFile* _tmp14_; + const gchar* _tmp15_; + GFile* _tmp16_; + GFile* _tmp17_; + GFile* _tmp18_; + GFile* _tmp19_; + GFile* _tmp20_; + GFile** _tmp21_; + GFile** _tmp22_; + gint _tmp22__length1; + gint db_files_length1; + gint _db_files_size_; + GFile** _tmp23_; + gint _tmp23__length1; const gchar* _tmp33_ = NULL; - SpitDataImportsImportableLibrary** _tmp34_ = NULL; - gint _tmp34__length1 = 0; - SpitDataImportsPluginHost* _tmp35_ = NULL; - SpitDataImportsImportableLibrary** _tmp36_ = NULL; - gint _tmp36__length1 = 0; + SpitDataImportsImportableLibrary** _tmp34_; + gint _tmp34__length1; + SpitDataImportsPluginHost* _tmp35_; + SpitDataImportsImportableLibrary** _tmp36_; + gint _tmp36__length1; #line 365 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_return_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_DATA_IMPORTER (self)); #line 366 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -3446,7 +3440,7 @@ static void data_imports_fspot_fspot_data_importer_do_discover_importable_librar _tmp23_ = db_files; #line 381 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp23__length1 = db_files_length1; -#line 3436 "FSpotImporter.c" +#line 3430 "FSpotImporter.c" { GFile** db_file_collection = NULL; gint db_file_collection_length1 = 0; @@ -3458,31 +3452,31 @@ static void data_imports_fspot_fspot_data_importer_do_discover_importable_librar db_file_collection_length1 = _tmp23__length1; #line 381 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" for (db_file_it = 0; db_file_it < _tmp23__length1; db_file_it = db_file_it + 1) { -#line 3448 "FSpotImporter.c" - GFile* _tmp24_ = NULL; +#line 3442 "FSpotImporter.c" + GFile* _tmp24_; GFile* db_file = NULL; #line 381 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp24_ = _g_object_ref0 (db_file_collection[db_file_it]); #line 381 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" db_file = _tmp24_; -#line 3455 "FSpotImporter.c" +#line 3449 "FSpotImporter.c" { - GFile* _tmp25_ = NULL; - gboolean _tmp26_ = FALSE; + GFile* _tmp25_; + gboolean _tmp26_; #line 382 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp25_ = db_file; #line 382 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp26_ = g_file_query_exists (_tmp25_, NULL); #line 382 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_tmp26_) { -#line 3465 "FSpotImporter.c" - SpitDataImportsImportableLibrary** _tmp27_ = NULL; - gint _tmp27__length1 = 0; - GFile* _tmp28_ = NULL; - DataImportsFSpotFSpotImportableLibrary* _tmp29_ = NULL; - GFile* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; +#line 3459 "FSpotImporter.c" + SpitDataImportsImportableLibrary** _tmp27_; + gint _tmp27__length1; + GFile* _tmp28_; + DataImportsFSpotFSpotImportableLibrary* _tmp29_; + GFile* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; #line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp27_ = discovered_libraries; #line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -3503,11 +3497,11 @@ static void data_imports_fspot_fspot_data_importer_do_discover_importable_librar g_message ("FSpotImporter.vala:384: Discovered importable library: %s", _tmp32_); #line 384 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_free0 (_tmp32_); -#line 3493 "FSpotImporter.c" +#line 3487 "FSpotImporter.c" } #line 381 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (db_file); -#line 3497 "FSpotImporter.c" +#line 3491 "FSpotImporter.c" } } } @@ -3519,11 +3513,11 @@ static void data_imports_fspot_fspot_data_importer_do_discover_importable_librar if (_tmp34__length1 > 0) { #line 389 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp33_ = DATA_IMPORTS_FSPOT_SERVICE_WELCOME_MESSAGE; -#line 3509 "FSpotImporter.c" +#line 3503 "FSpotImporter.c" } else { #line 389 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp33_ = DATA_IMPORTS_FSPOT_SERVICE_WELCOME_MESSAGE_FILE_ONLY; -#line 3513 "FSpotImporter.c" +#line 3507 "FSpotImporter.c" } #line 388 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp35_ = self->priv->host; @@ -3537,15 +3531,15 @@ static void data_imports_fspot_fspot_data_importer_do_discover_importable_librar db_files = (_vala_array_free (db_files, db_files_length1, (GDestroyNotify) g_object_unref), NULL); #line 365 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" discovered_libraries = (_vala_array_free (discovered_libraries, discovered_libraries_length1, (GDestroyNotify) g_object_unref), NULL); -#line 3527 "FSpotImporter.c" +#line 3521 "FSpotImporter.c" } static void data_imports_fspot_fspot_data_importer_real_on_library_selected (SpitDataImportsDataImporter* base, SpitDataImportsImportableLibrary* library) { DataImportsFSpotFSpotDataImporter * self; - SpitDataImportsImportableLibrary* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; + SpitDataImportsImportableLibrary* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; #line 395 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter); #line 395 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -3560,82 +3554,82 @@ static void data_imports_fspot_fspot_data_importer_real_on_library_selected (Spi spit_data_imports_data_importer_on_file_selected (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORTER, SpitDataImportsDataImporter), _tmp2_); #line 396 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (_tmp2_); -#line 3550 "FSpotImporter.c" +#line 3544 "FSpotImporter.c" } -static void _vala_array_add3 (DataImportsFSpotFSpotImportableTag*** array, int* length, int* size, DataImportsFSpotFSpotImportableTag* value) { +static void _vala_array_add3 (DataImportsFSpotFSpotImportableTag** * array, int* length, int* size, DataImportsFSpotFSpotImportableTag* value) { #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if ((*length) == (*size)) { #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" *size = (*size) ? (2 * (*size)) : 4; #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" *array = g_renew (DataImportsFSpotFSpotImportableTag*, *array, (*size) + 1); -#line 3561 "FSpotImporter.c" +#line 3555 "FSpotImporter.c" } #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" (*array)[(*length)++] = value; #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" (*array)[*length] = NULL; -#line 3567 "FSpotImporter.c" +#line 3561 "FSpotImporter.c" } -static void _vala_array_add4 (SpitDataImportsImportableMediaItem*** array, int* length, int* size, SpitDataImportsImportableMediaItem* value) { +static void _vala_array_add4 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value) { #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if ((*length) == (*size)) { #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" *size = (*size) ? (2 * (*size)) : 4; #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" *array = g_renew (SpitDataImportsImportableMediaItem*, *array, (*size) + 1); -#line 3578 "FSpotImporter.c" +#line 3572 "FSpotImporter.c" } #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" (*array)[(*length)++] = value; #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" (*array)[*length] = NULL; -#line 3584 "FSpotImporter.c" +#line 3578 "FSpotImporter.c" } -static void _vala_array_add5 (SpitDataImportsImportableMediaItem*** array, int* length, int* size, SpitDataImportsImportableMediaItem* value) { +static void _vala_array_add5 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value) { #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if ((*length) == (*size)) { #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" *size = (*size) ? (2 * (*size)) : 4; #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" *array = g_renew (SpitDataImportsImportableMediaItem*, *array, (*size) + 1); -#line 3595 "FSpotImporter.c" +#line 3589 "FSpotImporter.c" } #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" (*array)[(*length)++] = value; #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" (*array)[*length] = NULL; -#line 3601 "FSpotImporter.c" +#line 3595 "FSpotImporter.c" } -static void _vala_array_add6 (SpitDataImportsImportableMediaItem*** array, int* length, int* size, SpitDataImportsImportableMediaItem* value) { +static void _vala_array_add6 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value) { #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if ((*length) == (*size)) { #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" *size = (*size) ? (2 * (*size)) : 4; #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" *array = g_renew (SpitDataImportsImportableMediaItem*, *array, (*size) + 1); -#line 3612 "FSpotImporter.c" +#line 3606 "FSpotImporter.c" } #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" (*array)[(*length)++] = value; #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" (*array)[*length] = NULL; -#line 3618 "FSpotImporter.c" +#line 3612 "FSpotImporter.c" } static void _data_imports_fspot_fspot_data_importer_on_imported_items_count_spit_data_imports_imported_items_count_callback (gint imported_items_count, gpointer self) { #line 527 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" data_imports_fspot_fspot_data_importer_on_imported_items_count ((DataImportsFSpotFSpotDataImporter*) self, imported_items_count); -#line 3625 "FSpotImporter.c" +#line 3619 "FSpotImporter.c" } @@ -3647,12 +3641,11 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa gdouble progress_delta_per_photo = 0.0; gdouble progress_plugin_to_host_ratio = 0.0; gdouble current_progress = 0.0; - SpitDataImportsPluginHost* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; - GeeArrayList* _tmp36_ = NULL; - gint _tmp37_ = 0; - gint _tmp38_ = 0; - SpitDataImportsPluginHost* _tmp173_ = NULL; + SpitDataImportsPluginHost* _tmp24_; + GeeArrayList* _tmp35_; + gint _tmp36_; + gint _tmp37_; + SpitDataImportsPluginHost* _tmp172_; GError * _inner_error_ = NULL; #line 399 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter); @@ -3664,12 +3657,12 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa progress_plugin_to_host_ratio = 0.5; #line 405 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" current_progress = 0.0; -#line 3654 "FSpotImporter.c" +#line 3647 "FSpotImporter.c" { DataImportsFSpotDbFSpotDatabase* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - DataImportsFSpotDbFSpotDatabase* _tmp2_ = NULL; - DataImportsFSpotDbFSpotDatabase* _tmp3_ = NULL; + GFile* _tmp1_; + DataImportsFSpotDbFSpotDatabase* _tmp2_; + DataImportsFSpotDbFSpotDatabase* _tmp3_; #line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp1_ = file; #line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -3680,12 +3673,12 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa if (G_UNLIKELY (_inner_error_ != NULL)) { #line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 3670 "FSpotImporter.c" +#line 3663 "FSpotImporter.c" goto __catch0_database_error; } #line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_inner_error_->domain == SPIT_DATA_IMPORTS_DATA_IMPORT_ERROR) { -#line 3675 "FSpotImporter.c" +#line 3668 "FSpotImporter.c" goto __catch0_spit_data_imports_data_import_error; } #line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -3700,7 +3693,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa g_clear_error (&_inner_error_); #line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return; -#line 3690 "FSpotImporter.c" +#line 3683 "FSpotImporter.c" } #line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp3_ = _tmp0_; @@ -3712,17 +3705,17 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa database = _tmp3_; #line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (_tmp0_); -#line 3702 "FSpotImporter.c" +#line 3695 "FSpotImporter.c" } goto __finally0; __catch0_database_error: { GError* e = NULL; - GError* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - SpitDataImportsPluginHost* _tmp8_ = NULL; + GError* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + SpitDataImportsPluginHost* _tmp8_; #line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" e = _inner_error_; #line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -3753,17 +3746,17 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa _g_object_unref0 (database); #line 411 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return; -#line 3743 "FSpotImporter.c" +#line 3736 "FSpotImporter.c" } goto __finally0; __catch0_spit_data_imports_data_import_error: { GError* e = NULL; - GError* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - SpitDataImportsPluginHost* _tmp13_ = NULL; + GError* _tmp9_; + const gchar* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + SpitDataImportsPluginHost* _tmp13_; #line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" e = _inner_error_; #line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -3794,7 +3787,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa _g_object_unref0 (database); #line 415 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return; -#line 3784 "FSpotImporter.c" +#line 3777 "FSpotImporter.c" } __finally0: #line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -3811,14 +3804,14 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa g_clear_error (&_inner_error_); #line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return; -#line 3801 "FSpotImporter.c" +#line 3794 "FSpotImporter.c" } { DataImportsFSpotFSpotTagsCache* _tmp14_ = NULL; - DataImportsFSpotDbFSpotDatabase* _tmp15_ = NULL; - DataImportsFSpotDbFSpotTagsTable* _tmp16_ = NULL; - DataImportsFSpotFSpotTagsCache* _tmp17_ = NULL; - DataImportsFSpotFSpotTagsCache* _tmp18_ = NULL; + DataImportsFSpotDbFSpotDatabase* _tmp15_; + DataImportsFSpotDbFSpotTagsTable* _tmp16_; + DataImportsFSpotFSpotTagsCache* _tmp17_; + DataImportsFSpotFSpotTagsCache* _tmp18_; #line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp15_ = database; #line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -3831,7 +3824,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa if (G_UNLIKELY (_inner_error_ != NULL)) { #line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 3821 "FSpotImporter.c" +#line 3814 "FSpotImporter.c" goto __catch1_database_error; } #line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -3846,7 +3839,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa g_clear_error (&_inner_error_); #line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return; -#line 3836 "FSpotImporter.c" +#line 3829 "FSpotImporter.c" } #line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp18_ = _tmp14_; @@ -3858,17 +3851,17 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa tags_cache = _tmp18_; #line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (_tmp14_); -#line 3848 "FSpotImporter.c" +#line 3841 "FSpotImporter.c" } goto __finally1; __catch1_database_error: { GError* e = NULL; - GError* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - SpitDataImportsPluginHost* _tmp23_ = NULL; + GError* _tmp19_; + const gchar* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; + SpitDataImportsPluginHost* _tmp23_; #line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" e = _inner_error_; #line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -3899,7 +3892,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa _g_object_unref0 (database); #line 422 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return; -#line 3889 "FSpotImporter.c" +#line 3882 "FSpotImporter.c" } __finally1: #line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -3916,34 +3909,32 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa g_clear_error (&_inner_error_); #line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return; -#line 3906 "FSpotImporter.c" +#line 3899 "FSpotImporter.c" } #line 424 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp24_ = self->priv->host; #line 424 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp25_ = _ ("Preparing to import"); -#line 424 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - spit_data_imports_plugin_host_install_import_progress_pane (_tmp24_, _tmp25_); -#line 3914 "FSpotImporter.c" + spit_data_imports_plugin_host_install_import_progress_pane (_tmp24_, _ ("Preparing to import")); +#line 3905 "FSpotImporter.c" { - GeeArrayList* _tmp26_ = NULL; - DataImportsFSpotDbFSpotDatabase* _tmp27_ = NULL; - DataImportsFSpotDbFSpotPhotosTable* _tmp28_ = NULL; - GeeArrayList* _tmp29_ = NULL; - GeeArrayList* _tmp30_ = NULL; + GeeArrayList* _tmp25_ = NULL; + DataImportsFSpotDbFSpotDatabase* _tmp26_; + DataImportsFSpotDbFSpotPhotosTable* _tmp27_; + GeeArrayList* _tmp28_; + GeeArrayList* _tmp29_; #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp27_ = database; + _tmp26_ = database; #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp28_ = _tmp27_->photos_table; + _tmp27_ = _tmp26_->photos_table; #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp29_ = data_imports_fspot_db_fspot_photos_table_get_all (_tmp28_, &_inner_error_); + _tmp28_ = data_imports_fspot_db_fspot_photos_table_get_all (_tmp27_, &_inner_error_); #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp26_ = _tmp29_; + _tmp25_ = _tmp28_; #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 3933 "FSpotImporter.c" +#line 3924 "FSpotImporter.c" goto __catch2_database_error; } #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -3958,49 +3949,49 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa g_clear_error (&_inner_error_); #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return; -#line 3948 "FSpotImporter.c" +#line 3939 "FSpotImporter.c" } #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp30_ = _tmp26_; + _tmp29_ = _tmp25_; #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp26_ = NULL; + _tmp25_ = NULL; #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (all_photos); #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - all_photos = _tmp30_; + all_photos = _tmp29_; #line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _g_object_unref0 (_tmp26_); -#line 3960 "FSpotImporter.c" + _g_object_unref0 (_tmp25_); +#line 3951 "FSpotImporter.c" } goto __finally2; __catch2_database_error: { GError* e = NULL; - GError* _tmp31_ = NULL; - const gchar* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; - SpitDataImportsPluginHost* _tmp35_ = NULL; + GError* _tmp30_; + const gchar* _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; + SpitDataImportsPluginHost* _tmp34_; #line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" e = _inner_error_; #line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _inner_error_ = NULL; #line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp31_ = e; + _tmp30_ = e; #line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp32_ = _tmp31_->message; + _tmp31_ = _tmp30_->message; #line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp33_ = g_strdup_printf ("FSpotDataImporter: Can't read photos table: %s", _tmp32_); + _tmp32_ = g_strdup_printf ("FSpotDataImporter: Can't read photos table: %s", _tmp31_); #line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp34_ = _tmp33_; + _tmp33_ = _tmp32_; #line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - g_debug ("FSpotImporter.vala:428: %s", _tmp34_); + g_debug ("FSpotImporter.vala:428: %s", _tmp33_); #line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _g_free0 (_tmp34_); + _g_free0 (_tmp33_); #line 429 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp35_ = self->priv->host; + _tmp34_ = self->priv->host; #line 429 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - spit_data_imports_plugin_host_post_error_message (_tmp35_, DATA_IMPORTS_FSPOT_ERROR_CANT_READ_PHOTOS_TABLE); + spit_data_imports_plugin_host_post_error_message (_tmp34_, DATA_IMPORTS_FSPOT_ERROR_CANT_READ_PHOTOS_TABLE); #line 430 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_error_free0 (e); #line 430 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -4011,7 +4002,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa _g_object_unref0 (database); #line 430 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return; -#line 4001 "FSpotImporter.c" +#line 3992 "FSpotImporter.c" } __finally2: #line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -4028,108 +4019,108 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa g_clear_error (&_inner_error_); #line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return; -#line 4018 "FSpotImporter.c" +#line 4009 "FSpotImporter.c" } #line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp36_ = all_photos; + _tmp35_ = all_photos; #line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp36_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp38_ = _tmp37_; + _tmp37_ = _tmp36_; #line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - if (_tmp38_ > 0) { -#line 4028 "FSpotImporter.c" - GeeArrayList* _tmp39_ = NULL; - gint _tmp40_ = 0; - gint _tmp41_ = 0; + if (_tmp37_ > 0) { +#line 4019 "FSpotImporter.c" + GeeArrayList* _tmp38_; + gint _tmp39_; + gint _tmp40_; #line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp39_ = all_photos; + _tmp38_ = all_photos; #line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp40_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp39_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp41_ = _tmp40_; + _tmp40_ = _tmp39_; #line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - progress_delta_per_photo = 1.0 / _tmp41_; -#line 4040 "FSpotImporter.c" + progress_delta_per_photo = 1.0 / _tmp40_; +#line 4031 "FSpotImporter.c" } { GeeArrayList* _photo_row_list = NULL; - GeeArrayList* _tmp42_ = NULL; - GeeArrayList* _tmp43_ = NULL; + GeeArrayList* _tmp41_; + GeeArrayList* _tmp42_; gint _photo_row_size = 0; - GeeArrayList* _tmp44_ = NULL; - gint _tmp45_ = 0; - gint _tmp46_ = 0; + GeeArrayList* _tmp43_; + gint _tmp44_; + gint _tmp45_; gint _photo_row_index = 0; #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp42_ = all_photos; + _tmp41_ = all_photos; #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp43_ = _g_object_ref0 (_tmp42_); + _tmp42_ = _g_object_ref0 (_tmp41_); #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _photo_row_list = _tmp43_; + _photo_row_list = _tmp42_; #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp44_ = _photo_row_list; + _tmp43_ = _photo_row_list; #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp45_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp44_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp46_ = _tmp45_; + _tmp45_ = _tmp44_; #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _photo_row_size = _tmp46_; + _photo_row_size = _tmp45_; #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _photo_row_index = -1; #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" while (TRUE) { -#line 4069 "FSpotImporter.c" - gint _tmp47_ = 0; - gint _tmp48_ = 0; - gint _tmp49_ = 0; +#line 4060 "FSpotImporter.c" + gint _tmp46_; + gint _tmp47_; + gint _tmp48_; DataImportsFSpotDbFSpotPhotoRow* photo_row = NULL; - GeeArrayList* _tmp50_ = NULL; - gint _tmp51_ = 0; - gpointer _tmp52_ = NULL; + GeeArrayList* _tmp49_; + gint _tmp50_; + gpointer _tmp51_; gboolean hidden = FALSE; gboolean favorite = FALSE; DataImportsFSpotFSpotImportableTag** tags = NULL; - DataImportsFSpotFSpotImportableTag** _tmp53_ = NULL; - gint tags_length1 = 0; - gint _tags_size_ = 0; + DataImportsFSpotFSpotImportableTag** _tmp52_; + gint tags_length1; + gint _tags_size_; DataImportsFSpotFSpotImportableEvent* event = NULL; DataImportsFSpotDbFSpotRollRow* roll_row = NULL; SpitDataImportsImportableMediaItem** importable_items = NULL; - SpitDataImportsImportableMediaItem** _tmp97_ = NULL; - gint importable_items_length1 = 0; - gint _importable_items_size_ = 0; - gboolean _tmp161_ = FALSE; + SpitDataImportsImportableMediaItem** _tmp96_; + gint importable_items_length1; + gint _importable_items_size_; + gboolean _tmp160_; #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp47_ = _photo_row_index; + _tmp46_ = _photo_row_index; #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _photo_row_index = _tmp47_ + 1; + _photo_row_index = _tmp46_ + 1; #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp48_ = _photo_row_index; + _tmp47_ = _photo_row_index; #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp49_ = _photo_row_size; + _tmp48_ = _photo_row_size; #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - if (!(_tmp48_ < _tmp49_)) { + if (!(_tmp47_ < _tmp48_)) { #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" break; -#line 4102 "FSpotImporter.c" +#line 4093 "FSpotImporter.c" } #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp50_ = _photo_row_list; + _tmp49_ = _photo_row_list; #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp51_ = _photo_row_index; + _tmp50_ = _photo_row_index; #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp52_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp51_); + _tmp51_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp50_); #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - photo_row = (DataImportsFSpotDbFSpotPhotoRow*) _tmp52_; + photo_row = (DataImportsFSpotDbFSpotPhotoRow*) _tmp51_; #line 435 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" hidden = FALSE; #line 436 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" favorite = FALSE; #line 437 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp53_ = g_new0 (DataImportsFSpotFSpotImportableTag*, 0 + 1); + _tmp52_ = g_new0 (DataImportsFSpotFSpotImportableTag*, 0 + 1); #line 437 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - tags = _tmp53_; + tags = _tmp52_; #line 437 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" tags_length1 = 0; #line 437 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -4138,31 +4129,31 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa event = NULL; #line 439 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" roll_row = NULL; -#line 4128 "FSpotImporter.c" +#line 4119 "FSpotImporter.c" { - GeeArrayList* _tmp54_ = NULL; - DataImportsFSpotDbFSpotDatabase* _tmp55_ = NULL; - DataImportsFSpotDbFSpotTagsTable* _tmp56_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp57_ = NULL; - gint64 _tmp58_ = 0LL; - GeeArrayList* _tmp59_ = NULL; + GeeArrayList* _tmp53_ = NULL; + DataImportsFSpotDbFSpotDatabase* _tmp54_; + DataImportsFSpotDbFSpotTagsTable* _tmp55_; + DataImportsFSpotDbFSpotPhotoRow* _tmp56_; + gint64 _tmp57_; + GeeArrayList* _tmp58_; #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp55_ = database; + _tmp54_ = database; #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp56_ = _tmp55_->tags_table; + _tmp55_ = _tmp54_->tags_table; #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp57_ = photo_row; + _tmp56_ = photo_row; #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp58_ = _tmp57_->photo_id; + _tmp57_ = _tmp56_->photo_id; #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp59_ = data_imports_fspot_db_fspot_tags_table_get_by_photo_id (_tmp56_, _tmp58_, &_inner_error_); + _tmp58_ = data_imports_fspot_db_fspot_tags_table_get_by_photo_id (_tmp55_, _tmp57_, &_inner_error_); #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp54_ = _tmp59_; + _tmp53_ = _tmp58_; #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 4152 "FSpotImporter.c" +#line 4143 "FSpotImporter.c" goto __catch3_database_error; } #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -4187,80 +4178,78 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa g_clear_error (&_inner_error_); #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return; -#line 4177 "FSpotImporter.c" +#line 4168 "FSpotImporter.c" } { GeeArrayList* _tag_row_list = NULL; - GeeArrayList* _tmp60_ = NULL; + GeeArrayList* _tmp59_; gint _tag_row_size = 0; - GeeArrayList* _tmp61_ = NULL; - gint _tmp62_ = 0; - gint _tmp63_ = 0; + GeeArrayList* _tmp60_; + gint _tmp61_; + gint _tmp62_; gint _tag_row_index = 0; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp60_ = _tmp54_; -#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp54_ = NULL; + _tmp59_ = _g_object_ref0 (_tmp53_); #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tag_row_list = _tmp60_; + _tag_row_list = _tmp59_; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp61_ = _tag_row_list; + _tmp60_ = _tag_row_list; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp62_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp61_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp63_ = _tmp62_; + _tmp62_ = _tmp61_; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tag_row_size = _tmp63_; + _tag_row_size = _tmp62_; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tag_row_index = -1; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" while (TRUE) { -#line 4205 "FSpotImporter.c" - gint _tmp64_ = 0; - gint _tmp65_ = 0; - gint _tmp66_ = 0; +#line 4194 "FSpotImporter.c" + gint _tmp63_; + gint _tmp64_; + gint _tmp65_; DataImportsFSpotDbFSpotTagRow* tag_row = NULL; - GeeArrayList* _tmp67_ = NULL; - gint _tmp68_ = 0; - gpointer _tmp69_ = NULL; + GeeArrayList* _tmp66_; + gint _tmp67_; + gpointer _tmp68_; DataImportsFSpotFSpotImportableTag* tag = NULL; - DataImportsFSpotFSpotTagsCache* _tmp70_ = NULL; - DataImportsFSpotDbFSpotTagRow* _tmp71_ = NULL; - DataImportsFSpotFSpotImportableTag* _tmp72_ = NULL; - DataImportsFSpotFSpotImportableTag* _tmp73_ = NULL; - DataImportsFSpotDbFSpotDatabase* _tmp74_ = NULL; - gint64 _tmp75_ = 0LL; - gboolean _tmp76_ = FALSE; + DataImportsFSpotFSpotTagsCache* _tmp69_; + DataImportsFSpotDbFSpotTagRow* _tmp70_; + DataImportsFSpotFSpotImportableTag* _tmp71_; + DataImportsFSpotFSpotImportableTag* _tmp72_; + DataImportsFSpotDbFSpotDatabase* _tmp73_; + gint64 _tmp74_; + gboolean _tmp75_; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp64_ = _tag_row_index; + _tmp63_ = _tag_row_index; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tag_row_index = _tmp64_ + 1; + _tag_row_index = _tmp63_ + 1; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp65_ = _tag_row_index; + _tmp64_ = _tag_row_index; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp66_ = _tag_row_size; + _tmp65_ = _tag_row_size; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - if (!(_tmp65_ < _tmp66_)) { + if (!(_tmp64_ < _tmp65_)) { #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" break; -#line 4233 "FSpotImporter.c" +#line 4222 "FSpotImporter.c" } #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp67_ = _tag_row_list; + _tmp66_ = _tag_row_list; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp68_ = _tag_row_index; + _tmp67_ = _tag_row_index; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp69_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp68_); + _tmp68_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp67_); #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - tag_row = (DataImportsFSpotDbFSpotTagRow*) _tmp69_; + tag_row = (DataImportsFSpotDbFSpotTagRow*) _tmp68_; #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp70_ = tags_cache; + _tmp69_ = tags_cache; #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp71_ = tag_row; + _tmp70_ = tag_row; #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp72_ = data_imports_fspot_fspot_tags_cache_get_tag (_tmp70_, _tmp71_, &_inner_error_); + _tmp71_ = data_imports_fspot_fspot_tags_cache_get_tag (_tmp69_, _tmp70_, &_inner_error_); #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - tag = _tmp72_; + tag = _tmp71_; #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -4268,10 +4257,10 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (_tag_row_list); #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _g_object_unref0 (_tmp54_); + _g_object_unref0 (_tmp53_); #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 4261 "FSpotImporter.c" +#line 4250 "FSpotImporter.c" goto __catch3_database_error; } #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -4279,7 +4268,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (_tag_row_list); #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _g_object_unref0 (_tmp54_); + _g_object_unref0 (_tmp53_); #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (roll_row); #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -4302,90 +4291,90 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa g_clear_error (&_inner_error_); #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return; -#line 4292 "FSpotImporter.c" +#line 4281 "FSpotImporter.c" } #line 452 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp73_ = tag; + _tmp72_ = tag; #line 452 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp74_ = database; + _tmp73_ = database; #line 452 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp75_ = _tmp74_->hidden_tag_id; + _tmp74_ = _tmp73_->hidden_tag_id; #line 452 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp76_ = data_imports_fspot_fspot_data_importer_is_tag_hidden (self, _tmp73_, _tmp75_); + _tmp75_ = data_imports_fspot_fspot_data_importer_is_tag_hidden (self, _tmp72_, _tmp74_); #line 452 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - if (_tmp76_) { + if (_tmp75_) { #line 453 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" hidden = TRUE; -#line 4306 "FSpotImporter.c" +#line 4295 "FSpotImporter.c" } else { - DataImportsFSpotFSpotImportableTag* _tmp77_ = NULL; - gboolean _tmp78_ = FALSE; + DataImportsFSpotFSpotImportableTag* _tmp76_; + gboolean _tmp77_; #line 454 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp77_ = tag; + _tmp76_ = tag; #line 454 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp78_ = data_imports_fspot_fspot_data_importer_is_tag_favorite (self, _tmp77_); + _tmp77_ = data_imports_fspot_fspot_data_importer_is_tag_favorite (self, _tmp76_); #line 454 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - if (_tmp78_) { + if (_tmp77_) { #line 455 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" favorite = TRUE; -#line 4318 "FSpotImporter.c" +#line 4307 "FSpotImporter.c" } else { - DataImportsFSpotFSpotImportableTag** _tmp79_ = NULL; - gint _tmp79__length1 = 0; - DataImportsFSpotFSpotImportableTag* _tmp80_ = NULL; - DataImportsFSpotFSpotImportableTag* _tmp81_ = NULL; + DataImportsFSpotFSpotImportableTag** _tmp78_; + gint _tmp78__length1; + DataImportsFSpotFSpotImportableTag* _tmp79_; + DataImportsFSpotFSpotImportableTag* _tmp80_; #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp79_ = tags; + _tmp78_ = tags; #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp79__length1 = tags_length1; + _tmp78__length1 = tags_length1; #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp80_ = tag; + _tmp79_ = tag; #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp81_ = _g_object_ref0 (_tmp80_); + _tmp80_ = _g_object_ref0 (_tmp79_); #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _vala_array_add3 (&tags, &tags_length1, &_tags_size_, _tmp81_); -#line 4334 "FSpotImporter.c" + _vala_array_add3 (&tags, &tags_length1, &_tags_size_, _tmp80_); +#line 4323 "FSpotImporter.c" } } #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (tag); #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (tag_row); -#line 4341 "FSpotImporter.c" +#line 4330 "FSpotImporter.c" } #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (_tag_row_list); -#line 4345 "FSpotImporter.c" +#line 4334 "FSpotImporter.c" } #line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _g_object_unref0 (_tmp54_); -#line 4349 "FSpotImporter.c" + _g_object_unref0 (_tmp53_); +#line 4338 "FSpotImporter.c" } goto __finally3; __catch3_database_error: { GError* e = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp82_ = NULL; - gint64 _tmp83_ = 0LL; - GError* _tmp84_ = NULL; - const gchar* _tmp85_ = NULL; + DataImportsFSpotDbFSpotPhotoRow* _tmp81_; + gint64 _tmp82_; + GError* _tmp83_; + const gchar* _tmp84_; #line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" e = _inner_error_; #line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _inner_error_ = NULL; #line 461 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp82_ = photo_row; + _tmp81_ = photo_row; #line 461 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp83_ = _tmp82_->photo_id; + _tmp82_ = _tmp81_->photo_id; #line 461 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp84_ = e; + _tmp83_ = e; #line 461 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp85_ = _tmp84_->message; + _tmp84_ = _tmp83_->message; #line 461 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - g_message ("FSpotImporter.vala:461: Failed to retrieve tags for photo ID %ld: %s", (glong) _tmp83_, _tmp85_); + g_message ("FSpotImporter.vala:461: Failed to retrieve tags for photo ID %ld: %s", (glong) _tmp82_, _tmp84_); #line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_error_free0 (e); -#line 4375 "FSpotImporter.c" +#line 4364 "FSpotImporter.c" } __finally3: #line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -4412,33 +4401,33 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa g_clear_error (&_inner_error_); #line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return; -#line 4402 "FSpotImporter.c" +#line 4391 "FSpotImporter.c" } { - DataImportsFSpotDbFSpotRollRow* _tmp86_ = NULL; - DataImportsFSpotDbFSpotDatabase* _tmp87_ = NULL; - DataImportsFSpotDbFSpotRollsTable* _tmp88_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp89_ = NULL; - gint64 _tmp90_ = 0LL; - DataImportsFSpotDbFSpotRollRow* _tmp91_ = NULL; - DataImportsFSpotDbFSpotRollRow* _tmp92_ = NULL; + DataImportsFSpotDbFSpotRollRow* _tmp85_ = NULL; + DataImportsFSpotDbFSpotDatabase* _tmp86_; + DataImportsFSpotDbFSpotRollsTable* _tmp87_; + DataImportsFSpotDbFSpotPhotoRow* _tmp88_; + gint64 _tmp89_; + DataImportsFSpotDbFSpotRollRow* _tmp90_; + DataImportsFSpotDbFSpotRollRow* _tmp91_; #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp87_ = database; + _tmp86_ = database; #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp88_ = _tmp87_->rolls_table; + _tmp87_ = _tmp86_->rolls_table; #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp89_ = photo_row; + _tmp88_ = photo_row; #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp90_ = _tmp89_->roll_id; + _tmp89_ = _tmp88_->roll_id; #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp91_ = data_imports_fspot_db_fspot_rolls_table_get_by_id (_tmp88_, _tmp90_, &_inner_error_); + _tmp90_ = data_imports_fspot_db_fspot_rolls_table_get_by_id (_tmp87_, _tmp89_, &_inner_error_); #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp86_ = _tmp91_; + _tmp85_ = _tmp90_; #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 4428 "FSpotImporter.c" +#line 4417 "FSpotImporter.c" goto __catch4_database_error; } #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -4463,45 +4452,45 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa g_clear_error (&_inner_error_); #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return; -#line 4453 "FSpotImporter.c" +#line 4442 "FSpotImporter.c" } #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp92_ = _tmp86_; + _tmp91_ = _tmp85_; #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp86_ = NULL; + _tmp85_ = NULL; #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (roll_row); #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - roll_row = _tmp92_; + roll_row = _tmp91_; #line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _g_object_unref0 (_tmp86_); -#line 4465 "FSpotImporter.c" + _g_object_unref0 (_tmp85_); +#line 4454 "FSpotImporter.c" } goto __finally4; __catch4_database_error: { GError* e = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp93_ = NULL; - gint64 _tmp94_ = 0LL; - GError* _tmp95_ = NULL; - const gchar* _tmp96_ = NULL; + DataImportsFSpotDbFSpotPhotoRow* _tmp92_; + gint64 _tmp93_; + GError* _tmp94_; + const gchar* _tmp95_; #line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" e = _inner_error_; #line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _inner_error_ = NULL; #line 469 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp93_ = photo_row; + _tmp92_ = photo_row; #line 469 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp94_ = _tmp93_->photo_id; + _tmp93_ = _tmp92_->photo_id; #line 469 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp95_ = e; + _tmp94_ = e; #line 469 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp96_ = _tmp95_->message; + _tmp95_ = _tmp94_->message; #line 469 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - g_message ("FSpotImporter.vala:469: Failed to retrieve roll for photo ID %ld: %s", (glong) _tmp94_, _tmp96_); + g_message ("FSpotImporter.vala:469: Failed to retrieve roll for photo ID %ld: %s", (glong) _tmp93_, _tmp95_); #line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_error_free0 (e); -#line 4491 "FSpotImporter.c" +#line 4480 "FSpotImporter.c" } __finally4: #line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -4528,45 +4517,45 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa g_clear_error (&_inner_error_); #line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return; -#line 4518 "FSpotImporter.c" +#line 4507 "FSpotImporter.c" } #line 473 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp97_ = g_new0 (SpitDataImportsImportableMediaItem*, 0 + 1); + _tmp96_ = g_new0 (SpitDataImportsImportableMediaItem*, 0 + 1); #line 473 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - importable_items = _tmp97_; + importable_items = _tmp96_; #line 473 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" importable_items_length1 = 0; #line 473 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _importable_items_size_ = importable_items_length1; -#line 4528 "FSpotImporter.c" +#line 4517 "FSpotImporter.c" { GeeArrayList* photo_versions = NULL; - DataImportsFSpotDbFSpotDatabase* _tmp98_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionsTable* _tmp99_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp100_ = NULL; - gint64 _tmp101_ = 0LL; - GeeArrayList* _tmp102_ = NULL; + DataImportsFSpotDbFSpotDatabase* _tmp97_; + DataImportsFSpotDbFSpotPhotoVersionsTable* _tmp98_; + DataImportsFSpotDbFSpotPhotoRow* _tmp99_; + gint64 _tmp100_; + GeeArrayList* _tmp101_; gboolean photo_versions_added = FALSE; gboolean photo_versions_skipped = FALSE; - gboolean _tmp128_ = FALSE; - gboolean _tmp129_ = FALSE; + gboolean _tmp127_ = FALSE; + gboolean _tmp128_; #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp98_ = database; + _tmp97_ = database; #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp99_ = _tmp98_->photo_versions_table; + _tmp98_ = _tmp97_->photo_versions_table; #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp100_ = photo_row; + _tmp99_ = photo_row; #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp101_ = _tmp100_->photo_id; + _tmp100_ = _tmp99_->photo_id; #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp102_ = data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id (_tmp99_, _tmp101_, &_inner_error_); + _tmp101_ = data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id (_tmp98_, _tmp100_, &_inner_error_); #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - photo_versions = _tmp102_; + photo_versions = _tmp101_; #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 4556 "FSpotImporter.c" +#line 4545 "FSpotImporter.c" goto __catch5_database_error; } #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -4593,319 +4582,319 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa g_clear_error (&_inner_error_); #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return; -#line 4583 "FSpotImporter.c" +#line 4572 "FSpotImporter.c" } #line 477 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" photo_versions_added = FALSE; #line 478 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" photo_versions_skipped = FALSE; -#line 4589 "FSpotImporter.c" +#line 4578 "FSpotImporter.c" { GeeArrayList* _photo_version_row_list = NULL; - GeeArrayList* _tmp103_ = NULL; - GeeArrayList* _tmp104_ = NULL; + GeeArrayList* _tmp102_; + GeeArrayList* _tmp103_; gint _photo_version_row_size = 0; - GeeArrayList* _tmp105_ = NULL; - gint _tmp106_ = 0; - gint _tmp107_ = 0; + GeeArrayList* _tmp104_; + gint _tmp105_; + gint _tmp106_; gint _photo_version_row_index = 0; #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp103_ = photo_versions; + _tmp102_ = photo_versions; #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp104_ = _g_object_ref0 (_tmp103_); + _tmp103_ = _g_object_ref0 (_tmp102_); #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _photo_version_row_list = _tmp104_; + _photo_version_row_list = _tmp103_; #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp105_ = _photo_version_row_list; + _tmp104_ = _photo_version_row_list; #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp106_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp105_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp107_ = _tmp106_; + _tmp106_ = _tmp105_; #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _photo_version_row_size = _tmp107_; + _photo_version_row_size = _tmp106_; #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _photo_version_row_index = -1; #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" while (TRUE) { -#line 4617 "FSpotImporter.c" - gint _tmp108_ = 0; - gint _tmp109_ = 0; - gint _tmp110_ = 0; +#line 4606 "FSpotImporter.c" + gint _tmp107_; + gint _tmp108_; + gint _tmp109_; DataImportsFSpotDbFSpotPhotoVersionRow* photo_version_row = NULL; - GeeArrayList* _tmp111_ = NULL; - gint _tmp112_ = 0; - gpointer _tmp113_ = NULL; - gboolean _tmp114_ = FALSE; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp115_ = NULL; - GFile* _tmp116_ = NULL; + GeeArrayList* _tmp110_; + gint _tmp111_; + gpointer _tmp112_; + gboolean _tmp113_ = FALSE; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp114_; + GFile* _tmp115_; #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp108_ = _photo_version_row_index; + _tmp107_ = _photo_version_row_index; #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _photo_version_row_index = _tmp108_ + 1; + _photo_version_row_index = _tmp107_ + 1; #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp109_ = _photo_version_row_index; + _tmp108_ = _photo_version_row_index; #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp110_ = _photo_version_row_size; + _tmp109_ = _photo_version_row_size; #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - if (!(_tmp109_ < _tmp110_)) { + if (!(_tmp108_ < _tmp109_)) { #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" break; -#line 4640 "FSpotImporter.c" +#line 4629 "FSpotImporter.c" } #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp111_ = _photo_version_row_list; + _tmp110_ = _photo_version_row_list; #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp112_ = _photo_version_row_index; + _tmp111_ = _photo_version_row_index; #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp113_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp112_); + _tmp112_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp111_); #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - photo_version_row = (DataImportsFSpotDbFSpotPhotoVersionRow*) _tmp113_; + photo_version_row = (DataImportsFSpotDbFSpotPhotoVersionRow*) _tmp112_; #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp115_ = photo_version_row; + _tmp114_ = photo_version_row; #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp116_ = _tmp115_->base_path; + _tmp115_ = _tmp114_->base_path; #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - if (_tmp116_ != NULL) { -#line 4656 "FSpotImporter.c" - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp117_ = NULL; - const gchar* _tmp118_ = NULL; + if (_tmp115_ != NULL) { +#line 4645 "FSpotImporter.c" + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp116_; + const gchar* _tmp117_; #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp117_ = photo_version_row; + _tmp116_ = photo_version_row; #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp118_ = _tmp117_->filename; + _tmp117_ = _tmp116_->filename; #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp114_ = _tmp118_ != NULL; -#line 4665 "FSpotImporter.c" + _tmp113_ = _tmp117_ != NULL; +#line 4654 "FSpotImporter.c" } else { #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp114_ = FALSE; -#line 4669 "FSpotImporter.c" + _tmp113_ = FALSE; +#line 4658 "FSpotImporter.c" } #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - if (_tmp114_) { -#line 4673 "FSpotImporter.c" - SpitDataImportsImportableMediaItem** _tmp119_ = NULL; - gint _tmp119__length1 = 0; - DataImportsFSpotDbFSpotPhotoRow* _tmp120_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp121_ = NULL; - DataImportsFSpotDbFSpotRollRow* _tmp122_ = NULL; - DataImportsFSpotFSpotImportableTag** _tmp123_ = NULL; - gint _tmp123__length1 = 0; - DataImportsFSpotFSpotImportableEvent* _tmp124_ = NULL; - gboolean _tmp125_ = FALSE; - gboolean _tmp126_ = FALSE; - DataImportsFSpotFSpotImportableItem* _tmp127_ = NULL; + if (_tmp113_) { +#line 4662 "FSpotImporter.c" + SpitDataImportsImportableMediaItem** _tmp118_; + gint _tmp118__length1; + DataImportsFSpotDbFSpotPhotoRow* _tmp119_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp120_; + DataImportsFSpotDbFSpotRollRow* _tmp121_; + DataImportsFSpotFSpotImportableTag** _tmp122_; + gint _tmp122__length1; + DataImportsFSpotFSpotImportableEvent* _tmp123_; + gboolean _tmp124_; + gboolean _tmp125_; + DataImportsFSpotFSpotImportableItem* _tmp126_; #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp119_ = importable_items; + _tmp118_ = importable_items; #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp119__length1 = importable_items_length1; + _tmp118__length1 = importable_items_length1; #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp120_ = photo_row; + _tmp119_ = photo_row; #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp121_ = photo_version_row; + _tmp120_ = photo_version_row; #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp122_ = roll_row; + _tmp121_ = roll_row; #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp123_ = tags; + _tmp122_ = tags; #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp123__length1 = tags_length1; + _tmp122__length1 = tags_length1; #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp124_ = event; + _tmp123_ = event; #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp125_ = hidden; + _tmp124_ = hidden; #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp126_ = favorite; + _tmp125_ = favorite; #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp127_ = data_imports_fspot_fspot_importable_item_new (_tmp120_, _tmp121_, _tmp122_, _tmp123_, _tmp123__length1, _tmp124_, _tmp125_, _tmp126_); + _tmp126_ = data_imports_fspot_fspot_importable_item_new (_tmp119_, _tmp120_, _tmp121_, _tmp122_, _tmp122__length1, _tmp123_, _tmp124_, _tmp125_); #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _vala_array_add4 (&importable_items, &importable_items_length1, &_importable_items_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_MEDIA_ITEM, SpitDataImportsImportableMediaItem)); + _vala_array_add4 (&importable_items, &importable_items_length1, &_importable_items_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_MEDIA_ITEM, SpitDataImportsImportableMediaItem)); #line 484 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" photo_versions_added = TRUE; -#line 4711 "FSpotImporter.c" +#line 4700 "FSpotImporter.c" } else { #line 486 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" photo_versions_skipped = TRUE; -#line 4715 "FSpotImporter.c" +#line 4704 "FSpotImporter.c" } #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (photo_version_row); -#line 4719 "FSpotImporter.c" +#line 4708 "FSpotImporter.c" } #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (_photo_version_row_list); -#line 4723 "FSpotImporter.c" +#line 4712 "FSpotImporter.c" } #line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp129_ = photo_versions_skipped; + _tmp128_ = photo_versions_skipped; #line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - if (_tmp129_) { + if (_tmp128_) { #line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp128_ = TRUE; -#line 4731 "FSpotImporter.c" + _tmp127_ = TRUE; +#line 4720 "FSpotImporter.c" } else { - gboolean _tmp130_ = FALSE; + gboolean _tmp129_; #line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp130_ = photo_versions_added; + _tmp129_ = photo_versions_added; #line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp128_ = !_tmp130_; -#line 4738 "FSpotImporter.c" + _tmp127_ = !_tmp129_; +#line 4727 "FSpotImporter.c" } #line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - if (_tmp128_) { -#line 4742 "FSpotImporter.c" - gboolean _tmp131_ = FALSE; - DataImportsFSpotDbFSpotPhotoRow* _tmp132_ = NULL; - GFile* _tmp133_ = NULL; + if (_tmp127_) { +#line 4731 "FSpotImporter.c" + gboolean _tmp130_ = FALSE; + DataImportsFSpotDbFSpotPhotoRow* _tmp131_; + GFile* _tmp132_; #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp132_ = photo_row; + _tmp131_ = photo_row; #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp133_ = _tmp132_->base_path; + _tmp132_ = _tmp131_->base_path; #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - if (_tmp133_ != NULL) { -#line 4752 "FSpotImporter.c" - DataImportsFSpotDbFSpotPhotoRow* _tmp134_ = NULL; - const gchar* _tmp135_ = NULL; + if (_tmp132_ != NULL) { +#line 4741 "FSpotImporter.c" + DataImportsFSpotDbFSpotPhotoRow* _tmp133_; + const gchar* _tmp134_; #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp134_ = photo_row; + _tmp133_ = photo_row; #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp135_ = _tmp134_->filename; + _tmp134_ = _tmp133_->filename; #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp131_ = _tmp135_ != NULL; -#line 4761 "FSpotImporter.c" + _tmp130_ = _tmp134_ != NULL; +#line 4750 "FSpotImporter.c" } else { #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp131_ = FALSE; -#line 4765 "FSpotImporter.c" + _tmp130_ = FALSE; +#line 4754 "FSpotImporter.c" } #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - if (_tmp131_) { -#line 4769 "FSpotImporter.c" - SpitDataImportsImportableMediaItem** _tmp136_ = NULL; - gint _tmp136__length1 = 0; - DataImportsFSpotDbFSpotPhotoRow* _tmp137_ = NULL; - DataImportsFSpotDbFSpotRollRow* _tmp138_ = NULL; - DataImportsFSpotFSpotImportableTag** _tmp139_ = NULL; - gint _tmp139__length1 = 0; - DataImportsFSpotFSpotImportableEvent* _tmp140_ = NULL; - gboolean _tmp141_ = FALSE; - gboolean _tmp142_ = FALSE; - DataImportsFSpotFSpotImportableItem* _tmp143_ = NULL; + if (_tmp130_) { +#line 4758 "FSpotImporter.c" + SpitDataImportsImportableMediaItem** _tmp135_; + gint _tmp135__length1; + DataImportsFSpotDbFSpotPhotoRow* _tmp136_; + DataImportsFSpotDbFSpotRollRow* _tmp137_; + DataImportsFSpotFSpotImportableTag** _tmp138_; + gint _tmp138__length1; + DataImportsFSpotFSpotImportableEvent* _tmp139_; + gboolean _tmp140_; + gboolean _tmp141_; + DataImportsFSpotFSpotImportableItem* _tmp142_; #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp136_ = importable_items; + _tmp135_ = importable_items; #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp136__length1 = importable_items_length1; + _tmp135__length1 = importable_items_length1; #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp137_ = photo_row; + _tmp136_ = photo_row; #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp138_ = roll_row; + _tmp137_ = roll_row; #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp139_ = tags; + _tmp138_ = tags; #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp139__length1 = tags_length1; + _tmp138__length1 = tags_length1; #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp140_ = event; + _tmp139_ = event; #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp141_ = hidden; + _tmp140_ = hidden; #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp142_ = favorite; + _tmp141_ = favorite; #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp143_ = data_imports_fspot_fspot_importable_item_new (_tmp137_, NULL, _tmp138_, _tmp139_, _tmp139__length1, _tmp140_, _tmp141_, _tmp142_); + _tmp142_ = data_imports_fspot_fspot_importable_item_new (_tmp136_, NULL, _tmp137_, _tmp138_, _tmp138__length1, _tmp139_, _tmp140_, _tmp141_); #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _vala_array_add5 (&importable_items, &importable_items_length1, &_importable_items_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_MEDIA_ITEM, SpitDataImportsImportableMediaItem)); -#line 4802 "FSpotImporter.c" + _vala_array_add5 (&importable_items, &importable_items_length1, &_importable_items_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_MEDIA_ITEM, SpitDataImportsImportableMediaItem)); +#line 4791 "FSpotImporter.c" } } #line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (photo_versions); -#line 4807 "FSpotImporter.c" +#line 4796 "FSpotImporter.c" } goto __finally5; __catch5_database_error: { GError* e = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp144_ = NULL; - gint64 _tmp145_ = 0LL; - GError* _tmp146_ = NULL; - const gchar* _tmp147_ = NULL; - gboolean _tmp148_ = FALSE; - DataImportsFSpotDbFSpotPhotoRow* _tmp149_ = NULL; - GFile* _tmp150_ = NULL; + DataImportsFSpotDbFSpotPhotoRow* _tmp143_; + gint64 _tmp144_; + GError* _tmp145_; + const gchar* _tmp146_; + gboolean _tmp147_ = FALSE; + DataImportsFSpotDbFSpotPhotoRow* _tmp148_; + GFile* _tmp149_; #line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" e = _inner_error_; #line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _inner_error_ = NULL; #line 504 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp144_ = photo_row; + _tmp143_ = photo_row; #line 504 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp145_ = _tmp144_->photo_id; + _tmp144_ = _tmp143_->photo_id; #line 504 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp146_ = e; + _tmp145_ = e; #line 504 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp147_ = _tmp146_->message; + _tmp146_ = _tmp145_->message; #line 504 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_message ("FSpotImporter.vala:504: Failed to retrieve versions for photo ID %ld: " \ -"%s", (glong) _tmp145_, _tmp147_); +"%s", (glong) _tmp144_, _tmp146_); #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp149_ = photo_row; + _tmp148_ = photo_row; #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp150_ = _tmp149_->base_path; + _tmp149_ = _tmp148_->base_path; #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - if (_tmp150_ != NULL) { -#line 4840 "FSpotImporter.c" - DataImportsFSpotDbFSpotPhotoRow* _tmp151_ = NULL; - const gchar* _tmp152_ = NULL; + if (_tmp149_ != NULL) { +#line 4829 "FSpotImporter.c" + DataImportsFSpotDbFSpotPhotoRow* _tmp150_; + const gchar* _tmp151_; #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp151_ = photo_row; + _tmp150_ = photo_row; #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp152_ = _tmp151_->filename; + _tmp151_ = _tmp150_->filename; #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp148_ = _tmp152_ != NULL; -#line 4849 "FSpotImporter.c" + _tmp147_ = _tmp151_ != NULL; +#line 4838 "FSpotImporter.c" } else { #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp148_ = FALSE; -#line 4853 "FSpotImporter.c" + _tmp147_ = FALSE; +#line 4842 "FSpotImporter.c" } #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - if (_tmp148_) { -#line 4857 "FSpotImporter.c" - SpitDataImportsImportableMediaItem** _tmp153_ = NULL; - gint _tmp153__length1 = 0; - DataImportsFSpotDbFSpotPhotoRow* _tmp154_ = NULL; - DataImportsFSpotDbFSpotRollRow* _tmp155_ = NULL; - DataImportsFSpotFSpotImportableTag** _tmp156_ = NULL; - gint _tmp156__length1 = 0; - DataImportsFSpotFSpotImportableEvent* _tmp157_ = NULL; - gboolean _tmp158_ = FALSE; - gboolean _tmp159_ = FALSE; - DataImportsFSpotFSpotImportableItem* _tmp160_ = NULL; + if (_tmp147_) { +#line 4846 "FSpotImporter.c" + SpitDataImportsImportableMediaItem** _tmp152_; + gint _tmp152__length1; + DataImportsFSpotDbFSpotPhotoRow* _tmp153_; + DataImportsFSpotDbFSpotRollRow* _tmp154_; + DataImportsFSpotFSpotImportableTag** _tmp155_; + gint _tmp155__length1; + DataImportsFSpotFSpotImportableEvent* _tmp156_; + gboolean _tmp157_; + gboolean _tmp158_; + DataImportsFSpotFSpotImportableItem* _tmp159_; #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp153_ = importable_items; + _tmp152_ = importable_items; #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp153__length1 = importable_items_length1; + _tmp152__length1 = importable_items_length1; #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp154_ = photo_row; + _tmp153_ = photo_row; #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp155_ = roll_row; + _tmp154_ = roll_row; #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp156_ = tags; + _tmp155_ = tags; #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp156__length1 = tags_length1; + _tmp155__length1 = tags_length1; #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp157_ = event; + _tmp156_ = event; #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp158_ = hidden; + _tmp157_ = hidden; #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp159_ = favorite; + _tmp158_ = favorite; #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp160_ = data_imports_fspot_fspot_importable_item_new (_tmp154_, NULL, _tmp155_, _tmp156_, _tmp156__length1, _tmp157_, _tmp158_, _tmp159_); + _tmp159_ = data_imports_fspot_fspot_importable_item_new (_tmp153_, NULL, _tmp154_, _tmp155_, _tmp155__length1, _tmp156_, _tmp157_, _tmp158_); #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _vala_array_add6 (&importable_items, &importable_items_length1, &_importable_items_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp160_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_MEDIA_ITEM, SpitDataImportsImportableMediaItem)); -#line 4890 "FSpotImporter.c" + _vala_array_add6 (&importable_items, &importable_items_length1, &_importable_items_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp159_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_MEDIA_ITEM, SpitDataImportsImportableMediaItem)); +#line 4879 "FSpotImporter.c" } #line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_error_free0 (e); -#line 4894 "FSpotImporter.c" +#line 4883 "FSpotImporter.c" } __finally5: #line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -4934,56 +4923,56 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa g_clear_error (&_inner_error_); #line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return; -#line 4923 "FSpotImporter.c" +#line 4912 "FSpotImporter.c" } #line 514 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp161_ = self->priv->running; + _tmp160_ = self->priv->running; #line 514 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - if (_tmp161_) { -#line 4929 "FSpotImporter.c" - SpitDataImportsPluginHost* _tmp162_ = NULL; - SpitDataImportsImportableMediaItem** _tmp163_ = NULL; - gint _tmp163__length1 = 0; - gdouble _tmp164_ = 0.0; - gdouble _tmp165_ = 0.0; - gdouble _tmp166_ = 0.0; - gdouble _tmp167_ = 0.0; - gdouble _tmp168_ = 0.0; - gdouble _tmp169_ = 0.0; - gdouble _tmp170_ = 0.0; - SpitDataImportsPluginHost* _tmp171_ = NULL; - gdouble _tmp172_ = 0.0; + if (_tmp160_) { +#line 4918 "FSpotImporter.c" + SpitDataImportsPluginHost* _tmp161_; + SpitDataImportsImportableMediaItem** _tmp162_; + gint _tmp162__length1; + gdouble _tmp163_; + gdouble _tmp164_; + gdouble _tmp165_; + gdouble _tmp166_; + gdouble _tmp167_; + gdouble _tmp168_; + gdouble _tmp169_; + SpitDataImportsPluginHost* _tmp170_; + gdouble _tmp171_; #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp162_ = self->priv->host; + _tmp161_ = self->priv->host; #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp163_ = importable_items; + _tmp162_ = importable_items; #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp163__length1 = importable_items_length1; + _tmp162__length1 = importable_items_length1; #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp164_ = current_progress; + _tmp163_ = current_progress; #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp165_ = progress_delta_per_photo; + _tmp164_ = progress_delta_per_photo; #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp166_ = progress_plugin_to_host_ratio; + _tmp165_ = progress_plugin_to_host_ratio; #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp167_ = progress_delta_per_photo; + _tmp166_ = progress_delta_per_photo; #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp168_ = progress_plugin_to_host_ratio; + _tmp167_ = progress_plugin_to_host_ratio; #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - spit_data_imports_plugin_host_prepare_media_items_for_import (_tmp162_, _tmp163_, _tmp163__length1, _tmp164_ + (_tmp165_ * _tmp166_), _tmp167_ * (1 - _tmp168_), NULL); + spit_data_imports_plugin_host_prepare_media_items_for_import (_tmp161_, _tmp162_, _tmp162__length1, _tmp163_ + (_tmp164_ * _tmp165_), _tmp166_ * (1 - _tmp167_), NULL); #line 521 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp169_ = current_progress; + _tmp168_ = current_progress; #line 521 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp170_ = progress_delta_per_photo; + _tmp169_ = progress_delta_per_photo; #line 521 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - current_progress = _tmp169_ + _tmp170_; + current_progress = _tmp168_ + _tmp169_; #line 522 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp171_ = self->priv->host; + _tmp170_ = self->priv->host; #line 522 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp172_ = current_progress; + _tmp171_ = current_progress; #line 522 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - spit_data_imports_plugin_host_update_import_progress_pane (_tmp171_, _tmp172_, NULL); -#line 4972 "FSpotImporter.c" + spit_data_imports_plugin_host_update_import_progress_pane (_tmp170_, _tmp171_, NULL); +#line 4961 "FSpotImporter.c" } else { #line 524 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" importable_items = (_vala_array_free (importable_items, importable_items_length1, (GDestroyNotify) g_object_unref), NULL); @@ -4997,7 +4986,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa _g_object_unref0 (photo_row); #line 524 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" break; -#line 4986 "FSpotImporter.c" +#line 4975 "FSpotImporter.c" } #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" importable_items = (_vala_array_free (importable_items, importable_items_length1, (GDestroyNotify) g_object_unref), NULL); @@ -5009,31 +4998,31 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_object_unref), NULL); #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (photo_row); -#line 4998 "FSpotImporter.c" +#line 4987 "FSpotImporter.c" } #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (_photo_row_list); -#line 5002 "FSpotImporter.c" +#line 4991 "FSpotImporter.c" } #line 527 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp173_ = self->priv->host; + _tmp172_ = self->priv->host; #line 527 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - spit_data_imports_plugin_host_finalize_import (_tmp173_, _data_imports_fspot_fspot_data_importer_on_imported_items_count_spit_data_imports_imported_items_count_callback, self, NULL); + spit_data_imports_plugin_host_finalize_import (_tmp172_, _data_imports_fspot_fspot_data_importer_on_imported_items_count_spit_data_imports_imported_items_count_callback, self, NULL); #line 399 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (all_photos); #line 399 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (tags_cache); #line 399 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (database); -#line 5014 "FSpotImporter.c" +#line 5003 "FSpotImporter.c" } void data_imports_fspot_fspot_data_importer_on_imported_items_count (DataImportsFSpotFSpotDataImporter* self, gint imported_items_count) { - SpitDataImportsPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + SpitDataImportsPluginHost* _tmp0_; + gint _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; #line 530 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_return_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_DATA_IMPORTER (self)); #line 531 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -5048,18 +5037,18 @@ void data_imports_fspot_fspot_data_importer_on_imported_items_count (DataImports spit_data_imports_plugin_host_install_static_message_pane (_tmp0_, _tmp3_, SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE); #line 531 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_free0 (_tmp3_); -#line 5037 "FSpotImporter.c" +#line 5026 "FSpotImporter.c" } static gboolean data_imports_fspot_fspot_data_importer_is_tag_event (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag) { gboolean result = FALSE; gboolean _result_ = FALSE; - DataImportsFSpotFSpotImportableTag* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; + DataImportsFSpotFSpotImportableTag* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gboolean _tmp3_; + gboolean _tmp4_; #line 537 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_DATA_IMPORTER (self), FALSE); #line 537 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -5080,11 +5069,11 @@ static gboolean data_imports_fspot_fspot_data_importer_is_tag_event (DataImports _tmp4_ = _result_; #line 539 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (!_tmp4_) { -#line 5069 "FSpotImporter.c" +#line 5058 "FSpotImporter.c" DataImportsFSpotFSpotImportableTag* parent = NULL; - DataImportsFSpotFSpotImportableTag* _tmp5_ = NULL; - DataImportsFSpotFSpotImportableTag* _tmp6_ = NULL; - DataImportsFSpotFSpotImportableTag* _tmp7_ = NULL; + DataImportsFSpotFSpotImportableTag* _tmp5_; + DataImportsFSpotFSpotImportableTag* _tmp6_; + DataImportsFSpotFSpotImportableTag* _tmp7_; #line 540 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp5_ = tag; #line 540 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -5097,37 +5086,37 @@ static gboolean data_imports_fspot_fspot_data_importer_is_tag_event (DataImports if (_tmp7_ == NULL) { #line 542 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _result_ = FALSE; -#line 5086 "FSpotImporter.c" +#line 5075 "FSpotImporter.c" } else { - DataImportsFSpotFSpotImportableTag* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; + DataImportsFSpotFSpotImportableTag* _tmp8_; + gboolean _tmp9_; #line 544 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp8_ = parent; #line 544 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp9_ = data_imports_fspot_fspot_data_importer_is_tag_event (self, _tmp8_); #line 544 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _result_ = _tmp9_; -#line 5096 "FSpotImporter.c" +#line 5085 "FSpotImporter.c" } #line 539 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (parent); -#line 5100 "FSpotImporter.c" +#line 5089 "FSpotImporter.c" } #line 546 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" result = _result_; #line 546 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 5106 "FSpotImporter.c" +#line 5095 "FSpotImporter.c" } static gboolean data_imports_fspot_fspot_data_importer_is_tag_hidden (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag, gint64 hidden_tag_id) { gboolean result = FALSE; gboolean _result_ = FALSE; - gint64 _tmp0_ = 0LL; - DataImportsFSpotFSpotImportableTag* _tmp1_ = NULL; - gint64 _tmp2_ = 0LL; - gboolean _tmp3_ = FALSE; + gint64 _tmp0_; + DataImportsFSpotFSpotImportableTag* _tmp1_; + gint64 _tmp2_; + gboolean _tmp3_; #line 549 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_DATA_IMPORTER (self), FALSE); #line 549 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -5144,11 +5133,11 @@ static gboolean data_imports_fspot_fspot_data_importer_is_tag_hidden (DataImport _tmp3_ = _result_; #line 551 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (!_tmp3_) { -#line 5133 "FSpotImporter.c" +#line 5122 "FSpotImporter.c" DataImportsFSpotFSpotImportableTag* parent = NULL; - DataImportsFSpotFSpotImportableTag* _tmp4_ = NULL; - DataImportsFSpotFSpotImportableTag* _tmp5_ = NULL; - DataImportsFSpotFSpotImportableTag* _tmp6_ = NULL; + DataImportsFSpotFSpotImportableTag* _tmp4_; + DataImportsFSpotFSpotImportableTag* _tmp5_; + DataImportsFSpotFSpotImportableTag* _tmp6_; #line 552 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp4_ = tag; #line 552 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -5161,11 +5150,11 @@ static gboolean data_imports_fspot_fspot_data_importer_is_tag_hidden (DataImport if (_tmp6_ == NULL) { #line 554 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _result_ = FALSE; -#line 5150 "FSpotImporter.c" +#line 5139 "FSpotImporter.c" } else { - DataImportsFSpotFSpotImportableTag* _tmp7_ = NULL; - gint64 _tmp8_ = 0LL; - gboolean _tmp9_ = FALSE; + DataImportsFSpotFSpotImportableTag* _tmp7_; + gint64 _tmp8_; + gboolean _tmp9_; #line 556 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp7_ = parent; #line 556 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -5174,28 +5163,28 @@ static gboolean data_imports_fspot_fspot_data_importer_is_tag_hidden (DataImport _tmp9_ = data_imports_fspot_fspot_data_importer_is_tag_hidden (self, _tmp7_, _tmp8_); #line 556 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _result_ = _tmp9_; -#line 5163 "FSpotImporter.c" +#line 5152 "FSpotImporter.c" } #line 551 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (parent); -#line 5167 "FSpotImporter.c" +#line 5156 "FSpotImporter.c" } #line 558 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" result = _result_; #line 558 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 5173 "FSpotImporter.c" +#line 5162 "FSpotImporter.c" } static gboolean data_imports_fspot_fspot_data_importer_is_tag_favorite (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag) { gboolean result = FALSE; gboolean _result_ = FALSE; - DataImportsFSpotFSpotImportableTag* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; + DataImportsFSpotFSpotImportableTag* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gboolean _tmp3_; + gboolean _tmp4_; #line 561 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_DATA_IMPORTER (self), FALSE); #line 561 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -5216,11 +5205,11 @@ static gboolean data_imports_fspot_fspot_data_importer_is_tag_favorite (DataImpo _tmp4_ = _result_; #line 563 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" if (!_tmp4_) { -#line 5205 "FSpotImporter.c" +#line 5194 "FSpotImporter.c" DataImportsFSpotFSpotImportableTag* parent = NULL; - DataImportsFSpotFSpotImportableTag* _tmp5_ = NULL; - DataImportsFSpotFSpotImportableTag* _tmp6_ = NULL; - DataImportsFSpotFSpotImportableTag* _tmp7_ = NULL; + DataImportsFSpotFSpotImportableTag* _tmp5_; + DataImportsFSpotFSpotImportableTag* _tmp6_; + DataImportsFSpotFSpotImportableTag* _tmp7_; #line 564 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp5_ = tag; #line 564 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -5233,27 +5222,27 @@ static gboolean data_imports_fspot_fspot_data_importer_is_tag_favorite (DataImpo if (_tmp7_ == NULL) { #line 566 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _result_ = FALSE; -#line 5222 "FSpotImporter.c" +#line 5211 "FSpotImporter.c" } else { - DataImportsFSpotFSpotImportableTag* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; + DataImportsFSpotFSpotImportableTag* _tmp8_; + gboolean _tmp9_; #line 568 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp8_ = parent; #line 568 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp9_ = data_imports_fspot_fspot_data_importer_is_tag_favorite (self, _tmp8_); #line 568 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _result_ = _tmp9_; -#line 5232 "FSpotImporter.c" +#line 5221 "FSpotImporter.c" } #line 563 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (parent); -#line 5236 "FSpotImporter.c" +#line 5225 "FSpotImporter.c" } #line 570 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" result = _result_; #line 570 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" return result; -#line 5242 "FSpotImporter.c" +#line 5231 "FSpotImporter.c" } @@ -5264,7 +5253,7 @@ static void data_imports_fspot_fspot_data_importer_class_init (DataImportsFSpotF g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotDataImporterPrivate)); #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_data_importer_finalize; -#line 5253 "FSpotImporter.c" +#line 5242 "FSpotImporter.c" } @@ -5272,18 +5261,18 @@ static void data_imports_fspot_fspot_data_importer_spit_data_imports_data_import #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" data_imports_fspot_fspot_data_importer_spit_data_imports_data_importer_parent_iface = g_type_interface_peek_parent (iface); #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->is_running = (gboolean (*)(SpitDataImportsDataImporter*)) data_imports_fspot_fspot_data_importer_real_is_running; + iface->is_running = (gboolean (*) (SpitDataImportsDataImporter *)) data_imports_fspot_fspot_data_importer_real_is_running; #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->get_service = (SpitDataImportsService* (*)(SpitDataImportsDataImporter*)) data_imports_fspot_fspot_data_importer_real_get_service; + iface->get_service = (SpitDataImportsService* (*) (SpitDataImportsDataImporter *)) data_imports_fspot_fspot_data_importer_real_get_service; #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->start = (void (*)(SpitDataImportsDataImporter*)) data_imports_fspot_fspot_data_importer_real_start; + iface->start = (void (*) (SpitDataImportsDataImporter *)) data_imports_fspot_fspot_data_importer_real_start; #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->stop = (void (*)(SpitDataImportsDataImporter*)) data_imports_fspot_fspot_data_importer_real_stop; + iface->stop = (void (*) (SpitDataImportsDataImporter *)) data_imports_fspot_fspot_data_importer_real_stop; #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->on_library_selected = (void (*)(SpitDataImportsDataImporter*, SpitDataImportsImportableLibrary*)) data_imports_fspot_fspot_data_importer_real_on_library_selected; + iface->on_library_selected = (void (*) (SpitDataImportsDataImporter *, SpitDataImportsImportableLibrary*)) data_imports_fspot_fspot_data_importer_real_on_library_selected; #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - iface->on_file_selected = (void (*)(SpitDataImportsDataImporter*, GFile*)) data_imports_fspot_fspot_data_importer_real_on_file_selected; -#line 5272 "FSpotImporter.c" + iface->on_file_selected = (void (*) (SpitDataImportsDataImporter *, GFile*)) data_imports_fspot_fspot_data_importer_real_on_file_selected; +#line 5261 "FSpotImporter.c" } @@ -5296,17 +5285,17 @@ static void data_imports_fspot_fspot_data_importer_instance_init (DataImportsFSp self->priv->service = NULL; #line 326 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self->priv->running = FALSE; -#line 5285 "FSpotImporter.c" +#line 5274 "FSpotImporter.c" } -static void data_imports_fspot_fspot_data_importer_finalize (GObject* obj) { +static void data_imports_fspot_fspot_data_importer_finalize (GObject * obj) { DataImportsFSpotFSpotDataImporter * self; #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter); #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" G_OBJECT_CLASS (data_imports_fspot_fspot_data_importer_parent_class)->finalize (obj); -#line 5295 "FSpotImporter.c" +#line 5284 "FSpotImporter.c" } diff --git a/plugins/shotwell-data-imports/FSpotMetaTable.c b/plugins/shotwell-data-imports/FSpotMetaTable.c index 55e20af..0b87d55 100644 --- a/plugins/shotwell-data-imports/FSpotMetaTable.c +++ b/plugins/shotwell-data-imports/FSpotMetaTable.c @@ -1,4 +1,4 @@ -/* FSpotMetaTable.c generated by valac 0.34.7, the Vala compiler +/* FSpotMetaTable.c generated by valac 0.36.6, the Vala compiler * generated from FSpotMetaTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -154,7 +154,7 @@ static gpointer data_imports_fspot_db_fspot_meta_table_parent_class = NULL; static gpointer data_imports_fspot_db_fspot_meta_behavior_parent_class = NULL; static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_instance; static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_instance = NULL; -static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_meta_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; +static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_meta_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; GType data_imports_fspot_db_fspot_meta_row_get_type (void) G_GNUC_CONST; enum { @@ -162,7 +162,7 @@ enum { }; DataImportsFSpotDbFSpotMetaRow* data_imports_fspot_db_fspot_meta_row_new (void); DataImportsFSpotDbFSpotMetaRow* data_imports_fspot_db_fspot_meta_row_construct (GType object_type); -static void data_imports_fspot_db_fspot_meta_row_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_meta_row_finalize (GObject * obj); gpointer importable_database_table_ref (gpointer instance); void importable_database_table_unref (gpointer instance); GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -198,8 +198,8 @@ static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_beh static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_construct (GType object_type); static gchar* data_imports_fspot_db_fspot_meta_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base); static gchar** data_imports_fspot_db_fspot_meta_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1); -static void data_imports_fspot_db_fspot_meta_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotMetaRow** row, gint offset); -static void data_imports_fspot_db_fspot_meta_behavior_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_meta_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotMetaRow* * row, gint offset); +static void data_imports_fspot_db_fspot_meta_behavior_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -234,7 +234,7 @@ static void data_imports_fspot_db_fspot_meta_row_instance_init (DataImportsFSpot } -static void data_imports_fspot_db_fspot_meta_row_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_meta_row_finalize (GObject * obj) { DataImportsFSpotDbFSpotMetaRow * self; #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_ROW, DataImportsFSpotDbFSpotMetaRow); @@ -265,9 +265,9 @@ GType data_imports_fspot_db_fspot_meta_row_get_type (void) { DataImportsFSpotDbFSpotMetaTable* data_imports_fspot_db_fspot_meta_table_construct (GType object_type, sqlite3* db) { DataImportsFSpotDbFSpotMetaTable* self = NULL; - sqlite3* _tmp0_ = NULL; - DataImportsFSpotDbFSpotMetaBehavior* _tmp1_ = NULL; - DataImportsFSpotDbFSpotMetaBehavior* _tmp2_ = NULL; + sqlite3* _tmp0_; + DataImportsFSpotDbFSpotMetaBehavior* _tmp1_; + DataImportsFSpotDbFSpotMetaBehavior* _tmp2_; #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" g_return_val_if_fail (db != NULL, NULL); #line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" @@ -297,408 +297,408 @@ DataImportsFSpotDbFSpotMetaTable* data_imports_fspot_db_fspot_meta_table_new (sq static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; - gchar** _tmp3_ = NULL; - gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp3_; + gint _tmp3__length1; +#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" separator = ""; #line 312 "FSpotMetaTable.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = TRUE; #line 322 "FSpotMetaTable.c" } else { - gchar** _tmp4_ = NULL; - gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp4_; + gint _tmp4__length1; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; #line 332 "FSpotMetaTable.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = TRUE; #line 338 "FSpotMetaTable.c" } else { gboolean _tmp5_ = FALSE; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp6_; + gint _tmp6__length1; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { #line 349 "FSpotMetaTable.c" - gchar** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp7_; + gint _tmp7__length1; + const gchar* _tmp8_; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; #line 361 "FSpotMetaTable.c" } else { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = FALSE; #line 365 "FSpotMetaTable.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; #line 369 "FSpotMetaTable.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_) { #line 373 "FSpotMetaTable.c" gint i = 0; gsize len = 0UL; - gint _tmp31_ = 0; - gint _tmp33_ = 0; - gint _tmp34_ = 0; - gsize _tmp35_ = 0UL; - const gchar* _tmp36_ = NULL; - gint _tmp37_ = 0; - gint _tmp38_ = 0; - gint _tmp39_ = 0; + gint _tmp31_; + gint _tmp33_; + gint _tmp34_; + gsize _tmp35_; + const gchar* _tmp36_; + gint _tmp37_; + gint _tmp38_; + gint _tmp39_; const gchar* res = NULL; - gsize _tmp40_ = 0UL; - void* _tmp41_ = NULL; + gsize _tmp40_; + void* _tmp41_; void* ptr = NULL; - const gchar* _tmp42_ = NULL; - gchar** _tmp43_ = NULL; - gint _tmp43__length1 = 0; - const gchar* _tmp44_ = NULL; - void* _tmp45_ = NULL; - const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp42_; + gchar** _tmp43_; + gint _tmp43__length1; + const gchar* _tmp44_; + void* _tmp45_; + const gchar* _tmp62_; +#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = (gsize) 1; #line 396 "FSpotMetaTable.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { #line 405 "FSpotMetaTable.c" gboolean _tmp11_ = FALSE; gboolean _tmp12_ = FALSE; - gchar** _tmp13_ = NULL; - gint _tmp13__length1 = 0; + gchar** _tmp13_; + gint _tmp13__length1; gint _tmp21_ = 0; - gchar** _tmp22_ = NULL; - gint _tmp22__length1 = 0; - gint _tmp23_ = 0; - const gchar* _tmp24_ = NULL; - gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp22_; + gint _tmp22__length1; + gint _tmp23_; + const gchar* _tmp24_; + gsize _tmp30_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp9_) { #line 418 "FSpotMetaTable.c" - gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint _tmp10_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp10_ + 1; #line 424 "FSpotMetaTable.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { #line 434 "FSpotMetaTable.c" - gint _tmp14_ = 0; - gchar** _tmp15_ = NULL; - gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint _tmp14_; + gchar** _tmp15_; + gint _tmp15__length1; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; #line 446 "FSpotMetaTable.c" } else { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 450 "FSpotMetaTable.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = TRUE; #line 456 "FSpotMetaTable.c" } else { gboolean _tmp16_ = FALSE; - gchar** _tmp17_ = NULL; - gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp17_; + gint _tmp17__length1; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { #line 467 "FSpotMetaTable.c" - gchar** _tmp18_ = NULL; - gint _tmp18__length1 = 0; - gint _tmp19_ = 0; - const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp18_; + gint _tmp18__length1; + gint _tmp19_; + const gchar* _tmp20_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; #line 482 "FSpotMetaTable.c" } else { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = FALSE; #line 486 "FSpotMetaTable.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; #line 490 "FSpotMetaTable.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" break; #line 496 "FSpotMetaTable.c" } -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { #line 508 "FSpotMetaTable.c" - gchar** _tmp25_ = NULL; - gint _tmp25__length1 = 0; - gint _tmp26_ = 0; - const gchar* _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp25_; + gint _tmp25__length1; + gint _tmp26_; + const gchar* _tmp27_; + gint _tmp28_; + gint _tmp29_; +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; #line 529 "FSpotMetaTable.c" } else { -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = 0; #line 533 "FSpotMetaTable.c" } -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; #line 539 "FSpotMetaTable.c" } } -#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { #line 546 "FSpotMetaTable.c" - gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp32_; +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 554 "FSpotMetaTable.c" } -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp45_; #line 592 "FSpotMetaTable.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { #line 601 "FSpotMetaTable.c" - gint _tmp48_ = 0; - gchar** _tmp49_ = NULL; - gint _tmp49__length1 = 0; - void* _tmp50_ = NULL; - const gchar* _tmp51_ = NULL; - void* _tmp52_ = NULL; + gint _tmp48_; + gchar** _tmp49_; + gint _tmp49__length1; + void* _tmp50_; + const gchar* _tmp51_; + void* _tmp52_; const gchar* _tmp53_ = NULL; - gchar** _tmp54_ = NULL; - gint _tmp54__length1 = 0; - gint _tmp55_ = 0; - const gchar* _tmp56_ = NULL; - void* _tmp60_ = NULL; - void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp54_; + gint _tmp54__length1; + gint _tmp55_; + const gchar* _tmp56_; + void* _tmp60_; + void* _tmp61_; +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp46_) { #line 617 "FSpotMetaTable.c" - gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint _tmp47_; +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp47_ + 1; #line 623 "FSpotMetaTable.c" } -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" break; #line 637 "FSpotMetaTable.c" } -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { #line 657 "FSpotMetaTable.c" - gchar** _tmp57_ = NULL; - gint _tmp57__length1 = 0; - gint _tmp58_ = 0; - const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp57_; + gint _tmp57__length1; + gint _tmp58_; + const gchar* _tmp59_; +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; #line 672 "FSpotMetaTable.c" } else { -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = ""; #line 676 "FSpotMetaTable.c" } -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp61_; #line 684 "FSpotMetaTable.c" } } -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 695 "FSpotMetaTable.c" } else { - gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp63_; +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 704 "FSpotMetaTable.c" } @@ -708,42 +708,42 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gchar* data_imports_fspot_db_fspot_meta_table_get_data (DataImportsFSpotDbFSpotMetaTable* self, const gchar* name, GError** error) { gchar* result = NULL; gchar** columns = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL; - gint _tmp1_ = 0; - gchar** _tmp2_ = NULL; - gint columns_length1 = 0; - gint _columns_size_ = 0; + DataImportsFSpotDbFSpotTableBehavior* _tmp0_; + gint _tmp1_; + gchar** _tmp2_; + gint columns_length1; + gint _columns_size_; gchar* column_list = NULL; - gchar** _tmp3_ = NULL; - gint _tmp3__length1 = 0; - gchar* _tmp4_ = NULL; + gchar** _tmp3_; + gint _tmp3__length1; + gchar* _tmp4_; gchar* sql = NULL; - const gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; + const gchar* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; + sqlite3* _tmp8_; + const gchar* _tmp9_; sqlite3_stmt* _tmp10_ = NULL; - gint _tmp11_ = 0; - gint _tmp12_ = 0; - sqlite3_stmt* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - GDestroyNotify _tmp20_ = NULL; - gint _tmp21_ = 0; - gint _tmp22_ = 0; - sqlite3_stmt* _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; + gint _tmp11_; + gint _tmp12_; + sqlite3_stmt* _tmp17_; + const gchar* _tmp18_; + gchar* _tmp19_; + GDestroyNotify _tmp20_; + gint _tmp21_; + gint _tmp22_; + sqlite3_stmt* _tmp27_; + gint _tmp28_; + gint _tmp29_; DataImportsFSpotDbFSpotMetaRow* row = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp32_ = NULL; - sqlite3_stmt* _tmp33_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp32_; + sqlite3_stmt* _tmp33_; gpointer _tmp34_ = NULL; - DataImportsFSpotDbFSpotMetaRow* _tmp35_ = NULL; - const gchar* _tmp36_ = NULL; - gchar* _tmp37_ = NULL; + DataImportsFSpotDbFSpotMetaRow* _tmp35_; + const gchar* _tmp36_; + gchar* _tmp37_; GError * _inner_error_ = NULL; #line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_TABLE (self), NULL); @@ -792,10 +792,10 @@ gchar* data_imports_fspot_db_fspot_meta_table_get_data (DataImportsFSpotDbFSpotM #line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" if (_tmp12_ != SQLITE_OK) { #line 795 "FSpotMetaTable.c" - const gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - gint _tmp16_ = 0; + const gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + gint _tmp16_; #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _tmp13_ = sql; #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" @@ -861,10 +861,10 @@ gchar* data_imports_fspot_db_fspot_meta_table_get_data (DataImportsFSpotDbFSpotM #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" if (_tmp22_ != SQLITE_OK) { #line 864 "FSpotMetaTable.c" - const gchar* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - gint _tmp26_ = 0; + const gchar* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; + gint _tmp26_; #line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _tmp23_ = name; #line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" @@ -924,13 +924,13 @@ gchar* data_imports_fspot_db_fspot_meta_table_get_data (DataImportsFSpotDbFSpotM #line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" if (_tmp29_ != SQLITE_ROW) { #line 927 "FSpotMetaTable.c" - gint _tmp30_ = 0; + gint _tmp30_; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _tmp30_ = res; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" if (_tmp30_ != SQLITE_DONE) { #line 933 "FSpotMetaTable.c" - gint _tmp31_ = 0; + gint _tmp31_; #line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _tmp31_ = res; #line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" @@ -1022,8 +1022,8 @@ gchar* data_imports_fspot_db_fspot_meta_table_get_data (DataImportsFSpotDbFSpotM gchar* data_imports_fspot_db_fspot_meta_table_get_app_version (DataImportsFSpotDbFSpotMetaTable* self, GError** error) { gchar* result = NULL; gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + gchar* _tmp1_; + gchar* _tmp2_; GError * _inner_error_ = NULL; #line 65 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_TABLE (self), NULL); @@ -1067,8 +1067,8 @@ gchar* data_imports_fspot_db_fspot_meta_table_get_app_version (DataImportsFSpotD gchar* data_imports_fspot_db_fspot_meta_table_get_db_version (DataImportsFSpotDbFSpotMetaTable* self, GError** error) { gchar* result = NULL; gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + gchar* _tmp1_; + gchar* _tmp2_; GError * _inner_error_ = NULL; #line 69 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_TABLE (self), NULL); @@ -1111,17 +1111,17 @@ gchar* data_imports_fspot_db_fspot_meta_table_get_db_version (DataImportsFSpotDb static gint64 int64_parse (const gchar* str) { gint64 result = 0LL; - const gchar* _tmp0_ = NULL; - gint64 _tmp1_ = 0LL; -#line 679 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp0_; + gint64 _tmp1_; +#line 687 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (str != NULL, 0LL); -#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0); -#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_; -#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 1127 "FSpotMetaTable.c" } @@ -1130,7 +1130,7 @@ static gint64 int64_parse (const gchar* str) { gint64 data_imports_fspot_db_fspot_meta_table_get_hidden_tag_id (DataImportsFSpotDbFSpotMetaTable* self, GError** error) { gint64 result = 0LL; gchar* id_str = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; GError * _inner_error_ = NULL; #line 73 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_TABLE (self), 0LL); @@ -1163,7 +1163,7 @@ gint64 data_imports_fspot_db_fspot_meta_table_get_hidden_tag_id (DataImportsFSpo #line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" if (id_str != NULL) { #line 1166 "FSpotMetaTable.c" - gint64 _tmp3_ = 0LL; + gint64 _tmp3_; #line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _tmp3_ = int64_parse (id_str); #line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" @@ -1251,15 +1251,15 @@ static gpointer _g_object_ref0 (gpointer self) { DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_get_instance (void) { DataImportsFSpotDbFSpotMetaBehavior* result = NULL; - DataImportsFSpotDbFSpotMetaBehavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotMetaBehavior* _tmp2_ = NULL; - DataImportsFSpotDbFSpotMetaBehavior* _tmp3_ = NULL; + DataImportsFSpotDbFSpotMetaBehavior* _tmp0_; + DataImportsFSpotDbFSpotMetaBehavior* _tmp2_; + DataImportsFSpotDbFSpotMetaBehavior* _tmp3_; #line 92 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _tmp0_ = data_imports_fspot_db_fspot_meta_behavior_instance; #line 92 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" if (_tmp0_ == NULL) { #line 1262 "FSpotMetaTable.c" - DataImportsFSpotDbFSpotMetaBehavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotMetaBehavior* _tmp1_; #line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _tmp1_ = data_imports_fspot_db_fspot_meta_behavior_new (); #line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" @@ -1283,7 +1283,7 @@ DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_g static gchar* data_imports_fspot_db_fspot_meta_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) { DataImportsFSpotDbFSpotMetaBehavior * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR, DataImportsFSpotDbFSpotMetaBehavior); #line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" @@ -1299,11 +1299,11 @@ static gchar* data_imports_fspot_db_fspot_meta_behavior_real_get_table_name (Dat static gchar** data_imports_fspot_db_fspot_meta_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) { DataImportsFSpotDbFSpotMetaBehavior * self; gchar** result = NULL; - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar** _tmp2_ = NULL; - gchar** _tmp3_ = NULL; - gint _tmp3__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar** _tmp2_; + gchar** _tmp3_; + gint _tmp3__length1; #line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR, DataImportsFSpotDbFSpotMetaBehavior); #line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" @@ -1334,18 +1334,18 @@ static gchar** data_imports_fspot_db_fspot_meta_behavior_real_list_columns (Data } -static void data_imports_fspot_db_fspot_meta_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotMetaRow** row, gint offset) { +static void data_imports_fspot_db_fspot_meta_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotMetaRow* * row, gint offset) { DataImportsFSpotDbFSpotMetaBehavior * self; DataImportsFSpotDbFSpotMetaRow* _vala_row = NULL; - DataImportsFSpotDbFSpotMetaRow* _tmp0_ = NULL; - sqlite3_stmt* _tmp1_ = NULL; - gint _tmp2_ = 0; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - sqlite3_stmt* _tmp5_ = NULL; - gint _tmp6_ = 0; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + DataImportsFSpotDbFSpotMetaRow* _tmp0_; + sqlite3_stmt* _tmp1_; + gint _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; + sqlite3_stmt* _tmp5_; + gint _tmp6_; + const gchar* _tmp7_; + gchar* _tmp8_; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR, DataImportsFSpotDbFSpotMetaBehavior); #line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" @@ -1406,11 +1406,11 @@ static void data_imports_fspot_db_fspot_meta_behavior_data_imports_fspot_db_fspo #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" data_imports_fspot_db_fspot_meta_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface); #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" - iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_meta_behavior_real_get_table_name; + iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_meta_behavior_real_get_table_name; #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" - iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_meta_behavior_real_list_columns; + iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_meta_behavior_real_list_columns; #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" - iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_meta_behavior_real_build_row; + iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_meta_behavior_real_build_row; #line 1415 "FSpotMetaTable.c" } @@ -1419,7 +1419,7 @@ static void data_imports_fspot_db_fspot_meta_behavior_instance_init (DataImports } -static void data_imports_fspot_db_fspot_meta_behavior_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_meta_behavior_finalize (GObject * obj) { DataImportsFSpotDbFSpotMetaBehavior * self; #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR, DataImportsFSpotDbFSpotMetaBehavior); diff --git a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c index b1e6274..8865ca1 100644 --- a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c +++ b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c @@ -1,4 +1,4 @@ -/* FSpotPhotoTagsTable.c generated by valac 0.34.7, the Vala compiler +/* FSpotPhotoTagsTable.c generated by valac 0.36.6, the Vala compiler * generated from FSpotPhotoTagsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -153,7 +153,7 @@ static gpointer data_imports_fspot_db_fspot_photo_tags_table_parent_class = NULL static gpointer data_imports_fspot_db_fspot_photo_tags_v0_behavior_parent_class = NULL; static DataImportsFSpotDbFSpotPhotoTagsV0Behavior* data_imports_fspot_db_fspot_photo_tags_v0_behavior_instance; static DataImportsFSpotDbFSpotPhotoTagsV0Behavior* data_imports_fspot_db_fspot_photo_tags_v0_behavior_instance = NULL; -static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photo_tags_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; +static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photo_tags_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; GType data_imports_fspot_db_fspot_photo_tag_row_get_type (void) G_GNUC_CONST; enum { @@ -161,7 +161,7 @@ enum { }; DataImportsFSpotDbFSpotPhotoTagRow* data_imports_fspot_db_fspot_photo_tag_row_new (void); DataImportsFSpotDbFSpotPhotoTagRow* data_imports_fspot_db_fspot_photo_tag_row_construct (GType object_type); -static void data_imports_fspot_db_fspot_photo_tag_row_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_photo_tag_row_finalize (GObject * obj); gpointer importable_database_table_ref (gpointer instance); void importable_database_table_unref (gpointer instance); GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -191,8 +191,8 @@ static DataImportsFSpotDbFSpotPhotoTagsV0Behavior* data_imports_fspot_db_fspot_p DataImportsFSpotDbFSpotPhotoTagsV0Behavior* data_imports_fspot_db_fspot_photo_tags_v0_behavior_get_instance (void); static gchar* data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base); static gchar** data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1); -static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoTagRow** row, gint offset); -static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoTagRow* * row, gint offset); +static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_finalize (GObject * obj); DataImportsFSpotDbFSpotPhotoTagRow* data_imports_fspot_db_fspot_photo_tag_row_construct (GType object_type) { @@ -225,7 +225,7 @@ static void data_imports_fspot_db_fspot_photo_tag_row_instance_init (DataImports } -static void data_imports_fspot_db_fspot_photo_tag_row_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_photo_tag_row_finalize (GObject * obj) { DataImportsFSpotDbFSpotPhotoTagRow * self; #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW, DataImportsFSpotDbFSpotPhotoTagRow); @@ -252,10 +252,10 @@ GType data_imports_fspot_db_fspot_photo_tag_row_get_type (void) { DataImportsFSpotDbFSpotPhotoTagsTable* data_imports_fspot_db_fspot_photo_tags_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior) { DataImportsFSpotDbFSpotPhotoTagsTable* self = NULL; - sqlite3* _tmp0_ = NULL; - DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp2_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp3_ = NULL; + sqlite3* _tmp0_; + DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_; + DataImportsFSpotDbFSpotTableBehavior* _tmp2_; + DataImportsFSpotDbFSpotTableBehavior* _tmp3_; #line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" g_return_val_if_fail (db != NULL, NULL); #line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" @@ -339,15 +339,15 @@ static gpointer _g_object_ref0 (gpointer self) { DataImportsFSpotDbFSpotPhotoTagsV0Behavior* data_imports_fspot_db_fspot_photo_tags_v0_behavior_get_instance (void) { DataImportsFSpotDbFSpotPhotoTagsV0Behavior* result = NULL; - DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp2_ = NULL; - DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp3_ = NULL; + DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp0_; + DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp2_; + DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp3_; #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" _tmp0_ = data_imports_fspot_db_fspot_photo_tags_v0_behavior_instance; #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" if (_tmp0_ == NULL) { #line 350 "FSpotPhotoTagsTable.c" - DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp1_; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" _tmp1_ = data_imports_fspot_db_fspot_photo_tags_v0_behavior_new (); #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" @@ -371,7 +371,7 @@ DataImportsFSpotDbFSpotPhotoTagsV0Behavior* data_imports_fspot_db_fspot_photo_ta static gchar* data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) { DataImportsFSpotDbFSpotPhotoTagsV0Behavior * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoTagsV0Behavior); #line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" @@ -387,11 +387,11 @@ static gchar* data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_get_table_ static gchar** data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) { DataImportsFSpotDbFSpotPhotoTagsV0Behavior * self; gchar** result = NULL; - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar** _tmp2_ = NULL; - gchar** _tmp3_ = NULL; - gint _tmp3__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar** _tmp2_; + gchar** _tmp3_; + gint _tmp3__length1; #line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoTagsV0Behavior); #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" @@ -422,16 +422,16 @@ static gchar** data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_list_colu } -static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoTagRow** row, gint offset) { +static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoTagRow* * row, gint offset) { DataImportsFSpotDbFSpotPhotoTagsV0Behavior * self; DataImportsFSpotDbFSpotPhotoTagRow* _vala_row = NULL; - DataImportsFSpotDbFSpotPhotoTagRow* _tmp0_ = NULL; - sqlite3_stmt* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint64 _tmp3_ = 0LL; - sqlite3_stmt* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint64 _tmp6_ = 0LL; + DataImportsFSpotDbFSpotPhotoTagRow* _tmp0_; + sqlite3_stmt* _tmp1_; + gint _tmp2_; + gint64 _tmp3_; + sqlite3_stmt* _tmp4_; + gint _tmp5_; + gint64 _tmp6_; #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoTagsV0Behavior); #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" @@ -484,11 +484,11 @@ static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_data_imports_fspo #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" data_imports_fspot_db_fspot_photo_tags_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface); #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" - iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_get_table_name; + iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_get_table_name; #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" - iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_list_columns; + iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_list_columns; #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" - iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_build_row; + iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_build_row; #line 493 "FSpotPhotoTagsTable.c" } @@ -497,7 +497,7 @@ static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_instance_init (Da } -static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_finalize (GObject * obj) { DataImportsFSpotDbFSpotPhotoTagsV0Behavior * self; #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoTagsV0Behavior); diff --git a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c index 267d1f1..d7b9079 100644 --- a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c +++ b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c @@ -1,4 +1,4 @@ -/* FSpotPhotoVersionsTable.c generated by valac 0.34.7, the Vala compiler +/* FSpotPhotoVersionsTable.c generated by valac 0.36.6, the Vala compiler * generated from FSpotPhotoVersionsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -251,23 +251,23 @@ static gpointer data_imports_fspot_db_fspot_photo_versions_table_parent_class = static gpointer data_imports_fspot_db_fspot_photo_versions_v0_behavior_parent_class = NULL; static DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_photo_versions_v0_behavior_instance; static DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_photo_versions_v0_behavior_instance = NULL; -static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photo_versions_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; +static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photo_versions_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; static gpointer data_imports_fspot_db_fspot_photo_versions_v9_behavior_parent_class = NULL; static DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_photo_versions_v9_behavior_instance; static DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_photo_versions_v9_behavior_instance = NULL; -static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photo_versions_v9_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; +static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photo_versions_v9_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; static gpointer data_imports_fspot_db_fspot_photo_versions_v16_behavior_parent_class = NULL; static DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_photo_versions_v16_behavior_instance; static DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_photo_versions_v16_behavior_instance = NULL; -static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photo_versions_v16_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; +static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photo_versions_v16_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; static gpointer data_imports_fspot_db_fspot_photo_versions_v17_behavior_parent_class = NULL; static DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_photo_versions_v17_behavior_instance; static DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_photo_versions_v17_behavior_instance = NULL; -static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photo_versions_v17_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; +static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photo_versions_v17_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; static gpointer data_imports_fspot_db_fspot_photo_versions_v18_behavior_parent_class = NULL; static DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_photo_versions_v18_behavior_instance; static DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_photo_versions_v18_behavior_instance = NULL; -static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photo_versions_v18_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; +static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photo_versions_v18_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; GType data_imports_fspot_db_fspot_photo_version_row_get_type (void) G_GNUC_CONST; enum { @@ -275,7 +275,7 @@ enum { }; DataImportsFSpotDbFSpotPhotoVersionRow* data_imports_fspot_db_fspot_photo_version_row_new (void); DataImportsFSpotDbFSpotPhotoVersionRow* data_imports_fspot_db_fspot_photo_version_row_construct (GType object_type); -static void data_imports_fspot_db_fspot_photo_version_row_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_photo_version_row_finalize (GObject * obj); gpointer importable_database_table_ref (gpointer instance); void importable_database_table_unref (gpointer instance); GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -310,8 +310,8 @@ static DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fsp DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_photo_versions_v0_behavior_get_instance (void); static gchar* data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base); static gchar** data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1); -static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset); -static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset); +static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_finalize (GObject * obj); GType data_imports_fspot_db_fspot_photo_versions_v9_behavior_get_type (void) G_GNUC_CONST; enum { DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR_DUMMY_PROPERTY @@ -321,8 +321,8 @@ static DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fsp DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_photo_versions_v9_behavior_get_instance (void); static gchar* data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base); static gchar** data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1); -static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset); -static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset); +static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_finalize (GObject * obj); GType data_imports_fspot_db_fspot_photo_versions_v16_behavior_get_type (void) G_GNUC_CONST; enum { DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR_DUMMY_PROPERTY @@ -332,8 +332,8 @@ static DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fs DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_photo_versions_v16_behavior_get_instance (void); static gchar* data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base); static gchar** data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1); -static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset); -static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset); +static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_finalize (GObject * obj); GType data_imports_fspot_db_fspot_photo_versions_v17_behavior_get_type (void) G_GNUC_CONST; enum { DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR_DUMMY_PROPERTY @@ -343,8 +343,8 @@ static DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fs DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_photo_versions_v17_behavior_get_instance (void); static gchar* data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base); static gchar** data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1); -static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset); -static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset); +static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_finalize (GObject * obj); GType data_imports_fspot_db_fspot_photo_versions_v18_behavior_get_type (void) G_GNUC_CONST; enum { DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR_DUMMY_PROPERTY @@ -354,8 +354,8 @@ static DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fs DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_photo_versions_v18_behavior_get_instance (void); static gchar* data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base); static gchar** data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1); -static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset); -static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset); +static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_finalize (GObject * obj); DataImportsFSpotDbFSpotPhotoVersionRow* data_imports_fspot_db_fspot_photo_version_row_construct (GType object_type) { @@ -388,7 +388,7 @@ static void data_imports_fspot_db_fspot_photo_version_row_instance_init (DataImp } -static void data_imports_fspot_db_fspot_photo_version_row_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_photo_version_row_finalize (GObject * obj) { DataImportsFSpotDbFSpotPhotoVersionRow * self; #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW, DataImportsFSpotDbFSpotPhotoVersionRow); @@ -423,10 +423,10 @@ GType data_imports_fspot_db_fspot_photo_version_row_get_type (void) { DataImportsFSpotDbFSpotPhotoVersionsTable* data_imports_fspot_db_fspot_photo_versions_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior) { DataImportsFSpotDbFSpotPhotoVersionsTable* self = NULL; - sqlite3* _tmp0_ = NULL; - DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp2_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp3_ = NULL; + sqlite3* _tmp0_; + DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_; + DataImportsFSpotDbFSpotTableBehavior* _tmp2_; + DataImportsFSpotDbFSpotTableBehavior* _tmp3_; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" g_return_val_if_fail (db != NULL, NULL); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -461,26 +461,26 @@ DataImportsFSpotDbFSpotPhotoVersionsTable* data_imports_fspot_db_fspot_photo_ver GeeArrayList* data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id (DataImportsFSpotDbFSpotPhotoVersionsTable* self, gint64 photo_id, GError** error) { GeeArrayList* result = NULL; GeeArrayList* rows = NULL; - GeeArrayList* _tmp0_ = NULL; + GeeArrayList* _tmp0_; sqlite3_stmt* stmt = NULL; gchar* column_list = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp1_; gchar* sql = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + const gchar* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; gint res = 0; - sqlite3* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; + sqlite3* _tmp5_; + const gchar* _tmp6_; sqlite3_stmt* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; - sqlite3_stmt* _tmp14_ = NULL; - gint64 _tmp15_ = 0LL; - gint _tmp16_ = 0; - gint _tmp17_ = 0; - sqlite3_stmt* _tmp19_ = NULL; - gint _tmp20_ = 0; + gint _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp14_; + gint64 _tmp15_; + gint _tmp16_; + gint _tmp17_; + sqlite3_stmt* _tmp19_; + gint _tmp20_; GError * _inner_error_ = NULL; #line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_TABLE (self), NULL); @@ -517,10 +517,10 @@ GeeArrayList* data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id ( #line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" if (_tmp9_ != SQLITE_OK) { #line 520 "FSpotPhotoVersionsTable.c" - const gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gint _tmp13_ = 0; + const gchar* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + gint _tmp13_; #line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp10_ = sql; #line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -582,7 +582,7 @@ GeeArrayList* data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id ( #line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" if (_tmp17_ != SQLITE_OK) { #line 585 "FSpotPhotoVersionsTable.c" - gint _tmp18_ = 0; + gint _tmp18_; #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp18_ = res; #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -632,15 +632,15 @@ GeeArrayList* data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id ( #line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" while (TRUE) { #line 635 "FSpotPhotoVersionsTable.c" - gint _tmp21_ = 0; + gint _tmp21_; DataImportsFSpotDbFSpotPhotoVersionRow* row = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp22_ = NULL; - sqlite3_stmt* _tmp23_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp22_; + sqlite3_stmt* _tmp23_; gpointer _tmp24_ = NULL; - GeeArrayList* _tmp25_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp26_ = NULL; - sqlite3_stmt* _tmp27_ = NULL; - gint _tmp28_ = 0; + GeeArrayList* _tmp25_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp26_; + sqlite3_stmt* _tmp27_; + gint _tmp28_; #line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp21_ = res; #line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -741,15 +741,15 @@ static gpointer _g_object_ref0 (gpointer self) { DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_photo_versions_v0_behavior_get_instance (void) { DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* result = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp2_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp3_ = NULL; + DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp0_; + DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp2_; + DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp3_; #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp0_ = data_imports_fspot_db_fspot_photo_versions_v0_behavior_instance; #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" if (_tmp0_ == NULL) { #line 752 "FSpotPhotoVersionsTable.c" - DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp1_; #line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp1_ = data_imports_fspot_db_fspot_photo_versions_v0_behavior_new (); #line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -773,7 +773,7 @@ DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_phot static gchar* data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) { DataImportsFSpotDbFSpotPhotoVersionsV0Behavior * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV0Behavior); #line 80 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -789,13 +789,13 @@ static gchar* data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_get_ta static gchar** data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) { DataImportsFSpotDbFSpotPhotoVersionsV0Behavior * self; gchar** result = NULL; - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar** _tmp4_ = NULL; - gchar** _tmp5_ = NULL; - gint _tmp5__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar** _tmp4_; + gchar** _tmp5_; + gint _tmp5__length1; #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV0Behavior); #line 84 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -834,32 +834,32 @@ static gchar** data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_list_ } -static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset) { +static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset) { DataImportsFSpotDbFSpotPhotoVersionsV0Behavior * self; DataImportsFSpotDbFSpotPhotoVersionRow* _vala_row = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_ = NULL; - sqlite3_stmt* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint64 _tmp4_ = 0LL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_ = NULL; - sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint64 _tmp8_ = 0LL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_ = NULL; - sqlite3_stmt* _tmp10_ = NULL; - gint _tmp11_ = 0; - const gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_; + sqlite3_stmt* _tmp2_; + gint _tmp3_; + gint64 _tmp4_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_; + sqlite3_stmt* _tmp6_; + gint _tmp7_; + gint64 _tmp8_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_; + sqlite3_stmt* _tmp10_; + gint _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_; gchar* full_path = NULL; - sqlite3_stmt* _tmp14_ = NULL; - gint _tmp15_ = 0; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp29_ = NULL; + sqlite3_stmt* _tmp14_; + gint _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; + const gchar* _tmp18_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp27_; + gchar* _tmp28_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp29_; #line 87 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV0Behavior); #line 87 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -920,14 +920,14 @@ static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_ro if (_tmp18_ != NULL) { #line 922 "FSpotPhotoVersionsTable.c" GFile* uri = NULL; - const gchar* _tmp19_ = NULL; - GFile* _tmp20_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp21_ = NULL; - GFile* _tmp22_ = NULL; - GFile* _tmp23_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_ = NULL; - GFile* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; + const gchar* _tmp19_; + GFile* _tmp20_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp21_; + GFile* _tmp22_; + GFile* _tmp23_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_; + GFile* _tmp25_; + gchar* _tmp26_; #line 95 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp19_ = full_path; #line 95 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -998,11 +998,11 @@ static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_data_imports_ #line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" data_imports_fspot_db_fspot_photo_versions_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface); #line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" - iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_get_table_name; + iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_get_table_name; #line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" - iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_list_columns; + iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_list_columns; #line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" - iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_row; + iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_row; #line 1007 "FSpotPhotoVersionsTable.c" } @@ -1011,7 +1011,7 @@ static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_instance_init } -static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_finalize (GObject * obj) { DataImportsFSpotDbFSpotPhotoVersionsV0Behavior * self; #line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV0Behavior); @@ -1054,15 +1054,15 @@ static DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fsp DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_photo_versions_v9_behavior_get_instance (void) { DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* result = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp2_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp3_ = NULL; + DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp0_; + DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp2_; + DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp3_; #line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp0_ = data_imports_fspot_db_fspot_photo_versions_v9_behavior_instance; #line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" if (_tmp0_ == NULL) { #line 1065 "FSpotPhotoVersionsTable.c" - DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp1_; #line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp1_ = data_imports_fspot_db_fspot_photo_versions_v9_behavior_new (); #line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -1086,7 +1086,7 @@ DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_phot static gchar* data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) { DataImportsFSpotDbFSpotPhotoVersionsV9Behavior * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV9Behavior); #line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -1102,14 +1102,14 @@ static gchar* data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_get_ta static gchar** data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) { DataImportsFSpotDbFSpotPhotoVersionsV9Behavior * self; gchar** result = NULL; - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar** _tmp5_ = NULL; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar** _tmp5_; + gchar** _tmp6_; + gint _tmp6__length1; #line 123 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV9Behavior); #line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -1152,35 +1152,35 @@ static gchar** data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_list_ } -static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset) { +static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset) { DataImportsFSpotDbFSpotPhotoVersionsV9Behavior * self; DataImportsFSpotDbFSpotPhotoVersionRow* _vala_row = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_ = NULL; - sqlite3_stmt* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint64 _tmp4_ = 0LL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_ = NULL; - sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint64 _tmp8_ = 0LL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_ = NULL; - sqlite3_stmt* _tmp10_ = NULL; - gint _tmp11_ = 0; - const gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_; + sqlite3_stmt* _tmp2_; + gint _tmp3_; + gint64 _tmp4_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_; + sqlite3_stmt* _tmp6_; + gint _tmp7_; + gint64 _tmp8_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_; + sqlite3_stmt* _tmp10_; + gint _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_; gchar* full_path = NULL; - sqlite3_stmt* _tmp14_ = NULL; - gint _tmp15_ = 0; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp29_ = NULL; - sqlite3_stmt* _tmp30_ = NULL; - gint _tmp31_ = 0; - gint _tmp32_ = 0; + sqlite3_stmt* _tmp14_; + gint _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; + const gchar* _tmp18_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp27_; + gchar* _tmp28_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp29_; + sqlite3_stmt* _tmp30_; + gint _tmp31_; + gint _tmp32_; #line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV9Behavior); #line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -1241,14 +1241,14 @@ static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_ro if (_tmp18_ != NULL) { #line 1243 "FSpotPhotoVersionsTable.c" GFile* uri = NULL; - const gchar* _tmp19_ = NULL; - GFile* _tmp20_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp21_ = NULL; - GFile* _tmp22_ = NULL; - GFile* _tmp23_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_ = NULL; - GFile* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; + const gchar* _tmp19_; + GFile* _tmp20_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp21_; + GFile* _tmp22_; + GFile* _tmp23_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_; + GFile* _tmp25_; + gchar* _tmp26_; #line 136 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp19_ = full_path; #line 136 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -1325,11 +1325,11 @@ static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_data_imports_ #line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" data_imports_fspot_db_fspot_photo_versions_v9_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface); #line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" - iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_get_table_name; + iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_get_table_name; #line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" - iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_list_columns; + iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_list_columns; #line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" - iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_row; + iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_row; #line 1334 "FSpotPhotoVersionsTable.c" } @@ -1338,7 +1338,7 @@ static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_instance_init } -static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_finalize (GObject * obj) { DataImportsFSpotDbFSpotPhotoVersionsV9Behavior * self; #line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV9Behavior); @@ -1381,15 +1381,15 @@ static DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fs DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_photo_versions_v16_behavior_get_instance (void) { DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* result = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp2_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp3_ = NULL; + DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp0_; + DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp2_; + DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp3_; #line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp0_ = data_imports_fspot_db_fspot_photo_versions_v16_behavior_instance; #line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" if (_tmp0_ == NULL) { #line 1392 "FSpotPhotoVersionsTable.c" - DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp1_; #line 156 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp1_ = data_imports_fspot_db_fspot_photo_versions_v16_behavior_new (); #line 156 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -1413,7 +1413,7 @@ DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_pho static gchar* data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) { DataImportsFSpotDbFSpotPhotoVersionsV16Behavior * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 160 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV16Behavior); #line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -1429,15 +1429,15 @@ static gchar* data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_get_t static gchar** data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) { DataImportsFSpotDbFSpotPhotoVersionsV16Behavior * self; gchar** result = 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; - gint _tmp7__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar** _tmp6_; + gchar** _tmp7_; + gint _tmp7__length1; #line 164 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV16Behavior); #line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -1484,38 +1484,38 @@ static gchar** data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_list } -static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset) { +static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset) { DataImportsFSpotDbFSpotPhotoVersionsV16Behavior * self; DataImportsFSpotDbFSpotPhotoVersionRow* _vala_row = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_ = NULL; - sqlite3_stmt* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint64 _tmp4_ = 0LL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_ = NULL; - sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint64 _tmp8_ = 0LL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_ = NULL; - sqlite3_stmt* _tmp10_ = NULL; - gint _tmp11_ = 0; - const gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_; + sqlite3_stmt* _tmp2_; + gint _tmp3_; + gint64 _tmp4_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_; + sqlite3_stmt* _tmp6_; + gint _tmp7_; + gint64 _tmp8_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_; + sqlite3_stmt* _tmp10_; + gint _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_; gchar* full_path = NULL; - sqlite3_stmt* _tmp14_ = NULL; - gint _tmp15_ = 0; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp27_ = NULL; - sqlite3_stmt* _tmp28_ = NULL; - gint _tmp29_ = 0; - const gchar* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp32_ = NULL; - sqlite3_stmt* _tmp33_ = NULL; - gint _tmp34_ = 0; - gint _tmp35_ = 0; + sqlite3_stmt* _tmp14_; + gint _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; + const gchar* _tmp18_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp27_; + sqlite3_stmt* _tmp28_; + gint _tmp29_; + const gchar* _tmp30_; + gchar* _tmp31_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp32_; + sqlite3_stmt* _tmp33_; + gint _tmp34_; + gint _tmp35_; #line 169 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV16Behavior); #line 169 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -1576,14 +1576,14 @@ static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_r if (_tmp18_ != NULL) { #line 1578 "FSpotPhotoVersionsTable.c" GFile* uri = NULL; - const gchar* _tmp19_ = NULL; - GFile* _tmp20_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp21_ = NULL; - GFile* _tmp22_ = NULL; - GFile* _tmp23_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_ = NULL; - GFile* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; + const gchar* _tmp19_; + GFile* _tmp20_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp21_; + GFile* _tmp22_; + GFile* _tmp23_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_; + GFile* _tmp25_; + gchar* _tmp26_; #line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp19_ = full_path; #line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -1666,11 +1666,11 @@ static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_data_imports #line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" data_imports_fspot_db_fspot_photo_versions_v16_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface); #line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" - iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_get_table_name; + iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_get_table_name; #line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" - iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_list_columns; + iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_list_columns; #line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" - iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_row; + iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_row; #line 1675 "FSpotPhotoVersionsTable.c" } @@ -1679,7 +1679,7 @@ static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_instance_ini } -static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_finalize (GObject * obj) { DataImportsFSpotDbFSpotPhotoVersionsV16Behavior * self; #line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV16Behavior); @@ -1722,15 +1722,15 @@ static DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fs DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_photo_versions_v17_behavior_get_instance (void) { DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* result = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp2_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp3_ = NULL; + DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp0_; + DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp2_; + DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp3_; #line 197 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp0_ = data_imports_fspot_db_fspot_photo_versions_v17_behavior_instance; #line 197 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" if (_tmp0_ == NULL) { #line 1733 "FSpotPhotoVersionsTable.c" - DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp1_; #line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp1_ = data_imports_fspot_db_fspot_photo_versions_v17_behavior_new (); #line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -1754,7 +1754,7 @@ DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_pho static gchar* data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) { DataImportsFSpotDbFSpotPhotoVersionsV17Behavior * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV17Behavior); #line 203 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -1770,16 +1770,16 @@ static gchar* data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_get_t static gchar** data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) { DataImportsFSpotDbFSpotPhotoVersionsV17Behavior * self; gchar** result = 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; - gchar** _tmp8_ = NULL; - gint _tmp8__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar** _tmp7_; + gchar** _tmp8_; + gint _tmp8__length1; #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV17Behavior); #line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -1830,44 +1830,44 @@ static gchar** data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_list } -static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset) { +static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset) { DataImportsFSpotDbFSpotPhotoVersionsV17Behavior * self; DataImportsFSpotDbFSpotPhotoVersionRow* _vala_row = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_ = NULL; - sqlite3_stmt* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint64 _tmp4_ = 0LL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_ = NULL; - sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint64 _tmp8_ = 0LL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_ = NULL; - sqlite3_stmt* _tmp10_ = NULL; - gint _tmp11_ = 0; - const gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_; + sqlite3_stmt* _tmp2_; + gint _tmp3_; + gint64 _tmp4_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_; + sqlite3_stmt* _tmp6_; + gint _tmp7_; + gint64 _tmp8_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_; + sqlite3_stmt* _tmp10_; + gint _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_; gchar* base_path = NULL; - sqlite3_stmt* _tmp14_ = NULL; - gint _tmp15_ = 0; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; + sqlite3_stmt* _tmp14_; + gint _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; gchar* filename = NULL; - sqlite3_stmt* _tmp18_ = NULL; - gint _tmp19_ = 0; - const gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; + sqlite3_stmt* _tmp18_; + gint _tmp19_; + const gchar* _tmp20_; + gchar* _tmp21_; gboolean _tmp22_ = FALSE; - const gchar* _tmp23_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp31_ = NULL; - sqlite3_stmt* _tmp32_ = NULL; - gint _tmp33_ = 0; - const gchar* _tmp34_ = NULL; - gchar* _tmp35_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp36_ = NULL; - sqlite3_stmt* _tmp37_ = NULL; - gint _tmp38_ = 0; - gint _tmp39_ = 0; + const gchar* _tmp23_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp31_; + sqlite3_stmt* _tmp32_; + gint _tmp33_; + const gchar* _tmp34_; + gchar* _tmp35_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp36_; + sqlite3_stmt* _tmp37_; + gint _tmp38_; + gint _tmp39_; #line 211 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV17Behavior); #line 211 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -1937,7 +1937,7 @@ static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_r #line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" if (_tmp23_ != NULL) { #line 1940 "FSpotPhotoVersionsTable.c" - const gchar* _tmp24_ = NULL; + const gchar* _tmp24_; #line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp24_ = filename; #line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -1951,12 +1951,12 @@ static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_r #line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" if (_tmp22_) { #line 1954 "FSpotPhotoVersionsTable.c" - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp25_ = NULL; - const gchar* _tmp26_ = NULL; - GFile* _tmp27_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp28_ = NULL; - const gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp25_; + const gchar* _tmp26_; + GFile* _tmp27_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp28_; + const gchar* _tmp29_; + gchar* _tmp30_; #line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp25_ = _vala_row; #line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -2033,11 +2033,11 @@ static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_data_imports #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" data_imports_fspot_db_fspot_photo_versions_v17_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface); #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" - iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_get_table_name; + iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_get_table_name; #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" - iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_list_columns; + iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_list_columns; #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" - iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_row; + iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_row; #line 2042 "FSpotPhotoVersionsTable.c" } @@ -2046,7 +2046,7 @@ static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_instance_ini } -static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_finalize (GObject * obj) { DataImportsFSpotDbFSpotPhotoVersionsV17Behavior * self; #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV17Behavior); @@ -2089,15 +2089,15 @@ static DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fs DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_photo_versions_v18_behavior_get_instance (void) { DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* result = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp2_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp3_ = NULL; + DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp0_; + DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp2_; + DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp3_; #line 238 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp0_ = data_imports_fspot_db_fspot_photo_versions_v18_behavior_instance; #line 238 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" if (_tmp0_ == NULL) { #line 2100 "FSpotPhotoVersionsTable.c" - DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp1_; #line 239 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp1_ = data_imports_fspot_db_fspot_photo_versions_v18_behavior_new (); #line 239 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -2121,7 +2121,7 @@ DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_pho static gchar* data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) { DataImportsFSpotDbFSpotPhotoVersionsV18Behavior * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 243 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV18Behavior); #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -2137,16 +2137,16 @@ static gchar* data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_get_t static gchar** data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) { DataImportsFSpotDbFSpotPhotoVersionsV18Behavior * self; gchar** result = 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; - gchar** _tmp8_ = NULL; - gint _tmp8__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar** _tmp7_; + gchar** _tmp8_; + gint _tmp8__length1; #line 247 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV18Behavior); #line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -2197,44 +2197,44 @@ static gchar** data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_list } -static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset) { +static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset) { DataImportsFSpotDbFSpotPhotoVersionsV18Behavior * self; DataImportsFSpotDbFSpotPhotoVersionRow* _vala_row = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_ = NULL; - sqlite3_stmt* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint64 _tmp4_ = 0LL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_ = NULL; - sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint64 _tmp8_ = 0LL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_ = NULL; - sqlite3_stmt* _tmp10_ = NULL; - gint _tmp11_ = 0; - const gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_; + sqlite3_stmt* _tmp2_; + gint _tmp3_; + gint64 _tmp4_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_; + sqlite3_stmt* _tmp6_; + gint _tmp7_; + gint64 _tmp8_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_; + sqlite3_stmt* _tmp10_; + gint _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_; gchar* base_path = NULL; - sqlite3_stmt* _tmp14_ = NULL; - gint _tmp15_ = 0; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; + sqlite3_stmt* _tmp14_; + gint _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; gchar* filename = NULL; - sqlite3_stmt* _tmp18_ = NULL; - gint _tmp19_ = 0; - const gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; + sqlite3_stmt* _tmp18_; + gint _tmp19_; + const gchar* _tmp20_; + gchar* _tmp21_; gboolean _tmp22_ = FALSE; - const gchar* _tmp23_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp31_ = NULL; - sqlite3_stmt* _tmp32_ = NULL; - gint _tmp33_ = 0; - const gchar* _tmp34_ = NULL; - gchar* _tmp35_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp36_ = NULL; - sqlite3_stmt* _tmp37_ = NULL; - gint _tmp38_ = 0; - gint _tmp39_ = 0; + const gchar* _tmp23_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp31_; + sqlite3_stmt* _tmp32_; + gint _tmp33_; + const gchar* _tmp34_; + gchar* _tmp35_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp36_; + sqlite3_stmt* _tmp37_; + gint _tmp38_; + gint _tmp39_; #line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV18Behavior); #line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -2304,7 +2304,7 @@ static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_r #line 260 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" if (_tmp23_ != NULL) { #line 2307 "FSpotPhotoVersionsTable.c" - const gchar* _tmp24_ = NULL; + const gchar* _tmp24_; #line 260 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp24_ = filename; #line 260 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -2318,12 +2318,12 @@ static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_r #line 260 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" if (_tmp22_) { #line 2321 "FSpotPhotoVersionsTable.c" - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp25_ = NULL; - const gchar* _tmp26_ = NULL; - GFile* _tmp27_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionRow* _tmp28_ = NULL; - const gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp25_; + const gchar* _tmp26_; + GFile* _tmp27_; + DataImportsFSpotDbFSpotPhotoVersionRow* _tmp28_; + const gchar* _tmp29_; + gchar* _tmp30_; #line 261 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp25_ = _vala_row; #line 261 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -2400,11 +2400,11 @@ static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_data_imports #line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" data_imports_fspot_db_fspot_photo_versions_v18_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface); #line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" - iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_get_table_name; + iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_get_table_name; #line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" - iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_list_columns; + iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_list_columns; #line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" - iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_row; + iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_row; #line 2409 "FSpotPhotoVersionsTable.c" } @@ -2413,7 +2413,7 @@ static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_instance_ini } -static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_finalize (GObject * obj) { DataImportsFSpotDbFSpotPhotoVersionsV18Behavior * self; #line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV18Behavior); diff --git a/plugins/shotwell-data-imports/FSpotPhotosTable.c b/plugins/shotwell-data-imports/FSpotPhotosTable.c index af8cc0a..4eb3d76 100644 --- a/plugins/shotwell-data-imports/FSpotPhotosTable.c +++ b/plugins/shotwell-data-imports/FSpotPhotosTable.c @@ -1,4 +1,4 @@ -/* FSpotPhotosTable.c generated by valac 0.34.7, the Vala compiler +/* FSpotPhotosTable.c generated by valac 0.36.6, the Vala compiler * generated from FSpotPhotosTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -294,31 +294,31 @@ static gpointer data_imports_fspot_db_fspot_photos_table_parent_class = NULL; static gpointer data_imports_fspot_db_fspot_photos_v0_behavior_parent_class = NULL; static DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_behavior_instance; static DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_behavior_instance = NULL; -static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photos_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; +static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; static gpointer data_imports_fspot_db_fspot_photos_v5_behavior_parent_class = NULL; static DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_behavior_instance; static DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_behavior_instance = NULL; -static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photos_v5_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; +static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v5_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; static gpointer data_imports_fspot_db_fspot_photos_v7_behavior_parent_class = NULL; static DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_behavior_instance; static DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_behavior_instance = NULL; -static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photos_v7_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; +static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v7_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; static gpointer data_imports_fspot_db_fspot_photos_v11_behavior_parent_class = NULL; static DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11_behavior_instance; static DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11_behavior_instance = NULL; -static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photos_v11_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; +static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v11_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; static gpointer data_imports_fspot_db_fspot_photos_v16_behavior_parent_class = NULL; static DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16_behavior_instance; static DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16_behavior_instance = NULL; -static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photos_v16_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; +static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v16_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; static gpointer data_imports_fspot_db_fspot_photos_v17_behavior_parent_class = NULL; static DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17_behavior_instance; static DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17_behavior_instance = NULL; -static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photos_v17_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; +static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v17_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; static gpointer data_imports_fspot_db_fspot_photos_v18_behavior_parent_class = NULL; static DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18_behavior_instance; static DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18_behavior_instance = NULL; -static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photos_v18_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; +static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v18_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; GType data_imports_fspot_db_fspot_photo_row_get_type (void) G_GNUC_CONST; enum { @@ -326,7 +326,7 @@ enum { }; DataImportsFSpotDbFSpotPhotoRow* data_imports_fspot_db_fspot_photo_row_new (void); DataImportsFSpotDbFSpotPhotoRow* data_imports_fspot_db_fspot_photo_row_construct (GType object_type); -static void data_imports_fspot_db_fspot_photo_row_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_photo_row_finalize (GObject * obj); gpointer importable_database_table_ref (gpointer instance); void importable_database_table_unref (gpointer instance); GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -349,7 +349,7 @@ void data_imports_fspot_db_fspot_database_table_set_behavior (DataImportsFSpotDb DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photos_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self); GQuark database_error_quark (void); GeeArrayList* data_imports_fspot_db_fspot_photos_table_get_all (DataImportsFSpotDbFSpotPhotosTable* self, GError** error); -gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFSpotDatabaseTable* self, sqlite3_stmt** stmt, GError** error); +gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFSpotDatabaseTable* self, sqlite3_stmt* * stmt, GError** error); void data_imports_fspot_db_fspot_table_behavior_build_row (DataImportsFSpotDbFSpotTableBehavior* self, sqlite3_stmt* stmt, gpointer* row, gint offset); GType data_imports_fspot_db_fspot_photos_v0_behavior_get_type (void) G_GNUC_CONST; enum { @@ -360,9 +360,9 @@ static DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_phot DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_behavior_get_instance (void); static gchar* data_imports_fspot_db_fspot_photos_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base); static gchar** data_imports_fspot_db_fspot_photos_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1); -static void data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset); +static void data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset); #define DATA_IMPORTS_FSPOT_DB_INVALID_ID ((gint64) -1) -static void data_imports_fspot_db_fspot_photos_v0_behavior_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_photos_v0_behavior_finalize (GObject * obj); GType data_imports_fspot_db_fspot_photos_v5_behavior_get_type (void) G_GNUC_CONST; enum { DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V5_BEHAVIOR_DUMMY_PROPERTY @@ -372,8 +372,8 @@ static DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_phot DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_behavior_get_instance (void); static gchar* data_imports_fspot_db_fspot_photos_v5_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base); static gchar** data_imports_fspot_db_fspot_photos_v5_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1); -static void data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset); -static void data_imports_fspot_db_fspot_photos_v5_behavior_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset); +static void data_imports_fspot_db_fspot_photos_v5_behavior_finalize (GObject * obj); GType data_imports_fspot_db_fspot_photos_v7_behavior_get_type (void) G_GNUC_CONST; enum { DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V7_BEHAVIOR_DUMMY_PROPERTY @@ -383,8 +383,8 @@ static DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_phot DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_behavior_get_instance (void); static gchar* data_imports_fspot_db_fspot_photos_v7_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base); static gchar** data_imports_fspot_db_fspot_photos_v7_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1); -static void data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset); -static void data_imports_fspot_db_fspot_photos_v7_behavior_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset); +static void data_imports_fspot_db_fspot_photos_v7_behavior_finalize (GObject * obj); GType data_imports_fspot_db_fspot_photos_v11_behavior_get_type (void) G_GNUC_CONST; enum { DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V11_BEHAVIOR_DUMMY_PROPERTY @@ -394,8 +394,8 @@ static DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_pho DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11_behavior_get_instance (void); static gchar* data_imports_fspot_db_fspot_photos_v11_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base); static gchar** data_imports_fspot_db_fspot_photos_v11_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1); -static void data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset); -static void data_imports_fspot_db_fspot_photos_v11_behavior_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset); +static void data_imports_fspot_db_fspot_photos_v11_behavior_finalize (GObject * obj); GType data_imports_fspot_db_fspot_photos_v16_behavior_get_type (void) G_GNUC_CONST; enum { DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V16_BEHAVIOR_DUMMY_PROPERTY @@ -405,8 +405,8 @@ static DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_pho DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16_behavior_get_instance (void); static gchar* data_imports_fspot_db_fspot_photos_v16_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base); static gchar** data_imports_fspot_db_fspot_photos_v16_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1); -static void data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset); -static void data_imports_fspot_db_fspot_photos_v16_behavior_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset); +static void data_imports_fspot_db_fspot_photos_v16_behavior_finalize (GObject * obj); GType data_imports_fspot_db_fspot_photos_v17_behavior_get_type (void) G_GNUC_CONST; enum { DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V17_BEHAVIOR_DUMMY_PROPERTY @@ -416,8 +416,8 @@ static DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_pho DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17_behavior_get_instance (void); static gchar* data_imports_fspot_db_fspot_photos_v17_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base); static gchar** data_imports_fspot_db_fspot_photos_v17_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1); -static void data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset); -static void data_imports_fspot_db_fspot_photos_v17_behavior_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset); +static void data_imports_fspot_db_fspot_photos_v17_behavior_finalize (GObject * obj); GType data_imports_fspot_db_fspot_photos_v18_behavior_get_type (void) G_GNUC_CONST; enum { DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V18_BEHAVIOR_DUMMY_PROPERTY @@ -427,8 +427,8 @@ static DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_pho DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18_behavior_get_instance (void); static gchar* data_imports_fspot_db_fspot_photos_v18_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base); static gchar** data_imports_fspot_db_fspot_photos_v18_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1); -static void data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset); -static void data_imports_fspot_db_fspot_photos_v18_behavior_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset); +static void data_imports_fspot_db_fspot_photos_v18_behavior_finalize (GObject * obj); DataImportsFSpotDbFSpotPhotoRow* data_imports_fspot_db_fspot_photo_row_construct (GType object_type) { @@ -461,7 +461,7 @@ static void data_imports_fspot_db_fspot_photo_row_instance_init (DataImportsFSpo } -static void data_imports_fspot_db_fspot_photo_row_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_photo_row_finalize (GObject * obj) { DataImportsFSpotDbFSpotPhotoRow * self; #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW, DataImportsFSpotDbFSpotPhotoRow); @@ -496,10 +496,10 @@ GType data_imports_fspot_db_fspot_photo_row_get_type (void) { DataImportsFSpotDbFSpotPhotosTable* data_imports_fspot_db_fspot_photos_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior) { DataImportsFSpotDbFSpotPhotosTable* self = NULL; - sqlite3* _tmp0_ = NULL; - DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp2_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp3_ = NULL; + sqlite3* _tmp0_; + DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_; + DataImportsFSpotDbFSpotTableBehavior* _tmp2_; + DataImportsFSpotDbFSpotTableBehavior* _tmp3_; #line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" g_return_val_if_fail (db != NULL, NULL); #line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -534,11 +534,11 @@ DataImportsFSpotDbFSpotPhotosTable* data_imports_fspot_db_fspot_photos_table_new GeeArrayList* data_imports_fspot_db_fspot_photos_table_get_all (DataImportsFSpotDbFSpotPhotosTable* self, GError** error) { GeeArrayList* result = NULL; GeeArrayList* all = NULL; - GeeArrayList* _tmp0_ = NULL; + GeeArrayList* _tmp0_; sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3_stmt* _tmp1_ = NULL; - gint _tmp2_ = 0; + gint _tmp2_; GError * _inner_error_ = NULL; #line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_TABLE (self), NULL); @@ -584,12 +584,12 @@ GeeArrayList* data_imports_fspot_db_fspot_photos_table_get_all (DataImportsFSpot #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" while (TRUE) { #line 587 "FSpotPhotosTable.c" - gint _tmp3_ = 0; + gint _tmp3_; DataImportsFSpotDbFSpotPhotoRow* row = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp4_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp4_; gpointer _tmp5_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp6_ = NULL; - gint _tmp7_ = 0; + DataImportsFSpotDbFSpotPhotoRow* _tmp6_; + gint _tmp7_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp3_ = res; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -680,15 +680,15 @@ static gpointer _g_object_ref0 (gpointer self) { DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_behavior_get_instance (void) { DataImportsFSpotDbFSpotPhotosV0Behavior* result = NULL; - DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp2_ = NULL; - DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp3_ = NULL; + DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp0_; + DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp2_; + DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp3_; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp0_ = data_imports_fspot_db_fspot_photos_v0_behavior_instance; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" if (_tmp0_ == NULL) { #line 691 "FSpotPhotosTable.c" - DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp1_; #line 61 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp1_ = data_imports_fspot_db_fspot_photos_v0_behavior_new (); #line 61 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -712,7 +712,7 @@ DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_b static gchar* data_imports_fspot_db_fspot_photos_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) { DataImportsFSpotDbFSpotPhotosV0Behavior * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 65 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV0Behavior); #line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -728,15 +728,15 @@ static gchar* data_imports_fspot_db_fspot_photos_v0_behavior_real_get_table_name static gchar** data_imports_fspot_db_fspot_photos_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) { DataImportsFSpotDbFSpotPhotosV0Behavior * self; gchar** result = 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; - gint _tmp7__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar** _tmp6_; + gchar** _tmp7_; + gint _tmp7__length1; #line 69 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV0Behavior); #line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -783,43 +783,43 @@ static gchar** data_imports_fspot_db_fspot_photos_v0_behavior_real_list_columns } -static void data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset) { +static void data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) { DataImportsFSpotDbFSpotPhotosV0Behavior * self; DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL; - sqlite3_stmt* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint64 _tmp4_ = 0LL; - DataImportsFSpotDbFSpotPhotoRow* _tmp5_ = NULL; - sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint64 _tmp8_ = 0LL; + DataImportsFSpotDbFSpotPhotoRow* _tmp0_; + DataImportsFSpotDbFSpotPhotoRow* _tmp1_; + sqlite3_stmt* _tmp2_; + gint _tmp3_; + gint64 _tmp4_; + DataImportsFSpotDbFSpotPhotoRow* _tmp5_; + sqlite3_stmt* _tmp6_; + gint _tmp7_; + gint64 _tmp8_; gchar* base_path = NULL; - sqlite3_stmt* _tmp9_ = NULL; - gint _tmp10_ = 0; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; + sqlite3_stmt* _tmp9_; + gint _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; gchar* filename = NULL; - sqlite3_stmt* _tmp13_ = NULL; - gint _tmp14_ = 0; - const gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; + sqlite3_stmt* _tmp13_; + gint _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; gboolean _tmp17_ = FALSE; - const gchar* _tmp18_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp26_ = NULL; - sqlite3_stmt* _tmp27_ = NULL; - gint _tmp28_ = 0; - const gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp31_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp32_ = NULL; - sqlite3_stmt* _tmp33_ = NULL; - gint _tmp34_ = 0; - gint64 _tmp35_ = 0LL; - DataImportsFSpotDbFSpotPhotoRow* _tmp36_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; + const gchar* _tmp18_; + DataImportsFSpotDbFSpotPhotoRow* _tmp26_; + sqlite3_stmt* _tmp27_; + gint _tmp28_; + const gchar* _tmp29_; + gchar* _tmp30_; + DataImportsFSpotDbFSpotPhotoRow* _tmp31_; + DataImportsFSpotDbFSpotPhotoRow* _tmp32_; + sqlite3_stmt* _tmp33_; + gint _tmp34_; + gint64 _tmp35_; + DataImportsFSpotDbFSpotPhotoRow* _tmp36_; + DataImportsFSpotDbFSpotPhotoRow* _tmp37_; + gchar* _tmp38_; #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV0Behavior); #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -875,7 +875,7 @@ static void data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row (DataI #line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" if (_tmp18_ != NULL) { #line 878 "FSpotPhotosTable.c" - const gchar* _tmp19_ = NULL; + const gchar* _tmp19_; #line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp19_ = filename; #line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -889,12 +889,12 @@ static void data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row (DataI #line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" if (_tmp17_) { #line 892 "FSpotPhotosTable.c" - DataImportsFSpotDbFSpotPhotoRow* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - GFile* _tmp22_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; + DataImportsFSpotDbFSpotPhotoRow* _tmp20_; + const gchar* _tmp21_; + GFile* _tmp22_; + DataImportsFSpotDbFSpotPhotoRow* _tmp23_; + const gchar* _tmp24_; + gchar* _tmp25_; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp20_ = _vala_row; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -987,11 +987,11 @@ static void data_imports_fspot_db_fspot_photos_v0_behavior_data_imports_fspot_db #line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" data_imports_fspot_db_fspot_photos_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface); #line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photos_v0_behavior_real_get_table_name; + iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v0_behavior_real_get_table_name; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photos_v0_behavior_real_list_columns; + iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v0_behavior_real_list_columns; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row; + iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row; #line 996 "FSpotPhotosTable.c" } @@ -1000,7 +1000,7 @@ static void data_imports_fspot_db_fspot_photos_v0_behavior_instance_init (DataIm } -static void data_imports_fspot_db_fspot_photos_v0_behavior_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_photos_v0_behavior_finalize (GObject * obj) { DataImportsFSpotDbFSpotPhotosV0Behavior * self; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV0Behavior); @@ -1043,15 +1043,15 @@ static DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_phot DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_behavior_get_instance (void) { DataImportsFSpotDbFSpotPhotosV5Behavior* result = NULL; - DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp2_ = NULL; - DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp3_ = NULL; + DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp0_; + DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp2_; + DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp3_; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp0_ = data_imports_fspot_db_fspot_photos_v5_behavior_instance; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" if (_tmp0_ == NULL) { #line 1054 "FSpotPhotosTable.c" - DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp1_; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp1_ = data_imports_fspot_db_fspot_photos_v5_behavior_new (); #line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -1075,7 +1075,7 @@ DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_b static gchar* data_imports_fspot_db_fspot_photos_v5_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) { DataImportsFSpotDbFSpotPhotosV5Behavior * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 109 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV5Behavior); #line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -1091,16 +1091,16 @@ static gchar* data_imports_fspot_db_fspot_photos_v5_behavior_real_get_table_name static gchar** data_imports_fspot_db_fspot_photos_v5_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) { DataImportsFSpotDbFSpotPhotosV5Behavior * self; gchar** result = 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; - gchar** _tmp8_ = NULL; - gint _tmp8__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar** _tmp7_; + gchar** _tmp8_; + gint _tmp8__length1; #line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV5Behavior); #line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -1151,46 +1151,46 @@ static gchar** data_imports_fspot_db_fspot_photos_v5_behavior_real_list_columns } -static void data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset) { +static void data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) { DataImportsFSpotDbFSpotPhotosV5Behavior * self; DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL; - sqlite3_stmt* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint64 _tmp4_ = 0LL; - DataImportsFSpotDbFSpotPhotoRow* _tmp5_ = NULL; - sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint64 _tmp8_ = 0LL; + DataImportsFSpotDbFSpotPhotoRow* _tmp0_; + DataImportsFSpotDbFSpotPhotoRow* _tmp1_; + sqlite3_stmt* _tmp2_; + gint _tmp3_; + gint64 _tmp4_; + DataImportsFSpotDbFSpotPhotoRow* _tmp5_; + sqlite3_stmt* _tmp6_; + gint _tmp7_; + gint64 _tmp8_; gchar* base_path = NULL; - sqlite3_stmt* _tmp9_ = NULL; - gint _tmp10_ = 0; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; + sqlite3_stmt* _tmp9_; + gint _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; gchar* filename = NULL; - sqlite3_stmt* _tmp13_ = NULL; - gint _tmp14_ = 0; - const gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; + sqlite3_stmt* _tmp13_; + gint _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; gboolean _tmp17_ = FALSE; - const gchar* _tmp18_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp26_ = NULL; - sqlite3_stmt* _tmp27_ = NULL; - gint _tmp28_ = 0; - const gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp31_ = NULL; - sqlite3_stmt* _tmp32_ = NULL; - gint _tmp33_ = 0; - gint64 _tmp34_ = 0LL; - DataImportsFSpotDbFSpotPhotoRow* _tmp35_ = NULL; - sqlite3_stmt* _tmp36_ = NULL; - gint _tmp37_ = 0; - gint64 _tmp38_ = 0LL; - DataImportsFSpotDbFSpotPhotoRow* _tmp39_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp40_ = NULL; - gchar* _tmp41_ = NULL; + const gchar* _tmp18_; + DataImportsFSpotDbFSpotPhotoRow* _tmp26_; + sqlite3_stmt* _tmp27_; + gint _tmp28_; + const gchar* _tmp29_; + gchar* _tmp30_; + DataImportsFSpotDbFSpotPhotoRow* _tmp31_; + sqlite3_stmt* _tmp32_; + gint _tmp33_; + gint64 _tmp34_; + DataImportsFSpotDbFSpotPhotoRow* _tmp35_; + sqlite3_stmt* _tmp36_; + gint _tmp37_; + gint64 _tmp38_; + DataImportsFSpotDbFSpotPhotoRow* _tmp39_; + DataImportsFSpotDbFSpotPhotoRow* _tmp40_; + gchar* _tmp41_; #line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV5Behavior); #line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -1246,7 +1246,7 @@ static void data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row (DataI #line 125 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" if (_tmp18_ != NULL) { #line 1249 "FSpotPhotosTable.c" - const gchar* _tmp19_ = NULL; + const gchar* _tmp19_; #line 125 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp19_ = filename; #line 125 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -1260,12 +1260,12 @@ static void data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row (DataI #line 125 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" if (_tmp17_) { #line 1263 "FSpotPhotosTable.c" - DataImportsFSpotDbFSpotPhotoRow* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - GFile* _tmp22_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; + DataImportsFSpotDbFSpotPhotoRow* _tmp20_; + const gchar* _tmp21_; + GFile* _tmp22_; + DataImportsFSpotDbFSpotPhotoRow* _tmp23_; + const gchar* _tmp24_; + gchar* _tmp25_; #line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp20_ = _vala_row; #line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -1364,11 +1364,11 @@ static void data_imports_fspot_db_fspot_photos_v5_behavior_data_imports_fspot_db #line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" data_imports_fspot_db_fspot_photos_v5_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface); #line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photos_v5_behavior_real_get_table_name; + iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v5_behavior_real_get_table_name; #line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photos_v5_behavior_real_list_columns; + iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v5_behavior_real_list_columns; #line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row; + iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row; #line 1373 "FSpotPhotosTable.c" } @@ -1377,7 +1377,7 @@ static void data_imports_fspot_db_fspot_photos_v5_behavior_instance_init (DataIm } -static void data_imports_fspot_db_fspot_photos_v5_behavior_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_photos_v5_behavior_finalize (GObject * obj) { DataImportsFSpotDbFSpotPhotosV5Behavior * self; #line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV5Behavior); @@ -1420,15 +1420,15 @@ static DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_phot DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_behavior_get_instance (void) { DataImportsFSpotDbFSpotPhotosV7Behavior* result = NULL; - DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp2_ = NULL; - DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp3_ = NULL; + DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp0_; + DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp2_; + DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp3_; #line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp0_ = data_imports_fspot_db_fspot_photos_v7_behavior_instance; #line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" if (_tmp0_ == NULL) { #line 1431 "FSpotPhotosTable.c" - DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp1_; #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp1_ = data_imports_fspot_db_fspot_photos_v7_behavior_new (); #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -1452,7 +1452,7 @@ DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_b static gchar* data_imports_fspot_db_fspot_photos_v7_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) { DataImportsFSpotDbFSpotPhotosV7Behavior * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 154 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV7Behavior); #line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -1468,15 +1468,15 @@ static gchar* data_imports_fspot_db_fspot_photos_v7_behavior_real_get_table_name static gchar** data_imports_fspot_db_fspot_photos_v7_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) { DataImportsFSpotDbFSpotPhotosV7Behavior * self; gchar** result = 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; - gint _tmp7__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar** _tmp6_; + gchar** _tmp7_; + gint _tmp7__length1; #line 158 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV7Behavior); #line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -1523,40 +1523,40 @@ static gchar** data_imports_fspot_db_fspot_photos_v7_behavior_real_list_columns } -static void data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset) { +static void data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) { DataImportsFSpotDbFSpotPhotosV7Behavior * self; DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL; - sqlite3_stmt* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint64 _tmp4_ = 0LL; - DataImportsFSpotDbFSpotPhotoRow* _tmp5_ = NULL; - sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint64 _tmp8_ = 0LL; + DataImportsFSpotDbFSpotPhotoRow* _tmp0_; + DataImportsFSpotDbFSpotPhotoRow* _tmp1_; + sqlite3_stmt* _tmp2_; + gint _tmp3_; + gint64 _tmp4_; + DataImportsFSpotDbFSpotPhotoRow* _tmp5_; + sqlite3_stmt* _tmp6_; + gint _tmp7_; + gint64 _tmp8_; gchar* full_path = NULL; - sqlite3_stmt* _tmp9_ = NULL; - gint _tmp10_ = 0; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp22_ = NULL; - sqlite3_stmt* _tmp23_ = NULL; - gint _tmp24_ = 0; - const gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp27_ = NULL; - sqlite3_stmt* _tmp28_ = NULL; - gint _tmp29_ = 0; - gint64 _tmp30_ = 0LL; - DataImportsFSpotDbFSpotPhotoRow* _tmp31_ = NULL; - sqlite3_stmt* _tmp32_ = NULL; - gint _tmp33_ = 0; - gint64 _tmp34_ = 0LL; - DataImportsFSpotDbFSpotPhotoRow* _tmp35_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp36_ = NULL; - gchar* _tmp37_ = NULL; + sqlite3_stmt* _tmp9_; + gint _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; + const gchar* _tmp13_; + DataImportsFSpotDbFSpotPhotoRow* _tmp22_; + sqlite3_stmt* _tmp23_; + gint _tmp24_; + const gchar* _tmp25_; + gchar* _tmp26_; + DataImportsFSpotDbFSpotPhotoRow* _tmp27_; + sqlite3_stmt* _tmp28_; + gint _tmp29_; + gint64 _tmp30_; + DataImportsFSpotDbFSpotPhotoRow* _tmp31_; + sqlite3_stmt* _tmp32_; + gint _tmp33_; + gint64 _tmp34_; + DataImportsFSpotDbFSpotPhotoRow* _tmp35_; + DataImportsFSpotDbFSpotPhotoRow* _tmp36_; + gchar* _tmp37_; #line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV7Behavior); #line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -1603,14 +1603,14 @@ static void data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row (DataI if (_tmp13_ != NULL) { #line 1605 "FSpotPhotosTable.c" GFile* uri = NULL; - const gchar* _tmp14_ = NULL; - GFile* _tmp15_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp16_ = NULL; - GFile* _tmp17_ = NULL; - GFile* _tmp18_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp19_ = NULL; - GFile* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; + const gchar* _tmp14_; + GFile* _tmp15_; + DataImportsFSpotDbFSpotPhotoRow* _tmp16_; + GFile* _tmp17_; + GFile* _tmp18_; + DataImportsFSpotDbFSpotPhotoRow* _tmp19_; + GFile* _tmp20_; + gchar* _tmp21_; #line 170 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp14_ = full_path; #line 170 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -1715,11 +1715,11 @@ static void data_imports_fspot_db_fspot_photos_v7_behavior_data_imports_fspot_db #line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" data_imports_fspot_db_fspot_photos_v7_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface); #line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photos_v7_behavior_real_get_table_name; + iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v7_behavior_real_get_table_name; #line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photos_v7_behavior_real_list_columns; + iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v7_behavior_real_list_columns; #line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row; + iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row; #line 1724 "FSpotPhotosTable.c" } @@ -1728,7 +1728,7 @@ static void data_imports_fspot_db_fspot_photos_v7_behavior_instance_init (DataIm } -static void data_imports_fspot_db_fspot_photos_v7_behavior_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_photos_v7_behavior_finalize (GObject * obj) { DataImportsFSpotDbFSpotPhotosV7Behavior * self; #line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV7Behavior); @@ -1771,15 +1771,15 @@ static DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_pho DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11_behavior_get_instance (void) { DataImportsFSpotDbFSpotPhotosV11Behavior* result = NULL; - DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp2_ = NULL; - DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp3_ = NULL; + DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp0_; + DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp2_; + DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp3_; #line 192 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp0_ = data_imports_fspot_db_fspot_photos_v11_behavior_instance; #line 192 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" if (_tmp0_ == NULL) { #line 1782 "FSpotPhotosTable.c" - DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp1_; #line 193 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp1_ = data_imports_fspot_db_fspot_photos_v11_behavior_new (); #line 193 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -1803,7 +1803,7 @@ DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11 static gchar* data_imports_fspot_db_fspot_photos_v11_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) { DataImportsFSpotDbFSpotPhotosV11Behavior * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 197 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV11Behavior); #line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -1819,16 +1819,16 @@ static gchar* data_imports_fspot_db_fspot_photos_v11_behavior_real_get_table_nam static gchar** data_imports_fspot_db_fspot_photos_v11_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) { DataImportsFSpotDbFSpotPhotosV11Behavior * self; gchar** result = 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; - gchar** _tmp8_ = NULL; - gint _tmp8__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar** _tmp7_; + gchar** _tmp8_; + gint _tmp8__length1; #line 201 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV11Behavior); #line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -1879,43 +1879,43 @@ static gchar** data_imports_fspot_db_fspot_photos_v11_behavior_real_list_columns } -static void data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset) { +static void data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) { DataImportsFSpotDbFSpotPhotosV11Behavior * self; DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL; - sqlite3_stmt* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint64 _tmp4_ = 0LL; - DataImportsFSpotDbFSpotPhotoRow* _tmp5_ = NULL; - sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint64 _tmp8_ = 0LL; + DataImportsFSpotDbFSpotPhotoRow* _tmp0_; + DataImportsFSpotDbFSpotPhotoRow* _tmp1_; + sqlite3_stmt* _tmp2_; + gint _tmp3_; + gint64 _tmp4_; + DataImportsFSpotDbFSpotPhotoRow* _tmp5_; + sqlite3_stmt* _tmp6_; + gint _tmp7_; + gint64 _tmp8_; gchar* full_path = NULL; - sqlite3_stmt* _tmp9_ = NULL; - gint _tmp10_ = 0; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp22_ = NULL; - sqlite3_stmt* _tmp23_ = NULL; - gint _tmp24_ = 0; - const gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp27_ = NULL; - sqlite3_stmt* _tmp28_ = NULL; - gint _tmp29_ = 0; - gint64 _tmp30_ = 0LL; - DataImportsFSpotDbFSpotPhotoRow* _tmp31_ = NULL; - sqlite3_stmt* _tmp32_ = NULL; - gint _tmp33_ = 0; - gint64 _tmp34_ = 0LL; - DataImportsFSpotDbFSpotPhotoRow* _tmp35_ = NULL; - sqlite3_stmt* _tmp36_ = NULL; - gint _tmp37_ = 0; - gint _tmp38_ = 0; - DataImportsFSpotDbFSpotPhotoRow* _tmp39_ = NULL; - gchar* _tmp40_ = NULL; + sqlite3_stmt* _tmp9_; + gint _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; + const gchar* _tmp13_; + DataImportsFSpotDbFSpotPhotoRow* _tmp22_; + sqlite3_stmt* _tmp23_; + gint _tmp24_; + const gchar* _tmp25_; + gchar* _tmp26_; + DataImportsFSpotDbFSpotPhotoRow* _tmp27_; + sqlite3_stmt* _tmp28_; + gint _tmp29_; + gint64 _tmp30_; + DataImportsFSpotDbFSpotPhotoRow* _tmp31_; + sqlite3_stmt* _tmp32_; + gint _tmp33_; + gint64 _tmp34_; + DataImportsFSpotDbFSpotPhotoRow* _tmp35_; + sqlite3_stmt* _tmp36_; + gint _tmp37_; + gint _tmp38_; + DataImportsFSpotDbFSpotPhotoRow* _tmp39_; + gchar* _tmp40_; #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV11Behavior); #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -1962,14 +1962,14 @@ static void data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row (Data if (_tmp13_ != NULL) { #line 1964 "FSpotPhotosTable.c" GFile* uri = NULL; - const gchar* _tmp14_ = NULL; - GFile* _tmp15_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp16_ = NULL; - GFile* _tmp17_ = NULL; - GFile* _tmp18_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp19_ = NULL; - GFile* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; + const gchar* _tmp14_; + GFile* _tmp15_; + DataImportsFSpotDbFSpotPhotoRow* _tmp16_; + GFile* _tmp17_; + GFile* _tmp18_; + DataImportsFSpotDbFSpotPhotoRow* _tmp19_; + GFile* _tmp20_; + gchar* _tmp21_; #line 213 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp14_ = full_path; #line 213 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -2080,11 +2080,11 @@ static void data_imports_fspot_db_fspot_photos_v11_behavior_data_imports_fspot_d #line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" data_imports_fspot_db_fspot_photos_v11_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface); #line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photos_v11_behavior_real_get_table_name; + iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v11_behavior_real_get_table_name; #line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photos_v11_behavior_real_list_columns; + iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v11_behavior_real_list_columns; #line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row; + iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row; #line 2089 "FSpotPhotosTable.c" } @@ -2093,7 +2093,7 @@ static void data_imports_fspot_db_fspot_photos_v11_behavior_instance_init (DataI } -static void data_imports_fspot_db_fspot_photos_v11_behavior_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_photos_v11_behavior_finalize (GObject * obj) { DataImportsFSpotDbFSpotPhotosV11Behavior * self; #line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV11Behavior); @@ -2136,15 +2136,15 @@ static DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_pho DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16_behavior_get_instance (void) { DataImportsFSpotDbFSpotPhotosV16Behavior* result = NULL; - DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp2_ = NULL; - DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp3_ = NULL; + DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp0_; + DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp2_; + DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp3_; #line 235 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp0_ = data_imports_fspot_db_fspot_photos_v16_behavior_instance; #line 235 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" if (_tmp0_ == NULL) { #line 2147 "FSpotPhotosTable.c" - DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp1_; #line 236 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp1_ = data_imports_fspot_db_fspot_photos_v16_behavior_new (); #line 236 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -2168,7 +2168,7 @@ DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16 static gchar* data_imports_fspot_db_fspot_photos_v16_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) { DataImportsFSpotDbFSpotPhotosV16Behavior * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 240 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV16Behavior); #line 241 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -2184,17 +2184,17 @@ static gchar* data_imports_fspot_db_fspot_photos_v16_behavior_real_get_table_nam static gchar** data_imports_fspot_db_fspot_photos_v16_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) { DataImportsFSpotDbFSpotPhotosV16Behavior * self; gchar** result = 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; - gchar** _tmp8_ = NULL; - gchar** _tmp9_ = NULL; - gint _tmp9__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar** _tmp8_; + gchar** _tmp9_; + gint _tmp9__length1; #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV16Behavior); #line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -2249,46 +2249,46 @@ static gchar** data_imports_fspot_db_fspot_photos_v16_behavior_real_list_columns } -static void data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset) { +static void data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) { DataImportsFSpotDbFSpotPhotosV16Behavior * self; DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL; - sqlite3_stmt* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint64 _tmp4_ = 0LL; - DataImportsFSpotDbFSpotPhotoRow* _tmp5_ = NULL; - sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint64 _tmp8_ = 0LL; + DataImportsFSpotDbFSpotPhotoRow* _tmp0_; + DataImportsFSpotDbFSpotPhotoRow* _tmp1_; + sqlite3_stmt* _tmp2_; + gint _tmp3_; + gint64 _tmp4_; + DataImportsFSpotDbFSpotPhotoRow* _tmp5_; + sqlite3_stmt* _tmp6_; + gint _tmp7_; + gint64 _tmp8_; gchar* full_path = NULL; - sqlite3_stmt* _tmp9_ = NULL; - gint _tmp10_ = 0; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp22_ = NULL; - sqlite3_stmt* _tmp23_ = NULL; - gint _tmp24_ = 0; - const gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp27_ = NULL; - sqlite3_stmt* _tmp28_ = NULL; - gint _tmp29_ = 0; - gint64 _tmp30_ = 0LL; - DataImportsFSpotDbFSpotPhotoRow* _tmp31_ = NULL; - sqlite3_stmt* _tmp32_ = NULL; - gint _tmp33_ = 0; - gint64 _tmp34_ = 0LL; - DataImportsFSpotDbFSpotPhotoRow* _tmp35_ = NULL; - sqlite3_stmt* _tmp36_ = NULL; - gint _tmp37_ = 0; - gint _tmp38_ = 0; - DataImportsFSpotDbFSpotPhotoRow* _tmp39_ = NULL; - sqlite3_stmt* _tmp40_ = NULL; - gint _tmp41_ = 0; - const gchar* _tmp42_ = NULL; - gchar* _tmp43_ = NULL; + sqlite3_stmt* _tmp9_; + gint _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; + const gchar* _tmp13_; + DataImportsFSpotDbFSpotPhotoRow* _tmp22_; + sqlite3_stmt* _tmp23_; + gint _tmp24_; + const gchar* _tmp25_; + gchar* _tmp26_; + DataImportsFSpotDbFSpotPhotoRow* _tmp27_; + sqlite3_stmt* _tmp28_; + gint _tmp29_; + gint64 _tmp30_; + DataImportsFSpotDbFSpotPhotoRow* _tmp31_; + sqlite3_stmt* _tmp32_; + gint _tmp33_; + gint64 _tmp34_; + DataImportsFSpotDbFSpotPhotoRow* _tmp35_; + sqlite3_stmt* _tmp36_; + gint _tmp37_; + gint _tmp38_; + DataImportsFSpotDbFSpotPhotoRow* _tmp39_; + sqlite3_stmt* _tmp40_; + gint _tmp41_; + const gchar* _tmp42_; + gchar* _tmp43_; #line 249 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV16Behavior); #line 249 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -2335,14 +2335,14 @@ static void data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row (Data if (_tmp13_ != NULL) { #line 2337 "FSpotPhotosTable.c" GFile* uri = NULL; - const gchar* _tmp14_ = NULL; - GFile* _tmp15_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp16_ = NULL; - GFile* _tmp17_ = NULL; - GFile* _tmp18_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp19_ = NULL; - GFile* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; + const gchar* _tmp14_; + GFile* _tmp15_; + DataImportsFSpotDbFSpotPhotoRow* _tmp16_; + GFile* _tmp17_; + GFile* _tmp18_; + DataImportsFSpotDbFSpotPhotoRow* _tmp19_; + GFile* _tmp20_; + gchar* _tmp21_; #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp14_ = full_path; #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -2459,11 +2459,11 @@ static void data_imports_fspot_db_fspot_photos_v16_behavior_data_imports_fspot_d #line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" data_imports_fspot_db_fspot_photos_v16_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface); #line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photos_v16_behavior_real_get_table_name; + iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v16_behavior_real_get_table_name; #line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photos_v16_behavior_real_list_columns; + iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v16_behavior_real_list_columns; #line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row; + iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row; #line 2468 "FSpotPhotosTable.c" } @@ -2472,7 +2472,7 @@ static void data_imports_fspot_db_fspot_photos_v16_behavior_instance_init (DataI } -static void data_imports_fspot_db_fspot_photos_v16_behavior_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_photos_v16_behavior_finalize (GObject * obj) { DataImportsFSpotDbFSpotPhotosV16Behavior * self; #line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV16Behavior); @@ -2515,15 +2515,15 @@ static DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_pho DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17_behavior_get_instance (void) { DataImportsFSpotDbFSpotPhotosV17Behavior* result = NULL; - DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp2_ = NULL; - DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp3_ = NULL; + DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp0_; + DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp2_; + DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp3_; #line 279 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp0_ = data_imports_fspot_db_fspot_photos_v17_behavior_instance; #line 279 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" if (_tmp0_ == NULL) { #line 2526 "FSpotPhotosTable.c" - DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp1_; #line 280 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp1_ = data_imports_fspot_db_fspot_photos_v17_behavior_new (); #line 280 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -2547,7 +2547,7 @@ DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17 static gchar* data_imports_fspot_db_fspot_photos_v17_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) { DataImportsFSpotDbFSpotPhotosV17Behavior * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 284 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV17Behavior); #line 285 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -2563,18 +2563,18 @@ static gchar* data_imports_fspot_db_fspot_photos_v17_behavior_real_get_table_nam static gchar** data_imports_fspot_db_fspot_photos_v17_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) { DataImportsFSpotDbFSpotPhotosV17Behavior * self; gchar** result = 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; - gchar* _tmp8_ = NULL; - gchar** _tmp9_ = NULL; - gchar** _tmp10_ = NULL; - gint _tmp10__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar** _tmp9_; + gchar** _tmp10_; + gint _tmp10__length1; #line 288 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV17Behavior); #line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -2633,52 +2633,52 @@ static gchar** data_imports_fspot_db_fspot_photos_v17_behavior_real_list_columns } -static void data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset) { +static void data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) { DataImportsFSpotDbFSpotPhotosV17Behavior * self; DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL; - sqlite3_stmt* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint64 _tmp4_ = 0LL; - DataImportsFSpotDbFSpotPhotoRow* _tmp5_ = NULL; - sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint64 _tmp8_ = 0LL; + DataImportsFSpotDbFSpotPhotoRow* _tmp0_; + DataImportsFSpotDbFSpotPhotoRow* _tmp1_; + sqlite3_stmt* _tmp2_; + gint _tmp3_; + gint64 _tmp4_; + DataImportsFSpotDbFSpotPhotoRow* _tmp5_; + sqlite3_stmt* _tmp6_; + gint _tmp7_; + gint64 _tmp8_; gchar* base_path = NULL; - sqlite3_stmt* _tmp9_ = NULL; - gint _tmp10_ = 0; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; + sqlite3_stmt* _tmp9_; + gint _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; gchar* filename = NULL; - sqlite3_stmt* _tmp13_ = NULL; - gint _tmp14_ = 0; - const gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; + sqlite3_stmt* _tmp13_; + gint _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; gboolean _tmp17_ = FALSE; - const gchar* _tmp18_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp26_ = NULL; - sqlite3_stmt* _tmp27_ = NULL; - gint _tmp28_ = 0; - const gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp31_ = NULL; - sqlite3_stmt* _tmp32_ = NULL; - gint _tmp33_ = 0; - gint64 _tmp34_ = 0LL; - DataImportsFSpotDbFSpotPhotoRow* _tmp35_ = NULL; - sqlite3_stmt* _tmp36_ = NULL; - gint _tmp37_ = 0; - gint64 _tmp38_ = 0LL; - DataImportsFSpotDbFSpotPhotoRow* _tmp39_ = NULL; - sqlite3_stmt* _tmp40_ = NULL; - gint _tmp41_ = 0; - gint _tmp42_ = 0; - DataImportsFSpotDbFSpotPhotoRow* _tmp43_ = NULL; - sqlite3_stmt* _tmp44_ = NULL; - gint _tmp45_ = 0; - const gchar* _tmp46_ = NULL; - gchar* _tmp47_ = NULL; + const gchar* _tmp18_; + DataImportsFSpotDbFSpotPhotoRow* _tmp26_; + sqlite3_stmt* _tmp27_; + gint _tmp28_; + const gchar* _tmp29_; + gchar* _tmp30_; + DataImportsFSpotDbFSpotPhotoRow* _tmp31_; + sqlite3_stmt* _tmp32_; + gint _tmp33_; + gint64 _tmp34_; + DataImportsFSpotDbFSpotPhotoRow* _tmp35_; + sqlite3_stmt* _tmp36_; + gint _tmp37_; + gint64 _tmp38_; + DataImportsFSpotDbFSpotPhotoRow* _tmp39_; + sqlite3_stmt* _tmp40_; + gint _tmp41_; + gint _tmp42_; + DataImportsFSpotDbFSpotPhotoRow* _tmp43_; + sqlite3_stmt* _tmp44_; + gint _tmp45_; + const gchar* _tmp46_; + gchar* _tmp47_; #line 293 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV17Behavior); #line 293 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -2734,7 +2734,7 @@ static void data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row (Data #line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" if (_tmp18_ != NULL) { #line 2737 "FSpotPhotosTable.c" - const gchar* _tmp19_ = NULL; + const gchar* _tmp19_; #line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp19_ = filename; #line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -2748,12 +2748,12 @@ static void data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row (Data #line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" if (_tmp17_) { #line 2751 "FSpotPhotosTable.c" - DataImportsFSpotDbFSpotPhotoRow* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - GFile* _tmp22_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; + DataImportsFSpotDbFSpotPhotoRow* _tmp20_; + const gchar* _tmp21_; + GFile* _tmp22_; + DataImportsFSpotDbFSpotPhotoRow* _tmp23_; + const gchar* _tmp24_; + gchar* _tmp25_; #line 301 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp20_ = _vala_row; #line 301 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -2864,11 +2864,11 @@ static void data_imports_fspot_db_fspot_photos_v17_behavior_data_imports_fspot_d #line 272 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" data_imports_fspot_db_fspot_photos_v17_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface); #line 272 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photos_v17_behavior_real_get_table_name; + iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v17_behavior_real_get_table_name; #line 272 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photos_v17_behavior_real_list_columns; + iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v17_behavior_real_list_columns; #line 272 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row; + iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row; #line 2873 "FSpotPhotosTable.c" } @@ -2877,7 +2877,7 @@ static void data_imports_fspot_db_fspot_photos_v17_behavior_instance_init (DataI } -static void data_imports_fspot_db_fspot_photos_v17_behavior_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_photos_v17_behavior_finalize (GObject * obj) { DataImportsFSpotDbFSpotPhotosV17Behavior * self; #line 272 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV17Behavior); @@ -2920,15 +2920,15 @@ static DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_pho DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18_behavior_get_instance (void) { DataImportsFSpotDbFSpotPhotosV18Behavior* result = NULL; - DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp2_ = NULL; - DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp3_ = NULL; + DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp0_; + DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp2_; + DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp3_; #line 321 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp0_ = data_imports_fspot_db_fspot_photos_v18_behavior_instance; #line 321 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" if (_tmp0_ == NULL) { #line 2931 "FSpotPhotosTable.c" - DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp1_; #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp1_ = data_imports_fspot_db_fspot_photos_v18_behavior_new (); #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -2952,7 +2952,7 @@ DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18 static gchar* data_imports_fspot_db_fspot_photos_v18_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) { DataImportsFSpotDbFSpotPhotosV18Behavior * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 326 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV18Behavior); #line 327 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -2968,17 +2968,17 @@ static gchar* data_imports_fspot_db_fspot_photos_v18_behavior_real_get_table_nam static gchar** data_imports_fspot_db_fspot_photos_v18_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) { DataImportsFSpotDbFSpotPhotosV18Behavior * self; gchar** result = 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; - gchar** _tmp8_ = NULL; - gchar** _tmp9_ = NULL; - gint _tmp9__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar** _tmp8_; + gchar** _tmp9_; + gint _tmp9__length1; #line 330 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV18Behavior); #line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -3033,49 +3033,49 @@ static gchar** data_imports_fspot_db_fspot_photos_v18_behavior_real_list_columns } -static void data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset) { +static void data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) { DataImportsFSpotDbFSpotPhotosV18Behavior * self; DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL; - sqlite3_stmt* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint64 _tmp4_ = 0LL; - DataImportsFSpotDbFSpotPhotoRow* _tmp5_ = NULL; - sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint64 _tmp8_ = 0LL; + DataImportsFSpotDbFSpotPhotoRow* _tmp0_; + DataImportsFSpotDbFSpotPhotoRow* _tmp1_; + sqlite3_stmt* _tmp2_; + gint _tmp3_; + gint64 _tmp4_; + DataImportsFSpotDbFSpotPhotoRow* _tmp5_; + sqlite3_stmt* _tmp6_; + gint _tmp7_; + gint64 _tmp8_; gchar* base_path = NULL; - sqlite3_stmt* _tmp9_ = NULL; - gint _tmp10_ = 0; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; + sqlite3_stmt* _tmp9_; + gint _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; gchar* filename = NULL; - sqlite3_stmt* _tmp13_ = NULL; - gint _tmp14_ = 0; - const gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; + sqlite3_stmt* _tmp13_; + gint _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; gboolean _tmp17_ = FALSE; - const gchar* _tmp18_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp26_ = NULL; - sqlite3_stmt* _tmp27_ = NULL; - gint _tmp28_ = 0; - const gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp31_ = NULL; - sqlite3_stmt* _tmp32_ = NULL; - gint _tmp33_ = 0; - gint64 _tmp34_ = 0LL; - DataImportsFSpotDbFSpotPhotoRow* _tmp35_ = NULL; - sqlite3_stmt* _tmp36_ = NULL; - gint _tmp37_ = 0; - gint64 _tmp38_ = 0LL; - DataImportsFSpotDbFSpotPhotoRow* _tmp39_ = NULL; - sqlite3_stmt* _tmp40_ = NULL; - gint _tmp41_ = 0; - gint _tmp42_ = 0; - DataImportsFSpotDbFSpotPhotoRow* _tmp43_ = NULL; - gchar* _tmp44_ = NULL; + const gchar* _tmp18_; + DataImportsFSpotDbFSpotPhotoRow* _tmp26_; + sqlite3_stmt* _tmp27_; + gint _tmp28_; + const gchar* _tmp29_; + gchar* _tmp30_; + DataImportsFSpotDbFSpotPhotoRow* _tmp31_; + sqlite3_stmt* _tmp32_; + gint _tmp33_; + gint64 _tmp34_; + DataImportsFSpotDbFSpotPhotoRow* _tmp35_; + sqlite3_stmt* _tmp36_; + gint _tmp37_; + gint64 _tmp38_; + DataImportsFSpotDbFSpotPhotoRow* _tmp39_; + sqlite3_stmt* _tmp40_; + gint _tmp41_; + gint _tmp42_; + DataImportsFSpotDbFSpotPhotoRow* _tmp43_; + gchar* _tmp44_; #line 335 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV18Behavior); #line 335 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -3131,7 +3131,7 @@ static void data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row (Data #line 342 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" if (_tmp18_ != NULL) { #line 3134 "FSpotPhotosTable.c" - const gchar* _tmp19_ = NULL; + const gchar* _tmp19_; #line 342 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp19_ = filename; #line 342 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -3145,12 +3145,12 @@ static void data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row (Data #line 342 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" if (_tmp17_) { #line 3148 "FSpotPhotosTable.c" - DataImportsFSpotDbFSpotPhotoRow* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - GFile* _tmp22_ = NULL; - DataImportsFSpotDbFSpotPhotoRow* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; + DataImportsFSpotDbFSpotPhotoRow* _tmp20_; + const gchar* _tmp21_; + GFile* _tmp22_; + DataImportsFSpotDbFSpotPhotoRow* _tmp23_; + const gchar* _tmp24_; + gchar* _tmp25_; #line 343 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp20_ = _vala_row; #line 343 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -3255,11 +3255,11 @@ static void data_imports_fspot_db_fspot_photos_v18_behavior_data_imports_fspot_d #line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" data_imports_fspot_db_fspot_photos_v18_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface); #line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photos_v18_behavior_real_get_table_name; + iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v18_behavior_real_get_table_name; #line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photos_v18_behavior_real_list_columns; + iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v18_behavior_real_list_columns; #line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row; + iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row; #line 3264 "FSpotPhotosTable.c" } @@ -3268,7 +3268,7 @@ static void data_imports_fspot_db_fspot_photos_v18_behavior_instance_init (DataI } -static void data_imports_fspot_db_fspot_photos_v18_behavior_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_photos_v18_behavior_finalize (GObject * obj) { DataImportsFSpotDbFSpotPhotosV18Behavior * self; #line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV18Behavior); diff --git a/plugins/shotwell-data-imports/FSpotRollsTable.c b/plugins/shotwell-data-imports/FSpotRollsTable.c index f232dd9..3b3e3e4 100644 --- a/plugins/shotwell-data-imports/FSpotRollsTable.c +++ b/plugins/shotwell-data-imports/FSpotRollsTable.c @@ -1,4 +1,4 @@ -/* FSpotRollsTable.c generated by valac 0.34.7, the Vala compiler +/* FSpotRollsTable.c generated by valac 0.36.6, the Vala compiler * generated from FSpotRollsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -185,11 +185,11 @@ static gpointer data_imports_fspot_db_fspot_rolls_table_parent_class = NULL; static gpointer data_imports_fspot_db_fspot_rolls_v0_behavior_parent_class = NULL; static DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_behavior_instance; static DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_behavior_instance = NULL; -static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_rolls_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; +static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_rolls_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; static gpointer data_imports_fspot_db_fspot_rolls_v5_behavior_parent_class = NULL; static DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_behavior_instance; static DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_behavior_instance = NULL; -static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_rolls_v5_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; +static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_rolls_v5_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; GType data_imports_fspot_db_fspot_roll_row_get_type (void) G_GNUC_CONST; enum { @@ -197,7 +197,7 @@ enum { }; DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_roll_row_new (void); DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_roll_row_construct (GType object_type); -static void data_imports_fspot_db_fspot_roll_row_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_roll_row_finalize (GObject * obj); gpointer importable_database_table_ref (gpointer instance); void importable_database_table_unref (gpointer instance); GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -233,8 +233,8 @@ static DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_behavior_get_instance (void); static gchar* data_imports_fspot_db_fspot_rolls_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base); static gchar** data_imports_fspot_db_fspot_rolls_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1); -static void data_imports_fspot_db_fspot_rolls_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow** row, gint offset); -static void data_imports_fspot_db_fspot_rolls_v0_behavior_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_rolls_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow* * row, gint offset); +static void data_imports_fspot_db_fspot_rolls_v0_behavior_finalize (GObject * obj); GType data_imports_fspot_db_fspot_rolls_v5_behavior_get_type (void) G_GNUC_CONST; enum { DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_V5_BEHAVIOR_DUMMY_PROPERTY @@ -244,8 +244,8 @@ static DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_behavior_get_instance (void); static gchar* data_imports_fspot_db_fspot_rolls_v5_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base); static gchar** data_imports_fspot_db_fspot_rolls_v5_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1); -static void data_imports_fspot_db_fspot_rolls_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow** row, gint offset); -static void data_imports_fspot_db_fspot_rolls_v5_behavior_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_rolls_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow* * row, gint offset); +static void data_imports_fspot_db_fspot_rolls_v5_behavior_finalize (GObject * obj); DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_roll_row_construct (GType object_type) { @@ -278,7 +278,7 @@ static void data_imports_fspot_db_fspot_roll_row_instance_init (DataImportsFSpot } -static void data_imports_fspot_db_fspot_roll_row_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_roll_row_finalize (GObject * obj) { DataImportsFSpotDbFSpotRollRow * self; #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW, DataImportsFSpotDbFSpotRollRow); @@ -305,10 +305,10 @@ GType data_imports_fspot_db_fspot_roll_row_get_type (void) { DataImportsFSpotDbFSpotRollsTable* data_imports_fspot_db_fspot_rolls_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior) { DataImportsFSpotDbFSpotRollsTable* self = NULL; - sqlite3* _tmp0_ = NULL; - DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp2_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp3_ = NULL; + sqlite3* _tmp0_; + DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_; + DataImportsFSpotDbFSpotTableBehavior* _tmp2_; + DataImportsFSpotDbFSpotTableBehavior* _tmp3_; #line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" g_return_val_if_fail (db != NULL, NULL); #line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" @@ -345,24 +345,24 @@ DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_rolls_table_get_by_i sqlite3_stmt* stmt = NULL; DataImportsFSpotDbFSpotRollRow* row = NULL; gchar* column_list = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; gchar* sql = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + const gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; gint res = 0; - sqlite3* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; + sqlite3* _tmp4_; + const gchar* _tmp5_; sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - sqlite3_stmt* _tmp13_ = NULL; - gint64 _tmp14_ = 0LL; - gint _tmp15_ = 0; - gint _tmp16_ = 0; - sqlite3_stmt* _tmp18_ = NULL; - gint _tmp19_ = 0; - gint _tmp20_ = 0; + gint _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp13_; + gint64 _tmp14_; + gint _tmp15_; + gint _tmp16_; + sqlite3_stmt* _tmp18_; + gint _tmp19_; + gint _tmp20_; GError * _inner_error_ = NULL; #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLLS_TABLE (self), NULL); @@ -397,10 +397,10 @@ DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_rolls_table_get_by_i #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" if (_tmp8_ != SQLITE_OK) { #line 400 "FSpotRollsTable.c" - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gint _tmp12_ = 0; + const gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + gint _tmp12_; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" _tmp9_ = sql; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" @@ -462,7 +462,7 @@ DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_rolls_table_get_by_i #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" if (_tmp16_ != SQLITE_OK) { #line 465 "FSpotRollsTable.c" - gint _tmp17_ = 0; + gint _tmp17_; #line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" _tmp17_ = res; #line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" @@ -514,8 +514,8 @@ DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_rolls_table_get_by_i #line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" if (_tmp20_ == SQLITE_ROW) { #line 517 "FSpotRollsTable.c" - DataImportsFSpotDbFSpotTableBehavior* _tmp21_ = NULL; - sqlite3_stmt* _tmp22_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp21_; + sqlite3_stmt* _tmp22_; gpointer _tmp23_ = NULL; #line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" _tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable)->behavior; @@ -529,13 +529,13 @@ DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_rolls_table_get_by_i row = _tmp23_; #line 531 "FSpotRollsTable.c" } else { - gint _tmp24_ = 0; + gint _tmp24_; #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" _tmp24_ = res; #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" if (_tmp24_ == SQLITE_DONE) { #line 538 "FSpotRollsTable.c" - gint64 _tmp25_ = 0LL; + gint64 _tmp25_; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" _tmp25_ = roll_id; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" @@ -609,15 +609,15 @@ static gpointer _g_object_ref0 (gpointer self) { DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_behavior_get_instance (void) { DataImportsFSpotDbFSpotRollsV0Behavior* result = NULL; - DataImportsFSpotDbFSpotRollsV0Behavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotRollsV0Behavior* _tmp2_ = NULL; - DataImportsFSpotDbFSpotRollsV0Behavior* _tmp3_ = NULL; + DataImportsFSpotDbFSpotRollsV0Behavior* _tmp0_; + DataImportsFSpotDbFSpotRollsV0Behavior* _tmp2_; + DataImportsFSpotDbFSpotRollsV0Behavior* _tmp3_; #line 61 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" _tmp0_ = data_imports_fspot_db_fspot_rolls_v0_behavior_instance; #line 61 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" if (_tmp0_ == NULL) { #line 620 "FSpotRollsTable.c" - DataImportsFSpotDbFSpotRollsV0Behavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotRollsV0Behavior* _tmp1_; #line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" _tmp1_ = data_imports_fspot_db_fspot_rolls_v0_behavior_new (); #line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" @@ -641,7 +641,7 @@ DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_beh static gchar* data_imports_fspot_db_fspot_rolls_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) { DataImportsFSpotDbFSpotRollsV0Behavior * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR, DataImportsFSpotDbFSpotRollsV0Behavior); #line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" @@ -657,11 +657,11 @@ static gchar* data_imports_fspot_db_fspot_rolls_v0_behavior_real_get_table_name static gchar** data_imports_fspot_db_fspot_rolls_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) { DataImportsFSpotDbFSpotRollsV0Behavior * self; gchar** result = NULL; - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar** _tmp2_ = NULL; - gchar** _tmp3_ = NULL; - gint _tmp3__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar** _tmp2_; + gchar** _tmp3_; + gint _tmp3__length1; #line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR, DataImportsFSpotDbFSpotRollsV0Behavior); #line 71 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" @@ -692,16 +692,16 @@ static gchar** data_imports_fspot_db_fspot_rolls_v0_behavior_real_list_columns ( } -static void data_imports_fspot_db_fspot_rolls_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow** row, gint offset) { +static void data_imports_fspot_db_fspot_rolls_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow* * row, gint offset) { DataImportsFSpotDbFSpotRollsV0Behavior * self; DataImportsFSpotDbFSpotRollRow* _vala_row = NULL; - DataImportsFSpotDbFSpotRollRow* _tmp0_ = NULL; - sqlite3_stmt* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint64 _tmp3_ = 0LL; - sqlite3_stmt* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint64 _tmp6_ = 0LL; + DataImportsFSpotDbFSpotRollRow* _tmp0_; + sqlite3_stmt* _tmp1_; + gint _tmp2_; + gint64 _tmp3_; + sqlite3_stmt* _tmp4_; + gint _tmp5_; + gint64 _tmp6_; #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR, DataImportsFSpotDbFSpotRollsV0Behavior); #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" @@ -754,11 +754,11 @@ static void data_imports_fspot_db_fspot_rolls_v0_behavior_data_imports_fspot_db_ #line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" data_imports_fspot_db_fspot_rolls_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface); #line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" - iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_rolls_v0_behavior_real_get_table_name; + iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_rolls_v0_behavior_real_get_table_name; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" - iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_rolls_v0_behavior_real_list_columns; + iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_rolls_v0_behavior_real_list_columns; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" - iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_rolls_v0_behavior_real_build_row; + iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_rolls_v0_behavior_real_build_row; #line 763 "FSpotRollsTable.c" } @@ -767,7 +767,7 @@ static void data_imports_fspot_db_fspot_rolls_v0_behavior_instance_init (DataImp } -static void data_imports_fspot_db_fspot_rolls_v0_behavior_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_rolls_v0_behavior_finalize (GObject * obj) { DataImportsFSpotDbFSpotRollsV0Behavior * self; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR, DataImportsFSpotDbFSpotRollsV0Behavior); @@ -810,15 +810,15 @@ static DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_behavior_get_instance (void) { DataImportsFSpotDbFSpotRollsV5Behavior* result = NULL; - DataImportsFSpotDbFSpotRollsV5Behavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotRollsV5Behavior* _tmp2_ = NULL; - DataImportsFSpotDbFSpotRollsV5Behavior* _tmp3_ = NULL; + DataImportsFSpotDbFSpotRollsV5Behavior* _tmp0_; + DataImportsFSpotDbFSpotRollsV5Behavior* _tmp2_; + DataImportsFSpotDbFSpotRollsV5Behavior* _tmp3_; #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" _tmp0_ = data_imports_fspot_db_fspot_rolls_v5_behavior_instance; #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" if (_tmp0_ == NULL) { #line 821 "FSpotRollsTable.c" - DataImportsFSpotDbFSpotRollsV5Behavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotRollsV5Behavior* _tmp1_; #line 91 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" _tmp1_ = data_imports_fspot_db_fspot_rolls_v5_behavior_new (); #line 91 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" @@ -842,7 +842,7 @@ DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_beh static gchar* data_imports_fspot_db_fspot_rolls_v5_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) { DataImportsFSpotDbFSpotRollsV5Behavior * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 95 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR, DataImportsFSpotDbFSpotRollsV5Behavior); #line 96 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" @@ -858,11 +858,11 @@ static gchar* data_imports_fspot_db_fspot_rolls_v5_behavior_real_get_table_name static gchar** data_imports_fspot_db_fspot_rolls_v5_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) { DataImportsFSpotDbFSpotRollsV5Behavior * self; gchar** result = NULL; - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar** _tmp2_ = NULL; - gchar** _tmp3_ = NULL; - gint _tmp3__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar** _tmp2_; + gchar** _tmp3_; + gint _tmp3__length1; #line 99 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR, DataImportsFSpotDbFSpotRollsV5Behavior); #line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" @@ -893,16 +893,16 @@ static gchar** data_imports_fspot_db_fspot_rolls_v5_behavior_real_list_columns ( } -static void data_imports_fspot_db_fspot_rolls_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow** row, gint offset) { +static void data_imports_fspot_db_fspot_rolls_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow* * row, gint offset) { DataImportsFSpotDbFSpotRollsV5Behavior * self; DataImportsFSpotDbFSpotRollRow* _vala_row = NULL; - DataImportsFSpotDbFSpotRollRow* _tmp0_ = NULL; - sqlite3_stmt* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint64 _tmp3_ = 0LL; - sqlite3_stmt* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint64 _tmp6_ = 0LL; + DataImportsFSpotDbFSpotRollRow* _tmp0_; + sqlite3_stmt* _tmp1_; + gint _tmp2_; + gint64 _tmp3_; + sqlite3_stmt* _tmp4_; + gint _tmp5_; + gint64 _tmp6_; #line 103 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR, DataImportsFSpotDbFSpotRollsV5Behavior); #line 103 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" @@ -955,11 +955,11 @@ static void data_imports_fspot_db_fspot_rolls_v5_behavior_data_imports_fspot_db_ #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" data_imports_fspot_db_fspot_rolls_v5_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface); #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" - iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_rolls_v5_behavior_real_get_table_name; + iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_rolls_v5_behavior_real_get_table_name; #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" - iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_rolls_v5_behavior_real_list_columns; + iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_rolls_v5_behavior_real_list_columns; #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" - iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_rolls_v5_behavior_real_build_row; + iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_rolls_v5_behavior_real_build_row; #line 964 "FSpotRollsTable.c" } @@ -968,7 +968,7 @@ static void data_imports_fspot_db_fspot_rolls_v5_behavior_instance_init (DataImp } -static void data_imports_fspot_db_fspot_rolls_v5_behavior_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_rolls_v5_behavior_finalize (GObject * obj) { DataImportsFSpotDbFSpotRollsV5Behavior * self; #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR, DataImportsFSpotDbFSpotRollsV5Behavior); diff --git a/plugins/shotwell-data-imports/FSpotTableBehavior.c b/plugins/shotwell-data-imports/FSpotTableBehavior.c index e3d5c7d..016fee8 100644 --- a/plugins/shotwell-data-imports/FSpotTableBehavior.c +++ b/plugins/shotwell-data-imports/FSpotTableBehavior.c @@ -1,4 +1,4 @@ -/* FSpotTableBehavior.c generated by valac 0.34.7, the Vala compiler +/* FSpotTableBehavior.c generated by valac 0.36.6, the Vala compiler * generated from FSpotTableBehavior.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotTagsTable.c b/plugins/shotwell-data-imports/FSpotTagsTable.c index 95f6432..54fe7c6 100644 --- a/plugins/shotwell-data-imports/FSpotTagsTable.c +++ b/plugins/shotwell-data-imports/FSpotTagsTable.c @@ -1,4 +1,4 @@ -/* FSpotTagsTable.c generated by valac 0.34.7, the Vala compiler +/* FSpotTagsTable.c generated by valac 0.36.6, the Vala compiler * generated from FSpotTagsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -187,7 +187,7 @@ static gpointer data_imports_fspot_db_fspot_tags_table_parent_class = NULL; static gpointer data_imports_fspot_db_fspot_tags_v0_behavior_parent_class = NULL; static DataImportsFSpotDbFSpotTagsV0Behavior* data_imports_fspot_db_fspot_tags_v0_behavior_instance; static DataImportsFSpotDbFSpotTagsV0Behavior* data_imports_fspot_db_fspot_tags_v0_behavior_instance = NULL; -static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_tags_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; +static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_tags_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL; GType data_imports_fspot_db_fspot_tag_row_get_type (void) G_GNUC_CONST; enum { @@ -195,7 +195,7 @@ enum { }; DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tag_row_new (void); DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tag_row_construct (GType object_type); -static void data_imports_fspot_db_fspot_tag_row_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_tag_row_finalize (GObject * obj); gpointer importable_database_table_ref (gpointer instance); void importable_database_table_unref (gpointer instance); GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -231,7 +231,7 @@ void importable_database_table_throw_error (const gchar* method, gint res, GErro void data_imports_fspot_db_fspot_table_behavior_build_row (DataImportsFSpotDbFSpotTableBehavior* self, sqlite3_stmt* stmt, gpointer* row, gint offset); GeeArrayList* data_imports_fspot_db_fspot_tags_table_get_by_photo_id (DataImportsFSpotDbFSpotTagsTable* self, gint64 photo_id, GError** error); gchar* data_imports_fspot_db_fspot_table_behavior_get_table_name (DataImportsFSpotDbFSpotTableBehavior* self); -static void data_imports_fspot_db_fspot_tags_table_finalize (ImportableDatabaseTable* obj); +static void data_imports_fspot_db_fspot_tags_table_finalize (ImportableDatabaseTable * obj); GType data_imports_fspot_db_fspot_tags_v0_behavior_get_type (void) G_GNUC_CONST; enum { DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_V0_BEHAVIOR_DUMMY_PROPERTY @@ -241,8 +241,8 @@ static DataImportsFSpotDbFSpotTagsV0Behavior* data_imports_fspot_db_fspot_tags_v DataImportsFSpotDbFSpotTagsV0Behavior* data_imports_fspot_db_fspot_tags_v0_behavior_get_instance (void); static gchar* data_imports_fspot_db_fspot_tags_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base); static gchar** data_imports_fspot_db_fspot_tags_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1); -static void data_imports_fspot_db_fspot_tags_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotTagRow** row, gint offset); -static void data_imports_fspot_db_fspot_tags_v0_behavior_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_tags_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotTagRow* * row, gint offset); +static void data_imports_fspot_db_fspot_tags_v0_behavior_finalize (GObject * obj); DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tag_row_construct (GType object_type) { @@ -275,7 +275,7 @@ static void data_imports_fspot_db_fspot_tag_row_instance_init (DataImportsFSpotD } -static void data_imports_fspot_db_fspot_tag_row_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_tag_row_finalize (GObject * obj) { DataImportsFSpotDbFSpotTagRow * self; #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW, DataImportsFSpotDbFSpotTagRow); @@ -306,12 +306,12 @@ GType data_imports_fspot_db_fspot_tag_row_get_type (void) { DataImportsFSpotDbFSpotTagsTable* data_imports_fspot_db_fspot_tags_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior) { DataImportsFSpotDbFSpotTagsTable* self = NULL; - sqlite3* _tmp0_ = NULL; - DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp2_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp3_ = NULL; - DataImportsFSpotDbFSpotDatabaseBehavior* _tmp4_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp5_ = NULL; + sqlite3* _tmp0_; + DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_; + DataImportsFSpotDbFSpotTableBehavior* _tmp2_; + DataImportsFSpotDbFSpotTableBehavior* _tmp3_; + DataImportsFSpotDbFSpotDatabaseBehavior* _tmp4_; + DataImportsFSpotDbFSpotTableBehavior* _tmp5_; #line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" g_return_val_if_fail (db != NULL, NULL); #line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" @@ -356,24 +356,24 @@ DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tags_table_get_by_id sqlite3_stmt* stmt = NULL; DataImportsFSpotDbFSpotTagRow* row = NULL; gchar* column_list = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; gchar* sql = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + const gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; gint res = 0; - sqlite3* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; + sqlite3* _tmp4_; + const gchar* _tmp5_; sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - sqlite3_stmt* _tmp13_ = NULL; - gint64 _tmp14_ = 0LL; - gint _tmp15_ = 0; - gint _tmp16_ = 0; - sqlite3_stmt* _tmp17_ = NULL; - gint _tmp18_ = 0; - gint _tmp19_ = 0; + gint _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp13_; + gint64 _tmp14_; + gint _tmp15_; + gint _tmp16_; + sqlite3_stmt* _tmp17_; + gint _tmp18_; + gint _tmp19_; GError * _inner_error_ = NULL; #line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAGS_TABLE (self), NULL); @@ -408,10 +408,10 @@ DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tags_table_get_by_id #line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" if (_tmp8_ != SQLITE_OK) { #line 411 "FSpotTagsTable.c" - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gint _tmp12_ = 0; + const gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + gint _tmp12_; #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" _tmp9_ = sql; #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" @@ -483,8 +483,8 @@ DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tags_table_get_by_id #line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" if (_tmp19_ == SQLITE_ROW) { #line 486 "FSpotTagsTable.c" - DataImportsFSpotDbFSpotTableBehavior* _tmp20_ = NULL; - sqlite3_stmt* _tmp21_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp20_; + sqlite3_stmt* _tmp21_; gpointer _tmp22_ = NULL; #line 56 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" _tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable)->behavior; @@ -498,13 +498,13 @@ DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tags_table_get_by_id row = _tmp22_; #line 500 "FSpotTagsTable.c" } else { - gint _tmp23_ = 0; + gint _tmp23_; #line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" _tmp23_ = res; #line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" if (_tmp23_ == SQLITE_DONE) { #line 507 "FSpotTagsTable.c" - gint64 _tmp24_ = 0LL; + gint64 _tmp24_; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" _tmp24_ = tag_id; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" @@ -529,30 +529,30 @@ DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tags_table_get_by_id GeeArrayList* data_imports_fspot_db_fspot_tags_table_get_by_photo_id (DataImportsFSpotDbFSpotTagsTable* self, gint64 photo_id, GError** error) { GeeArrayList* result = NULL; GeeArrayList* rows = NULL; - GeeArrayList* _tmp0_ = NULL; + GeeArrayList* _tmp0_; sqlite3_stmt* stmt = NULL; gchar* column_list = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp1_; gchar* sql = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + const gchar* _tmp2_; + const gchar* _tmp3_; + DataImportsFSpotDbFSpotTableBehavior* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; gint res = 0; - sqlite3* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; + sqlite3* _tmp9_; + const gchar* _tmp10_; sqlite3_stmt* _tmp11_ = NULL; - gint _tmp12_ = 0; - gint _tmp13_ = 0; - sqlite3_stmt* _tmp18_ = NULL; - gint64 _tmp19_ = 0LL; - gint _tmp20_ = 0; - gint _tmp21_ = 0; - sqlite3_stmt* _tmp23_ = NULL; - gint _tmp24_ = 0; + gint _tmp12_; + gint _tmp13_; + sqlite3_stmt* _tmp18_; + gint64 _tmp19_; + gint _tmp20_; + gint _tmp21_; + sqlite3_stmt* _tmp23_; + gint _tmp24_; GError * _inner_error_ = NULL; #line 63 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAGS_TABLE (self), NULL); @@ -600,10 +600,10 @@ GeeArrayList* data_imports_fspot_db_fspot_tags_table_get_by_photo_id (DataImport #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" if (_tmp13_ != SQLITE_OK) { #line 602 "FSpotTagsTable.c" - const gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gint _tmp17_ = 0; + const gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + gint _tmp17_; #line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" _tmp14_ = sql; #line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" @@ -665,7 +665,7 @@ GeeArrayList* data_imports_fspot_db_fspot_tags_table_get_by_photo_id (DataImport #line 78 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" if (_tmp21_ != SQLITE_OK) { #line 667 "FSpotTagsTable.c" - gint _tmp22_ = 0; + gint _tmp22_; #line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" _tmp22_ = res; #line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" @@ -715,15 +715,15 @@ GeeArrayList* data_imports_fspot_db_fspot_tags_table_get_by_photo_id (DataImport #line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" while (TRUE) { #line 717 "FSpotTagsTable.c" - gint _tmp25_ = 0; + gint _tmp25_; DataImportsFSpotDbFSpotTagRow* row = NULL; - DataImportsFSpotDbFSpotTableBehavior* _tmp26_ = NULL; - sqlite3_stmt* _tmp27_ = NULL; + DataImportsFSpotDbFSpotTableBehavior* _tmp26_; + sqlite3_stmt* _tmp27_; gpointer _tmp28_ = NULL; - GeeArrayList* _tmp29_ = NULL; - DataImportsFSpotDbFSpotTagRow* _tmp30_ = NULL; - sqlite3_stmt* _tmp31_ = NULL; - gint _tmp32_ = 0; + GeeArrayList* _tmp29_; + DataImportsFSpotDbFSpotTagRow* _tmp30_; + sqlite3_stmt* _tmp31_; + gint _tmp32_; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" _tmp25_ = res; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" @@ -790,7 +790,7 @@ static void data_imports_fspot_db_fspot_tags_table_instance_init (DataImportsFSp } -static void data_imports_fspot_db_fspot_tags_table_finalize (ImportableDatabaseTable* obj) { +static void data_imports_fspot_db_fspot_tags_table_finalize (ImportableDatabaseTable * obj) { DataImportsFSpotDbFSpotTagsTable * self; #line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_TABLE, DataImportsFSpotDbFSpotTagsTable); @@ -843,15 +843,15 @@ static gpointer _g_object_ref0 (gpointer self) { DataImportsFSpotDbFSpotTagsV0Behavior* data_imports_fspot_db_fspot_tags_v0_behavior_get_instance (void) { DataImportsFSpotDbFSpotTagsV0Behavior* result = NULL; - DataImportsFSpotDbFSpotTagsV0Behavior* _tmp0_ = NULL; - DataImportsFSpotDbFSpotTagsV0Behavior* _tmp2_ = NULL; - DataImportsFSpotDbFSpotTagsV0Behavior* _tmp3_ = NULL; + DataImportsFSpotDbFSpotTagsV0Behavior* _tmp0_; + DataImportsFSpotDbFSpotTagsV0Behavior* _tmp2_; + DataImportsFSpotDbFSpotTagsV0Behavior* _tmp3_; #line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" _tmp0_ = data_imports_fspot_db_fspot_tags_v0_behavior_instance; #line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" if (_tmp0_ == NULL) { #line 853 "FSpotTagsTable.c" - DataImportsFSpotDbFSpotTagsV0Behavior* _tmp1_ = NULL; + DataImportsFSpotDbFSpotTagsV0Behavior* _tmp1_; #line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" _tmp1_ = data_imports_fspot_db_fspot_tags_v0_behavior_new (); #line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" @@ -875,7 +875,7 @@ DataImportsFSpotDbFSpotTagsV0Behavior* data_imports_fspot_db_fspot_tags_v0_behav static gchar* data_imports_fspot_db_fspot_tags_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) { DataImportsFSpotDbFSpotTagsV0Behavior * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotTagsV0Behavior); #line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" @@ -891,15 +891,15 @@ static gchar* data_imports_fspot_db_fspot_tags_v0_behavior_real_get_table_name ( static gchar** data_imports_fspot_db_fspot_tags_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) { DataImportsFSpotDbFSpotTagsV0Behavior * self; gchar** result = 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; - gint _tmp7__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar** _tmp6_; + gchar** _tmp7_; + gint _tmp7__length1; #line 109 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotTagsV0Behavior); #line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" @@ -946,38 +946,38 @@ static gchar** data_imports_fspot_db_fspot_tags_v0_behavior_real_list_columns (D } -static void data_imports_fspot_db_fspot_tags_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotTagRow** row, gint offset) { +static void data_imports_fspot_db_fspot_tags_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotTagRow* * row, gint offset) { DataImportsFSpotDbFSpotTagsV0Behavior * self; DataImportsFSpotDbFSpotTagRow* _vala_row = NULL; - DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL; - DataImportsFSpotDbFSpotTagRow* _tmp1_ = NULL; - sqlite3_stmt* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint64 _tmp4_ = 0LL; - DataImportsFSpotDbFSpotTagRow* _tmp5_ = NULL; - sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_ = 0; - const gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - DataImportsFSpotDbFSpotTagRow* _tmp10_ = NULL; - sqlite3_stmt* _tmp11_ = NULL; - gint _tmp12_ = 0; - gint64 _tmp13_ = 0LL; - DataImportsFSpotDbFSpotTagRow* _tmp14_ = NULL; - sqlite3_stmt* _tmp15_ = NULL; - gint _tmp16_ = 0; - gint _tmp17_ = 0; - DataImportsFSpotDbFSpotTagRow* _tmp18_ = NULL; - sqlite3_stmt* _tmp19_ = NULL; - gint _tmp20_ = 0; - gint _tmp21_ = 0; + DataImportsFSpotDbFSpotTagRow* _tmp0_; + DataImportsFSpotDbFSpotTagRow* _tmp1_; + sqlite3_stmt* _tmp2_; + gint _tmp3_; + gint64 _tmp4_; + DataImportsFSpotDbFSpotTagRow* _tmp5_; + sqlite3_stmt* _tmp6_; + gint _tmp7_; + const gchar* _tmp8_; + gchar* _tmp9_; + DataImportsFSpotDbFSpotTagRow* _tmp10_; + sqlite3_stmt* _tmp11_; + gint _tmp12_; + gint64 _tmp13_; + DataImportsFSpotDbFSpotTagRow* _tmp14_; + sqlite3_stmt* _tmp15_; + gint _tmp16_; + gint _tmp17_; + DataImportsFSpotDbFSpotTagRow* _tmp18_; + sqlite3_stmt* _tmp19_; + gint _tmp20_; + gint _tmp21_; gchar* icon_str = NULL; - sqlite3_stmt* _tmp22_ = NULL; - gint _tmp23_ = 0; - const gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; + sqlite3_stmt* _tmp22_; + gint _tmp23_; + const gchar* _tmp24_; + gchar* _tmp25_; gboolean _tmp26_ = FALSE; - const gchar* _tmp27_ = NULL; + const gchar* _tmp27_; #line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotTagsV0Behavior); #line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" @@ -1057,8 +1057,8 @@ static void data_imports_fspot_db_fspot_tags_v0_behavior_real_build_row (DataImp #line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" if (_tmp27_ != NULL) { #line 1059 "FSpotTagsTable.c" - const gchar* _tmp28_ = NULL; - gboolean _tmp29_ = FALSE; + const gchar* _tmp28_; + gboolean _tmp29_; #line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" _tmp28_ = icon_str; #line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" @@ -1074,9 +1074,9 @@ static void data_imports_fspot_db_fspot_tags_v0_behavior_real_build_row (DataImp #line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" if (_tmp26_) { #line 1076 "FSpotTagsTable.c" - DataImportsFSpotDbFSpotTagRow* _tmp30_ = NULL; - const gchar* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; + DataImportsFSpotDbFSpotTagRow* _tmp30_; + const gchar* _tmp31_; + gchar* _tmp32_; #line 122 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" _tmp30_ = _vala_row; #line 122 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" @@ -1089,8 +1089,8 @@ static void data_imports_fspot_db_fspot_tags_v0_behavior_real_build_row (DataImp _tmp30_->stock_icon = _tmp32_; #line 1090 "FSpotTagsTable.c" } else { - DataImportsFSpotDbFSpotTagRow* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; + DataImportsFSpotDbFSpotTagRow* _tmp33_; + gchar* _tmp34_; #line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" _tmp33_ = _vala_row; #line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" @@ -1129,11 +1129,11 @@ static void data_imports_fspot_db_fspot_tags_v0_behavior_data_imports_fspot_db_f #line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" data_imports_fspot_db_fspot_tags_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface); #line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" - iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_tags_v0_behavior_real_get_table_name; + iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_tags_v0_behavior_real_get_table_name; #line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" - iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_tags_v0_behavior_real_list_columns; + iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_tags_v0_behavior_real_list_columns; #line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" - iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_tags_v0_behavior_real_build_row; + iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_tags_v0_behavior_real_build_row; #line 1137 "FSpotTagsTable.c" } @@ -1142,7 +1142,7 @@ static void data_imports_fspot_db_fspot_tags_v0_behavior_instance_init (DataImpo } -static void data_imports_fspot_db_fspot_tags_v0_behavior_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_tags_v0_behavior_finalize (GObject * obj) { DataImportsFSpotDbFSpotTagsV0Behavior * self; #line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotTagsV0Behavior); diff --git a/plugins/shotwell-data-imports/SqliteSupport.c b/plugins/shotwell-data-imports/SqliteSupport.c index c02a5e6..eb9eec2 100644 --- a/plugins/shotwell-data-imports/SqliteSupport.c +++ b/plugins/shotwell-data-imports/SqliteSupport.c @@ -1,4 +1,4 @@ -/* SqliteSupport.c generated by valac 0.34.7, the Vala compiler +/* SqliteSupport.c generated by valac 0.36.6, the Vala compiler * generated from SqliteSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -72,7 +72,7 @@ enum { void importable_database_table_set_table_name (ImportableDatabaseTable* self, const gchar* table_name); void importable_database_table_throw_error (const gchar* method, gint res, GError** error); ImportableDatabaseTable* importable_database_table_construct (GType object_type); -static void importable_database_table_finalize (ImportableDatabaseTable* obj); +static void importable_database_table_finalize (ImportableDatabaseTable * obj); GQuark database_error_quark (void) { @@ -81,8 +81,8 @@ GQuark database_error_quark (void) { void importable_database_table_set_table_name (ImportableDatabaseTable* self, const gchar* table_name) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" g_return_if_fail (IS_IMPORTABLE_DATABASE_TABLE (self)); #line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" @@ -101,12 +101,12 @@ void importable_database_table_set_table_name (ImportableDatabaseTable* self, co void importable_database_table_throw_error (const gchar* method, gint res, GError** error) { gchar* msg = NULL; - const gchar* _tmp0_ = NULL; - gint _tmp1_ = 0; - sqlite3* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gint _tmp5_ = 0; + const gchar* _tmp0_; + gint _tmp1_; + sqlite3* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; + gint _tmp5_; GError * _inner_error_ = NULL; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" g_return_if_fail (method != NULL); @@ -162,8 +162,8 @@ void importable_database_table_throw_error (const gchar* method, gint res, GErro case SQLITE_NOTADB: #line 164 "SqliteSupport.c" { - const gchar* _tmp6_ = NULL; - GError* _tmp7_ = NULL; + const gchar* _tmp6_; + GError* _tmp7_; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" _tmp6_ = msg; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" @@ -195,8 +195,8 @@ void importable_database_table_throw_error (const gchar* method, gint res, GErro case SQLITE_NOMEM: #line 197 "SqliteSupport.c" { - const gchar* _tmp8_ = NULL; - GError* _tmp9_ = NULL; + const gchar* _tmp8_; + GError* _tmp9_; #line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" _tmp8_ = msg; #line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" @@ -232,8 +232,8 @@ void importable_database_table_throw_error (const gchar* method, gint res, GErro case SQLITE_INTERRUPT: #line 234 "SqliteSupport.c" { - const gchar* _tmp10_ = NULL; - GError* _tmp11_ = NULL; + const gchar* _tmp10_; + GError* _tmp11_; #line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" _tmp10_ = msg; #line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" @@ -273,8 +273,8 @@ void importable_database_table_throw_error (const gchar* method, gint res, GErro case SQLITE_RANGE: #line 275 "SqliteSupport.c" { - const gchar* _tmp12_ = NULL; - GError* _tmp13_ = NULL; + const gchar* _tmp12_; + GError* _tmp13_; #line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" _tmp12_ = msg; #line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" @@ -308,8 +308,8 @@ void importable_database_table_throw_error (const gchar* method, gint res, GErro case SQLITE_MISMATCH: #line 310 "SqliteSupport.c" { - const gchar* _tmp14_ = NULL; - GError* _tmp15_ = NULL; + const gchar* _tmp14_; + GError* _tmp15_; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" _tmp14_ = msg; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" @@ -346,8 +346,8 @@ void importable_database_table_throw_error (const gchar* method, gint res, GErro case SQLITE_MISUSE: #line 348 "SqliteSupport.c" { - const gchar* _tmp16_ = NULL; - GError* _tmp17_ = NULL; + const gchar* _tmp16_; + GError* _tmp17_; #line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" _tmp16_ = msg; #line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" @@ -434,7 +434,7 @@ static gchar* value_importable_database_table_collect_value (GValue* value, guin #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" if (collect_values[0].v_pointer) { #line 437 "SqliteSupport.c" - ImportableDatabaseTable* object; + ImportableDatabaseTable * object; object = collect_values[0].v_pointer; #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" if (object->parent_instance.g_class == NULL) { @@ -461,7 +461,7 @@ static gchar* value_importable_database_table_collect_value (GValue* value, guin static gchar* value_importable_database_table_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - ImportableDatabaseTable** object_p; + ImportableDatabaseTable ** object_p; object_p = collect_values[0].v_pointer; #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" if (!object_p) { @@ -513,7 +513,7 @@ gpointer value_get_importable_database_table (const GValue* value) { void value_set_importable_database_table (GValue* value, gpointer v_object) { - ImportableDatabaseTable* old; + ImportableDatabaseTable * old; #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORTABLE_DATABASE_TABLE)); #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" @@ -544,7 +544,7 @@ void value_set_importable_database_table (GValue* value, gpointer v_object) { void value_take_importable_database_table (GValue* value, gpointer v_object) { - ImportableDatabaseTable* old; + ImportableDatabaseTable * old; #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORTABLE_DATABASE_TABLE)); #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" @@ -590,7 +590,7 @@ static void importable_database_table_instance_init (ImportableDatabaseTable * s } -static void importable_database_table_finalize (ImportableDatabaseTable* obj) { +static void importable_database_table_finalize (ImportableDatabaseTable * obj) { ImportableDatabaseTable * self; #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable); @@ -617,7 +617,7 @@ GType importable_database_table_get_type (void) { gpointer importable_database_table_ref (gpointer instance) { - ImportableDatabaseTable* self; + ImportableDatabaseTable * self; self = instance; #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" g_atomic_int_inc (&self->ref_count); @@ -628,7 +628,7 @@ gpointer importable_database_table_ref (gpointer instance) { void importable_database_table_unref (gpointer instance) { - ImportableDatabaseTable* self; + ImportableDatabaseTable * self; self = instance; #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { diff --git a/plugins/shotwell-data-imports/VersionNumber.c b/plugins/shotwell-data-imports/VersionNumber.c index 7d21a8d..dd5f414 100644 --- a/plugins/shotwell-data-imports/VersionNumber.c +++ b/plugins/shotwell-data-imports/VersionNumber.c @@ -1,4 +1,4 @@ -/* VersionNumber.c generated by valac 0.34.7, the Vala compiler +/* VersionNumber.c generated by valac 0.36.6, the Vala compiler * generated from VersionNumber.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -43,7 +43,7 @@ struct _UtilsVersionNumberPrivate { static gpointer utils_version_number_parent_class = NULL; -static GeeComparableIface* utils_version_number_gee_comparable_parent_iface = NULL; +static GeeComparableIface * utils_version_number_gee_comparable_parent_iface = NULL; GType utils_version_number_get_type (void) G_GNUC_CONST; #define UTILS_VERSION_NUMBER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), UTILS_TYPE_VERSION_NUMBER, UtilsVersionNumberPrivate)) @@ -57,7 +57,7 @@ UtilsVersionNumber* utils_version_number_new_from_string (const gchar* str_versi UtilsVersionNumber* utils_version_number_construct_from_string (GType object_type, const gchar* str_version, const gchar* separator); gchar* utils_version_number_to_string (UtilsVersionNumber* self); static gint utils_version_number_real_compare_to (GeeComparable* base, UtilsVersionNumber* other); -static void utils_version_number_finalize (GObject* obj); +static void utils_version_number_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); @@ -72,10 +72,10 @@ static gint* _vala_array_dup3 (gint* self, int length) { UtilsVersionNumber* utils_version_number_construct (GType object_type, gint* version, int version_length1) { UtilsVersionNumber * self = NULL; - gint* _tmp0_ = NULL; - gint _tmp0__length1 = 0; - gint* _tmp1_ = NULL; - gint _tmp1__length1 = 0; + gint* _tmp0_; + gint _tmp0__length1; + gint* _tmp1_; + gint _tmp1__length1; #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" self = (UtilsVersionNumber*) g_object_new (object_type, NULL); #line 17 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" @@ -110,15 +110,15 @@ UtilsVersionNumber* utils_version_number_new (gint* version, int version_length1 UtilsVersionNumber* utils_version_number_construct_from_string (GType object_type, const gchar* str_version, const gchar* separator) { UtilsVersionNumber * self = NULL; gchar** version_items = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar** _tmp2_ = NULL; - gchar** _tmp3_ = NULL; - gint version_items_length1 = 0; - gint _version_items_size_ = 0; - gchar** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - gint* _tmp5_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + gchar** _tmp2_; + gchar** _tmp3_; + gint version_items_length1; + gint _version_items_size_; + gchar** _tmp4_; + gint _tmp4__length1; + gint* _tmp5_; #line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" g_return_val_if_fail (str_version != NULL, NULL); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" @@ -164,22 +164,22 @@ UtilsVersionNumber* utils_version_number_construct_from_string (GType object_typ #line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" while (TRUE) { #line 167 "VersionNumber.c" - gint _tmp8_ = 0; - gchar** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - gint* _tmp10_ = NULL; - gint _tmp10__length1 = 0; - gint _tmp11_ = 0; - gchar** _tmp12_ = NULL; - gint _tmp12__length1 = 0; - gint _tmp13_ = 0; - const gchar* _tmp14_ = NULL; - gint _tmp15_ = 0; - gint _tmp16_ = 0; + gint _tmp8_; + gchar** _tmp9_; + gint _tmp9__length1; + gint* _tmp10_; + gint _tmp10__length1; + gint _tmp11_; + gchar** _tmp12_; + gint _tmp12__length1; + gint _tmp13_; + const gchar* _tmp14_; + gint _tmp15_; + gint _tmp16_; #line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" if (!_tmp6_) { #line 182 "VersionNumber.c" - gint _tmp7_ = 0; + gint _tmp7_; #line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" _tmp7_ = i; #line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" @@ -241,408 +241,408 @@ UtilsVersionNumber* utils_version_number_new_from_string (const gchar* str_versi static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; - gchar** _tmp3_ = NULL; - gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp3_; + gint _tmp3__length1; +#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" separator = ""; #line 256 "VersionNumber.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = TRUE; #line 266 "VersionNumber.c" } else { - gchar** _tmp4_ = NULL; - gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp4_; + gint _tmp4__length1; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; #line 276 "VersionNumber.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = TRUE; #line 282 "VersionNumber.c" } else { gboolean _tmp5_ = FALSE; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp6_; + gint _tmp6__length1; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { #line 293 "VersionNumber.c" - gchar** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp7_; + gint _tmp7__length1; + const gchar* _tmp8_; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; #line 305 "VersionNumber.c" } else { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = FALSE; #line 309 "VersionNumber.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; #line 313 "VersionNumber.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_) { #line 317 "VersionNumber.c" gint i = 0; gsize len = 0UL; - gint _tmp31_ = 0; - gint _tmp33_ = 0; - gint _tmp34_ = 0; - gsize _tmp35_ = 0UL; - const gchar* _tmp36_ = NULL; - gint _tmp37_ = 0; - gint _tmp38_ = 0; - gint _tmp39_ = 0; + gint _tmp31_; + gint _tmp33_; + gint _tmp34_; + gsize _tmp35_; + const gchar* _tmp36_; + gint _tmp37_; + gint _tmp38_; + gint _tmp39_; const gchar* res = NULL; - gsize _tmp40_ = 0UL; - void* _tmp41_ = NULL; + gsize _tmp40_; + void* _tmp41_; void* ptr = NULL; - const gchar* _tmp42_ = NULL; - gchar** _tmp43_ = NULL; - gint _tmp43__length1 = 0; - const gchar* _tmp44_ = NULL; - void* _tmp45_ = NULL; - const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp42_; + gchar** _tmp43_; + gint _tmp43__length1; + const gchar* _tmp44_; + void* _tmp45_; + const gchar* _tmp62_; +#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = (gsize) 1; #line 340 "VersionNumber.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { #line 349 "VersionNumber.c" gboolean _tmp11_ = FALSE; gboolean _tmp12_ = FALSE; - gchar** _tmp13_ = NULL; - gint _tmp13__length1 = 0; + gchar** _tmp13_; + gint _tmp13__length1; gint _tmp21_ = 0; - gchar** _tmp22_ = NULL; - gint _tmp22__length1 = 0; - gint _tmp23_ = 0; - const gchar* _tmp24_ = NULL; - gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp22_; + gint _tmp22__length1; + gint _tmp23_; + const gchar* _tmp24_; + gsize _tmp30_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp9_) { #line 362 "VersionNumber.c" - gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint _tmp10_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp10_ + 1; #line 368 "VersionNumber.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { #line 378 "VersionNumber.c" - gint _tmp14_ = 0; - gchar** _tmp15_ = NULL; - gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint _tmp14_; + gchar** _tmp15_; + gint _tmp15__length1; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; #line 390 "VersionNumber.c" } else { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 394 "VersionNumber.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = TRUE; #line 400 "VersionNumber.c" } else { gboolean _tmp16_ = FALSE; - gchar** _tmp17_ = NULL; - gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp17_; + gint _tmp17__length1; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { #line 411 "VersionNumber.c" - gchar** _tmp18_ = NULL; - gint _tmp18__length1 = 0; - gint _tmp19_ = 0; - const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp18_; + gint _tmp18__length1; + gint _tmp19_; + const gchar* _tmp20_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; #line 426 "VersionNumber.c" } else { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = FALSE; #line 430 "VersionNumber.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; #line 434 "VersionNumber.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" break; #line 440 "VersionNumber.c" } -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { #line 452 "VersionNumber.c" - gchar** _tmp25_ = NULL; - gint _tmp25__length1 = 0; - gint _tmp26_ = 0; - const gchar* _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp25_; + gint _tmp25__length1; + gint _tmp26_; + const gchar* _tmp27_; + gint _tmp28_; + gint _tmp29_; +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; #line 473 "VersionNumber.c" } else { -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = 0; #line 477 "VersionNumber.c" } -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; #line 483 "VersionNumber.c" } } -#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { #line 490 "VersionNumber.c" - gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp32_; +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 498 "VersionNumber.c" } -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp45_; #line 536 "VersionNumber.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { #line 545 "VersionNumber.c" - gint _tmp48_ = 0; - gchar** _tmp49_ = NULL; - gint _tmp49__length1 = 0; - void* _tmp50_ = NULL; - const gchar* _tmp51_ = NULL; - void* _tmp52_ = NULL; + gint _tmp48_; + gchar** _tmp49_; + gint _tmp49__length1; + void* _tmp50_; + const gchar* _tmp51_; + void* _tmp52_; const gchar* _tmp53_ = NULL; - gchar** _tmp54_ = NULL; - gint _tmp54__length1 = 0; - gint _tmp55_ = 0; - const gchar* _tmp56_ = NULL; - void* _tmp60_ = NULL; - void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp54_; + gint _tmp54__length1; + gint _tmp55_; + const gchar* _tmp56_; + void* _tmp60_; + void* _tmp61_; +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp46_) { #line 561 "VersionNumber.c" - gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint _tmp47_; +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp47_ + 1; #line 567 "VersionNumber.c" } -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" break; #line 581 "VersionNumber.c" } -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { #line 601 "VersionNumber.c" - gchar** _tmp57_ = NULL; - gint _tmp57__length1 = 0; - gint _tmp58_ = 0; - const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp57_; + gint _tmp57__length1; + gint _tmp58_; + const gchar* _tmp59_; +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; #line 616 "VersionNumber.c" } else { -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = ""; #line 620 "VersionNumber.c" } -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp61_; #line 628 "VersionNumber.c" } } -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 639 "VersionNumber.c" } else { - gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp63_; +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 648 "VersionNumber.c" } @@ -652,14 +652,14 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gchar* utils_version_number_to_string (UtilsVersionNumber* self) { gchar* result = NULL; gchar** version_items = NULL; - gint* _tmp0_ = NULL; - gint _tmp0__length1 = 0; - gchar** _tmp1_ = NULL; - gint version_items_length1 = 0; - gint _version_items_size_ = 0; - gchar** _tmp13_ = NULL; - gint _tmp13__length1 = 0; - gchar* _tmp14_ = NULL; + gint* _tmp0_; + gint _tmp0__length1; + gchar** _tmp1_; + gint version_items_length1; + gint _version_items_size_; + gchar** _tmp13_; + gint _tmp13__length1; + gchar* _tmp14_; #line 27 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" g_return_val_if_fail (UTILS_IS_VERSION_NUMBER (self), NULL); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" @@ -687,22 +687,22 @@ gchar* utils_version_number_to_string (UtilsVersionNumber* self) { #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" while (TRUE) { #line 690 "VersionNumber.c" - gint _tmp4_ = 0; - gint* _tmp5_ = NULL; - gint _tmp5__length1 = 0; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - gint _tmp7_ = 0; - gint* _tmp8_ = NULL; - gint _tmp8__length1 = 0; - gint _tmp9_ = 0; - gint _tmp10_ = 0; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; + gint _tmp4_; + gint* _tmp5_; + gint _tmp5__length1; + gchar** _tmp6_; + gint _tmp6__length1; + gint _tmp7_; + gint* _tmp8_; + gint _tmp8__length1; + gint _tmp9_; + gint _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" if (!_tmp2_) { #line 705 "VersionNumber.c" - gint _tmp3_ = 0; + gint _tmp3_; #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" _tmp3_ = i; #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" @@ -769,11 +769,11 @@ static gint utils_version_number_real_compare_to (GeeComparable* base, UtilsVers UtilsVersionNumber * self; gint result = 0; gint _tmp0_ = 0; - gint* _tmp1_ = NULL; - gint _tmp1__length1 = 0; - UtilsVersionNumber* _tmp2_ = NULL; - gint* _tmp3_ = NULL; - gint _tmp3__length1 = 0; + gint* _tmp1_; + gint _tmp1__length1; + UtilsVersionNumber* _tmp2_; + gint* _tmp3_; + gint _tmp3__length1; gint max_len = 0; gint res = 0; #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" @@ -793,8 +793,8 @@ static gint utils_version_number_real_compare_to (GeeComparable* base, UtilsVers #line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" if (_tmp1__length1 > _tmp3__length1) { #line 796 "VersionNumber.c" - gint* _tmp4_ = NULL; - gint _tmp4__length1 = 0; + gint* _tmp4_; + gint _tmp4__length1; #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" _tmp4_ = self->priv->version; #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" @@ -803,9 +803,9 @@ static gint utils_version_number_real_compare_to (GeeComparable* base, UtilsVers _tmp0_ = _tmp4__length1; #line 805 "VersionNumber.c" } else { - UtilsVersionNumber* _tmp5_ = NULL; - gint* _tmp6_ = NULL; - gint _tmp6__length1 = 0; + UtilsVersionNumber* _tmp5_; + gint* _tmp6_; + gint _tmp6__length1; #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" _tmp5_ = other; #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" @@ -833,26 +833,26 @@ static gint utils_version_number_real_compare_to (GeeComparable* base, UtilsVers #line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" while (TRUE) { #line 836 "VersionNumber.c" - gint _tmp9_ = 0; - gint _tmp10_ = 0; + gint _tmp9_; + gint _tmp10_; gint _tmp11_ = 0; - gint _tmp12_ = 0; - gint* _tmp13_ = NULL; - gint _tmp13__length1 = 0; + gint _tmp12_; + gint* _tmp13_; + gint _tmp13__length1; gint this_v = 0; gint _tmp17_ = 0; - gint _tmp18_ = 0; - UtilsVersionNumber* _tmp19_ = NULL; - gint* _tmp20_ = NULL; - gint _tmp20__length1 = 0; + gint _tmp18_; + UtilsVersionNumber* _tmp19_; + gint* _tmp20_; + gint _tmp20__length1; gint other_v = 0; - gint _tmp25_ = 0; - gint _tmp26_ = 0; - gint _tmp27_ = 0; + gint _tmp25_; + gint _tmp26_; + gint _tmp27_; #line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" if (!_tmp7_) { #line 855 "VersionNumber.c" - gint _tmp8_ = 0; + gint _tmp8_; #line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" _tmp8_ = i; #line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" @@ -880,10 +880,10 @@ static gint utils_version_number_real_compare_to (GeeComparable* base, UtilsVers #line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" if (_tmp12_ < _tmp13__length1) { #line 883 "VersionNumber.c" - gint* _tmp14_ = NULL; - gint _tmp14__length1 = 0; - gint _tmp15_ = 0; - gint _tmp16_ = 0; + gint* _tmp14_; + gint _tmp14__length1; + gint _tmp15_; + gint _tmp16_; #line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" _tmp14_ = self->priv->version; #line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" @@ -913,11 +913,11 @@ static gint utils_version_number_real_compare_to (GeeComparable* base, UtilsVers #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" if (_tmp18_ < _tmp20__length1) { #line 916 "VersionNumber.c" - UtilsVersionNumber* _tmp21_ = NULL; - gint* _tmp22_ = NULL; - gint _tmp22__length1 = 0; - gint _tmp23_ = 0; - gint _tmp24_ = 0; + UtilsVersionNumber* _tmp21_; + gint* _tmp22_; + gint _tmp22__length1; + gint _tmp23_; + gint _tmp24_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" _tmp21_ = other; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" @@ -978,7 +978,7 @@ static void utils_version_number_gee_comparable_interface_init (GeeComparableIfa #line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" utils_version_number_gee_comparable_parent_iface = g_type_interface_peek_parent (iface); #line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" - iface->compare_to = (gint (*)(GeeComparable*, gconstpointer)) utils_version_number_real_compare_to; + iface->compare_to = (gint (*) (GeeComparable *, gconstpointer)) utils_version_number_real_compare_to; #line 983 "VersionNumber.c" } @@ -990,7 +990,7 @@ static void utils_version_number_instance_init (UtilsVersionNumber * self) { } -static void utils_version_number_finalize (GObject* obj) { +static void utils_version_number_finalize (GObject * obj) { UtilsVersionNumber * self; #line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, UTILS_TYPE_VERSION_NUMBER, UtilsVersionNumber); diff --git a/plugins/shotwell-data-imports/shotwell-data-imports.c b/plugins/shotwell-data-imports/shotwell-data-imports.c index 31600b3..467066b 100644 --- a/plugins/shotwell-data-imports/shotwell-data-imports.c +++ b/plugins/shotwell-data-imports/shotwell-data-imports.c @@ -1,4 +1,4 @@ -/* shotwell-data-imports.c generated by valac 0.34.7, the Vala compiler +/* shotwell-data-imports.c generated by valac 0.36.6, the Vala compiler * generated from shotwell-data-imports.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -55,7 +55,7 @@ struct _ShotwellDataImportsCoreServicesPrivate { static gpointer shotwell_data_imports_core_services_parent_class = NULL; -static SpitModuleIface* shotwell_data_imports_core_services_spit_module_parent_iface = NULL; +static SpitModuleIface * shotwell_data_imports_core_services_spit_module_parent_iface = NULL; GType shotwell_data_imports_core_services_get_type (void) G_GNUC_CONST; #define SHOTWELL_DATA_IMPORTS_CORE_SERVICES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES, ShotwellDataImportsCoreServicesPrivate)) @@ -67,18 +67,18 @@ ShotwellDataImportsCoreServices* shotwell_data_imports_core_services_construct ( FSpotService* fspot_service_new (GFile* resource_directory); FSpotService* fspot_service_construct (GType object_type, GFile* resource_directory); GType fspot_service_get_type (void) G_GNUC_CONST; -static void _vala_array_add7 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add7 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); static const gchar* shotwell_data_imports_core_services_real_get_module_name (SpitModule* base); static const gchar* shotwell_data_imports_core_services_real_get_version (SpitModule* base); static const gchar* shotwell_data_imports_core_services_real_get_id (SpitModule* base); static SpitPluggable** shotwell_data_imports_core_services_real_get_pluggables (SpitModule* base, int* result_length1); -static void shotwell_data_imports_core_services_finalize (GObject* obj); +static void shotwell_data_imports_core_services_finalize (GObject * obj); SpitModule* spit_entry_point (SpitEntryPointParams* params); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_add7 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add7 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 18 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" if ((*length) == (*size)) { #line 18 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" @@ -98,11 +98,11 @@ static void _vala_array_add7 (SpitPluggable*** array, int* length, int* size, Sp ShotwellDataImportsCoreServices* shotwell_data_imports_core_services_construct (GType object_type, GFile* module_file) { ShotwellDataImportsCoreServices * self = NULL; GFile* resource_directory = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - SpitPluggable** _tmp2_ = NULL; - gint _tmp2__length1 = 0; - FSpotService* _tmp3_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; + SpitPluggable** _tmp2_; + gint _tmp2__length1; + FSpotService* _tmp3_; #line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" g_return_val_if_fail (G_IS_FILE (module_file), NULL); #line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" @@ -139,16 +139,13 @@ ShotwellDataImportsCoreServices* shotwell_data_imports_core_services_new (GFile* static const gchar* shotwell_data_imports_core_services_real_get_module_name (SpitModule* base) { ShotwellDataImportsCoreServices * self; const gchar* result = NULL; - const gchar* _tmp0_ = NULL; #line 21 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES, ShotwellDataImportsCoreServices); #line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" - _tmp0_ = _ ("Core Data Import Services"); -#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" - result = _tmp0_; + result = _ ("Core Data Import Services"); #line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" return result; -#line 152 "shotwell-data-imports.c" +#line 149 "shotwell-data-imports.c" } @@ -161,7 +158,7 @@ static const gchar* shotwell_data_imports_core_services_real_get_version (SpitMo result = _VERSION; #line 26 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" return result; -#line 165 "shotwell-data-imports.c" +#line 162 "shotwell-data-imports.c" } @@ -174,17 +171,17 @@ static const gchar* shotwell_data_imports_core_services_real_get_id (SpitModule* result = "org.yorba.shotwell.data_imports.core_services"; #line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" return result; -#line 178 "shotwell-data-imports.c" +#line 175 "shotwell-data-imports.c" } static SpitPluggable** shotwell_data_imports_core_services_real_get_pluggables (SpitModule* base, int* result_length1) { ShotwellDataImportsCoreServices * self; SpitPluggable** result = NULL; - SpitPluggable** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - SpitPluggable** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + SpitPluggable** _tmp0_; + gint _tmp0__length1; + SpitPluggable** _tmp1_; + gint _tmp1__length1; #line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES, ShotwellDataImportsCoreServices); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" @@ -199,13 +196,13 @@ static SpitPluggable** shotwell_data_imports_core_services_real_get_pluggables ( if (result_length1) { #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" *result_length1 = _tmp1__length1; -#line 203 "shotwell-data-imports.c" +#line 200 "shotwell-data-imports.c" } #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" result = _tmp1_; #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" return result; -#line 209 "shotwell-data-imports.c" +#line 206 "shotwell-data-imports.c" } @@ -216,7 +213,7 @@ static void shotwell_data_imports_core_services_class_init (ShotwellDataImportsC g_type_class_add_private (klass, sizeof (ShotwellDataImportsCoreServicesPrivate)); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" G_OBJECT_CLASS (klass)->finalize = shotwell_data_imports_core_services_finalize; -#line 220 "shotwell-data-imports.c" +#line 217 "shotwell-data-imports.c" } @@ -224,19 +221,19 @@ static void shotwell_data_imports_core_services_spit_module_interface_init (Spit #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" shotwell_data_imports_core_services_spit_module_parent_iface = g_type_interface_peek_parent (iface); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" - iface->get_module_name = (const gchar* (*)(SpitModule*)) shotwell_data_imports_core_services_real_get_module_name; + iface->get_module_name = (const gchar* (*) (SpitModule *)) shotwell_data_imports_core_services_real_get_module_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" - iface->get_version = (const gchar* (*)(SpitModule*)) shotwell_data_imports_core_services_real_get_version; + iface->get_version = (const gchar* (*) (SpitModule *)) shotwell_data_imports_core_services_real_get_version; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" - iface->get_id = (const gchar* (*)(SpitModule*)) shotwell_data_imports_core_services_real_get_id; + iface->get_id = (const gchar* (*) (SpitModule *)) shotwell_data_imports_core_services_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" - iface->get_pluggables = (SpitPluggable** (*)(SpitModule*, int*)) shotwell_data_imports_core_services_real_get_pluggables; -#line 235 "shotwell-data-imports.c" + iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_data_imports_core_services_real_get_pluggables; +#line 232 "shotwell-data-imports.c" } static void shotwell_data_imports_core_services_instance_init (ShotwellDataImportsCoreServices * self) { - SpitPluggable** _tmp0_ = NULL; + SpitPluggable** _tmp0_; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" self->priv = SHOTWELL_DATA_IMPORTS_CORE_SERVICES_GET_PRIVATE (self); #line 11 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" @@ -247,11 +244,11 @@ static void shotwell_data_imports_core_services_instance_init (ShotwellDataImpor self->priv->pluggables_length1 = 0; #line 11 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" self->priv->_pluggables_size_ = self->priv->pluggables_length1; -#line 251 "shotwell-data-imports.c" +#line 248 "shotwell-data-imports.c" } -static void shotwell_data_imports_core_services_finalize (GObject* obj) { +static void shotwell_data_imports_core_services_finalize (GObject * obj) { ShotwellDataImportsCoreServices * self; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES, ShotwellDataImportsCoreServices); @@ -259,7 +256,7 @@ static void shotwell_data_imports_core_services_finalize (GObject* obj) { self->priv->pluggables = (_vala_array_free (self->priv->pluggables, self->priv->pluggables_length1, (GDestroyNotify) g_object_unref), NULL); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" G_OBJECT_CLASS (shotwell_data_imports_core_services_parent_class)->finalize (obj); -#line 263 "shotwell-data-imports.c" +#line 260 "shotwell-data-imports.c" } @@ -279,14 +276,14 @@ GType shotwell_data_imports_core_services_get_type (void) { SpitModule* spit_entry_point (SpitEntryPointParams* params) { SpitModule* result = NULL; - SpitEntryPointParams* _tmp0_ = NULL; - gint _tmp1_ = 0; - SpitEntryPointParams* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + SpitEntryPointParams* _tmp0_; + gint _tmp1_; + SpitEntryPointParams* _tmp2_; + gint _tmp3_; + gint _tmp4_; ShotwellDataImportsCoreServices* _tmp5_ = NULL; - SpitEntryPointParams* _tmp6_ = NULL; - gint _tmp7_ = 0; + SpitEntryPointParams* _tmp6_; + gint _tmp7_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" _tmp0_ = params; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" @@ -305,10 +302,10 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) { _tmp7_ = (*_tmp6_).module_spit_interface; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) { -#line 309 "shotwell-data-imports.c" - SpitEntryPointParams* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - ShotwellDataImportsCoreServices* _tmp10_ = NULL; +#line 306 "shotwell-data-imports.c" + SpitEntryPointParams* _tmp8_; + GFile* _tmp9_; + ShotwellDataImportsCoreServices* _tmp10_; #line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" _tmp8_ = params; #line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" @@ -319,19 +316,19 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) { _g_object_unref0 (_tmp5_); #line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" _tmp5_ = _tmp10_; -#line 323 "shotwell-data-imports.c" +#line 320 "shotwell-data-imports.c" } else { #line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" _g_object_unref0 (_tmp5_); #line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" _tmp5_ = NULL; -#line 329 "shotwell-data-imports.c" +#line 326 "shotwell-data-imports.c" } #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_MODULE, SpitModule); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" return result; -#line 335 "shotwell-data-imports.c" +#line 332 "shotwell-data-imports.c" } diff --git a/plugins/shotwell-plugin-common.h b/plugins/shotwell-plugin-common.h index 578c7a2..797b04e 100644 --- a/plugins/shotwell-plugin-common.h +++ b/plugins/shotwell-plugin-common.h @@ -1,4 +1,4 @@ -/* shotwell-plugin-common.h generated by valac 0.34.7, the Vala compiler, do not modify */ +/* shotwell-plugin-common.h generated by valac 0.36.6, the Vala compiler, do not modify */ #ifndef __PLUGINS_SHOTWELL_PLUGIN_COMMON_H__ @@ -328,7 +328,7 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (Publi PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct (GType object_type, PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method); PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method); PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method); -gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self, GTlsCertificate** cert); +gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self, GTlsCertificate* * cert); void publishing_rest_support_transaction_check_response (PublishingRESTSupportTransaction* self, SoupMessage* message, GError** error); PublishingRESTSupportArgument** publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self, int* result_length1); PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_arguments (PublishingRESTSupportTransaction* self, int* result_length1); diff --git a/plugins/shotwell-plugin-common.vapi b/plugins/shotwell-plugin-common.vapi index a37ad0e..9fc93eb 100644 --- a/plugins/shotwell-plugin-common.vapi +++ b/plugins/shotwell-plugin-common.vapi @@ -1,4 +1,4 @@ -/* shotwell-plugin-common.vapi generated by valac 0.34.7, do not modify. */ +/* shotwell-plugin-common.vapi generated by valac 0.36.6, do not modify. */ namespace Publishing { namespace RESTSupport { diff --git a/plugins/shotwell-plugin-dev-1.0.h b/plugins/shotwell-plugin-dev-1.0.h index 4429651..f9315b3 100644 --- a/plugins/shotwell-plugin-dev-1.0.h +++ b/plugins/shotwell-plugin-dev-1.0.h @@ -1,12 +1,12 @@ -/* shotwell-plugin-dev-1.0.h generated by valac 0.34.7, the Vala compiler, do not modify */ +/* shotwell-plugin-dev-1.0.h generated by valac 0.36.6, the Vala compiler, do not modify */ #ifndef __PLUGINS_SHOTWELL_PLUGIN_DEV_1_0_H__ #define __PLUGINS_SHOTWELL_PLUGIN_DEV_1_0_H__ #include <glib.h> -#include <gio/gio.h> #include <glib-object.h> +#include <gio/gio.h> #include <stdlib.h> #include <string.h> #include <gdk-pixbuf/gdk-pixbuf.h> @@ -712,10 +712,10 @@ void spit_transitions_visuals_reserved5 (SpitTransitionsVisuals* self); void spit_transitions_visuals_reserved6 (SpitTransitionsVisuals* self); void spit_transitions_visuals_reserved7 (SpitTransitionsVisuals* self); GdkPixbuf* spit_transitions_visuals_get_from_pixbuf (SpitTransitionsVisuals* self); -void spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self, GdkRectangle* result); +void spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self, GdkRectangle * result); GdkPixbuf* spit_transitions_visuals_get_to_pixbuf (SpitTransitionsVisuals* self); -void spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self, GdkRectangle* result); -void spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self, GdkRGBA* result); +void spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self, GdkRectangle * result); +void spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self, GdkRGBA * result); GType spit_transitions_motion_get_type (void) G_GNUC_CONST; SpitTransitionsMotion* spit_transitions_motion_new (SpitTransitionsDirection direction, gint fps, gint duration_msec); SpitTransitionsMotion* spit_transitions_motion_construct (GType object_type, SpitTransitionsDirection direction, gint fps, gint duration_msec); diff --git a/plugins/shotwell-plugin-dev-1.0.vapi b/plugins/shotwell-plugin-dev-1.0.vapi index ad91c03..ab248a4 100644 --- a/plugins/shotwell-plugin-dev-1.0.vapi +++ b/plugins/shotwell-plugin-dev-1.0.vapi @@ -1,4 +1,4 @@ -/* shotwell-plugin-dev-1.0.vapi generated by valac 0.34.7, do not modify. */ +/* shotwell-plugin-dev-1.0.vapi generated by valac 0.36.6, do not modify. */ namespace Spit { namespace DataImports { diff --git a/plugins/shotwell-publishing-extras/GalleryConnector.c b/plugins/shotwell-publishing-extras/GalleryConnector.c index 29ade8e..17f2ef2 100644 --- a/plugins/shotwell-publishing-extras/GalleryConnector.c +++ b/plugins/shotwell-publishing-extras/GalleryConnector.c @@ -1,4 +1,4 @@ -/* GalleryConnector.c generated by valac 0.34.7, the Vala compiler +/* GalleryConnector.c generated by valac 0.36.6, the Vala compiler * generated from GalleryConnector.vala, do not modify */ /* Copyright 2012-2013 Joe Sapp nixphoeni@gentoo.org @@ -242,6 +242,12 @@ typedef struct _PublishingGallery3UploaderClass PublishingGallery3UploaderClass; #define _publishing_rest_support_batch_uploader_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_batch_uploader_unref (var), NULL))) typedef struct _PublishingGallery3PublishingOptionsPanePrivate PublishingGallery3PublishingOptionsPanePrivate; #define _g_slist_free0(var) ((var == NULL) ? NULL : (var = (g_slist_free (var), NULL))) +enum { + PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL, + PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL, + PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL +}; +static guint publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0}; typedef struct _PublishingGallery3PublishingParametersPrivate PublishingGallery3PublishingParametersPrivate; typedef struct _PublishingGallery3ParamSpecPublishingParameters PublishingGallery3ParamSpecPublishingParameters; typedef struct _PublishingGallery3CredentialsPanePrivate PublishingGallery3CredentialsPanePrivate; @@ -255,7 +261,19 @@ typedef struct _PublishingGallery3CredentialsPanePrivate PublishingGallery3Crede typedef struct _PublishingGallery3CredentialsGrid PublishingGallery3CredentialsGrid; typedef struct _PublishingGallery3CredentialsGridClass PublishingGallery3CredentialsGridClass; +enum { + PUBLISHING_GALLERY3_CREDENTIALS_PANE_GO_BACK_SIGNAL, + PUBLISHING_GALLERY3_CREDENTIALS_PANE_LOGIN_SIGNAL, + PUBLISHING_GALLERY3_CREDENTIALS_PANE_LAST_SIGNAL +}; +static guint publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_LAST_SIGNAL] = {0}; typedef struct _PublishingGallery3CredentialsGridPrivate PublishingGallery3CredentialsGridPrivate; +enum { + PUBLISHING_GALLERY3_CREDENTIALS_GRID_GO_BACK_SIGNAL, + PUBLISHING_GALLERY3_CREDENTIALS_GRID_LOGIN_SIGNAL, + PUBLISHING_GALLERY3_CREDENTIALS_GRID_LAST_SIGNAL +}; +static guint publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_LAST_SIGNAL] = {0}; typedef struct _PublishingGallery3SessionPrivate PublishingGallery3SessionPrivate; typedef struct _PublishingGallery3UploaderPrivate PublishingGallery3UploaderPrivate; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); @@ -587,15 +605,15 @@ struct _PublishingGallery3UploaderPrivate { static gpointer shotwell_publishing_gallery3_parent_class = NULL; -static SpitModuleIface* shotwell_publishing_gallery3_spit_module_parent_iface = NULL; +static SpitModuleIface * shotwell_publishing_gallery3_spit_module_parent_iface = NULL; static gpointer gallery3_service_parent_class = NULL; static GdkPixbuf** gallery3_service_icon_pixbuf_set; static gint gallery3_service_icon_pixbuf_set_length1; static GdkPixbuf** gallery3_service_icon_pixbuf_set = NULL; static gint gallery3_service_icon_pixbuf_set_length1 = 0; static gint _gallery3_service_icon_pixbuf_set_size_ = 0; -static SpitPluggableIface* gallery3_service_spit_pluggable_parent_iface = NULL; -static SpitPublishingServiceIface* gallery3_service_spit_publishing_service_parent_iface = NULL; +static SpitPluggableIface * gallery3_service_spit_pluggable_parent_iface = NULL; +static SpitPublishingServiceIface * gallery3_service_spit_publishing_service_parent_iface = NULL; static gpointer publishing_gallery3_album_parent_class = NULL; static gpointer publishing_gallery3_base_gallery_transaction_parent_class = NULL; static gpointer publishing_gallery3_key_fetch_transaction_parent_class = NULL; @@ -608,12 +626,12 @@ static gpointer publishing_gallery3_gallery_set_tag_relationship_transaction_par static gpointer publishing_gallery3_gallery_album_create_transaction_parent_class = NULL; static gpointer publishing_gallery3_gallery_upload_transaction_parent_class = NULL; static gpointer publishing_gallery3_gallery_publisher_parent_class = NULL; -static SpitPublishingPublisherIface* publishing_gallery3_gallery_publisher_spit_publishing_publisher_parent_iface = NULL; +static SpitPublishingPublisherIface * publishing_gallery3_gallery_publisher_spit_publishing_publisher_parent_iface = NULL; static gpointer publishing_gallery3_publishing_options_pane_parent_class = NULL; -static SpitPublishingDialogPaneIface* publishing_gallery3_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL; +static SpitPublishingDialogPaneIface * publishing_gallery3_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL; static gpointer publishing_gallery3_publishing_parameters_parent_class = NULL; static gpointer publishing_gallery3_credentials_pane_parent_class = NULL; -static SpitPublishingDialogPaneIface* publishing_gallery3_credentials_pane_spit_publishing_dialog_pane_parent_iface = NULL; +static SpitPublishingDialogPaneIface * publishing_gallery3_credentials_pane_spit_publishing_dialog_pane_parent_iface = NULL; static gpointer publishing_gallery3_credentials_grid_parent_class = NULL; static gpointer publishing_gallery3_session_parent_class = NULL; static gpointer publishing_gallery3_uploader_parent_class = NULL; @@ -651,12 +669,12 @@ ShotwellPublishingGallery3* shotwell_publishing_gallery3_construct (GType object Gallery3Service* gallery3_service_new (GFile* resource_directory); Gallery3Service* gallery3_service_construct (GType object_type, GFile* resource_directory); GType gallery3_service_get_type (void) G_GNUC_CONST; -static void _vala_array_add1 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add1 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); static const gchar* shotwell_publishing_gallery3_real_get_module_name (SpitModule* base); static const gchar* shotwell_publishing_gallery3_real_get_version (SpitModule* base); static const gchar* shotwell_publishing_gallery3_real_get_id (SpitModule* base); static SpitPluggable** shotwell_publishing_gallery3_real_get_pluggables (SpitModule* base, int* result_length1); -static void shotwell_publishing_gallery3_finalize (GObject* obj); +static void shotwell_publishing_gallery3_finalize (GObject * obj); enum { GALLERY3_SERVICE_DUMMY_PROPERTY }; @@ -672,7 +690,7 @@ PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_new (S PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host); GType publishing_gallery3_gallery_publisher_get_type (void) G_GNUC_CONST; static SpitPublishingPublisherMediaType gallery3_service_real_get_supported_media (SpitPublishingService* base); -static void gallery3_service_finalize (GObject* obj); +static void gallery3_service_finalize (GObject * obj); #define PUBLISHING_GALLERY3_SERVICE_NAME "Gallery3" #define PUBLISHING_GALLERY3_SERVICE_WELCOME_MESSAGE _ ("You are not currently logged into your Gallery.\n" \ "\n" \ @@ -709,7 +727,7 @@ static void publishing_gallery3_album_set_summary (PublishingGallery3Album* self const gchar* publishing_gallery3_album_get_parentname (PublishingGallery3Album* self); const gchar* publishing_gallery3_album_get_path (PublishingGallery3Album* self); gboolean publishing_gallery3_album_get_editable (PublishingGallery3Album* self); -static void publishing_gallery3_album_finalize (PublishingGallery3Album* obj); +static void publishing_gallery3_album_finalize (PublishingGallery3Album * obj); GType publishing_gallery3_base_gallery_transaction_get_type (void) G_GNUC_CONST; enum { PUBLISHING_GALLERY3_BASE_GALLERY_TRANSACTION_DUMMY_PROPERTY @@ -718,7 +736,7 @@ GType publishing_gallery3_session_get_type (void) G_GNUC_CONST; PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_transaction_new (PublishingGallery3Session* session, const gchar* endpoint_url, const gchar* item_path, PublishingRESTSupportHttpMethod method); PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* endpoint_url, const gchar* item_path, PublishingRESTSupportHttpMethod method); JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (PublishingGallery3BaseGalleryTransaction* self, GError** error); -static void publishing_gallery3_base_gallery_transaction_finalize (PublishingRESTSupportTransaction* obj); +static void publishing_gallery3_base_gallery_transaction_finalize (PublishingRESTSupportTransaction * obj); GType publishing_gallery3_key_fetch_transaction_get_type (void) G_GNUC_CONST; #define PUBLISHING_GALLERY3_KEY_FETCH_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_KEY_FETCH_TRANSACTION, PublishingGallery3KeyFetchTransactionPrivate)) enum { @@ -727,7 +745,7 @@ enum { PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction_new (PublishingGallery3Session* session, const gchar* url, const gchar* username, const gchar* password); PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* url, const gchar* username, const gchar* password); gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyFetchTransaction* self); -static void publishing_gallery3_key_fetch_transaction_finalize (PublishingRESTSupportTransaction* obj); +static void publishing_gallery3_key_fetch_transaction_finalize (PublishingRESTSupportTransaction * obj); GType publishing_gallery3_gallery_request_transaction_get_type (void) G_GNUC_CONST; enum { PUBLISHING_GALLERY3_GALLERY_REQUEST_TRANSACTION_DUMMY_PROPERTY @@ -743,7 +761,7 @@ enum { PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_transaction_new (PublishingGallery3Session* session); PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_transaction_construct (GType object_type, PublishingGallery3Session* session); gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (PublishingGallery3GetAlbumURLsTransaction* self, int* result_length1); -static void _vala_array_add2 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add2 (gchar** * array, int* length, int* size, gchar* value); GType publishing_gallery3_get_albums_transaction_get_type (void) G_GNUC_CONST; #define PUBLISHING_GALLERY3_GET_ALBUMS_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION, PublishingGallery3GetAlbumsTransactionPrivate)) enum { @@ -755,13 +773,13 @@ static void publishing_gallery3_get_albums_transaction_set_album_urls (Publishin gchar** publishing_gallery3_get_albums_transaction_get_album_urls (PublishingGallery3GetAlbumsTransaction* self, int* result_length1); static void publishing_gallery3_get_albums_transaction_set_urls_sent (PublishingGallery3GetAlbumsTransaction* self, guint value); guint publishing_gallery3_get_albums_transaction_get_urls_sent (PublishingGallery3GetAlbumsTransaction* self); -static void _vala_array_add3 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add3 (gchar** * array, int* length, int* size, gchar* value); static void publishing_gallery3_get_albums_transaction_set_more_urls (PublishingGallery3GetAlbumsTransaction* self, gboolean value); PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums (PublishingGallery3GetAlbumsTransaction* self, int* result_length1, GError** error); -static void _vala_array_add4 (PublishingGallery3Album*** array, int* length, int* size, PublishingGallery3Album* value); +static void _vala_array_add4 (PublishingGallery3Album** * array, int* length, int* size, PublishingGallery3Album* value); static gchar** _vala_array_dup2 (gchar** self, int length); gboolean publishing_gallery3_get_albums_transaction_get_more_urls (PublishingGallery3GetAlbumsTransaction* self); -static void publishing_gallery3_get_albums_transaction_finalize (PublishingRESTSupportTransaction* obj); +static void publishing_gallery3_get_albums_transaction_finalize (PublishingRESTSupportTransaction * obj); GType publishing_gallery3_gallery_get_tag_transaction_get_type (void) G_GNUC_CONST; enum { PUBLISHING_GALLERY3_GALLERY_GET_TAG_TRANSACTION_DUMMY_PROPERTY @@ -778,7 +796,7 @@ enum { PublishingGallery3GalleryGetItemTagsURLsTransaction* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_new (PublishingGallery3Session* session, const gchar* item_url); PublishingGallery3GalleryGetItemTagsURLsTransaction* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* item_url); gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags_path (PublishingGallery3GalleryGetItemTagsURLsTransaction* self); -static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_finalize (PublishingRESTSupportTransaction* obj); +static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_finalize (PublishingRESTSupportTransaction * obj); GType publishing_gallery3_gallery_set_tag_relationship_transaction_get_type (void) G_GNUC_CONST; enum { PUBLISHING_GALLERY3_GALLERY_SET_TAG_RELATIONSHIP_TRANSACTION_DUMMY_PROPERTY @@ -804,7 +822,7 @@ const gchar* publishing_gallery3_publishing_parameters_get_album_name (Publishin const gchar* publishing_gallery3_publishing_parameters_get_album_title (PublishingGallery3PublishingParameters* self); gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path (PublishingGallery3GalleryAlbumCreateTransaction* self); PublishingGallery3PublishingParameters* publishing_gallery3_gallery_album_create_transaction_get_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self); -static void publishing_gallery3_gallery_album_create_transaction_finalize (PublishingRESTSupportTransaction* obj); +static void publishing_gallery3_gallery_album_create_transaction_finalize (PublishingRESTSupportTransaction * obj); GType publishing_gallery3_gallery_upload_transaction_get_type (void) G_GNUC_CONST; #define PUBLISHING_GALLERY3_GALLERY_UPLOAD_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_GALLERY_UPLOAD_TRANSACTION, PublishingGallery3GalleryUploadTransactionPrivate)) enum { @@ -821,7 +839,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (PublishingGallery3GalleryUploadTransaction* self, GError** error); gboolean publishing_gallery3_publishing_parameters_get_strip_metadata (PublishingGallery3PublishingParameters* self); static void publishing_gallery3_gallery_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error); -static void publishing_gallery3_gallery_upload_transaction_finalize (PublishingRESTSupportTransaction* obj); +static void publishing_gallery3_gallery_upload_transaction_finalize (PublishingRESTSupportTransaction * obj); GType publishing_gallery3_publishing_options_pane_get_type (void) G_GNUC_CONST; #define PUBLISHING_GALLERY3_GALLERY_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, PublishingGallery3GalleryPublisherPrivate)) enum { @@ -908,13 +926,13 @@ static void publishing_gallery3_gallery_publisher_on_upload_status_updated (Publ static void _publishing_gallery3_gallery_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self); static void publishing_gallery3_gallery_publisher_do_show_success_pane (PublishingGallery3GalleryPublisher* self); const gchar* publishing_gallery3_session_get_username (PublishingGallery3Session* self); -static void _vala_array_add5 (PublishingGallery3Album*** array, int* length, int* size, PublishingGallery3Album* value); +static void _vala_array_add5 (PublishingGallery3Album** * array, int* length, int* size, PublishingGallery3Album* value); void publishing_gallery3_publishing_parameters_set_album_path (PublishingGallery3PublishingParameters* self, const gchar* value); const gchar* publishing_gallery3_uploader_get_current_publishable_name (PublishingGallery3Uploader* self); guint publishing_gallery3_uploader_get_status_code (PublishingGallery3Uploader* self); SpitPublishingPublisherMediaType publishing_gallery3_uploader_get_current_publishable_type (PublishingGallery3Uploader* self); gboolean publishing_gallery3_publishing_parameters_is_to_new_album (PublishingGallery3PublishingParameters* self); -static void publishing_gallery3_gallery_publisher_finalize (GObject* obj); +static void publishing_gallery3_gallery_publisher_finalize (GObject * obj); #define PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, PublishingGallery3PublishingOptionsPanePrivate)) enum { PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY @@ -950,7 +968,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_gallery3_publishing_op static void publishing_gallery3_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base); static void publishing_gallery3_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base); static void g_cclosure_user_marshal_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void publishing_gallery3_publishing_options_pane_finalize (GObject* obj); +static void publishing_gallery3_publishing_options_pane_finalize (GObject * obj); #define PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS, PublishingGallery3PublishingParametersPrivate)) enum { PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS_DUMMY_PROPERTY @@ -961,7 +979,7 @@ static void publishing_gallery3_publishing_parameters_set_album_name (Publishing static void publishing_gallery3_publishing_parameters_set_album_title (PublishingGallery3PublishingParameters* self, const gchar* value); const gchar* publishing_gallery3_publishing_parameters_get_entity_title (PublishingGallery3PublishingParameters* self); static void publishing_gallery3_publishing_parameters_set_entity_title (PublishingGallery3PublishingParameters* self, const gchar* value); -static void publishing_gallery3_publishing_parameters_finalize (PublishingGallery3PublishingParameters* obj); +static void publishing_gallery3_publishing_parameters_finalize (PublishingGallery3PublishingParameters * obj); GType publishing_gallery3_credentials_grid_get_type (void) G_GNUC_CONST; #define PUBLISHING_GALLERY3_CREDENTIALS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, PublishingGallery3CredentialsPanePrivate)) enum { @@ -980,11 +998,11 @@ static void _publishing_gallery3_credentials_pane_notify_login_publishing_galler void publishing_gallery3_credentials_grid_installed (PublishingGallery3CredentialsGrid* self); static void publishing_gallery3_credentials_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base); static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void publishing_gallery3_credentials_pane_finalize (GObject* obj); +static void publishing_gallery3_credentials_pane_finalize (GObject * obj); #define PUBLISHING_GALLERY3_CREDENTIALS_GRID_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, PublishingGallery3CredentialsGridPrivate)) enum { PUBLISHING_GALLERY3_CREDENTIALS_GRID_DUMMY_PROPERTY, - PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET + PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY }; #define PUBLISHING_GALLERY3_CREDENTIALS_GRID_INTRO_MESSAGE _ ("Enter the URL for your Gallery3 site and the username and password (or" \ " API key) for your Gallery3 account.") @@ -1000,7 +1018,7 @@ static void publishing_gallery3_credentials_grid_on_go_back_button_clicked (Publ static void _publishing_gallery3_credentials_grid_on_go_back_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); static void publishing_gallery3_credentials_grid_on_login_button_clicked (PublishingGallery3CredentialsGrid* self); static void _publishing_gallery3_credentials_grid_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); -static void publishing_gallery3_credentials_grid_finalize (GObject* obj); +static void publishing_gallery3_credentials_grid_finalize (GObject * obj); static void _vala_publishing_gallery3_credentials_grid_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_publishing_gallery3_credentials_grid_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); #define PUBLISHING_GALLERY3_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_SESSION, PublishingGallery3SessionPrivate)) @@ -1011,42 +1029,42 @@ static gboolean publishing_gallery3_session_real_is_authenticated (PublishingRES static void publishing_gallery3_session_set_url (PublishingGallery3Session* self, const gchar* value); static void publishing_gallery3_session_set_username (PublishingGallery3Session* self, const gchar* value); static void publishing_gallery3_session_set_key (PublishingGallery3Session* self, const gchar* value); -static void publishing_gallery3_session_finalize (PublishingRESTSupportSession* obj); +static void publishing_gallery3_session_finalize (PublishingRESTSupportSession * obj); #define PUBLISHING_GALLERY3_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_UPLOADER, PublishingGallery3UploaderPrivate)) enum { PUBLISHING_GALLERY3_UPLOADER_DUMMY_PROPERTY }; static PublishingRESTSupportTransaction* publishing_gallery3_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable); -static void publishing_gallery3_uploader_finalize (PublishingRESTSupportBatchUploader* obj); +static void publishing_gallery3_uploader_finalize (PublishingRESTSupportBatchUploader * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_add1 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add1 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if ((*length) == (*size)) { #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *size = (*size) ? (2 * (*size)) : 4; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *array = g_renew (SpitPluggable*, *array, (*size) + 1); -#line 1002 "GalleryConnector.c" +#line 1020 "GalleryConnector.c" } #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" (*array)[(*length)++] = value; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" (*array)[*length] = NULL; -#line 1008 "GalleryConnector.c" +#line 1026 "GalleryConnector.c" } ShotwellPublishingGallery3* shotwell_publishing_gallery3_construct (GType object_type, GFile* module_file) { ShotwellPublishingGallery3 * self = NULL; GFile* resource_directory = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - SpitPluggable** _tmp2_ = NULL; - gint _tmp2__length1 = 0; - Gallery3Service* _tmp3_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; + SpitPluggable** _tmp2_; + gint _tmp2__length1; + Gallery3Service* _tmp3_; #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (G_IS_FILE (module_file), NULL); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1069,30 +1087,27 @@ ShotwellPublishingGallery3* shotwell_publishing_gallery3_construct (GType object _g_object_unref0 (resource_directory); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 1042 "GalleryConnector.c" +#line 1060 "GalleryConnector.c" } ShotwellPublishingGallery3* shotwell_publishing_gallery3_new (GFile* module_file) { #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return shotwell_publishing_gallery3_construct (TYPE_SHOTWELL_PUBLISHING_GALLERY3, module_file); -#line 1049 "GalleryConnector.c" +#line 1067 "GalleryConnector.c" } static const gchar* shotwell_publishing_gallery3_real_get_module_name (SpitModule* base) { ShotwellPublishingGallery3 * self; const gchar* result = NULL; - const gchar* _tmp0_ = NULL; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_GALLERY3, ShotwellPublishingGallery3); #line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = _ ("Gallery3 publishing module"); -#line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - result = _tmp0_; + result = _ ("Gallery3 publishing module"); #line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1065 "GalleryConnector.c" +#line 1080 "GalleryConnector.c" } @@ -1105,7 +1120,7 @@ static const gchar* shotwell_publishing_gallery3_real_get_version (SpitModule* b result = G3_VERSION; #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1078 "GalleryConnector.c" +#line 1093 "GalleryConnector.c" } @@ -1118,17 +1133,17 @@ static const gchar* shotwell_publishing_gallery3_real_get_id (SpitModule* base) result = "org.yorba.shotwell.sharing.gallery3"; #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1091 "GalleryConnector.c" +#line 1106 "GalleryConnector.c" } static SpitPluggable** shotwell_publishing_gallery3_real_get_pluggables (SpitModule* base, int* result_length1) { ShotwellPublishingGallery3 * self; SpitPluggable** result = NULL; - SpitPluggable** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - SpitPluggable** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + SpitPluggable** _tmp0_; + gint _tmp0__length1; + SpitPluggable** _tmp1_; + gint _tmp1__length1; #line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_GALLERY3, ShotwellPublishingGallery3); #line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1143,13 +1158,13 @@ static SpitPluggable** shotwell_publishing_gallery3_real_get_pluggables (SpitMod if (result_length1) { #line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *result_length1 = _tmp1__length1; -#line 1116 "GalleryConnector.c" +#line 1131 "GalleryConnector.c" } #line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" result = _tmp1_; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1122 "GalleryConnector.c" +#line 1137 "GalleryConnector.c" } @@ -1160,7 +1175,7 @@ static void shotwell_publishing_gallery3_class_init (ShotwellPublishingGallery3C g_type_class_add_private (klass, sizeof (ShotwellPublishingGallery3Private)); #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (klass)->finalize = shotwell_publishing_gallery3_finalize; -#line 1133 "GalleryConnector.c" +#line 1148 "GalleryConnector.c" } @@ -1168,19 +1183,19 @@ static void shotwell_publishing_gallery3_spit_module_interface_init (SpitModuleI #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" shotwell_publishing_gallery3_spit_module_parent_iface = g_type_interface_peek_parent (iface); #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_module_name = (const gchar* (*)(SpitModule*)) shotwell_publishing_gallery3_real_get_module_name; + iface->get_module_name = (const gchar* (*) (SpitModule *)) shotwell_publishing_gallery3_real_get_module_name; #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_version = (const gchar* (*)(SpitModule*)) shotwell_publishing_gallery3_real_get_version; + iface->get_version = (const gchar* (*) (SpitModule *)) shotwell_publishing_gallery3_real_get_version; #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_id = (const gchar* (*)(SpitModule*)) shotwell_publishing_gallery3_real_get_id; + iface->get_id = (const gchar* (*) (SpitModule *)) shotwell_publishing_gallery3_real_get_id; #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_pluggables = (SpitPluggable** (*)(SpitModule*, int*)) shotwell_publishing_gallery3_real_get_pluggables; -#line 1148 "GalleryConnector.c" + iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_publishing_gallery3_real_get_pluggables; +#line 1163 "GalleryConnector.c" } static void shotwell_publishing_gallery3_instance_init (ShotwellPublishingGallery3 * self) { - SpitPluggable** _tmp0_ = NULL; + SpitPluggable** _tmp0_; #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = SHOTWELL_PUBLISHING_GALLERY3_GET_PRIVATE (self); #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1191,11 +1206,11 @@ static void shotwell_publishing_gallery3_instance_init (ShotwellPublishingGaller self->priv->pluggables_length1 = 0; #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_pluggables_size_ = self->priv->pluggables_length1; -#line 1164 "GalleryConnector.c" +#line 1179 "GalleryConnector.c" } -static void shotwell_publishing_gallery3_finalize (GObject* obj) { +static void shotwell_publishing_gallery3_finalize (GObject * obj) { ShotwellPublishingGallery3 * self; #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_PUBLISHING_GALLERY3, ShotwellPublishingGallery3); @@ -1203,7 +1218,7 @@ static void shotwell_publishing_gallery3_finalize (GObject* obj) { self->priv->pluggables = (_vala_array_free (self->priv->pluggables, self->priv->pluggables_length1, (GDestroyNotify) g_object_unref), NULL); #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (shotwell_publishing_gallery3_parent_class)->finalize (obj); -#line 1176 "GalleryConnector.c" +#line 1191 "GalleryConnector.c" } @@ -1223,8 +1238,8 @@ GType shotwell_publishing_gallery3_get_type (void) { Gallery3Service* gallery3_service_construct (GType object_type, GFile* resource_directory) { Gallery3Service * self = NULL; - GdkPixbuf** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + GdkPixbuf** _tmp0_; + gint _tmp0__length1; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (G_IS_FILE (resource_directory), NULL); #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1235,9 +1250,9 @@ Gallery3Service* gallery3_service_construct (GType object_type, GFile* resource_ _tmp0__length1 = gallery3_service_icon_pixbuf_set_length1; #line 65 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp0_ == NULL) { -#line 1208 "GalleryConnector.c" - gint _tmp1_ = 0; - GdkPixbuf** _tmp2_ = NULL; +#line 1223 "GalleryConnector.c" + gint _tmp1_; + GdkPixbuf** _tmp2_; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" GALLERY3_SERVICE_ICON_FILENAME, &_tmp1_); #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1248,27 +1263,27 @@ Gallery3Service* gallery3_service_construct (GType object_type, GFile* resource_ gallery3_service_icon_pixbuf_set_length1 = _tmp1_; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _gallery3_service_icon_pixbuf_set_size_ = gallery3_service_icon_pixbuf_set_length1; -#line 1221 "GalleryConnector.c" +#line 1236 "GalleryConnector.c" } #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 1225 "GalleryConnector.c" +#line 1240 "GalleryConnector.c" } Gallery3Service* gallery3_service_new (GFile* resource_directory) { #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return gallery3_service_construct (TYPE_GALLERY3_SERVICE, resource_directory); -#line 1232 "GalleryConnector.c" +#line 1247 "GalleryConnector.c" } static gint gallery3_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) { Gallery3Service * self; gint result = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GALLERY3_SERVICE, Gallery3Service); #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1281,7 +1296,7 @@ static gint gallery3_service_real_get_pluggable_interface (SpitPluggable* base, result = _tmp2_; #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1254 "GalleryConnector.c" +#line 1269 "GalleryConnector.c" } @@ -1294,7 +1309,7 @@ static const gchar* gallery3_service_real_get_id (SpitPluggable* base) { result = "publishing-gallery3"; #line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1267 "GalleryConnector.c" +#line 1282 "GalleryConnector.c" } @@ -1307,14 +1322,14 @@ static const gchar* gallery3_service_real_get_pluggable_name (SpitPluggable* bas result = "Gallery3"; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1280 "GalleryConnector.c" +#line 1295 "GalleryConnector.c" } static gpointer _g_object_ref0 (gpointer self) { #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self ? g_object_ref (self) : NULL; -#line 1287 "GalleryConnector.c" +#line 1302 "GalleryConnector.c" } @@ -1325,32 +1340,32 @@ static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) { result = g_new0 (GdkPixbuf*, length + 1); #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" for (i = 0; i < length; i++) { -#line 1298 "GalleryConnector.c" - GdkPixbuf* _tmp0_ = NULL; +#line 1313 "GalleryConnector.c" + GdkPixbuf* _tmp0_; #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" result[i] = _tmp0_; -#line 1304 "GalleryConnector.c" +#line 1319 "GalleryConnector.c" } #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1308 "GalleryConnector.c" +#line 1323 "GalleryConnector.c" } static void gallery3_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) { Gallery3Service * self; - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - GdkPixbuf** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - GdkPixbuf** _tmp7_ = NULL; - gint _tmp7__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + GdkPixbuf** _tmp6_; + gint _tmp6__length1; + GdkPixbuf** _tmp7_; + gint _tmp7__length1; #line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GALLERY3_SERVICE, Gallery3Service); #line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1407,7 +1422,7 @@ static void gallery3_service_real_get_info (SpitPluggable* base, SpitPluggableIn (*info).icons = _tmp7_; #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" (*info).icons_length1 = _tmp7__length1; -#line 1380 "GalleryConnector.c" +#line 1395 "GalleryConnector.c" } @@ -1415,15 +1430,15 @@ static void gallery3_service_real_activation (SpitPluggable* base, gboolean enab Gallery3Service * self; #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GALLERY3_SERVICE, Gallery3Service); -#line 1388 "GalleryConnector.c" +#line 1403 "GalleryConnector.c" } static SpitPublishingPublisher* gallery3_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) { Gallery3Service * self; SpitPublishingPublisher* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - PublishingGallery3GalleryPublisher* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + PublishingGallery3GalleryPublisher* _tmp1_; #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GALLERY3_SERVICE, Gallery3Service); #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1436,7 +1451,7 @@ static SpitPublishingPublisher* gallery3_service_real_create_publisher (SpitPubl result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher); #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1409 "GalleryConnector.c" +#line 1424 "GalleryConnector.c" } @@ -1449,7 +1464,7 @@ static SpitPublishingPublisherMediaType gallery3_service_real_get_supported_medi result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1422 "GalleryConnector.c" +#line 1437 "GalleryConnector.c" } @@ -1458,7 +1473,7 @@ static void gallery3_service_class_init (Gallery3ServiceClass * klass) { gallery3_service_parent_class = g_type_class_peek_parent (klass); #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (klass)->finalize = gallery3_service_finalize; -#line 1431 "GalleryConnector.c" +#line 1446 "GalleryConnector.c" } @@ -1466,16 +1481,16 @@ static void gallery3_service_spit_pluggable_interface_init (SpitPluggableIface * #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" gallery3_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface); #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) gallery3_service_real_get_pluggable_interface; + iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) gallery3_service_real_get_pluggable_interface; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_id = (const gchar* (*)(SpitPluggable*)) gallery3_service_real_get_id; + iface->get_id = (const gchar* (*) (SpitPluggable *)) gallery3_service_real_get_id; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) gallery3_service_real_get_pluggable_name; + iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) gallery3_service_real_get_pluggable_name; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) gallery3_service_real_get_info; + iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) gallery3_service_real_get_info; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->activation = (void (*)(SpitPluggable*, gboolean)) gallery3_service_real_activation; -#line 1448 "GalleryConnector.c" + iface->activation = (void (*) (SpitPluggable *, gboolean)) gallery3_service_real_activation; +#line 1463 "GalleryConnector.c" } @@ -1483,10 +1498,10 @@ static void gallery3_service_spit_publishing_service_interface_init (SpitPublish #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" gallery3_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface); #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) gallery3_service_real_create_publisher; + iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) gallery3_service_real_create_publisher; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) gallery3_service_real_get_supported_media; -#line 1459 "GalleryConnector.c" + iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) gallery3_service_real_get_supported_media; +#line 1474 "GalleryConnector.c" } @@ -1494,13 +1509,13 @@ static void gallery3_service_instance_init (Gallery3Service * self) { } -static void gallery3_service_finalize (GObject* obj) { +static void gallery3_service_finalize (GObject * obj) { Gallery3Service * self; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_GALLERY3_SERVICE, Gallery3Service); #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (gallery3_service_parent_class)->finalize (obj); -#line 1473 "GalleryConnector.c" +#line 1488 "GalleryConnector.c" } @@ -1523,17 +1538,17 @@ GType gallery3_service_get_type (void) { PublishingGallery3Album* publishing_gallery3_album_construct (GType object_type, JsonObject* collection) { PublishingGallery3Album* self = NULL; JsonObject* entity = NULL; - JsonObject* _tmp0_ = NULL; - JsonObject* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - JsonObject* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; - const gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; + JsonObject* _tmp0_; + JsonObject* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + JsonObject* _tmp5_; + const gchar* _tmp6_; + gboolean _tmp7_; + const gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (collection != NULL, NULL); #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1578,20 +1593,20 @@ PublishingGallery3Album* publishing_gallery3_album_construct (GType object_type, _g_free0 (_tmp10_); #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 1551 "GalleryConnector.c" +#line 1566 "GalleryConnector.c" } PublishingGallery3Album* publishing_gallery3_album_new (JsonObject* collection) { #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_album_construct (PUBLISHING_GALLERY3_TYPE_ALBUM, collection); -#line 1558 "GalleryConnector.c" +#line 1573 "GalleryConnector.c" } const gchar* publishing_gallery3_album_get_name (PublishingGallery3Album* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self), NULL); #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1600,13 +1615,13 @@ const gchar* publishing_gallery3_album_get_name (PublishingGallery3Album* self) result = _tmp0_; #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1573 "GalleryConnector.c" +#line 1588 "GalleryConnector.c" } static void publishing_gallery3_album_set_name (PublishingGallery3Album* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self)); #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1617,13 +1632,13 @@ static void publishing_gallery3_album_set_name (PublishingGallery3Album* self, c _g_free0 (self->priv->_name); #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_name = _tmp1_; -#line 1590 "GalleryConnector.c" +#line 1605 "GalleryConnector.c" } const gchar* publishing_gallery3_album_get_title (PublishingGallery3Album* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self), NULL); #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1632,13 +1647,13 @@ const gchar* publishing_gallery3_album_get_title (PublishingGallery3Album* self) result = _tmp0_; #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1605 "GalleryConnector.c" +#line 1620 "GalleryConnector.c" } static void publishing_gallery3_album_set_title (PublishingGallery3Album* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self)); #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1649,13 +1664,13 @@ static void publishing_gallery3_album_set_title (PublishingGallery3Album* self, _g_free0 (self->priv->_title); #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_title = _tmp1_; -#line 1622 "GalleryConnector.c" +#line 1637 "GalleryConnector.c" } const gchar* publishing_gallery3_album_get_summary (PublishingGallery3Album* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self), NULL); #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1664,13 +1679,13 @@ const gchar* publishing_gallery3_album_get_summary (PublishingGallery3Album* sel result = _tmp0_; #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1637 "GalleryConnector.c" +#line 1652 "GalleryConnector.c" } static void publishing_gallery3_album_set_summary (PublishingGallery3Album* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self)); #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1681,13 +1696,13 @@ static void publishing_gallery3_album_set_summary (PublishingGallery3Album* self _g_free0 (self->priv->_summary); #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_summary = _tmp1_; -#line 1654 "GalleryConnector.c" +#line 1669 "GalleryConnector.c" } const gchar* publishing_gallery3_album_get_parentname (PublishingGallery3Album* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self), NULL); #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1696,13 +1711,13 @@ const gchar* publishing_gallery3_album_get_parentname (PublishingGallery3Album* result = _tmp0_; #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1669 "GalleryConnector.c" +#line 1684 "GalleryConnector.c" } static void publishing_gallery3_album_set_parentname (PublishingGallery3Album* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self)); #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1713,13 +1728,13 @@ static void publishing_gallery3_album_set_parentname (PublishingGallery3Album* s _g_free0 (self->priv->_parentname); #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_parentname = _tmp1_; -#line 1686 "GalleryConnector.c" +#line 1701 "GalleryConnector.c" } const gchar* publishing_gallery3_album_get_url (PublishingGallery3Album* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self), NULL); #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1728,13 +1743,13 @@ const gchar* publishing_gallery3_album_get_url (PublishingGallery3Album* self) { result = _tmp0_; #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1701 "GalleryConnector.c" +#line 1716 "GalleryConnector.c" } static void publishing_gallery3_album_set_url (PublishingGallery3Album* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self)); #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1745,13 +1760,13 @@ static void publishing_gallery3_album_set_url (PublishingGallery3Album* self, co _g_free0 (self->priv->_url); #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_url = _tmp1_; -#line 1718 "GalleryConnector.c" +#line 1733 "GalleryConnector.c" } const gchar* publishing_gallery3_album_get_path (PublishingGallery3Album* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self), NULL); #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1760,13 +1775,13 @@ const gchar* publishing_gallery3_album_get_path (PublishingGallery3Album* self) result = _tmp0_; #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1733 "GalleryConnector.c" +#line 1748 "GalleryConnector.c" } static void publishing_gallery3_album_set_path (PublishingGallery3Album* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self)); #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1777,13 +1792,13 @@ static void publishing_gallery3_album_set_path (PublishingGallery3Album* self, c _g_free0 (self->priv->_path); #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_path = _tmp1_; -#line 1750 "GalleryConnector.c" +#line 1765 "GalleryConnector.c" } gboolean publishing_gallery3_album_get_editable (PublishingGallery3Album* self) { gboolean result; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self), FALSE); #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1792,26 +1807,26 @@ gboolean publishing_gallery3_album_get_editable (PublishingGallery3Album* self) result = _tmp0_; #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1765 "GalleryConnector.c" +#line 1780 "GalleryConnector.c" } static void publishing_gallery3_album_set_editable (PublishingGallery3Album* self, gboolean value) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self)); #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = value; #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_editable = _tmp0_; -#line 1777 "GalleryConnector.c" +#line 1792 "GalleryConnector.c" } static void publishing_gallery3_value_album_init (GValue* value) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = NULL; -#line 1784 "GalleryConnector.c" +#line 1799 "GalleryConnector.c" } @@ -1820,7 +1835,7 @@ static void publishing_gallery3_value_album_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_album_unref (value->data[0].v_pointer); -#line 1793 "GalleryConnector.c" +#line 1808 "GalleryConnector.c" } } @@ -1830,11 +1845,11 @@ static void publishing_gallery3_value_album_copy_value (const GValue* src_value, if (src_value->data[0].v_pointer) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" dest_value->data[0].v_pointer = publishing_gallery3_album_ref (src_value->data[0].v_pointer); -#line 1803 "GalleryConnector.c" +#line 1818 "GalleryConnector.c" } else { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" dest_value->data[0].v_pointer = NULL; -#line 1807 "GalleryConnector.c" +#line 1822 "GalleryConnector.c" } } @@ -1842,66 +1857,66 @@ static void publishing_gallery3_value_album_copy_value (const GValue* src_value, static gpointer publishing_gallery3_value_album_peek_pointer (const GValue* value) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return value->data[0].v_pointer; -#line 1815 "GalleryConnector.c" +#line 1830 "GalleryConnector.c" } static gchar* publishing_gallery3_value_album_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (collect_values[0].v_pointer) { -#line 1822 "GalleryConnector.c" - PublishingGallery3Album* object; +#line 1837 "GalleryConnector.c" + PublishingGallery3Album * object; object = collect_values[0].v_pointer; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (object->parent_instance.g_class == NULL) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1829 "GalleryConnector.c" +#line 1844 "GalleryConnector.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1833 "GalleryConnector.c" +#line 1848 "GalleryConnector.c" } #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = publishing_gallery3_album_ref (object); -#line 1837 "GalleryConnector.c" +#line 1852 "GalleryConnector.c" } else { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = NULL; -#line 1841 "GalleryConnector.c" +#line 1856 "GalleryConnector.c" } #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 1845 "GalleryConnector.c" +#line 1860 "GalleryConnector.c" } static gchar* publishing_gallery3_value_album_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingGallery3Album** object_p; + PublishingGallery3Album ** object_p; object_p = collect_values[0].v_pointer; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!object_p) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1856 "GalleryConnector.c" +#line 1871 "GalleryConnector.c" } #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!value->data[0].v_pointer) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *object_p = NULL; -#line 1862 "GalleryConnector.c" +#line 1877 "GalleryConnector.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *object_p = value->data[0].v_pointer; -#line 1866 "GalleryConnector.c" +#line 1881 "GalleryConnector.c" } else { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *object_p = publishing_gallery3_album_ref (value->data[0].v_pointer); -#line 1870 "GalleryConnector.c" +#line 1885 "GalleryConnector.c" } #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 1874 "GalleryConnector.c" +#line 1889 "GalleryConnector.c" } @@ -1915,7 +1930,7 @@ GParamSpec* publishing_gallery3_param_spec_album (const gchar* name, const gchar G_PARAM_SPEC (spec)->value_type = object_type; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return G_PARAM_SPEC (spec); -#line 1888 "GalleryConnector.c" +#line 1903 "GalleryConnector.c" } @@ -1924,12 +1939,12 @@ gpointer publishing_gallery3_value_get_album (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_ALBUM), NULL); #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return value->data[0].v_pointer; -#line 1897 "GalleryConnector.c" +#line 1912 "GalleryConnector.c" } void publishing_gallery3_value_set_album (GValue* value, gpointer v_object) { - PublishingGallery3Album* old; + PublishingGallery3Album * old; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_ALBUM)); #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1944,23 +1959,23 @@ void publishing_gallery3_value_set_album (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_album_ref (value->data[0].v_pointer); -#line 1917 "GalleryConnector.c" +#line 1932 "GalleryConnector.c" } else { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = NULL; -#line 1921 "GalleryConnector.c" +#line 1936 "GalleryConnector.c" } #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (old) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_album_unref (old); -#line 1927 "GalleryConnector.c" +#line 1942 "GalleryConnector.c" } } void publishing_gallery3_value_take_album (GValue* value, gpointer v_object) { - PublishingGallery3Album* old; + PublishingGallery3Album * old; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_ALBUM)); #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1973,17 +1988,17 @@ void publishing_gallery3_value_take_album (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = v_object; -#line 1946 "GalleryConnector.c" +#line 1961 "GalleryConnector.c" } else { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = NULL; -#line 1950 "GalleryConnector.c" +#line 1965 "GalleryConnector.c" } #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (old) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_album_unref (old); -#line 1956 "GalleryConnector.c" +#line 1971 "GalleryConnector.c" } } @@ -1995,17 +2010,17 @@ static void publishing_gallery3_album_class_init (PublishingGallery3AlbumClass * ((PublishingGallery3AlbumClass *) klass)->finalize = publishing_gallery3_album_finalize; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_class_add_private (klass, sizeof (PublishingGallery3AlbumPrivate)); -#line 1968 "GalleryConnector.c" +#line 1983 "GalleryConnector.c" } static void publishing_gallery3_album_instance_init (PublishingGallery3Album * self) { - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = PUBLISHING_GALLERY3_ALBUM_GET_PRIVATE (self); #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2036,11 +2051,11 @@ static void publishing_gallery3_album_instance_init (PublishingGallery3Album * s self->priv->_editable = FALSE; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->ref_count = 1; -#line 2009 "GalleryConnector.c" +#line 2024 "GalleryConnector.c" } -static void publishing_gallery3_album_finalize (PublishingGallery3Album* obj) { +static void publishing_gallery3_album_finalize (PublishingGallery3Album * obj) { PublishingGallery3Album * self; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_ALBUM, PublishingGallery3Album); @@ -2058,7 +2073,7 @@ static void publishing_gallery3_album_finalize (PublishingGallery3Album* obj) { _g_free0 (self->priv->_url); #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (self->priv->_path); -#line 2031 "GalleryConnector.c" +#line 2046 "GalleryConnector.c" } @@ -2077,18 +2092,18 @@ GType publishing_gallery3_album_get_type (void) { gpointer publishing_gallery3_album_ref (gpointer instance) { - PublishingGallery3Album* self; + PublishingGallery3Album * self; self = instance; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_atomic_int_inc (&self->ref_count); #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return instance; -#line 2056 "GalleryConnector.c" +#line 2071 "GalleryConnector.c" } void publishing_gallery3_album_unref (gpointer instance) { - PublishingGallery3Album* self; + PublishingGallery3Album * self; self = instance; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -2096,42 +2111,42 @@ void publishing_gallery3_album_unref (gpointer instance) { PUBLISHING_GALLERY3_ALBUM_GET_CLASS (self)->finalize (self); #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2069 "GalleryConnector.c" +#line 2084 "GalleryConnector.c" } } static gchar string_get (const gchar* self, glong index) { gchar result = '\0'; - glong _tmp0_ = 0L; - gchar _tmp1_ = '\0'; -#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp0_; + gchar _tmp1_; +#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = index; -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_; -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2088 "GalleryConnector.c" +#line 2103 "GalleryConnector.c" } PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* endpoint_url, const gchar* item_path, PublishingRESTSupportHttpMethod method) { PublishingGallery3BaseGalleryTransaction* self = NULL; gboolean _tmp0_ = FALSE; - const gchar* _tmp1_ = NULL; - PublishingGallery3Session* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - PublishingRESTSupportHttpMethod _tmp12_ = 0; - JsonParser* _tmp13_ = NULL; + const gchar* _tmp1_; + PublishingGallery3Session* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + PublishingRESTSupportHttpMethod _tmp12_; + JsonParser* _tmp13_; #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL); #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2142,32 +2157,32 @@ PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_trans _tmp1_ = item_path; #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (g_strcmp0 (_tmp1_, "") != 0) { -#line 2115 "GalleryConnector.c" - const gchar* _tmp2_ = NULL; - gchar _tmp3_ = '\0'; +#line 2130 "GalleryConnector.c" + const gchar* _tmp2_; + gchar _tmp3_; #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = item_path; #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = string_get (_tmp2_, (glong) 0); #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = _tmp3_ != '/'; -#line 2124 "GalleryConnector.c" +#line 2139 "GalleryConnector.c" } else { #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = FALSE; -#line 2128 "GalleryConnector.c" +#line 2143 "GalleryConnector.c" } #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp0_) { -#line 2132 "GalleryConnector.c" - const gchar* _tmp4_ = NULL; +#line 2147 "GalleryConnector.c" + const gchar* _tmp4_; #line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_warning ("GalleryConnector.vala:164: Bad item path, this is a bug!"); #line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp4_ = item_path; #line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:165: %s", _tmp4_); -#line 2140 "GalleryConnector.c" +#line 2155 "GalleryConnector.c" } #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = session; @@ -2199,14 +2214,14 @@ PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_trans self->parser = _tmp13_; #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 2172 "GalleryConnector.c" +#line 2187 "GalleryConnector.c" } PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_transaction_new (PublishingGallery3Session* session, const gchar* endpoint_url, const gchar* item_path, PublishingRESTSupportHttpMethod method) { #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_base_gallery_transaction_construct (PUBLISHING_GALLERY3_TYPE_BASE_GALLERY_TRANSACTION, session, endpoint_url, item_path, method); -#line 2179 "GalleryConnector.c" +#line 2194 "GalleryConnector.c" } @@ -2214,12 +2229,12 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing JsonNode* result = NULL; gchar* json_object = NULL; JsonNode* root_node = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; gboolean _tmp1_ = FALSE; - const gchar* _tmp2_ = NULL; - JsonParser* _tmp15_ = NULL; - JsonNode* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; + const gchar* _tmp2_; + JsonParser* _tmp15_; + JsonNode* _tmp16_; + gboolean _tmp17_; GError * _inner_error_ = NULL; #line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_BASE_GALLERY_TRANSACTION (self), NULL); @@ -2235,11 +2250,11 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing if (NULL == _tmp2_) { #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = TRUE; -#line 2208 "GalleryConnector.c" +#line 2223 "GalleryConnector.c" } else { - const gchar* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; + const gchar* _tmp3_; + gint _tmp4_; + gint _tmp5_; #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = json_object; #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2248,15 +2263,15 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing _tmp5_ = _tmp4_; #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = 0 == _tmp5_; -#line 2221 "GalleryConnector.c" +#line 2236 "GalleryConnector.c" } #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp1_) { -#line 2225 "GalleryConnector.c" - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GError* _tmp8_ = NULL; - GError* _tmp9_ = NULL; +#line 2240 "GalleryConnector.c" + gchar* _tmp6_; + gchar* _tmp7_; + GError* _tmp8_; + GError* _tmp9_; #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp6_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2277,7 +2292,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing _g_free0 (json_object); #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 2250 "GalleryConnector.c" +#line 2265 "GalleryConnector.c" } else { #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (json_object); @@ -2287,12 +2302,12 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing g_clear_error (&_inner_error_); #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 2260 "GalleryConnector.c" +#line 2275 "GalleryConnector.c" } } { - JsonParser* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; + JsonParser* _tmp10_; + const gchar* _tmp11_; #line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp10_ = self->parser; #line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2301,7 +2316,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing json_parser_load_from_data (_tmp10_, _tmp11_, (gssize) -1, &_inner_error_); #line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2274 "GalleryConnector.c" +#line 2289 "GalleryConnector.c" goto __catch0_g_error; } } @@ -2309,9 +2324,9 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing __catch0_g_error: { GError* e = NULL; - GError* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - GError* _tmp14_ = NULL; + GError* _tmp12_; + const gchar* _tmp13_; + GError* _tmp14_; #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" e = _inner_error_; #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2330,7 +2345,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing _inner_error_ = _tmp14_; #line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (e); -#line 2303 "GalleryConnector.c" +#line 2318 "GalleryConnector.c" goto __finally0; } __finally0: @@ -2344,7 +2359,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing _g_free0 (json_object); #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 2317 "GalleryConnector.c" +#line 2332 "GalleryConnector.c" } else { #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (json_object); @@ -2354,7 +2369,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing g_clear_error (&_inner_error_); #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 2327 "GalleryConnector.c" +#line 2342 "GalleryConnector.c" } } #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2367,8 +2382,8 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing _tmp17_ = json_node_is_null (root_node); #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp17_) { -#line 2340 "GalleryConnector.c" - GError* _tmp18_ = NULL; +#line 2355 "GalleryConnector.c" + GError* _tmp18_; #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp18_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Root node is null, doesn't appear to be JSON data"); #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2381,7 +2396,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing _g_free0 (json_object); #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 2354 "GalleryConnector.c" +#line 2369 "GalleryConnector.c" } else { #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (json_object); @@ -2391,7 +2406,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing g_clear_error (&_inner_error_); #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 2364 "GalleryConnector.c" +#line 2379 "GalleryConnector.c" } } #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2400,7 +2415,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing _g_free0 (json_object); #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 2373 "GalleryConnector.c" +#line 2388 "GalleryConnector.c" } @@ -2409,7 +2424,7 @@ static void publishing_gallery3_base_gallery_transaction_class_init (PublishingG publishing_gallery3_base_gallery_transaction_parent_class = g_type_class_peek_parent (klass); #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" ((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_gallery3_base_gallery_transaction_finalize; -#line 2382 "GalleryConnector.c" +#line 2397 "GalleryConnector.c" } @@ -2417,7 +2432,7 @@ static void publishing_gallery3_base_gallery_transaction_instance_init (Publishi } -static void publishing_gallery3_base_gallery_transaction_finalize (PublishingRESTSupportTransaction* obj) { +static void publishing_gallery3_base_gallery_transaction_finalize (PublishingRESTSupportTransaction * obj) { PublishingGallery3BaseGalleryTransaction * self; #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_BASE_GALLERY_TRANSACTION, PublishingGallery3BaseGalleryTransaction); @@ -2425,7 +2440,7 @@ static void publishing_gallery3_base_gallery_transaction_finalize (PublishingRES _g_object_unref0 (self->parser); #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_base_gallery_transaction_parent_class)->finalize (obj); -#line 2398 "GalleryConnector.c" +#line 2413 "GalleryConnector.c" } @@ -2443,10 +2458,10 @@ GType publishing_gallery3_base_gallery_transaction_get_type (void) { PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* url, const gchar* username, const gchar* password) { PublishingGallery3KeyFetchTransaction* self = NULL; - PublishingGallery3Session* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; + PublishingGallery3Session* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL); #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2471,156 +2486,156 @@ PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "password", _tmp3_); #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 2444 "GalleryConnector.c" +#line 2459 "GalleryConnector.c" } PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction_new (PublishingGallery3Session* session, const gchar* url, const gchar* username, const gchar* password) { #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_key_fetch_transaction_construct (PUBLISHING_GALLERY3_TYPE_KEY_FETCH_TRANSACTION, session, url, username, password); -#line 2451 "GalleryConnector.c" +#line 2466 "GalleryConnector.c" } static gchar* string_slice (const gchar* self, glong start, glong end) { gchar* result = NULL; glong string_length = 0L; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - glong _tmp2_ = 0L; - glong _tmp5_ = 0L; + gint _tmp0_; + gint _tmp1_; + glong _tmp2_; + glong _tmp5_; gboolean _tmp8_ = FALSE; - glong _tmp9_ = 0L; + glong _tmp9_; gboolean _tmp12_ = FALSE; - glong _tmp13_ = 0L; - glong _tmp16_ = 0L; - glong _tmp17_ = 0L; - glong _tmp18_ = 0L; - glong _tmp19_ = 0L; - glong _tmp20_ = 0L; - gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp13_; + glong _tmp16_; + glong _tmp17_; + glong _tmp18_; + glong _tmp19_; + glong _tmp20_; + gchar* _tmp21_; +#line 1355 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { -#line 2484 "GalleryConnector.c" - glong _tmp3_ = 0L; - glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2499 "GalleryConnector.c" + glong _tmp3_; + glong _tmp4_; +#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; -#line 2493 "GalleryConnector.c" +#line 2508 "GalleryConnector.c" } -#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { -#line 2499 "GalleryConnector.c" - glong _tmp6_ = 0L; - glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2514 "GalleryConnector.c" + glong _tmp6_; + glong _tmp7_; +#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; -#line 2508 "GalleryConnector.c" +#line 2523 "GalleryConnector.c" } -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { -#line 2514 "GalleryConnector.c" - glong _tmp10_ = 0L; - glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2529 "GalleryConnector.c" + glong _tmp10_; + glong _tmp11_; +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; -#line 2523 "GalleryConnector.c" +#line 2538 "GalleryConnector.c" } else { -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = FALSE; -#line 2527 "GalleryConnector.c" +#line 2542 "GalleryConnector.c" } -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { -#line 2535 "GalleryConnector.c" - glong _tmp14_ = 0L; - glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2550 "GalleryConnector.c" + glong _tmp14_; + glong _tmp15_; +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; -#line 2544 "GalleryConnector.c" +#line 2559 "GalleryConnector.c" } else { -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 2548 "GalleryConnector.c" +#line 2563 "GalleryConnector.c" } -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2570 "GalleryConnector.c" +#line 2585 "GalleryConnector.c" } gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyFetchTransaction* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + gchar* _tmp3_; gboolean _tmp4_ = FALSE; gboolean _tmp5_ = FALSE; - const gchar* _tmp6_ = NULL; - const gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; + const gchar* _tmp6_; + const gchar* _tmp14_; + gchar* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_KEY_FETCH_TRANSACTION (self), NULL); #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = self->priv->key; #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (g_strcmp0 (_tmp0_, "") != 0) { -#line 2591 "GalleryConnector.c" - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; +#line 2606 "GalleryConnector.c" + const gchar* _tmp1_; + gchar* _tmp2_; #line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = self->priv->key; #line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2629,7 +2644,7 @@ gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyF result = _tmp2_; #line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 2602 "GalleryConnector.c" +#line 2617 "GalleryConnector.c" } #line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = publishing_rest_support_transaction_get_response (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); @@ -2643,24 +2658,24 @@ gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyF if (NULL == _tmp6_) { #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = TRUE; -#line 2616 "GalleryConnector.c" +#line 2631 "GalleryConnector.c" } else { - const gchar* _tmp7_ = NULL; + const gchar* _tmp7_; #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = self->priv->key; #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = g_strcmp0 ("", _tmp7_) == 0; -#line 2623 "GalleryConnector.c" +#line 2638 "GalleryConnector.c" } #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp5_) { #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp4_ = TRUE; -#line 2629 "GalleryConnector.c" +#line 2644 "GalleryConnector.c" } else { - const gchar* _tmp8_ = NULL; - gint _tmp9_ = 0; - gint _tmp10_ = 0; + const gchar* _tmp8_; + gint _tmp9_; + gint _tmp10_; #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp8_ = self->priv->key; #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2669,14 +2684,14 @@ gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyF _tmp10_ = _tmp9_; #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp4_ = 0 == _tmp10_; -#line 2642 "GalleryConnector.c" +#line 2657 "GalleryConnector.c" } #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp4_) { -#line 2646 "GalleryConnector.c" - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; +#line 2661 "GalleryConnector.c" + gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp11_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2691,7 +2706,7 @@ gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyF result = _tmp13_; #line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 2664 "GalleryConnector.c" +#line 2679 "GalleryConnector.c" } #line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp14_ = self->priv->key; @@ -2709,7 +2724,7 @@ gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyF result = _tmp17_; #line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 2682 "GalleryConnector.c" +#line 2697 "GalleryConnector.c" } @@ -2720,23 +2735,23 @@ static void publishing_gallery3_key_fetch_transaction_class_init (PublishingGall ((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_gallery3_key_fetch_transaction_finalize; #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_class_add_private (klass, sizeof (PublishingGallery3KeyFetchTransactionPrivate)); -#line 2693 "GalleryConnector.c" +#line 2708 "GalleryConnector.c" } static void publishing_gallery3_key_fetch_transaction_instance_init (PublishingGallery3KeyFetchTransaction * self) { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = PUBLISHING_GALLERY3_KEY_FETCH_TRANSACTION_GET_PRIVATE (self); #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = g_strdup (""); #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->key = _tmp0_; -#line 2705 "GalleryConnector.c" +#line 2720 "GalleryConnector.c" } -static void publishing_gallery3_key_fetch_transaction_finalize (PublishingRESTSupportTransaction* obj) { +static void publishing_gallery3_key_fetch_transaction_finalize (PublishingRESTSupportTransaction * obj) { PublishingGallery3KeyFetchTransaction * self; #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_KEY_FETCH_TRANSACTION, PublishingGallery3KeyFetchTransaction); @@ -2744,7 +2759,7 @@ static void publishing_gallery3_key_fetch_transaction_finalize (PublishingRESTSu _g_free0 (self->priv->key); #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_key_fetch_transaction_parent_class)->finalize (obj); -#line 2717 "GalleryConnector.c" +#line 2732 "GalleryConnector.c" } @@ -2762,8 +2777,8 @@ GType publishing_gallery3_key_fetch_transaction_get_type (void) { PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* item, PublishingRESTSupportHttpMethod method) { PublishingGallery3GalleryRequestTransaction* self = NULL; - PublishingGallery3Session* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + PublishingGallery3Session* _tmp0_; + gboolean _tmp1_; #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL); #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2776,17 +2791,17 @@ PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request if (!_tmp1_) { #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:254: Not authenticated"); -#line 2749 "GalleryConnector.c" +#line 2764 "GalleryConnector.c" } else { - PublishingGallery3Session* _tmp2_ = NULL; - PublishingGallery3Session* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - PublishingRESTSupportHttpMethod _tmp7_ = 0; - PublishingGallery3Session* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; + PublishingGallery3Session* _tmp2_; + PublishingGallery3Session* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp5_; + const gchar* _tmp6_; + PublishingRESTSupportHttpMethod _tmp7_; + PublishingGallery3Session* _tmp8_; + const gchar* _tmp9_; + const gchar* _tmp10_; #line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = session; #line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2811,25 +2826,25 @@ PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp10_); #line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Method", "GET"); -#line 2784 "GalleryConnector.c" +#line 2799 "GalleryConnector.c" } #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 2788 "GalleryConnector.c" +#line 2803 "GalleryConnector.c" } PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request_transaction_new (PublishingGallery3Session* session, const gchar* item, PublishingRESTSupportHttpMethod method) { #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_gallery_request_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_REQUEST_TRANSACTION, session, item, method); -#line 2795 "GalleryConnector.c" +#line 2810 "GalleryConnector.c" } static void publishing_gallery3_gallery_request_transaction_class_init (PublishingGallery3GalleryRequestTransactionClass * klass) { #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_request_transaction_parent_class = g_type_class_peek_parent (klass); -#line 2802 "GalleryConnector.c" +#line 2817 "GalleryConnector.c" } @@ -2851,7 +2866,7 @@ GType publishing_gallery3_gallery_request_transaction_get_type (void) { PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_transaction_construct (GType object_type, PublishingGallery3Session* session) { PublishingGallery3GetAlbumURLsTransaction* self = NULL; - PublishingGallery3Session* _tmp0_ = NULL; + PublishingGallery3Session* _tmp0_; #line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL); #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2864,31 +2879,31 @@ PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_t publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "scope", "all"); #line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 2837 "GalleryConnector.c" +#line 2852 "GalleryConnector.c" } PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_transaction_new (PublishingGallery3Session* session) { #line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_get_album_ur_ls_transaction_construct (PUBLISHING_GALLERY3_TYPE_GET_ALBUM_UR_LS_TRANSACTION, session); -#line 2844 "GalleryConnector.c" +#line 2859 "GalleryConnector.c" } -static void _vala_array_add2 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add2 (gchar** * array, int* length, int* size, gchar* value) { #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if ((*length) == (*size)) { #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *size = (*size) ? (2 * (*size)) : 4; #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 2855 "GalleryConnector.c" +#line 2870 "GalleryConnector.c" } #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" (*array)[(*length)++] = value; #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" (*array)[*length] = NULL; -#line 2861 "GalleryConnector.c" +#line 2876 "GalleryConnector.c" } @@ -2896,20 +2911,20 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi gchar** result = NULL; JsonNode* root_node = NULL; JsonArray* all_members = NULL; - JsonObject* _tmp2_ = NULL; - JsonArray* _tmp3_ = NULL; + JsonObject* _tmp2_; + JsonArray* _tmp3_; gchar** member_urls = NULL; - gint member_urls_length1 = 0; - gint _member_urls_size_ = 0; - gchar** _tmp14_ = NULL; - gint _tmp14__length1 = 0; + gint member_urls_length1; + gint _member_urls_size_; + gchar** _tmp14_; + gint _tmp14__length1; GError * _inner_error_ = NULL; #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUM_UR_LS_TRANSACTION (self), NULL); -#line 2879 "GalleryConnector.c" +#line 2894 "GalleryConnector.c" { JsonNode* _tmp0_ = NULL; - JsonNode* _tmp1_ = NULL; + JsonNode* _tmp1_; #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = publishing_gallery3_base_gallery_transaction_get_root_node (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_GALLERY3_TYPE_BASE_GALLERY_TRANSACTION, PublishingGallery3BaseGalleryTransaction), &_inner_error_); #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2918,7 +2933,7 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi if (G_UNLIKELY (_inner_error_ != NULL)) { #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2891 "GalleryConnector.c" +#line 2906 "GalleryConnector.c" goto __catch1_spit_publishing_publishing_error; } #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2927,11 +2942,11 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi g_clear_error (&_inner_error_); #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 2900 "GalleryConnector.c" +#line 2915 "GalleryConnector.c" } #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" root_node = _tmp0_; -#line 2904 "GalleryConnector.c" +#line 2919 "GalleryConnector.c" } goto __finally1; __catch1_spit_publishing_publishing_error: @@ -2945,7 +2960,7 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi g_error ("GalleryConnector.vala:285: Could not get root node"); #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (e); -#line 2918 "GalleryConnector.c" +#line 2933 "GalleryConnector.c" } __finally1: #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2956,7 +2971,7 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi g_clear_error (&_inner_error_); #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 2929 "GalleryConnector.c" +#line 2944 "GalleryConnector.c" } #line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = json_node_get_object (root_node); @@ -2970,37 +2985,37 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi member_urls_length1 = 0; #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _member_urls_size_ = member_urls_length1; -#line 2943 "GalleryConnector.c" +#line 2958 "GalleryConnector.c" { guint i = 0U; #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" i = (guint) 0; -#line 2948 "GalleryConnector.c" +#line 2963 "GalleryConnector.c" { gboolean _tmp4_ = FALSE; #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp4_ = TRUE; #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" while (TRUE) { -#line 2955 "GalleryConnector.c" - guint _tmp6_ = 0U; - JsonArray* _tmp7_ = NULL; - guint _tmp8_ = 0U; - gchar** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - JsonArray* _tmp10_ = NULL; - guint _tmp11_ = 0U; - const gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; +#line 2970 "GalleryConnector.c" + guint _tmp6_; + JsonArray* _tmp7_; + guint _tmp8_; + gchar** _tmp9_; + gint _tmp9__length1; + JsonArray* _tmp10_; + guint _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_; #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!_tmp4_) { -#line 2967 "GalleryConnector.c" - guint _tmp5_ = 0U; +#line 2982 "GalleryConnector.c" + guint _tmp5_; #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = i; #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" i = _tmp5_ + 1; -#line 2973 "GalleryConnector.c" +#line 2988 "GalleryConnector.c" } #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp4_ = FALSE; @@ -3014,7 +3029,7 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi if (!(_tmp6_ <= (_tmp8_ - 1))) { #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 2987 "GalleryConnector.c" +#line 3002 "GalleryConnector.c" } #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp9_ = member_urls; @@ -3030,7 +3045,7 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi _tmp13_ = g_strdup (_tmp12_); #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _vala_array_add2 (&member_urls, &member_urls_length1, &_member_urls_size_, _tmp13_); -#line 3003 "GalleryConnector.c" +#line 3018 "GalleryConnector.c" } } } @@ -3042,20 +3057,20 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi if (result_length1) { #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *result_length1 = _tmp14__length1; -#line 3015 "GalleryConnector.c" +#line 3030 "GalleryConnector.c" } #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" result = _tmp14_; #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 3021 "GalleryConnector.c" +#line 3036 "GalleryConnector.c" } static void publishing_gallery3_get_album_ur_ls_transaction_class_init (PublishingGallery3GetAlbumURLsTransactionClass * klass) { #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_get_album_ur_ls_transaction_parent_class = g_type_class_peek_parent (klass); -#line 3028 "GalleryConnector.c" +#line 3043 "GalleryConnector.c" } @@ -3075,458 +3090,458 @@ GType publishing_gallery3_get_album_ur_ls_transaction_get_type (void) { } -static void _vala_array_add3 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add3 (gchar** * array, int* length, int* size, gchar* value) { #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if ((*length) == (*size)) { #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *size = (*size) ? (2 * (*size)) : 4; #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 3055 "GalleryConnector.c" +#line 3070 "GalleryConnector.c" } #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" (*array)[(*length)++] = value; #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" (*array)[*length] = NULL; -#line 3061 "GalleryConnector.c" +#line 3076 "GalleryConnector.c" } static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; - gchar** _tmp3_ = NULL; - gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp3_; + gint _tmp3__length1; +#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" separator = ""; -#line 3078 "GalleryConnector.c" +#line 3093 "GalleryConnector.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = TRUE; -#line 3088 "GalleryConnector.c" +#line 3103 "GalleryConnector.c" } else { - gchar** _tmp4_ = NULL; - gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp4_; + gint _tmp4__length1; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; -#line 3098 "GalleryConnector.c" +#line 3113 "GalleryConnector.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 3104 "GalleryConnector.c" +#line 3119 "GalleryConnector.c" } else { gboolean _tmp5_ = FALSE; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp6_; + gint _tmp6__length1; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { -#line 3115 "GalleryConnector.c" - gchar** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3130 "GalleryConnector.c" + gchar** _tmp7_; + gint _tmp7__length1; + const gchar* _tmp8_; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; -#line 3127 "GalleryConnector.c" +#line 3142 "GalleryConnector.c" } else { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = FALSE; -#line 3131 "GalleryConnector.c" +#line 3146 "GalleryConnector.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; -#line 3135 "GalleryConnector.c" +#line 3150 "GalleryConnector.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 3139 "GalleryConnector.c" +#line 3154 "GalleryConnector.c" gint i = 0; gsize len = 0UL; - gint _tmp31_ = 0; - gint _tmp33_ = 0; - gint _tmp34_ = 0; - gsize _tmp35_ = 0UL; - const gchar* _tmp36_ = NULL; - gint _tmp37_ = 0; - gint _tmp38_ = 0; - gint _tmp39_ = 0; + gint _tmp31_; + gint _tmp33_; + gint _tmp34_; + gsize _tmp35_; + const gchar* _tmp36_; + gint _tmp37_; + gint _tmp38_; + gint _tmp39_; const gchar* res = NULL; - gsize _tmp40_ = 0UL; - void* _tmp41_ = NULL; + gsize _tmp40_; + void* _tmp41_; void* ptr = NULL; - const gchar* _tmp42_ = NULL; - gchar** _tmp43_ = NULL; - gint _tmp43__length1 = 0; - const gchar* _tmp44_ = NULL; - void* _tmp45_ = NULL; - const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp42_; + gchar** _tmp43_; + gint _tmp43__length1; + const gchar* _tmp44_; + void* _tmp45_; + const gchar* _tmp62_; +#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = (gsize) 1; -#line 3162 "GalleryConnector.c" +#line 3177 "GalleryConnector.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { -#line 3171 "GalleryConnector.c" +#line 3186 "GalleryConnector.c" gboolean _tmp11_ = FALSE; gboolean _tmp12_ = FALSE; - gchar** _tmp13_ = NULL; - gint _tmp13__length1 = 0; + gchar** _tmp13_; + gint _tmp13__length1; gint _tmp21_ = 0; - gchar** _tmp22_ = NULL; - gint _tmp22__length1 = 0; - gint _tmp23_ = 0; - const gchar* _tmp24_ = NULL; - gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp22_; + gint _tmp22__length1; + gint _tmp23_; + const gchar* _tmp24_; + gsize _tmp30_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp9_) { -#line 3184 "GalleryConnector.c" - gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3199 "GalleryConnector.c" + gint _tmp10_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp10_ + 1; -#line 3190 "GalleryConnector.c" +#line 3205 "GalleryConnector.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { -#line 3200 "GalleryConnector.c" - gint _tmp14_ = 0; - gchar** _tmp15_ = NULL; - gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3215 "GalleryConnector.c" + gint _tmp14_; + gchar** _tmp15_; + gint _tmp15__length1; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; -#line 3212 "GalleryConnector.c" +#line 3227 "GalleryConnector.c" } else { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 3216 "GalleryConnector.c" +#line 3231 "GalleryConnector.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = TRUE; -#line 3222 "GalleryConnector.c" +#line 3237 "GalleryConnector.c" } else { gboolean _tmp16_ = FALSE; - gchar** _tmp17_ = NULL; - gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp17_; + gint _tmp17__length1; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { -#line 3233 "GalleryConnector.c" - gchar** _tmp18_ = NULL; - gint _tmp18__length1 = 0; - gint _tmp19_ = 0; - const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3248 "GalleryConnector.c" + gchar** _tmp18_; + gint _tmp18__length1; + gint _tmp19_; + const gchar* _tmp20_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; -#line 3248 "GalleryConnector.c" +#line 3263 "GalleryConnector.c" } else { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = FALSE; -#line 3252 "GalleryConnector.c" +#line 3267 "GalleryConnector.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; -#line 3256 "GalleryConnector.c" +#line 3271 "GalleryConnector.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" break; -#line 3262 "GalleryConnector.c" +#line 3277 "GalleryConnector.c" } -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { -#line 3274 "GalleryConnector.c" - gchar** _tmp25_ = NULL; - gint _tmp25__length1 = 0; - gint _tmp26_ = 0; - const gchar* _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3289 "GalleryConnector.c" + gchar** _tmp25_; + gint _tmp25__length1; + gint _tmp26_; + const gchar* _tmp27_; + gint _tmp28_; + gint _tmp29_; +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; -#line 3295 "GalleryConnector.c" +#line 3310 "GalleryConnector.c" } else { -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = 0; -#line 3299 "GalleryConnector.c" +#line 3314 "GalleryConnector.c" } -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; -#line 3305 "GalleryConnector.c" +#line 3320 "GalleryConnector.c" } } -#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { -#line 3312 "GalleryConnector.c" - gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3327 "GalleryConnector.c" + gchar* _tmp32_; +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3320 "GalleryConnector.c" +#line 3335 "GalleryConnector.c" } -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp45_; -#line 3358 "GalleryConnector.c" +#line 3373 "GalleryConnector.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { -#line 3367 "GalleryConnector.c" - gint _tmp48_ = 0; - gchar** _tmp49_ = NULL; - gint _tmp49__length1 = 0; - void* _tmp50_ = NULL; - const gchar* _tmp51_ = NULL; - void* _tmp52_ = NULL; +#line 3382 "GalleryConnector.c" + gint _tmp48_; + gchar** _tmp49_; + gint _tmp49__length1; + void* _tmp50_; + const gchar* _tmp51_; + void* _tmp52_; const gchar* _tmp53_ = NULL; - gchar** _tmp54_ = NULL; - gint _tmp54__length1 = 0; - gint _tmp55_ = 0; - const gchar* _tmp56_ = NULL; - void* _tmp60_ = NULL; - void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp54_; + gint _tmp54__length1; + gint _tmp55_; + const gchar* _tmp56_; + void* _tmp60_; + void* _tmp61_; +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp46_) { -#line 3383 "GalleryConnector.c" - gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3398 "GalleryConnector.c" + gint _tmp47_; +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp47_ + 1; -#line 3389 "GalleryConnector.c" +#line 3404 "GalleryConnector.c" } -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" break; -#line 3403 "GalleryConnector.c" +#line 3418 "GalleryConnector.c" } -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { -#line 3423 "GalleryConnector.c" - gchar** _tmp57_ = NULL; - gint _tmp57__length1 = 0; - gint _tmp58_ = 0; - const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3438 "GalleryConnector.c" + gchar** _tmp57_; + gint _tmp57__length1; + gint _tmp58_; + const gchar* _tmp59_; +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; -#line 3438 "GalleryConnector.c" +#line 3453 "GalleryConnector.c" } else { -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = ""; -#line 3442 "GalleryConnector.c" +#line 3457 "GalleryConnector.c" } -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp61_; -#line 3450 "GalleryConnector.c" +#line 3465 "GalleryConnector.c" } } -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3461 "GalleryConnector.c" +#line 3476 "GalleryConnector.c" } else { - gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp63_; +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3470 "GalleryConnector.c" +#line 3485 "GalleryConnector.c" } } PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transaction_construct (GType object_type, PublishingGallery3Session* session, gchar** _album_urls, int _album_urls_length1, guint start) { PublishingGallery3GetAlbumsTransaction* self = NULL; - PublishingGallery3Session* _tmp0_ = NULL; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + PublishingGallery3Session* _tmp0_; + gchar** _tmp1_; + gint _tmp1__length1; gchar* url_list = NULL; - gchar* _tmp2_ = NULL; + gchar* _tmp2_; gchar** my_album_urls = NULL; - gint my_album_urls_length1 = 0; - gint _my_album_urls_size_ = 0; + gint my_album_urls_length1; + gint _my_album_urls_size_; gchar* endpoint_url = NULL; - PublishingGallery3Session* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + PublishingGallery3Session* _tmp3_; + gchar* _tmp4_; gint _tmp5_ = 0; - const gchar* _tmp6_ = NULL; + const gchar* _tmp6_; gint url_length = 0; - gint _tmp10_ = 0; - guint _tmp11_ = 0U; - gchar** _tmp12_ = NULL; - gint _tmp12__length1 = 0; - gchar** _tmp13_ = NULL; - gint _tmp13__length1 = 0; - const gchar* _tmp51_ = NULL; - gchar* _tmp52_ = NULL; - const gchar* _tmp53_ = NULL; + gint _tmp10_; + guint _tmp11_; + gchar** _tmp12_; + gint _tmp12__length1; + gchar** _tmp13_; + gint _tmp13__length1; + const gchar* _tmp51_; + gchar* _tmp52_; + const gchar* _tmp53_; #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL); #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -3561,10 +3576,10 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti _tmp6_ = endpoint_url; #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (NULL != _tmp6_) { -#line 3534 "GalleryConnector.c" - const gchar* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; +#line 3549 "GalleryConnector.c" + const gchar* _tmp7_; + gint _tmp8_; + gint _tmp9_; #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = endpoint_url; #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -3573,11 +3588,11 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti _tmp9_ = _tmp8_; #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = _tmp9_; -#line 3546 "GalleryConnector.c" +#line 3561 "GalleryConnector.c" } else { #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = 0; -#line 3550 "GalleryConnector.c" +#line 3565 "GalleryConnector.c" } #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" url_length = _tmp5_; @@ -3595,61 +3610,61 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti _tmp13__length1 = _tmp12__length1; #line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp11_ <= ((guint) (_tmp13__length1 - 1))) { -#line 3568 "GalleryConnector.c" - guint _tmp14_ = 0U; - const gchar* _tmp43_ = NULL; - gchar** _tmp44_ = NULL; - gint _tmp44__length1 = 0; - gchar* _tmp45_ = NULL; - gchar* _tmp46_ = NULL; - gchar* _tmp47_ = NULL; - guint _tmp48_ = 0U; - gchar** _tmp49_ = NULL; - gint _tmp49__length1 = 0; - gchar** _tmp50_ = NULL; - gint _tmp50__length1 = 0; +#line 3583 "GalleryConnector.c" + guint _tmp14_; + const gchar* _tmp43_; + gchar** _tmp44_; + gint _tmp44__length1; + gchar* _tmp45_; + gchar* _tmp46_; + gchar* _tmp47_; + guint _tmp48_; + gchar** _tmp49_; + gint _tmp49__length1; + gchar** _tmp50_; + gint _tmp50__length1; #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp14_ = start; #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_get_albums_transaction_set_urls_sent (self, _tmp14_); -#line 3585 "GalleryConnector.c" +#line 3600 "GalleryConnector.c" { gboolean _tmp15_ = FALSE; #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp15_ = TRUE; #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" while (TRUE) { -#line 3592 "GalleryConnector.c" - gchar** _tmp27_ = NULL; - gint _tmp27__length1 = 0; - gchar** _tmp28_ = NULL; - gint _tmp28__length1 = 0; - gchar** _tmp29_ = NULL; - gint _tmp29__length1 = 0; - guint _tmp30_ = 0U; - const gchar* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; - gint _tmp35_ = 0; - gchar** _tmp36_ = NULL; - gint _tmp36__length1 = 0; - gchar** _tmp37_ = NULL; - gint _tmp37__length1 = 0; - guint _tmp38_ = 0U; - const gchar* _tmp39_ = NULL; - gint _tmp40_ = 0; - gint _tmp41_ = 0; - guint _tmp42_ = 0U; +#line 3607 "GalleryConnector.c" + gchar** _tmp27_; + gint _tmp27__length1; + gchar** _tmp28_; + gint _tmp28__length1; + gchar** _tmp29_; + gint _tmp29__length1; + guint _tmp30_; + const gchar* _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; + gchar* _tmp34_; + gint _tmp35_; + gchar** _tmp36_; + gint _tmp36__length1; + gchar** _tmp37_; + gint _tmp37__length1; + guint _tmp38_; + const gchar* _tmp39_; + gint _tmp40_; + gint _tmp41_; + guint _tmp42_; #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!_tmp15_) { -#line 3616 "GalleryConnector.c" +#line 3631 "GalleryConnector.c" gboolean _tmp16_ = FALSE; - guint _tmp17_ = 0U; - gchar** _tmp18_ = NULL; - gint _tmp18__length1 = 0; - gchar** _tmp19_ = NULL; - gint _tmp19__length1 = 0; + guint _tmp17_; + gchar** _tmp18_; + gint _tmp18__length1; + gchar** _tmp19_; + gint _tmp19__length1; #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp17_ = self->priv->_urls_sent; #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -3660,16 +3675,16 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti _tmp19__length1 = _tmp18__length1; #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp17_ <= ((guint) (_tmp19__length1 - 1))) { -#line 3633 "GalleryConnector.c" - gint _tmp20_ = 0; - gchar** _tmp21_ = NULL; - gint _tmp21__length1 = 0; - gchar** _tmp22_ = NULL; - gint _tmp22__length1 = 0; - guint _tmp23_ = 0U; - const gchar* _tmp24_ = NULL; - gint _tmp25_ = 0; - gint _tmp26_ = 0; +#line 3648 "GalleryConnector.c" + gint _tmp20_; + gchar** _tmp21_; + gint _tmp21__length1; + gchar** _tmp22_; + gint _tmp22__length1; + guint _tmp23_; + const gchar* _tmp24_; + gint _tmp25_; + gint _tmp26_; #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp20_ = url_length; #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -3688,17 +3703,17 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti _tmp26_ = _tmp25_; #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp16_ = ((_tmp20_ + _tmp26_) + 3) <= 255; -#line 3661 "GalleryConnector.c" +#line 3676 "GalleryConnector.c" } else { #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp16_ = FALSE; -#line 3665 "GalleryConnector.c" +#line 3680 "GalleryConnector.c" } #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!_tmp16_) { #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 3671 "GalleryConnector.c" +#line 3686 "GalleryConnector.c" } } #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -3749,7 +3764,7 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti _tmp42_ = self->priv->_urls_sent; #line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_get_albums_transaction_set_urls_sent (self, _tmp42_ + 1); -#line 3722 "GalleryConnector.c" +#line 3737 "GalleryConnector.c" } } #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -3780,7 +3795,7 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti _tmp50__length1 = _tmp49__length1; #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_get_albums_transaction_set_more_urls (self, _tmp48_ <= ((guint) (_tmp50__length1 - 1))); -#line 3753 "GalleryConnector.c" +#line 3768 "GalleryConnector.c" } #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp51_ = url_list; @@ -3802,65 +3817,65 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti _g_free0 (url_list); #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 3775 "GalleryConnector.c" +#line 3790 "GalleryConnector.c" } PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transaction_new (PublishingGallery3Session* session, gchar** _album_urls, int _album_urls_length1, guint start) { #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_get_albums_transaction_construct (PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION, session, _album_urls, _album_urls_length1, start); -#line 3782 "GalleryConnector.c" +#line 3797 "GalleryConnector.c" } static gpointer _publishing_gallery3_album_ref0 (gpointer self) { #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self ? publishing_gallery3_album_ref (self) : NULL; -#line 3789 "GalleryConnector.c" +#line 3804 "GalleryConnector.c" } -static void _vala_array_add4 (PublishingGallery3Album*** array, int* length, int* size, PublishingGallery3Album* value) { +static void _vala_array_add4 (PublishingGallery3Album** * array, int* length, int* size, PublishingGallery3Album* value) { #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if ((*length) == (*size)) { #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *size = (*size) ? (2 * (*size)) : 4; #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *array = g_renew (PublishingGallery3Album*, *array, (*size) + 1); -#line 3800 "GalleryConnector.c" +#line 3815 "GalleryConnector.c" } #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" (*array)[(*length)++] = value; #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" (*array)[*length] = NULL; -#line 3806 "GalleryConnector.c" +#line 3821 "GalleryConnector.c" } static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1442 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1443 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1443 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3818 "GalleryConnector.c" +#line 3833 "GalleryConnector.c" } PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums (PublishingGallery3GetAlbumsTransaction* self, int* result_length1, GError** error) { PublishingGallery3Album** result = NULL; PublishingGallery3Album** albums = NULL; - gint albums_length1 = 0; - gint _albums_size_ = 0; + gint albums_length1; + gint _albums_size_; PublishingGallery3Album* tmp_album = NULL; JsonNode* root_node = NULL; - JsonNode* _tmp0_ = NULL; + JsonNode* _tmp0_; JsonArray* members = NULL; - JsonArray* _tmp1_ = NULL; - PublishingGallery3Album** _tmp23_ = NULL; - gint _tmp23__length1 = 0; + JsonArray* _tmp1_; + PublishingGallery3Album** _tmp23_; + gint _tmp23__length1; GError * _inner_error_ = NULL; #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self), NULL); @@ -3886,7 +3901,7 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums albums = (_vala_array_free (albums, albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL); #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 3859 "GalleryConnector.c" +#line 3874 "GalleryConnector.c" } else { #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_gallery3_album_unref0 (tmp_album); @@ -3898,45 +3913,45 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums g_clear_error (&_inner_error_); #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 3871 "GalleryConnector.c" +#line 3886 "GalleryConnector.c" } } #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = json_node_get_array (root_node); #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" members = _tmp1_; -#line 3878 "GalleryConnector.c" +#line 3893 "GalleryConnector.c" { guint i = 0U; #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" i = (guint) 0; -#line 3883 "GalleryConnector.c" +#line 3898 "GalleryConnector.c" { gboolean _tmp2_ = FALSE; #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = TRUE; #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" while (TRUE) { -#line 3890 "GalleryConnector.c" - guint _tmp4_ = 0U; - JsonArray* _tmp5_ = NULL; - guint _tmp6_ = 0U; - JsonArray* _tmp7_ = NULL; - guint _tmp8_ = 0U; - JsonObject* _tmp9_ = NULL; - PublishingGallery3Album* _tmp10_ = NULL; - PublishingGallery3Album* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - gboolean _tmp13_ = FALSE; +#line 3905 "GalleryConnector.c" + guint _tmp4_; + JsonArray* _tmp5_; + guint _tmp6_; + JsonArray* _tmp7_; + guint _tmp8_; + JsonObject* _tmp9_; + PublishingGallery3Album* _tmp10_; + PublishingGallery3Album* _tmp11_; + gboolean _tmp12_; + gboolean _tmp13_; #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!_tmp2_) { -#line 3903 "GalleryConnector.c" - guint _tmp3_ = 0U; +#line 3918 "GalleryConnector.c" + guint _tmp3_; #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = i; #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" i = _tmp3_ + 1; -#line 3909 "GalleryConnector.c" +#line 3924 "GalleryConnector.c" } #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = FALSE; @@ -3950,7 +3965,7 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums if (!(_tmp4_ <= (_tmp6_ - 1))) { #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 3923 "GalleryConnector.c" +#line 3938 "GalleryConnector.c" } #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = members; @@ -3972,11 +3987,11 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums _tmp13_ = _tmp12_; #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp13_) { -#line 3945 "GalleryConnector.c" - PublishingGallery3Album** _tmp14_ = NULL; - gint _tmp14__length1 = 0; - PublishingGallery3Album* _tmp15_ = NULL; - PublishingGallery3Album* _tmp16_ = NULL; +#line 3960 "GalleryConnector.c" + PublishingGallery3Album** _tmp14_; + gint _tmp14__length1; + PublishingGallery3Album* _tmp15_; + PublishingGallery3Album* _tmp16_; #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp14_ = albums; #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -3987,14 +4002,14 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums _tmp16_ = _publishing_gallery3_album_ref0 (_tmp15_); #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _vala_array_add4 (&albums, &albums_length1, &_albums_size_, _tmp16_); -#line 3960 "GalleryConnector.c" +#line 3975 "GalleryConnector.c" } else { - PublishingGallery3Album* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; + PublishingGallery3Album* _tmp17_; + const gchar* _tmp18_; + const gchar* _tmp19_; + const gchar* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp17_ = tmp_album; #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4011,7 +4026,7 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums g_warning ("GalleryConnector.vala:373: %s", _tmp22_); #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (_tmp22_); -#line 3984 "GalleryConnector.c" +#line 3999 "GalleryConnector.c" } } } @@ -4024,7 +4039,7 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums if (result_length1) { #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *result_length1 = _tmp23__length1; -#line 3997 "GalleryConnector.c" +#line 4012 "GalleryConnector.c" } #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" result = _tmp23_; @@ -4032,16 +4047,16 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums _publishing_gallery3_album_unref0 (tmp_album); #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 4005 "GalleryConnector.c" +#line 4020 "GalleryConnector.c" } gchar** publishing_gallery3_get_albums_transaction_get_album_urls (PublishingGallery3GetAlbumsTransaction* self, int* result_length1) { gchar** result; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + gchar** _tmp0_; + gint _tmp0__length1; + gchar** _tmp1_; + gint _tmp1__length1; #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self), NULL); #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4056,13 +4071,13 @@ gchar** publishing_gallery3_get_albums_transaction_get_album_urls (PublishingGal if (result_length1) { #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *result_length1 = _tmp1__length1; -#line 4029 "GalleryConnector.c" +#line 4044 "GalleryConnector.c" } #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" result = _tmp1_; #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 4035 "GalleryConnector.c" +#line 4050 "GalleryConnector.c" } @@ -4073,25 +4088,25 @@ static gchar** _vala_array_dup2 (gchar** self, int length) { result = g_new0 (gchar*, length + 1); #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" for (i = 0; i < length; i++) { -#line 4046 "GalleryConnector.c" - gchar* _tmp0_ = NULL; +#line 4061 "GalleryConnector.c" + gchar* _tmp0_; #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = g_strdup (self[i]); #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" result[i] = _tmp0_; -#line 4052 "GalleryConnector.c" +#line 4067 "GalleryConnector.c" } #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 4056 "GalleryConnector.c" +#line 4071 "GalleryConnector.c" } static void publishing_gallery3_get_albums_transaction_set_album_urls (PublishingGallery3GetAlbumsTransaction* self, gchar** value, int value_length1) { - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + gchar** _tmp0_; + gint _tmp0__length1; + gchar** _tmp1_; + gint _tmp1__length1; #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self)); #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4110,13 +4125,13 @@ static void publishing_gallery3_get_albums_transaction_set_album_urls (Publishin self->priv->_album_urls_length1 = _tmp1__length1; #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->__album_urls_size_ = self->priv->_album_urls_length1; -#line 4083 "GalleryConnector.c" +#line 4098 "GalleryConnector.c" } guint publishing_gallery3_get_albums_transaction_get_urls_sent (PublishingGallery3GetAlbumsTransaction* self) { guint result; - guint _tmp0_ = 0U; + guint _tmp0_; #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self), 0U); #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4125,25 +4140,25 @@ guint publishing_gallery3_get_albums_transaction_get_urls_sent (PublishingGaller result = _tmp0_; #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 4098 "GalleryConnector.c" +#line 4113 "GalleryConnector.c" } static void publishing_gallery3_get_albums_transaction_set_urls_sent (PublishingGallery3GetAlbumsTransaction* self, guint value) { - guint _tmp0_ = 0U; + guint _tmp0_; #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self)); #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = value; #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_urls_sent = _tmp0_; -#line 4110 "GalleryConnector.c" +#line 4125 "GalleryConnector.c" } gboolean publishing_gallery3_get_albums_transaction_get_more_urls (PublishingGallery3GetAlbumsTransaction* self) { gboolean result; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self), FALSE); #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4152,19 +4167,19 @@ gboolean publishing_gallery3_get_albums_transaction_get_more_urls (PublishingGal result = _tmp0_; #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 4125 "GalleryConnector.c" +#line 4140 "GalleryConnector.c" } static void publishing_gallery3_get_albums_transaction_set_more_urls (PublishingGallery3GetAlbumsTransaction* self, gboolean value) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self)); #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = value; #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_more_urls = _tmp0_; -#line 4137 "GalleryConnector.c" +#line 4152 "GalleryConnector.c" } @@ -4175,7 +4190,7 @@ static void publishing_gallery3_get_albums_transaction_class_init (PublishingGal ((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_gallery3_get_albums_transaction_finalize; #line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_class_add_private (klass, sizeof (PublishingGallery3GetAlbumsTransactionPrivate)); -#line 4148 "GalleryConnector.c" +#line 4163 "GalleryConnector.c" } @@ -4192,11 +4207,11 @@ static void publishing_gallery3_get_albums_transaction_instance_init (Publishing self->priv->_urls_sent = (guint) 0; #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_more_urls = FALSE; -#line 4165 "GalleryConnector.c" +#line 4180 "GalleryConnector.c" } -static void publishing_gallery3_get_albums_transaction_finalize (PublishingRESTSupportTransaction* obj) { +static void publishing_gallery3_get_albums_transaction_finalize (PublishingRESTSupportTransaction * obj) { PublishingGallery3GetAlbumsTransaction * self; #line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION, PublishingGallery3GetAlbumsTransaction); @@ -4204,7 +4219,7 @@ static void publishing_gallery3_get_albums_transaction_finalize (PublishingRESTS self->priv->_album_urls = (_vala_array_free (self->priv->_album_urls, self->priv->_album_urls_length1, (GDestroyNotify) g_free), NULL); #line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_get_albums_transaction_parent_class)->finalize (obj); -#line 4177 "GalleryConnector.c" +#line 4192 "GalleryConnector.c" } @@ -4223,14 +4238,14 @@ GType publishing_gallery3_get_albums_transaction_get_type (void) { static void _vala_JsonNode_free (JsonNode* self) { #line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_boxed_free (json_node_get_type (), self); -#line 4196 "GalleryConnector.c" +#line 4211 "GalleryConnector.c" } PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* tag_name) { PublishingGallery3GalleryGetTagTransaction* self = NULL; - PublishingGallery3Session* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + PublishingGallery3Session* _tmp0_; + gboolean _tmp1_; #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL); #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4243,26 +4258,26 @@ PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_ if (!_tmp1_) { #line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:389: Not authenticated"); -#line 4216 "GalleryConnector.c" +#line 4231 "GalleryConnector.c" } else { JsonGenerator* entity = NULL; - JsonGenerator* _tmp2_ = NULL; + JsonGenerator* _tmp2_; JsonNode* root_node = NULL; - JsonNode* _tmp3_ = NULL; + JsonNode* _tmp3_; JsonObject* obj = NULL; - JsonObject* _tmp4_ = NULL; - PublishingGallery3Session* _tmp5_ = NULL; - PublishingGallery3Session* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - PublishingGallery3Session* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; + JsonObject* _tmp4_; + PublishingGallery3Session* _tmp5_; + PublishingGallery3Session* _tmp6_; + const gchar* _tmp7_; + const gchar* _tmp8_; + PublishingGallery3Session* _tmp9_; + const gchar* _tmp10_; + const gchar* _tmp11_; + const gchar* _tmp12_; gsize entity_length = 0UL; gchar* entity_value = NULL; gsize _tmp13_ = 0UL; - gchar* _tmp14_ = NULL; + gchar* _tmp14_; #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = json_generator_new (); #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4321,18 +4336,18 @@ PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_ __vala_JsonNode_free0 (root_node); #line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (entity); -#line 4294 "GalleryConnector.c" +#line 4309 "GalleryConnector.c" } #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 4298 "GalleryConnector.c" +#line 4313 "GalleryConnector.c" } PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_transaction_new (PublishingGallery3Session* session, const gchar* tag_name) { #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_gallery_get_tag_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_GET_TAG_TRANSACTION, session, tag_name); -#line 4305 "GalleryConnector.c" +#line 4320 "GalleryConnector.c" } @@ -4340,16 +4355,16 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller gchar* result = NULL; JsonNode* root_node = NULL; gchar* url = NULL; - JsonObject* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + JsonObject* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; GError * _inner_error_ = NULL; #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_GET_TAG_TRANSACTION (self), NULL); -#line 4319 "GalleryConnector.c" +#line 4334 "GalleryConnector.c" { JsonNode* _tmp0_ = NULL; - JsonNode* _tmp1_ = NULL; + JsonNode* _tmp1_; #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = publishing_gallery3_base_gallery_transaction_get_root_node (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_GALLERY3_TYPE_BASE_GALLERY_TRANSACTION, PublishingGallery3BaseGalleryTransaction), &_inner_error_); #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4358,7 +4373,7 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller if (G_UNLIKELY (_inner_error_ != NULL)) { #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4331 "GalleryConnector.c" +#line 4346 "GalleryConnector.c" goto __catch2_spit_publishing_publishing_error; } #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4369,11 +4384,11 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller g_clear_error (&_inner_error_); #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 4342 "GalleryConnector.c" +#line 4357 "GalleryConnector.c" } #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" root_node = _tmp0_; -#line 4346 "GalleryConnector.c" +#line 4361 "GalleryConnector.c" } goto __finally2; __catch2_spit_publishing_publishing_error: @@ -4387,7 +4402,7 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller g_error ("GalleryConnector.vala:425: Could not get root node"); #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (e); -#line 4360 "GalleryConnector.c" +#line 4375 "GalleryConnector.c" } __finally2: #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4400,7 +4415,7 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller g_clear_error (&_inner_error_); #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 4373 "GalleryConnector.c" +#line 4388 "GalleryConnector.c" } #line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = json_node_get_object (root_node); @@ -4416,14 +4431,14 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller result = url; #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 4389 "GalleryConnector.c" +#line 4404 "GalleryConnector.c" } static void publishing_gallery3_gallery_get_tag_transaction_class_init (PublishingGallery3GalleryGetTagTransactionClass * klass) { #line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_get_tag_transaction_parent_class = g_type_class_peek_parent (klass); -#line 4396 "GalleryConnector.c" +#line 4411 "GalleryConnector.c" } @@ -4445,8 +4460,8 @@ GType publishing_gallery3_gallery_get_tag_transaction_get_type (void) { PublishingGallery3GalleryGetItemTagsURLsTransaction* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* item_url) { PublishingGallery3GalleryGetItemTagsURLsTransaction* self = NULL; - PublishingGallery3Session* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + PublishingGallery3Session* _tmp0_; + const gchar* _tmp1_; #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL); #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4459,14 +4474,14 @@ PublishingGallery3GalleryGetItemTagsURLsTransaction* publishing_gallery3_gallery self = (PublishingGallery3GalleryGetItemTagsURLsTransaction*) publishing_gallery3_gallery_request_transaction_construct (object_type, _tmp0_, _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET); #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 4432 "GalleryConnector.c" +#line 4447 "GalleryConnector.c" } PublishingGallery3GalleryGetItemTagsURLsTransaction* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_new (PublishingGallery3Session* session, const gchar* item_url) { #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION, session, item_url); -#line 4439 "GalleryConnector.c" +#line 4454 "GalleryConnector.c" } @@ -4475,9 +4490,9 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags JsonNode* root_node = NULL; JsonObject* relationships = NULL; JsonObject* tags = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp13_; + gchar* _tmp14_; GError * _inner_error_ = NULL; #line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION (self), NULL); @@ -4485,20 +4500,20 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags _tmp0_ = self->priv->item_tags_path; #line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (g_strcmp0 ("", _tmp0_) == 0) { -#line 4458 "GalleryConnector.c" - JsonNode* _tmp3_ = NULL; - JsonObject* _tmp4_ = NULL; - JsonObject* _tmp5_ = NULL; - JsonObject* _tmp6_ = NULL; - JsonObject* _tmp7_ = NULL; - JsonObject* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; +#line 4473 "GalleryConnector.c" + JsonNode* _tmp3_; + JsonObject* _tmp4_; + JsonObject* _tmp5_; + JsonObject* _tmp6_; + JsonObject* _tmp7_; + JsonObject* _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; { JsonNode* _tmp1_ = NULL; - JsonNode* _tmp2_ = NULL; + JsonNode* _tmp2_; #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = publishing_gallery3_base_gallery_transaction_get_root_node (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_GALLERY3_TYPE_BASE_GALLERY_TRANSACTION, PublishingGallery3BaseGalleryTransaction), &_inner_error_); #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4507,7 +4522,7 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags if (G_UNLIKELY (_inner_error_ != NULL)) { #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4480 "GalleryConnector.c" +#line 4495 "GalleryConnector.c" goto __catch3_spit_publishing_publishing_error; } #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4516,11 +4531,11 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags g_clear_error (&_inner_error_); #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 4489 "GalleryConnector.c" +#line 4504 "GalleryConnector.c" } #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" root_node = _tmp1_; -#line 4493 "GalleryConnector.c" +#line 4508 "GalleryConnector.c" } goto __finally3; __catch3_spit_publishing_publishing_error: @@ -4534,7 +4549,7 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags g_error ("GalleryConnector.vala:461: Could not get root node"); #line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (e); -#line 4507 "GalleryConnector.c" +#line 4522 "GalleryConnector.c" } __finally3: #line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4545,7 +4560,7 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags g_clear_error (&_inner_error_); #line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 4518 "GalleryConnector.c" +#line 4533 "GalleryConnector.c" } #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = root_node; @@ -4579,7 +4594,7 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags _g_free0 (self->priv->item_tags_path); #line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->item_tags_path = _tmp12_; -#line 4552 "GalleryConnector.c" +#line 4567 "GalleryConnector.c" } #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp13_ = self->priv->item_tags_path; @@ -4589,7 +4604,7 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags result = _tmp14_; #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 4562 "GalleryConnector.c" +#line 4577 "GalleryConnector.c" } @@ -4600,23 +4615,23 @@ static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_class_in ((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_finalize; #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_class_add_private (klass, sizeof (PublishingGallery3GalleryGetItemTagsURLsTransactionPrivate)); -#line 4573 "GalleryConnector.c" +#line 4588 "GalleryConnector.c" } static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_instance_init (PublishingGallery3GalleryGetItemTagsURLsTransaction * self) { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = PUBLISHING_GALLERY3_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION_GET_PRIVATE (self); #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = g_strdup (""); #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->item_tags_path = _tmp0_; -#line 4585 "GalleryConnector.c" +#line 4600 "GalleryConnector.c" } -static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_finalize (PublishingRESTSupportTransaction* obj) { +static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_finalize (PublishingRESTSupportTransaction * obj) { PublishingGallery3GalleryGetItemTagsURLsTransaction * self; #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION, PublishingGallery3GalleryGetItemTagsURLsTransaction); @@ -4624,7 +4639,7 @@ static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_finalize _g_free0 (self->priv->item_tags_path); #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_parent_class)->finalize (obj); -#line 4597 "GalleryConnector.c" +#line 4612 "GalleryConnector.c" } @@ -4642,8 +4657,8 @@ GType publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_type (void PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gallery_set_tag_relationship_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* item_tags_path, const gchar* tag_url, const gchar* item_url) { PublishingGallery3GallerySetTagRelationshipTransaction* self = NULL; - PublishingGallery3Session* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + PublishingGallery3Session* _tmp0_; + gboolean _tmp1_; #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL); #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4660,28 +4675,28 @@ PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gall if (!_tmp1_) { #line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:489: Not authenticated"); -#line 4633 "GalleryConnector.c" +#line 4648 "GalleryConnector.c" } else { JsonGenerator* entity = NULL; - JsonGenerator* _tmp2_ = NULL; + JsonGenerator* _tmp2_; JsonNode* root_node = NULL; - JsonNode* _tmp3_ = NULL; + JsonNode* _tmp3_; JsonObject* obj = NULL; - JsonObject* _tmp4_ = NULL; - PublishingGallery3Session* _tmp5_ = NULL; - PublishingGallery3Session* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - PublishingGallery3Session* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; + JsonObject* _tmp4_; + PublishingGallery3Session* _tmp5_; + PublishingGallery3Session* _tmp6_; + const gchar* _tmp7_; + const gchar* _tmp8_; + const gchar* _tmp9_; + PublishingGallery3Session* _tmp10_; + const gchar* _tmp11_; + const gchar* _tmp12_; + const gchar* _tmp13_; + const gchar* _tmp14_; gsize entity_length = 0UL; gchar* entity_value = NULL; gsize _tmp15_ = 0UL; - gchar* _tmp16_ = NULL; + gchar* _tmp16_; #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = json_generator_new (); #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4746,25 +4761,25 @@ PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gall __vala_JsonNode_free0 (root_node); #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (entity); -#line 4719 "GalleryConnector.c" +#line 4734 "GalleryConnector.c" } #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 4723 "GalleryConnector.c" +#line 4738 "GalleryConnector.c" } PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gallery_set_tag_relationship_transaction_new (PublishingGallery3Session* session, const gchar* item_tags_path, const gchar* tag_url, const gchar* item_url) { #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_gallery_set_tag_relationship_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_SET_TAG_RELATIONSHIP_TRANSACTION, session, item_tags_path, tag_url, item_url); -#line 4730 "GalleryConnector.c" +#line 4745 "GalleryConnector.c" } static void publishing_gallery3_gallery_set_tag_relationship_transaction_class_init (PublishingGallery3GallerySetTagRelationshipTransactionClass * klass) { #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_set_tag_relationship_transaction_parent_class = g_type_class_peek_parent (klass); -#line 4737 "GalleryConnector.c" +#line 4752 "GalleryConnector.c" } @@ -4786,8 +4801,8 @@ GType publishing_gallery3_gallery_set_tag_relationship_transaction_get_type (voi PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_album_create_transaction_construct (GType object_type, PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters) { PublishingGallery3GalleryAlbumCreateTransaction* self = NULL; - PublishingGallery3Session* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + PublishingGallery3Session* _tmp0_; + gboolean _tmp1_; #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL); #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4800,34 +4815,34 @@ PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_alb if (!_tmp1_) { #line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:533: Not authenticated"); -#line 4773 "GalleryConnector.c" +#line 4788 "GalleryConnector.c" } else { JsonGenerator* entity = NULL; - JsonGenerator* _tmp2_ = NULL; + JsonGenerator* _tmp2_; JsonNode* root_node = NULL; - JsonNode* _tmp3_ = NULL; + JsonNode* _tmp3_; JsonObject* obj = NULL; - JsonObject* _tmp4_ = NULL; - PublishingGallery3Session* _tmp5_ = NULL; - PublishingGallery3Session* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - PublishingGallery3Session* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - PublishingGallery3Session* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - PublishingGallery3PublishingParameters* _tmp16_ = NULL; - PublishingGallery3PublishingParameters* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - PublishingGallery3PublishingParameters* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; + JsonObject* _tmp4_; + PublishingGallery3Session* _tmp5_; + PublishingGallery3Session* _tmp6_; + const gchar* _tmp7_; + const gchar* _tmp8_; + PublishingGallery3Session* _tmp9_; + const gchar* _tmp10_; + const gchar* _tmp11_; + PublishingGallery3Session* _tmp12_; + const gchar* _tmp13_; + const gchar* _tmp14_; + gchar* _tmp15_; + PublishingGallery3PublishingParameters* _tmp16_; + PublishingGallery3PublishingParameters* _tmp17_; + const gchar* _tmp18_; + const gchar* _tmp19_; + PublishingGallery3PublishingParameters* _tmp20_; + const gchar* _tmp21_; + const gchar* _tmp22_; gchar* entity_value = NULL; - gchar* _tmp23_ = NULL; + gchar* _tmp23_; #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = json_generator_new (); #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4914,18 +4929,18 @@ PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_alb __vala_JsonNode_free0 (root_node); #line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (entity); -#line 4887 "GalleryConnector.c" +#line 4902 "GalleryConnector.c" } #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 4891 "GalleryConnector.c" +#line 4906 "GalleryConnector.c" } PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_album_create_transaction_new (PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters) { #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_gallery_album_create_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_ALBUM_CREATE_TRANSACTION, session, parameters); -#line 4898 "GalleryConnector.c" +#line 4913 "GalleryConnector.c" } @@ -4933,18 +4948,18 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path ( gchar* result = NULL; JsonNode* root_node = NULL; gchar* new_path = NULL; - JsonObject* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + JsonObject* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; GError * _inner_error_ = NULL; #line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_ALBUM_CREATE_TRANSACTION (self), NULL); -#line 4914 "GalleryConnector.c" +#line 4929 "GalleryConnector.c" { JsonNode* _tmp0_ = NULL; - JsonNode* _tmp1_ = NULL; + JsonNode* _tmp1_; #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = publishing_gallery3_base_gallery_transaction_get_root_node (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_GALLERY3_TYPE_BASE_GALLERY_TRANSACTION, PublishingGallery3BaseGalleryTransaction), &_inner_error_); #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4953,7 +4968,7 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path ( if (G_UNLIKELY (_inner_error_ != NULL)) { #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4926 "GalleryConnector.c" +#line 4941 "GalleryConnector.c" goto __catch4_spit_publishing_publishing_error; } #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4964,11 +4979,11 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path ( g_clear_error (&_inner_error_); #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 4937 "GalleryConnector.c" +#line 4952 "GalleryConnector.c" } #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" root_node = _tmp0_; -#line 4941 "GalleryConnector.c" +#line 4956 "GalleryConnector.c" } goto __finally4; __catch4_spit_publishing_publishing_error: @@ -4982,7 +4997,7 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path ( g_error ("GalleryConnector.vala:572: Could not get root node"); #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (e); -#line 4955 "GalleryConnector.c" +#line 4970 "GalleryConnector.c" } __finally4: #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4995,7 +5010,7 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path ( g_clear_error (&_inner_error_); #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 4968 "GalleryConnector.c" +#line 4983 "GalleryConnector.c" } #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = json_node_get_object (root_node); @@ -5019,13 +5034,13 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path ( result = new_path; #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 4992 "GalleryConnector.c" +#line 5007 "GalleryConnector.c" } PublishingGallery3PublishingParameters* publishing_gallery3_gallery_album_create_transaction_get_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self) { PublishingGallery3PublishingParameters* result; - PublishingGallery3PublishingParameters* _tmp0_ = NULL; + PublishingGallery3PublishingParameters* _tmp0_; #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_ALBUM_CREATE_TRANSACTION (self), NULL); #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5034,20 +5049,20 @@ PublishingGallery3PublishingParameters* publishing_gallery3_gallery_album_create result = _tmp0_; #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 5007 "GalleryConnector.c" +#line 5022 "GalleryConnector.c" } static gpointer _publishing_gallery3_publishing_parameters_ref0 (gpointer self) { #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self ? publishing_gallery3_publishing_parameters_ref (self) : NULL; -#line 5014 "GalleryConnector.c" +#line 5029 "GalleryConnector.c" } static void publishing_gallery3_gallery_album_create_transaction_set_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self, PublishingGallery3PublishingParameters* value) { - PublishingGallery3PublishingParameters* _tmp0_ = NULL; - PublishingGallery3PublishingParameters* _tmp1_ = NULL; + PublishingGallery3PublishingParameters* _tmp0_; + PublishingGallery3PublishingParameters* _tmp1_; #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_ALBUM_CREATE_TRANSACTION (self)); #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5058,7 +5073,7 @@ static void publishing_gallery3_gallery_album_create_transaction_set_parameters _publishing_gallery3_publishing_parameters_unref0 (self->priv->_parameters); #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_parameters = _tmp1_; -#line 5031 "GalleryConnector.c" +#line 5046 "GalleryConnector.c" } @@ -5069,18 +5084,18 @@ static void publishing_gallery3_gallery_album_create_transaction_class_init (Pub ((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_gallery3_gallery_album_create_transaction_finalize; #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_class_add_private (klass, sizeof (PublishingGallery3GalleryAlbumCreateTransactionPrivate)); -#line 5042 "GalleryConnector.c" +#line 5057 "GalleryConnector.c" } static void publishing_gallery3_gallery_album_create_transaction_instance_init (PublishingGallery3GalleryAlbumCreateTransaction * self) { #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = PUBLISHING_GALLERY3_GALLERY_ALBUM_CREATE_TRANSACTION_GET_PRIVATE (self); -#line 5049 "GalleryConnector.c" +#line 5064 "GalleryConnector.c" } -static void publishing_gallery3_gallery_album_create_transaction_finalize (PublishingRESTSupportTransaction* obj) { +static void publishing_gallery3_gallery_album_create_transaction_finalize (PublishingRESTSupportTransaction * obj) { PublishingGallery3GalleryAlbumCreateTransaction * self; #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_GALLERY_ALBUM_CREATE_TRANSACTION, PublishingGallery3GalleryAlbumCreateTransaction); @@ -5090,7 +5105,7 @@ static void publishing_gallery3_gallery_album_create_transaction_finalize (Publi _g_free0 (self->priv->session_url); #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_gallery_album_create_transaction_parent_class)->finalize (obj); -#line 5063 "GalleryConnector.c" +#line 5078 "GalleryConnector.c" } @@ -5109,83 +5124,83 @@ GType publishing_gallery3_gallery_album_create_transaction_get_type (void) { static gpointer _publishing_rest_support_session_ref0 (gpointer self) { #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self ? publishing_rest_support_session_ref (self) : NULL; -#line 5082 "GalleryConnector.c" +#line 5097 "GalleryConnector.c" } static void _g_free0_ (gpointer var) { #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" var = (g_free (var), NULL); -#line 5089 "GalleryConnector.c" +#line 5104 "GalleryConnector.c" } PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_transaction_construct (GType object_type, PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters, SpitPublishingPublishable* publishable) { PublishingGallery3GalleryUploadTransaction* self = NULL; - PublishingGallery3PublishingParameters* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar _tmp3_ = '\0'; - PublishingGallery3Session* _tmp7_ = NULL; - SpitPublishingPublishable* _tmp8_ = NULL; - PublishingGallery3Session* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - PublishingGallery3PublishingParameters* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - PublishingGallery3PublishingParameters* _tmp19_ = NULL; - PublishingGallery3PublishingParameters* _tmp20_ = NULL; - PublishingGallery3Session* _tmp21_ = NULL; - PublishingGallery3Session* _tmp22_ = NULL; - PublishingGallery3Session* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; + PublishingGallery3PublishingParameters* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + gchar _tmp3_; + PublishingGallery3Session* _tmp7_; + SpitPublishingPublishable* _tmp8_; + PublishingGallery3Session* _tmp9_; + const gchar* _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + PublishingGallery3PublishingParameters* _tmp14_; + const gchar* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + PublishingGallery3PublishingParameters* _tmp19_; + PublishingGallery3PublishingParameters* _tmp20_; + PublishingGallery3Session* _tmp21_; + PublishingGallery3Session* _tmp22_; + PublishingGallery3Session* _tmp23_; + const gchar* _tmp24_; + const gchar* _tmp25_; GHashTable* disposition_table = NULL; - GHashFunc _tmp26_ = NULL; - GEqualFunc _tmp27_ = NULL; - GHashTable* _tmp28_ = NULL; + GHashFunc _tmp26_; + GEqualFunc _tmp27_; + GHashTable* _tmp28_; gchar* title = NULL; - SpitPublishingPublishable* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; + SpitPublishingPublishable* _tmp29_; + gchar* _tmp30_; gchar* filename = NULL; - SpitPublishingPublishable* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; + SpitPublishingPublishable* _tmp31_; + gchar* _tmp32_; gboolean _tmp33_ = FALSE; - const gchar* _tmp34_ = NULL; - GHashTable* _tmp38_ = NULL; - gchar* _tmp39_ = NULL; - const gchar* _tmp40_ = NULL; - const gchar* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; - GHashTable* _tmp43_ = NULL; - gchar* _tmp44_ = NULL; - gchar* _tmp45_ = NULL; - GHashTable* _tmp46_ = NULL; - JsonGenerator* _tmp47_ = NULL; + const gchar* _tmp34_; + GHashTable* _tmp38_; + gchar* _tmp39_; + const gchar* _tmp40_; + const gchar* _tmp41_; + gchar* _tmp42_; + GHashTable* _tmp43_; + gchar* _tmp44_; + gchar* _tmp45_; + GHashTable* _tmp46_; + JsonGenerator* _tmp47_; gchar* desc = NULL; - SpitPublishingPublishable* _tmp48_ = NULL; - gchar* _tmp49_ = NULL; + SpitPublishingPublishable* _tmp48_; + gchar* _tmp49_; const gchar* _tmp50_ = NULL; - SpitPublishingPublishable* _tmp51_ = NULL; - SpitPublishingPublisherMediaType _tmp52_ = 0; + SpitPublishingPublishable* _tmp51_; + SpitPublishingPublisherMediaType _tmp52_; gchar* type = NULL; - gchar* _tmp53_ = NULL; + gchar* _tmp53_; JsonNode* root_node = NULL; - JsonNode* _tmp54_ = NULL; + JsonNode* _tmp54_; JsonObject* obj = NULL; - JsonObject* _tmp55_ = NULL; - const gchar* _tmp56_ = NULL; - const gchar* _tmp57_ = NULL; - const gchar* _tmp58_ = NULL; - JsonGenerator* _tmp59_ = NULL; - JsonGenerator* _tmp60_ = NULL; - gchar* _tmp61_ = NULL; - gchar* _tmp62_ = NULL; + JsonObject* _tmp55_; + const gchar* _tmp56_; + const gchar* _tmp57_; + const gchar* _tmp58_; + JsonGenerator* _tmp59_; + JsonGenerator* _tmp60_; + gchar* _tmp61_; + gchar* _tmp62_; #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL); #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5202,10 +5217,10 @@ PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_t _tmp3_ = string_get (_tmp2_, (glong) 0); #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp3_ != '/') { -#line 5175 "GalleryConnector.c" - PublishingGallery3PublishingParameters* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; +#line 5190 "GalleryConnector.c" + PublishingGallery3PublishingParameters* _tmp4_; + const gchar* _tmp5_; + const gchar* _tmp6_; #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_warning ("GalleryConnector.vala:601: Bad upload item path, this is a bug!"); #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5216,7 +5231,7 @@ PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_t _tmp6_ = _tmp5_; #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:602: %s", _tmp6_); -#line 5189 "GalleryConnector.c" +#line 5204 "GalleryConnector.c" } #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = session; @@ -5300,20 +5315,20 @@ PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_t if (_tmp34_ == NULL) { #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp33_ = TRUE; -#line 5273 "GalleryConnector.c" +#line 5288 "GalleryConnector.c" } else { - const gchar* _tmp35_ = NULL; + const gchar* _tmp35_; #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp35_ = title; #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp33_ = g_strcmp0 (_tmp35_, "") == 0; -#line 5280 "GalleryConnector.c" +#line 5295 "GalleryConnector.c" } #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp33_) { -#line 5284 "GalleryConnector.c" - const gchar* _tmp36_ = NULL; - gchar* _tmp37_ = NULL; +#line 5299 "GalleryConnector.c" + const gchar* _tmp36_; + gchar* _tmp37_; #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp36_ = filename; #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5322,7 +5337,7 @@ PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_t _g_free0 (title); #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" title = _tmp37_; -#line 5295 "GalleryConnector.c" +#line 5310 "GalleryConnector.c" } #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp38_ = disposition_table; @@ -5368,11 +5383,11 @@ PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_t if (_tmp52_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp50_ = "movie"; -#line 5341 "GalleryConnector.c" +#line 5356 "GalleryConnector.c" } else { #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp50_ = "photo"; -#line 5345 "GalleryConnector.c" +#line 5360 "GalleryConnector.c" } #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp53_ = g_strdup (_tmp50_); @@ -5432,14 +5447,14 @@ PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_t _g_hash_table_unref0 (disposition_table); #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 5405 "GalleryConnector.c" +#line 5420 "GalleryConnector.c" } PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_transaction_new (PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters, SpitPublishingPublishable* publishable) { #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_gallery_upload_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_UPLOAD_TRANSACTION, session, parameters, publishable); -#line 5412 "GalleryConnector.c" +#line 5427 "GalleryConnector.c" } @@ -5449,19 +5464,19 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P gchar* new_url = NULL; JsonNode* root_node = NULL; JsonParser* parser = NULL; - JsonParser* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + JsonParser* _tmp0_; + gchar* _tmp1_; gboolean _tmp2_ = FALSE; - const gchar* _tmp3_ = NULL; - const gchar* _tmp10_ = NULL; - JsonParser* _tmp14_ = NULL; - JsonNode* _tmp15_ = NULL; - JsonNode* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; - JsonNode* _tmp19_ = NULL; - JsonObject* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; + const gchar* _tmp3_; + const gchar* _tmp10_; + JsonParser* _tmp14_; + JsonNode* _tmp15_; + JsonNode* _tmp16_; + gboolean _tmp17_; + JsonNode* _tmp19_; + JsonObject* _tmp20_; + const gchar* _tmp21_; + gchar* _tmp22_; GError * _inner_error_ = NULL; #line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_UPLOAD_TRANSACTION (self), NULL); @@ -5481,11 +5496,11 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P if (NULL == _tmp3_) { #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = TRUE; -#line 5454 "GalleryConnector.c" +#line 5469 "GalleryConnector.c" } else { - const gchar* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; + const gchar* _tmp4_; + gint _tmp5_; + gint _tmp6_; #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp4_ = json_object; #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5494,14 +5509,14 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P _tmp6_ = _tmp5_; #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = 0 == _tmp6_; -#line 5467 "GalleryConnector.c" +#line 5482 "GalleryConnector.c" } #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp2_) { -#line 5471 "GalleryConnector.c" - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; +#line 5486 "GalleryConnector.c" + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5522,16 +5537,16 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P _g_free0 (json_object); #line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 5495 "GalleryConnector.c" +#line 5510 "GalleryConnector.c" } #line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp10_ = json_object; #line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:664: json_object: %s", _tmp10_); -#line 5501 "GalleryConnector.c" +#line 5516 "GalleryConnector.c" { - JsonParser* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; + JsonParser* _tmp11_; + const gchar* _tmp12_; #line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp11_ = parser; #line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5540,7 +5555,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P json_parser_load_from_data (_tmp11_, _tmp12_, (gssize) -1, &_inner_error_); #line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5513 "GalleryConnector.c" +#line 5528 "GalleryConnector.c" goto __catch5_g_error; } } @@ -5548,7 +5563,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P __catch5_g_error: { GError* e = NULL; - const gchar* _tmp13_ = NULL; + const gchar* _tmp13_; #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" e = _inner_error_; #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5563,7 +5578,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P g_error ("GalleryConnector.vala:674: %s", _tmp13_); #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (e); -#line 5536 "GalleryConnector.c" +#line 5551 "GalleryConnector.c" } __finally5: #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5580,7 +5595,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P g_clear_error (&_inner_error_); #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 5553 "GalleryConnector.c" +#line 5568 "GalleryConnector.c" } #line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp14_ = parser; @@ -5594,8 +5609,8 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P _tmp17_ = json_node_is_null (_tmp16_); #line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp17_) { -#line 5567 "GalleryConnector.c" - gchar* _tmp18_ = NULL; +#line 5582 "GalleryConnector.c" + gchar* _tmp18_; #line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_warning ("GalleryConnector.vala:679: Root node is null, doesn't appear to be JSO" \ "N data"); @@ -5611,7 +5626,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P _g_free0 (json_object); #line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 5583 "GalleryConnector.c" +#line 5598 "GalleryConnector.c" } #line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp19_ = root_node; @@ -5633,21 +5648,21 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P _g_free0 (json_object); #line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 5605 "GalleryConnector.c" +#line 5620 "GalleryConnector.c" } static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationship (PublishingGallery3GalleryUploadTransaction* self, const gchar* tag_url, GError** error) { PublishingGallery3GallerySetTagRelationshipTransaction* tag_txn = NULL; - PublishingRESTSupportSession* _tmp0_ = NULL; - PublishingGallery3Session* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - PublishingGallery3GallerySetTagRelationshipTransaction* _tmp5_ = NULL; - PublishingGallery3GallerySetTagRelationshipTransaction* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + PublishingRESTSupportSession* _tmp0_; + PublishingGallery3Session* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + PublishingGallery3GallerySetTagRelationshipTransaction* _tmp5_; + PublishingGallery3GallerySetTagRelationshipTransaction* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; GError * _inner_error_ = NULL; #line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_UPLOAD_TRANSACTION (self)); @@ -5683,7 +5698,7 @@ static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationsh _publishing_rest_support_transaction_unref0 (tag_txn); #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 5655 "GalleryConnector.c" +#line 5670 "GalleryConnector.c" } else { #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_transaction_unref0 (tag_txn); @@ -5693,7 +5708,7 @@ static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationsh g_clear_error (&_inner_error_); #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 5665 "GalleryConnector.c" +#line 5680 "GalleryConnector.c" } } #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5706,20 +5721,20 @@ static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationsh _g_free0 (_tmp8_); #line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_transaction_unref0 (tag_txn); -#line 5678 "GalleryConnector.c" +#line 5693 "GalleryConnector.c" } static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_path (PublishingGallery3GalleryUploadTransaction* self) { gchar* result = NULL; PublishingGallery3GalleryGetItemTagsURLsTransaction* tag_urls_txn = NULL; - PublishingRESTSupportSession* _tmp0_ = NULL; - PublishingGallery3Session* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp3_ = NULL; - PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp4_ = NULL; - PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; + PublishingRESTSupportSession* _tmp0_; + PublishingGallery3Session* _tmp1_; + const gchar* _tmp2_; + PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp3_; + PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp4_; + PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp9_; + gchar* _tmp10_; GError * _inner_error_ = NULL; #line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_UPLOAD_TRANSACTION (self), NULL); @@ -5737,9 +5752,9 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p _publishing_rest_support_session_unref0 (_tmp1_); #line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" tag_urls_txn = _tmp4_; -#line 5709 "GalleryConnector.c" +#line 5724 "GalleryConnector.c" { - PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp5_ = NULL; + PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp5_; #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = tag_urls_txn; #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5748,7 +5763,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p if (G_UNLIKELY (_inner_error_ != NULL)) { #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 5720 "GalleryConnector.c" +#line 5735 "GalleryConnector.c" goto __catch6_spit_publishing_publishing_error; } #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5759,16 +5774,16 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p g_clear_error (&_inner_error_); #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 5731 "GalleryConnector.c" +#line 5746 "GalleryConnector.c" } } goto __finally6; __catch6_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + GError* _tmp6_; + const gchar* _tmp7_; + gchar* _tmp8_; #line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" err = _inner_error_; #line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5789,7 +5804,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p _publishing_rest_support_transaction_unref0 (tag_urls_txn); #line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 5761 "GalleryConnector.c" +#line 5776 "GalleryConnector.c" } __finally6: #line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5802,7 +5817,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p g_clear_error (&_inner_error_); #line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 5774 "GalleryConnector.c" +#line 5789 "GalleryConnector.c" } #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp9_ = tag_urls_txn; @@ -5814,20 +5829,20 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p _publishing_rest_support_transaction_unref0 (tag_urls_txn); #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 5786 "GalleryConnector.c" +#line 5801 "GalleryConnector.c" } static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (PublishingGallery3GalleryUploadTransaction* self, const gchar* tag) { gchar* result = NULL; PublishingGallery3GalleryGetTagTransaction* tag_txn = NULL; - PublishingRESTSupportSession* _tmp0_ = NULL; - PublishingGallery3Session* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PublishingGallery3GalleryGetTagTransaction* _tmp3_ = NULL; - PublishingGallery3GalleryGetTagTransaction* _tmp4_ = NULL; - PublishingGallery3GalleryGetTagTransaction* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; + PublishingRESTSupportSession* _tmp0_; + PublishingGallery3Session* _tmp1_; + const gchar* _tmp2_; + PublishingGallery3GalleryGetTagTransaction* _tmp3_; + PublishingGallery3GalleryGetTagTransaction* _tmp4_; + PublishingGallery3GalleryGetTagTransaction* _tmp9_; + gchar* _tmp10_; GError * _inner_error_ = NULL; #line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_UPLOAD_TRANSACTION (self), NULL); @@ -5847,9 +5862,9 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis _publishing_rest_support_session_unref0 (_tmp1_); #line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" tag_txn = _tmp4_; -#line 5819 "GalleryConnector.c" +#line 5834 "GalleryConnector.c" { - PublishingGallery3GalleryGetTagTransaction* _tmp5_ = NULL; + PublishingGallery3GalleryGetTagTransaction* _tmp5_; #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = tag_txn; #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5858,7 +5873,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis if (G_UNLIKELY (_inner_error_ != NULL)) { #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 5830 "GalleryConnector.c" +#line 5845 "GalleryConnector.c" goto __catch7_spit_publishing_publishing_error; } #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5869,16 +5884,16 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis g_clear_error (&_inner_error_); #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 5841 "GalleryConnector.c" +#line 5856 "GalleryConnector.c" } } goto __finally7; __catch7_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + GError* _tmp6_; + const gchar* _tmp7_; + gchar* _tmp8_; #line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" err = _inner_error_; #line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5899,7 +5914,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis _publishing_rest_support_transaction_unref0 (tag_txn); #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 5871 "GalleryConnector.c" +#line 5886 "GalleryConnector.c" } __finally7: #line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5912,7 +5927,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis g_clear_error (&_inner_error_); #line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 5884 "GalleryConnector.c" +#line 5899 "GalleryConnector.c" } #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp9_ = tag_txn; @@ -5924,21 +5939,21 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis _publishing_rest_support_transaction_unref0 (tag_txn); #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 5896 "GalleryConnector.c" +#line 5911 "GalleryConnector.c" } static gpointer _g_error_copy0 (gpointer self) { #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self ? g_error_copy (self) : NULL; -#line 5903 "GalleryConnector.c" +#line 5918 "GalleryConnector.c" } static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (PublishingGallery3GalleryUploadTransaction* self, GError** error) { - PublishingGallery3PublishingParameters* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; + PublishingGallery3PublishingParameters* _tmp0_; + gboolean _tmp1_; + gboolean _tmp2_; GError * _inner_error_ = NULL; #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_UPLOAD_TRANSACTION (self)); @@ -5952,25 +5967,25 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( _tmp2_ = _tmp1_; #line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!_tmp2_) { -#line 5924 "GalleryConnector.c" +#line 5939 "GalleryConnector.c" gchar** keywords = NULL; gint keywords_length1 = 0; gint _keywords_size_ = 0; - SpitPublishingPublishable* _tmp3_ = NULL; - gint _tmp4_ = 0; - gchar** _tmp5_ = NULL; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; + SpitPublishingPublishable* _tmp3_; + gint _tmp4_; + gchar** _tmp5_; + gchar** _tmp6_; + gint _tmp6__length1; + gchar* _tmp7_; + const gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + const gchar* _tmp11_; + const gchar* _tmp12_; gboolean _tmp13_ = FALSE; - const gchar* _tmp14_ = NULL; - gchar** _tmp17_ = NULL; - gint _tmp17__length1 = 0; + const gchar* _tmp14_; + gchar** _tmp17_; + gint _tmp17__length1; #line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:746: EVENT: evaluating tags"); #line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5997,7 +6012,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL); #line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 5969 "GalleryConnector.c" +#line 5984 "GalleryConnector.c" } #line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = publishing_gallery3_gallery_upload_transaction_get_new_item_url (self); @@ -6033,19 +6048,19 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( if (g_strcmp0 ("", _tmp14_) == 0) { #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp13_ = TRUE; -#line 6005 "GalleryConnector.c" +#line 6020 "GalleryConnector.c" } else { - const gchar* _tmp15_ = NULL; + const gchar* _tmp15_; #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp15_ = self->priv->item_tags_path; #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp13_ = g_strcmp0 ("", _tmp15_) == 0; -#line 6012 "GalleryConnector.c" +#line 6027 "GalleryConnector.c" } #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp13_) { -#line 6016 "GalleryConnector.c" - GError* _tmp16_ = NULL; +#line 6031 "GalleryConnector.c" + GError* _tmp16_; #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp16_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_COMMUNICATION_FAILED, "Could not obtain URL of uploaded item or its " "\"item_tags\" relationship URL"); #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6058,7 +6073,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL); #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 6030 "GalleryConnector.c" +#line 6045 "GalleryConnector.c" } else { #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL); @@ -6068,14 +6083,14 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( g_clear_error (&_inner_error_); #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 6040 "GalleryConnector.c" +#line 6055 "GalleryConnector.c" } } #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp17_ = keywords; #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp17__length1 = keywords_length1; -#line 6047 "GalleryConnector.c" +#line 6062 "GalleryConnector.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; @@ -6087,22 +6102,22 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( tag_collection_length1 = _tmp17__length1; #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" for (tag_it = 0; tag_it < _tmp17__length1; tag_it = tag_it + 1) { -#line 6059 "GalleryConnector.c" - gchar* _tmp18_ = NULL; +#line 6074 "GalleryConnector.c" + gchar* _tmp18_; gchar* tag = NULL; #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp18_ = g_strdup (tag_collection[tag_it]); #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" tag = _tmp18_; -#line 6066 "GalleryConnector.c" +#line 6081 "GalleryConnector.c" { - const gchar* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; + const gchar* _tmp19_; + const gchar* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; gchar* new_tag_url = NULL; - const gchar* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; + const gchar* _tmp23_; + gchar* _tmp24_; #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp19_ = tag; #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6121,9 +6136,9 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( _tmp24_ = publishing_gallery3_gallery_upload_transaction_get_tag_url (self, _tmp23_); #line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" new_tag_url = _tmp24_; -#line 6093 "GalleryConnector.c" +#line 6108 "GalleryConnector.c" { - const gchar* _tmp25_ = NULL; + const gchar* _tmp25_; #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp25_ = new_tag_url; #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6132,7 +6147,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( if (G_UNLIKELY (_inner_error_ != NULL)) { #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 6104 "GalleryConnector.c" +#line 6119 "GalleryConnector.c" goto __catch8_spit_publishing_publishing_error; } #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6147,17 +6162,17 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( g_clear_error (&_inner_error_); #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 6119 "GalleryConnector.c" +#line 6134 "GalleryConnector.c" } } goto __finally8; __catch8_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; - GError* _tmp28_ = NULL; - GError* _tmp29_ = NULL; + GError* _tmp26_; + const gchar* _tmp27_; + GError* _tmp28_; + GError* _tmp29_; #line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" err = _inner_error_; #line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6176,7 +6191,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( _inner_error_ = _tmp29_; #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (err); -#line 6148 "GalleryConnector.c" +#line 6163 "GalleryConnector.c" goto __finally8; } __finally8: @@ -6194,7 +6209,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL); #line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 6166 "GalleryConnector.c" +#line 6181 "GalleryConnector.c" } else { #line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (new_tag_url); @@ -6208,20 +6223,20 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( g_clear_error (&_inner_error_); #line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 6180 "GalleryConnector.c" +#line 6195 "GalleryConnector.c" } } #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (new_tag_url); #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (tag); -#line 6187 "GalleryConnector.c" +#line 6202 "GalleryConnector.c" } } } #line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL); -#line 6193 "GalleryConnector.c" +#line 6208 "GalleryConnector.c" } } @@ -6241,7 +6256,7 @@ static void publishing_gallery3_gallery_upload_transaction_real_execute (Publish g_propagate_error (error, _inner_error_); #line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 6213 "GalleryConnector.c" +#line 6228 "GalleryConnector.c" } else { #line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -6249,7 +6264,7 @@ static void publishing_gallery3_gallery_upload_transaction_real_execute (Publish g_clear_error (&_inner_error_); #line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 6221 "GalleryConnector.c" +#line 6236 "GalleryConnector.c" } } #line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6262,7 +6277,7 @@ static void publishing_gallery3_gallery_upload_transaction_real_execute (Publish g_propagate_error (error, _inner_error_); #line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 6234 "GalleryConnector.c" +#line 6249 "GalleryConnector.c" } else { #line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -6270,7 +6285,7 @@ static void publishing_gallery3_gallery_upload_transaction_real_execute (Publish g_clear_error (&_inner_error_); #line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 6242 "GalleryConnector.c" +#line 6257 "GalleryConnector.c" } } } @@ -6284,19 +6299,19 @@ static void publishing_gallery3_gallery_upload_transaction_class_init (Publishin #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_class_add_private (klass, sizeof (PublishingGallery3GalleryUploadTransactionPrivate)); #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_gallery3_gallery_upload_transaction_real_execute; -#line 6257 "GalleryConnector.c" + ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_gallery3_gallery_upload_transaction_real_execute; +#line 6272 "GalleryConnector.c" } static void publishing_gallery3_gallery_upload_transaction_instance_init (PublishingGallery3GalleryUploadTransaction * self) { #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = PUBLISHING_GALLERY3_GALLERY_UPLOAD_TRANSACTION_GET_PRIVATE (self); -#line 6264 "GalleryConnector.c" +#line 6279 "GalleryConnector.c" } -static void publishing_gallery3_gallery_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) { +static void publishing_gallery3_gallery_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) { PublishingGallery3GalleryUploadTransaction * self; #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_GALLERY_UPLOAD_TRANSACTION, PublishingGallery3GalleryUploadTransaction); @@ -6314,7 +6329,7 @@ static void publishing_gallery3_gallery_upload_transaction_finalize (PublishingR _g_free0 (self->priv->item_tags_path); #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_gallery_upload_transaction_parent_class)->finalize (obj); -#line 6286 "GalleryConnector.c" +#line 6301 "GalleryConnector.c" } @@ -6332,9 +6347,9 @@ GType publishing_gallery3_gallery_upload_transaction_get_type (void) { PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) { PublishingGallery3GalleryPublisher * self = NULL; - SpitPublishingService* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; - PublishingGallery3Session* _tmp2_ = NULL; + SpitPublishingService* _tmp0_; + SpitPublishingPluginHost* _tmp1_; + PublishingGallery3Session* _tmp2_; #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL); #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6357,21 +6372,21 @@ PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_constr self->priv->session = _tmp2_; #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 6329 "GalleryConnector.c" +#line 6344 "GalleryConnector.c" } PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) { #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_gallery_publisher_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, service, host); -#line 6336 "GalleryConnector.c" +#line 6351 "GalleryConnector.c" } static gboolean publishing_gallery3_gallery_publisher_real_is_running (SpitPublishingPublisher* base) { PublishingGallery3GalleryPublisher * self; gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, PublishingGallery3GalleryPublisher); #line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6380,15 +6395,15 @@ static gboolean publishing_gallery3_gallery_publisher_real_is_running (SpitPubli result = _tmp0_; #line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 6352 "GalleryConnector.c" +#line 6367 "GalleryConnector.c" } static SpitPublishingService* publishing_gallery3_gallery_publisher_real_get_service (SpitPublishingPublisher* base) { PublishingGallery3GalleryPublisher * self; SpitPublishingService* result = NULL; - SpitPublishingService* _tmp0_ = NULL; - SpitPublishingService* _tmp1_ = NULL; + SpitPublishingService* _tmp0_; + SpitPublishingService* _tmp1_; #line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, PublishingGallery3GalleryPublisher); #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6399,17 +6414,17 @@ static SpitPublishingService* publishing_gallery3_gallery_publisher_real_get_ser result = _tmp1_; #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 6371 "GalleryConnector.c" +#line 6386 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_real_start (SpitPublishingPublisher* base) { PublishingGallery3GalleryPublisher * self; - gboolean _tmp0_ = FALSE; - SpitPublishingPluginHost* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + gboolean _tmp0_; + SpitPublishingPluginHost* _tmp1_; + gchar* _tmp2_; gboolean _tmp3_ = FALSE; - const gchar* _tmp4_ = NULL; + const gchar* _tmp4_; #line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, PublishingGallery3GalleryPublisher); #line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6418,7 +6433,7 @@ static void publishing_gallery3_gallery_publisher_real_start (SpitPublishingPubl if (_tmp0_) { #line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 6390 "GalleryConnector.c" +#line 6405 "GalleryConnector.c" } #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = self->priv->host; @@ -6426,7 +6441,7 @@ static void publishing_gallery3_gallery_publisher_real_start (SpitPublishingPubl if (_tmp1_ == NULL) { #line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:834: %s", "GalleryPublisher: start( ): can't start; this " "publisher is not restartable."); -#line 6398 "GalleryConnector.c" +#line 6413 "GalleryConnector.c" } #line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:837: GalleryPublisher: starting interaction."); @@ -6444,28 +6459,28 @@ static void publishing_gallery3_gallery_publisher_real_start (SpitPublishingPubl if (NULL == _tmp4_) { #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = TRUE; -#line 6416 "GalleryConnector.c" +#line 6431 "GalleryConnector.c" } else { - const gchar* _tmp5_ = NULL; + const gchar* _tmp5_; #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = self->priv->key; #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = g_strcmp0 ("", _tmp5_) == 0; -#line 6423 "GalleryConnector.c" +#line 6438 "GalleryConnector.c" } #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp3_) { #line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (self); -#line 6429 "GalleryConnector.c" +#line 6444 "GalleryConnector.c" } else { gchar* url = NULL; - gchar* _tmp6_ = NULL; + gchar* _tmp6_; gchar* username = NULL; - gchar* _tmp7_ = NULL; + gchar* _tmp7_; gboolean _tmp8_ = FALSE; gboolean _tmp9_ = FALSE; - const gchar* _tmp10_ = NULL; + const gchar* _tmp10_; #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp6_ = publishing_gallery3_gallery_publisher_get_gallery_url (self); #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6480,41 +6495,41 @@ static void publishing_gallery3_gallery_publisher_real_start (SpitPublishingPubl if (NULL == _tmp10_) { #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp9_ = TRUE; -#line 6452 "GalleryConnector.c" +#line 6467 "GalleryConnector.c" } else { - const gchar* _tmp11_ = NULL; + const gchar* _tmp11_; #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp11_ = self->priv->key; #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp9_ = NULL == _tmp11_; -#line 6459 "GalleryConnector.c" +#line 6474 "GalleryConnector.c" } #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp9_) { #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp8_ = TRUE; -#line 6465 "GalleryConnector.c" +#line 6480 "GalleryConnector.c" } else { - const gchar* _tmp12_ = NULL; + const gchar* _tmp12_; #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp12_ = url; #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp8_ = NULL == _tmp12_; -#line 6472 "GalleryConnector.c" +#line 6487 "GalleryConnector.c" } #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp8_) { #line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (self); -#line 6478 "GalleryConnector.c" +#line 6493 "GalleryConnector.c" } else { - const gchar* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - SpitPublishingPluginHost* _tmp15_ = NULL; - PublishingGallery3Session* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; + const gchar* _tmp13_; + const gchar* _tmp14_; + SpitPublishingPluginHost* _tmp15_; + PublishingGallery3Session* _tmp16_; + const gchar* _tmp17_; + const gchar* _tmp18_; + const gchar* _tmp19_; #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp13_ = username; #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6537,13 +6552,13 @@ static void publishing_gallery3_gallery_publisher_real_start (SpitPublishingPubl publishing_gallery3_session_authenticate (_tmp16_, _tmp17_, _tmp18_, _tmp19_); #line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_fetch_album_urls (self); -#line 6509 "GalleryConnector.c" +#line 6524 "GalleryConnector.c" } #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (username); #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (url); -#line 6515 "GalleryConnector.c" +#line 6530 "GalleryConnector.c" } } @@ -6556,14 +6571,14 @@ static void publishing_gallery3_gallery_publisher_real_stop (SpitPublishingPubli g_debug ("GalleryConnector.vala:867: GalleryPublisher: stop( ) invoked."); #line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->running = FALSE; -#line 6528 "GalleryConnector.c" +#line 6543 "GalleryConnector.c" } gchar* publishing_gallery3_gallery_publisher_get_api_key (PublishingGallery3GalleryPublisher* self) { gchar* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gchar* _tmp1_; #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self), NULL); #line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6574,13 +6589,13 @@ gchar* publishing_gallery3_gallery_publisher_get_api_key (PublishingGallery3Gall result = _tmp1_; #line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 6546 "GalleryConnector.c" +#line 6561 "GalleryConnector.c" } void publishing_gallery3_gallery_publisher_set_api_key (PublishingGallery3GalleryPublisher* self, const gchar* key) { - SpitPublishingPluginHost* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + const gchar* _tmp1_; #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6591,14 +6606,14 @@ void publishing_gallery3_gallery_publisher_set_api_key (PublishingGallery3Galler _tmp1_ = key; #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "api-key", _tmp1_); -#line 6563 "GalleryConnector.c" +#line 6578 "GalleryConnector.c" } gchar* publishing_gallery3_gallery_publisher_get_gallery_url (PublishingGallery3GalleryPublisher* self) { gchar* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gchar* _tmp1_; #line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self), NULL); #line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6609,13 +6624,13 @@ gchar* publishing_gallery3_gallery_publisher_get_gallery_url (PublishingGallery3 result = _tmp1_; #line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 6581 "GalleryConnector.c" +#line 6596 "GalleryConnector.c" } void publishing_gallery3_gallery_publisher_set_gallery_url (PublishingGallery3GalleryPublisher* self, const gchar* url) { - SpitPublishingPluginHost* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + const gchar* _tmp1_; #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6626,14 +6641,14 @@ void publishing_gallery3_gallery_publisher_set_gallery_url (PublishingGallery3Ga _tmp1_ = url; #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "url", _tmp1_); -#line 6598 "GalleryConnector.c" +#line 6613 "GalleryConnector.c" } gchar* publishing_gallery3_gallery_publisher_get_gallery_username (PublishingGallery3GalleryPublisher* self) { gchar* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gchar* _tmp1_; #line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self), NULL); #line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6644,13 +6659,13 @@ gchar* publishing_gallery3_gallery_publisher_get_gallery_username (PublishingGal result = _tmp1_; #line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 6616 "GalleryConnector.c" +#line 6631 "GalleryConnector.c" } void publishing_gallery3_gallery_publisher_set_gallery_username (PublishingGallery3GalleryPublisher* self, const gchar* username) { - SpitPublishingPluginHost* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + const gchar* _tmp1_; #line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6661,7 +6676,7 @@ void publishing_gallery3_gallery_publisher_set_gallery_username (PublishingGalle _tmp1_ = username; #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "username", _tmp1_); -#line 6633 "GalleryConnector.c" +#line 6648 "GalleryConnector.c" } @@ -6673,22 +6688,22 @@ static gboolean* _bool_dup (gboolean* self) { memcpy (dup, self, sizeof (gboolean)); #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return dup; -#line 6645 "GalleryConnector.c" +#line 6660 "GalleryConnector.c" } static gpointer __bool_dup0 (gpointer self) { #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self ? _bool_dup (self) : NULL; -#line 6652 "GalleryConnector.c" +#line 6667 "GalleryConnector.c" } gboolean* publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self) { gboolean* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - gboolean* _tmp2_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; + gboolean* _tmp2_; #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self), NULL); #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6701,13 +6716,13 @@ gboolean* publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (P result = _tmp2_; #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 6673 "GalleryConnector.c" +#line 6688 "GalleryConnector.c" } void publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self, gboolean strip_metadata) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; #line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6716,7 +6731,7 @@ void publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (Publis _tmp1_ = strip_metadata; #line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip-metadata", _tmp1_); -#line 6688 "GalleryConnector.c" +#line 6703 "GalleryConnector.c" } @@ -6728,22 +6743,22 @@ static gint* _int_dup (gint* self) { memcpy (dup, self, sizeof (gint)); #line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return dup; -#line 6700 "GalleryConnector.c" +#line 6715 "GalleryConnector.c" } static gpointer __int_dup0 (gpointer self) { #line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self ? _int_dup (self) : NULL; -#line 6707 "GalleryConnector.c" +#line 6722 "GalleryConnector.c" } gint* publishing_gallery3_gallery_publisher_get_scaling_constraint_id (PublishingGallery3GalleryPublisher* self) { gint* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint* _tmp2_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; + gint* _tmp2_; #line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self), NULL); #line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6756,13 +6771,13 @@ gint* publishing_gallery3_gallery_publisher_get_scaling_constraint_id (Publishin result = _tmp2_; #line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 6728 "GalleryConnector.c" +#line 6743 "GalleryConnector.c" } void publishing_gallery3_gallery_publisher_set_scaling_constraint_id (PublishingGallery3GalleryPublisher* self, gint constraint) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6771,15 +6786,15 @@ void publishing_gallery3_gallery_publisher_set_scaling_constraint_id (Publishing _tmp1_ = constraint; #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "scaling-constraint-id", _tmp1_); -#line 6743 "GalleryConnector.c" +#line 6758 "GalleryConnector.c" } gint* publishing_gallery3_gallery_publisher_get_scaling_pixels (PublishingGallery3GalleryPublisher* self) { gint* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint* _tmp2_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; + gint* _tmp2_; #line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self), NULL); #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6792,13 +6807,13 @@ gint* publishing_gallery3_gallery_publisher_get_scaling_pixels (PublishingGaller result = _tmp2_; #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 6764 "GalleryConnector.c" +#line 6779 "GalleryConnector.c" } void publishing_gallery3_gallery_publisher_set_scaling_pixels (PublishingGallery3GalleryPublisher* self, gint pixels) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6807,19 +6822,19 @@ void publishing_gallery3_gallery_publisher_set_scaling_pixels (PublishingGallery _tmp1_ = pixels; #line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "scaling-pixels", _tmp1_); -#line 6779 "GalleryConnector.c" +#line 6794 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self) { #line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_service_welcome_login ((PublishingGallery3GalleryPublisher*) self); -#line 6786 "GalleryConnector.c" +#line 6801 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (PublishingGallery3GalleryPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; + SpitPublishingPluginHost* _tmp0_; #line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6828,41 +6843,41 @@ static void publishing_gallery3_gallery_publisher_do_show_service_welcome_pane ( _tmp0_ = self->priv->host; #line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_publishing_plugin_host_install_welcome_pane (_tmp0_, PUBLISHING_GALLERY3_SERVICE_WELCOME_MESSAGE, _publishing_gallery3_gallery_publisher_on_service_welcome_login_spit_publishing_login_callback, self); -#line 6800 "GalleryConnector.c" +#line 6815 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_credentials_go_back_publishing_gallery3_credentials_pane_go_back (PublishingGallery3CredentialsPane* _sender, gpointer self) { #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_credentials_go_back ((PublishingGallery3GalleryPublisher*) self); -#line 6807 "GalleryConnector.c" +#line 6822 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_credentials_login_publishing_gallery3_credentials_pane_login (PublishingGallery3CredentialsPane* _sender, const gchar* url, const gchar* uname, const gchar* password, const gchar* key, gpointer self) { #line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_credentials_login ((PublishingGallery3GalleryPublisher*) self, url, uname, password); -#line 6814 "GalleryConnector.c" +#line 6829 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_do_show_credentials_pane (PublishingGallery3GalleryPublisher* self, PublishingGallery3CredentialsPaneMode mode) { - PublishingGallery3CredentialsPaneMode _tmp0_ = 0; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - PublishingGallery3Session* _tmp3_ = NULL; + PublishingGallery3CredentialsPaneMode _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + PublishingGallery3Session* _tmp3_; PublishingGallery3CredentialsPane* creds_pane = NULL; - SpitPublishingPluginHost* _tmp4_ = NULL; - PublishingGallery3CredentialsPaneMode _tmp5_ = 0; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - PublishingGallery3CredentialsPane* _tmp12_ = NULL; - PublishingGallery3CredentialsPane* _tmp13_ = NULL; - SpitPublishingPluginHost* _tmp14_ = NULL; + SpitPublishingPluginHost* _tmp4_; + PublishingGallery3CredentialsPaneMode _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + PublishingGallery3CredentialsPane* _tmp12_; + PublishingGallery3CredentialsPane* _tmp13_; + SpitPublishingPluginHost* _tmp14_; #line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6918,34 +6933,34 @@ static void publishing_gallery3_gallery_publisher_do_show_credentials_pane (Publ spit_publishing_plugin_host_install_dialog_pane (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (creds_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); #line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (creds_pane); -#line 6889 "GalleryConnector.c" +#line 6904 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_key_fetch_error ((PublishingGallery3GalleryPublisher*) self, _sender, err); -#line 6896 "GalleryConnector.c" +#line 6911 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_key_fetch_complete ((PublishingGallery3GalleryPublisher*) self, _sender); -#line 6903 "GalleryConnector.c" +#line 6918 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username, const gchar* password) { - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - SpitPublishingPluginHost* _tmp2_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + SpitPublishingPluginHost* _tmp2_; PublishingGallery3KeyFetchTransaction* fetch_trans = NULL; - PublishingGallery3Session* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - PublishingGallery3KeyFetchTransaction* _tmp7_ = NULL; + PublishingGallery3Session* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp5_; + const gchar* _tmp6_; + PublishingGallery3KeyFetchTransaction* _tmp7_; GError * _inner_error_ = NULL; #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); @@ -6981,7 +6996,7 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (fetch_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error, self, 0); #line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (fetch_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed, self, 0); -#line 6952 "GalleryConnector.c" +#line 6967 "GalleryConnector.c" { #line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (fetch_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -6989,7 +7004,7 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa if (G_UNLIKELY (_inner_error_ != NULL)) { #line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 6960 "GalleryConnector.c" +#line 6975 "GalleryConnector.c" goto __catch9_spit_publishing_publishing_error; } #line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7000,14 +7015,14 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa g_clear_error (&_inner_error_); #line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 6971 "GalleryConnector.c" +#line 6986 "GalleryConnector.c" } } goto __finally9; __catch9_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp8_ = NULL; + GError* _tmp8_; #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" err = _inner_error_; #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7020,7 +7035,7 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa publishing_gallery3_gallery_publisher_on_key_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (fetch_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp8_); #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (err); -#line 6991 "GalleryConnector.c" +#line 7006 "GalleryConnector.c" } __finally9: #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7033,33 +7048,33 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa g_clear_error (&_inner_error_); #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7004 "GalleryConnector.c" +#line 7019 "GalleryConnector.c" } #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_transaction_unref0 (fetch_trans); -#line 7008 "GalleryConnector.c" +#line 7023 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_album_urls_fetch_error ((PublishingGallery3GalleryPublisher*) self, _sender, err); -#line 7015 "GalleryConnector.c" +#line 7030 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete ((PublishingGallery3GalleryPublisher*) self, _sender); -#line 7022 "GalleryConnector.c" +#line 7037 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (PublishingGallery3GalleryPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; + SpitPublishingPluginHost* _tmp0_; PublishingGallery3GetAlbumURLsTransaction* album_trans = NULL; - PublishingGallery3Session* _tmp1_ = NULL; - PublishingGallery3GetAlbumURLsTransaction* _tmp2_ = NULL; + PublishingGallery3Session* _tmp1_; + PublishingGallery3GetAlbumURLsTransaction* _tmp2_; GError * _inner_error_ = NULL; #line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); @@ -7077,7 +7092,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (Publishin g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error, self, 0); #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed, self, 0); -#line 7048 "GalleryConnector.c" +#line 7063 "GalleryConnector.c" { #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -7085,7 +7100,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (Publishin if (G_UNLIKELY (_inner_error_ != NULL)) { #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 7056 "GalleryConnector.c" +#line 7071 "GalleryConnector.c" goto __catch10_spit_publishing_publishing_error; } #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7096,14 +7111,14 @@ static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (Publishin g_clear_error (&_inner_error_); #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7067 "GalleryConnector.c" +#line 7082 "GalleryConnector.c" } } goto __finally10; __catch10_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp3_ = NULL; + GError* _tmp3_; #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" err = _inner_error_; #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7116,7 +7131,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (Publishin publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp3_); #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (err); -#line 7087 "GalleryConnector.c" +#line 7102 "GalleryConnector.c" } __finally10: #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7129,35 +7144,35 @@ static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (Publishin g_clear_error (&_inner_error_); #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7100 "GalleryConnector.c" +#line 7115 "GalleryConnector.c" } #line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_transaction_unref0 (album_trans); -#line 7104 "GalleryConnector.c" +#line 7119 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_album_fetch_error ((PublishingGallery3GalleryPublisher*) self, _sender, err); -#line 7111 "GalleryConnector.c" +#line 7126 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_album_fetch_complete ((PublishingGallery3GalleryPublisher*) self, _sender); -#line 7118 "GalleryConnector.c" +#line 7133 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGallery3GalleryPublisher* self, gchar** album_urls, int album_urls_length1, guint start) { PublishingGallery3GetAlbumsTransaction* album_trans = NULL; - PublishingGallery3Session* _tmp0_ = NULL; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - guint _tmp2_ = 0U; - PublishingGallery3GetAlbumsTransaction* _tmp3_ = NULL; + PublishingGallery3Session* _tmp0_; + gchar** _tmp1_; + gint _tmp1__length1; + guint _tmp2_; + PublishingGallery3GetAlbumsTransaction* _tmp3_; GError * _inner_error_ = NULL; #line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); @@ -7177,7 +7192,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGal g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error, self, 0); #line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed, self, 0); -#line 7148 "GalleryConnector.c" +#line 7163 "GalleryConnector.c" { #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -7185,7 +7200,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGal if (G_UNLIKELY (_inner_error_ != NULL)) { #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 7156 "GalleryConnector.c" +#line 7171 "GalleryConnector.c" goto __catch11_spit_publishing_publishing_error; } #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7196,14 +7211,14 @@ static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGal g_clear_error (&_inner_error_); #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7167 "GalleryConnector.c" +#line 7182 "GalleryConnector.c" } } goto __finally11; __catch11_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp4_ = NULL; + GError* _tmp4_; #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" err = _inner_error_; #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7214,7 +7229,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGal publishing_gallery3_gallery_publisher_on_album_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp4_); #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (err); -#line 7185 "GalleryConnector.c" +#line 7200 "GalleryConnector.c" } __finally11: #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7227,48 +7242,48 @@ static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGal g_clear_error (&_inner_error_); #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7198 "GalleryConnector.c" +#line 7213 "GalleryConnector.c" } #line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_transaction_unref0 (album_trans); -#line 7202 "GalleryConnector.c" +#line 7217 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish_publishing_gallery3_publishing_options_pane_publish (PublishingGallery3PublishingOptionsPane* _sender, PublishingGallery3PublishingParameters* parameters, gpointer self) { #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish ((PublishingGallery3GalleryPublisher*) self, parameters); -#line 7209 "GalleryConnector.c" +#line 7224 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout (PublishingGallery3PublishingOptionsPane* _sender, gpointer self) { #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout ((PublishingGallery3GalleryPublisher*) self); -#line 7216 "GalleryConnector.c" +#line 7231 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username) { GtkBuilder* builder = NULL; - GtkBuilder* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - PublishingGallery3Album** _tmp13_ = NULL; - gint _tmp13__length1 = 0; - GtkBuilder* _tmp14_ = NULL; - gboolean* _tmp15_ = NULL; - gboolean* _tmp16_ = NULL; - gint* _tmp17_ = NULL; - gint* _tmp18_ = NULL; - gint* _tmp19_ = NULL; - gint* _tmp20_ = NULL; - PublishingGallery3PublishingOptionsPane* _tmp21_ = NULL; - PublishingGallery3PublishingOptionsPane* _tmp22_ = NULL; - PublishingGallery3PublishingOptionsPane* _tmp23_ = NULL; - SpitPublishingPluginHost* _tmp24_ = NULL; - PublishingGallery3PublishingOptionsPane* _tmp25_ = NULL; + GtkBuilder* _tmp0_; + SpitPublishingPluginHost* _tmp9_; + const gchar* _tmp10_; + const gchar* _tmp11_; + PublishingGallery3Album** _tmp12_; + gint _tmp12__length1; + GtkBuilder* _tmp13_; + gboolean* _tmp14_; + gboolean* _tmp15_; + gint* _tmp16_; + gint* _tmp17_; + gint* _tmp18_; + gint* _tmp19_; + PublishingGallery3PublishingOptionsPane* _tmp20_; + PublishingGallery3PublishingOptionsPane* _tmp21_; + PublishingGallery3PublishingOptionsPane* _tmp22_; + SpitPublishingPluginHost* _tmp23_; + PublishingGallery3PublishingOptionsPane* _tmp24_; GError * _inner_error_ = NULL; #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); @@ -7282,16 +7297,16 @@ static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pan _tmp0_ = gtk_builder_new (); #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" builder = _tmp0_; -#line 7253 "GalleryConnector.c" +#line 7268 "GalleryConnector.c" { - GtkBuilder* _tmp1_ = NULL; + GtkBuilder* _tmp1_; #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = builder; #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/gallery3_publishing_options_pane.ui", &_inner_error_); #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7262 "GalleryConnector.c" +#line 7277 "GalleryConnector.c" goto __catch12_g_error; } } @@ -7299,14 +7314,13 @@ static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pan __catch12_g_error: { GError* e = NULL; - GError* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - SpitPublishingPluginHost* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GError* _tmp8_ = NULL; - GError* _tmp9_ = NULL; + GError* _tmp2_; + const gchar* _tmp3_; + SpitPublishingPluginHost* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + GError* _tmp7_; + GError* _tmp8_; #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" e = _inner_error_; #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7320,29 +7334,27 @@ static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pan #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp4_ = self->priv->host; #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = _ ("A file required for publishing is unavailable. Publishing to %s can’t " \ -"continue."); -#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = g_strdup_printf (_tmp5_, PUBLISHING_GALLERY3_SERVICE_NAME); + _tmp5_ = g_strdup_printf (_ ("A file required for publishing is unavailable. Publishing to %s can’t " \ +"continue."), PUBLISHING_GALLERY3_SERVICE_NAME); #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp7_); + _tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp6_); #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - spit_publishing_plugin_host_post_error (_tmp4_, _tmp9_); + spit_publishing_plugin_host_post_error (_tmp4_, _tmp8_); #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_error_free0 (_tmp9_); + _g_error_free0 (_tmp8_); #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (e); #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (builder); #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7312 "GalleryConnector.c" +#line 7324 "GalleryConnector.c" } __finally12: #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7355,83 +7367,83 @@ static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pan g_clear_error (&_inner_error_); #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7325 "GalleryConnector.c" +#line 7337 "GalleryConnector.c" } #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = self->priv->host; + _tmp9_ = self->priv->host; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = url; + _tmp10_ = url; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = username; + _tmp11_ = username; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = self->priv->albums; + _tmp12_ = self->priv->albums; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13__length1 = self->priv->albums_length1; + _tmp12__length1 = self->priv->albums_length1; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = builder; + _tmp13_ = builder; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp15_ = publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (self); + _tmp14_ = publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (self); #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp17_ = publishing_gallery3_gallery_publisher_get_scaling_constraint_id (self); + _tmp16_ = publishing_gallery3_gallery_publisher_get_scaling_constraint_id (self); #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp18_ = _tmp17_; + _tmp17_ = _tmp16_; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp19_ = publishing_gallery3_gallery_publisher_get_scaling_pixels (self); + _tmp18_ = publishing_gallery3_gallery_publisher_get_scaling_pixels (self); #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp21_ = publishing_gallery3_publishing_options_pane_new (_tmp10_, _tmp11_, _tmp12_, _tmp13_, _tmp13__length1, _tmp14_, *_tmp16_, *_tmp18_, *_tmp20_); + _tmp20_ = publishing_gallery3_publishing_options_pane_new (_tmp9_, _tmp10_, _tmp11_, _tmp12_, _tmp12__length1, _tmp13_, *_tmp15_, *_tmp17_, *_tmp19_); #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->publishing_options_pane); #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->publishing_options_pane = _tmp21_; + self->priv->publishing_options_pane = _tmp20_; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp19_); #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp17_); #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp15_); #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp22_ = self->priv->publishing_options_pane; + _tmp21_ = self->priv->publishing_options_pane; #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (_tmp22_, "publish", (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish_publishing_gallery3_publishing_options_pane_publish, self, 0); + g_signal_connect_object (_tmp21_, "publish", (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish_publishing_gallery3_publishing_options_pane_publish, self, 0); #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp23_ = self->priv->publishing_options_pane; + _tmp22_ = self->priv->publishing_options_pane; #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (_tmp23_, "logout", (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout, self, 0); + g_signal_connect_object (_tmp22_, "logout", (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout, self, 0); #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp24_ = self->priv->host; + _tmp23_ = self->priv->host; #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp25_ = self->priv->publishing_options_pane; + _tmp24_ = self->priv->publishing_options_pane; #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - spit_publishing_plugin_host_install_dialog_pane (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); + spit_publishing_plugin_host_install_dialog_pane (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (builder); -#line 7379 "GalleryConnector.c" +#line 7391 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_album_create_error ((PublishingGallery3GalleryPublisher*) self, _sender, err); -#line 7386 "GalleryConnector.c" +#line 7398 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_album_create_complete ((PublishingGallery3GalleryPublisher*) self, _sender); -#line 7393 "GalleryConnector.c" +#line 7405 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters) { PublishingGallery3GalleryAlbumCreateTransaction* album_trans = NULL; - PublishingGallery3Session* _tmp0_ = NULL; - PublishingGallery3PublishingParameters* _tmp1_ = NULL; - PublishingGallery3GalleryAlbumCreateTransaction* _tmp2_ = NULL; + PublishingGallery3Session* _tmp0_; + PublishingGallery3PublishingParameters* _tmp1_; + PublishingGallery3GalleryAlbumCreateTransaction* _tmp2_; GError * _inner_error_ = NULL; #line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); @@ -7451,7 +7463,7 @@ static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGal g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error, self, 0); #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed, self, 0); -#line 7421 "GalleryConnector.c" +#line 7433 "GalleryConnector.c" { #line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -7459,7 +7471,7 @@ static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGal if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 7429 "GalleryConnector.c" +#line 7441 "GalleryConnector.c" goto __catch13_spit_publishing_publishing_error; } #line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7470,14 +7482,14 @@ static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGal g_clear_error (&_inner_error_); #line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7440 "GalleryConnector.c" +#line 7452 "GalleryConnector.c" } } goto __finally13; __catch13_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp3_ = NULL; + GError* _tmp3_; #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" err = _inner_error_; #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7488,7 +7500,7 @@ static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGal publishing_gallery3_gallery_publisher_on_album_create_error (self, G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp3_); #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (err); -#line 7458 "GalleryConnector.c" +#line 7470 "GalleryConnector.c" } __finally13: #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7501,71 +7513,71 @@ static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGal g_clear_error (&_inner_error_); #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7471 "GalleryConnector.c" +#line 7483 "GalleryConnector.c" } #line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_transaction_unref0 (album_trans); -#line 7475 "GalleryConnector.c" +#line 7487 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) { #line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_publish_complete ((PublishingGallery3GalleryPublisher*) self, _sender, num_photos_published); -#line 7482 "GalleryConnector.c" +#line 7494 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) { #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_publish_error ((PublishingGallery3GalleryPublisher*) self, _sender, err); -#line 7489 "GalleryConnector.c" +#line 7501 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) { #line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_upload_status_updated ((PublishingGallery3GalleryPublisher*) self, file_number, fraction_complete); -#line 7496 "GalleryConnector.c" +#line 7508 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters) { - PublishingGallery3PublishingParameters* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; + PublishingGallery3PublishingParameters* _tmp0_; + gboolean _tmp1_; + gboolean _tmp2_; gint _tmp3_ = 0; - PublishingGallery3PublishingParameters* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - PublishingGallery3PublishingParameters* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; - SpitPublishingPluginHost* _tmp10_ = NULL; - SpitPublishingPluginHost* _tmp11_ = NULL; - PublishingGallery3PublishingParameters* _tmp12_ = NULL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; - PublishingGallery3PublishingParameters* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; - gboolean _tmp17_ = FALSE; - void* _tmp18_ = NULL; - GDestroyNotify _tmp19_ = NULL; - SpitPublishingProgressCallback _tmp20_ = NULL; - gboolean _tmp21_ = FALSE; + PublishingGallery3PublishingParameters* _tmp4_; + gint _tmp5_; + gint _tmp6_; + PublishingGallery3PublishingParameters* _tmp7_; + gint _tmp8_; + gint _tmp9_; + SpitPublishingPluginHost* _tmp10_; + SpitPublishingPluginHost* _tmp11_; + PublishingGallery3PublishingParameters* _tmp12_; + gint _tmp13_; + gint _tmp14_; + PublishingGallery3PublishingParameters* _tmp15_; + gboolean _tmp16_; + gboolean _tmp17_; + void* _tmp18_; + GDestroyNotify _tmp19_; + SpitPublishingProgressCallback _tmp20_; + gboolean _tmp21_; PublishingGallery3Uploader* uploader = NULL; - PublishingGallery3Session* _tmp22_ = NULL; - SpitPublishingPluginHost* _tmp23_ = NULL; - gint _tmp24_ = 0; - SpitPublishingPublishable** _tmp25_ = NULL; - SpitPublishingPublishable** _tmp26_ = NULL; - gint _tmp26__length1 = 0; - PublishingGallery3PublishingParameters* _tmp27_ = NULL; - PublishingGallery3Uploader* _tmp28_ = NULL; - PublishingGallery3Uploader* _tmp29_ = NULL; - PublishingGallery3Uploader* _tmp30_ = NULL; - PublishingGallery3Uploader* _tmp31_ = NULL; - PublishingGallery3Uploader* _tmp32_ = NULL; + PublishingGallery3Session* _tmp22_; + SpitPublishingPluginHost* _tmp23_; + gint _tmp24_; + SpitPublishingPublishable** _tmp25_; + SpitPublishingPublishable** _tmp26_; + gint _tmp26__length1; + PublishingGallery3PublishingParameters* _tmp27_; + PublishingGallery3Uploader* _tmp28_; + PublishingGallery3Uploader* _tmp29_; + PublishingGallery3Uploader* _tmp30_; + PublishingGallery3Uploader* _tmp31_; + PublishingGallery3Uploader* _tmp32_; #line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7590,11 +7602,11 @@ static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3 if (_tmp6_ <= 0) { #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = 0; -#line 7560 "GalleryConnector.c" +#line 7572 "GalleryConnector.c" } else { #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = 1; -#line 7564 "GalleryConnector.c" +#line 7576 "GalleryConnector.c" } #line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_set_scaling_constraint_id (self, _tmp3_); @@ -7646,7 +7658,7 @@ static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3 if (!_tmp21_) { #line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7616 "GalleryConnector.c" +#line 7628 "GalleryConnector.c" } #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp22_ = self->priv->session; @@ -7682,13 +7694,13 @@ static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3 publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_gallery3_gallery_publisher_on_upload_status_updated_spit_publishing_progress_callback, self); #line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_batch_uploader_unref0 (uploader); -#line 7652 "GalleryConnector.c" +#line 7664 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_do_show_success_pane (PublishingGallery3GalleryPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7701,12 +7713,12 @@ static void publishing_gallery3_gallery_publisher_do_show_success_pane (Publishi _tmp1_ = self->priv->host; #line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_publishing_plugin_host_install_success_pane (_tmp1_); -#line 7671 "GalleryConnector.c" +#line 7683 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_service_welcome_login (PublishingGallery3GalleryPublisher* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7715,25 +7727,25 @@ static void publishing_gallery3_gallery_publisher_on_service_welcome_login (Publ if (!_tmp0_) { #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7685 "GalleryConnector.c" +#line 7697 "GalleryConnector.c" } #line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:1101: EVENT: user clicked 'Login' in welcome pan" \ "e."); #line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_INTRO); -#line 7691 "GalleryConnector.c" +#line 7703 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_credentials_login (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username, const gchar* password) { - gboolean _tmp0_ = FALSE; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; + gboolean _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp5_; + const gchar* _tmp6_; #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7748,7 +7760,7 @@ static void publishing_gallery3_gallery_publisher_on_credentials_login (Publishi if (!_tmp0_) { #line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7717 "GalleryConnector.c" +#line 7729 "GalleryConnector.c" } #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = username; @@ -7771,12 +7783,12 @@ static void publishing_gallery3_gallery_publisher_on_credentials_login (Publishi _tmp6_ = password; #line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_network_login (self, _tmp4_, _tmp5_, _tmp6_); -#line 7739 "GalleryConnector.c" +#line 7751 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_credentials_go_back (PublishingGallery3GalleryPublisher* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7785,29 +7797,29 @@ static void publishing_gallery3_gallery_publisher_on_credentials_go_back (Publis if (!_tmp0_) { #line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7753 "GalleryConnector.c" +#line 7765 "GalleryConnector.c" } #line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:1123: EVENT: user is attempting to go back."); #line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (self); -#line 7759 "GalleryConnector.c" +#line 7771 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_key_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingGallery3Session* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - PublishingRESTSupportTransaction* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - PublishingRESTSupportTransaction* _tmp10_ = NULL; - guint _tmp11_ = 0U; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingGallery3Session* _tmp5_; + gboolean _tmp6_; + PublishingRESTSupportTransaction* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + PublishingRESTSupportTransaction* _tmp10_; + guint _tmp11_; #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7830,7 +7842,7 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_error (Publishing if (!_tmp4_) { #line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7798 "GalleryConnector.c" +#line 7810 "GalleryConnector.c" } #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = self->priv->session; @@ -7840,7 +7852,7 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_error (Publishing if (_tmp6_) { #line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7808 "GalleryConnector.c" +#line 7820 "GalleryConnector.c" } #line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = bad_txn; @@ -7860,10 +7872,10 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_error (Publishing if (_tmp11_ == ((guint) 403)) { #line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY); -#line 7828 "GalleryConnector.c" +#line 7840 "GalleryConnector.c" } else { - PublishingRESTSupportTransaction* _tmp12_ = NULL; - guint _tmp13_ = 0U; + PublishingRESTSupportTransaction* _tmp12_; + guint _tmp13_; #line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp12_ = bad_txn; #line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7872,33 +7884,33 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_error (Publishing if (_tmp13_ == ((guint) 400)) { #line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL); -#line 7840 "GalleryConnector.c" +#line 7852 "GalleryConnector.c" } else { - SpitPublishingPluginHost* _tmp14_ = NULL; - GError* _tmp15_ = NULL; + SpitPublishingPluginHost* _tmp14_; + GError* _tmp15_; #line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp14_ = self->priv->host; #line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp15_ = err; #line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_); -#line 7850 "GalleryConnector.c" +#line 7862 "GalleryConnector.c" } } } static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingGallery3Session* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - PublishingRESTSupportTransaction* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingGallery3Session* _tmp5_; + gboolean _tmp6_; + PublishingRESTSupportTransaction* _tmp7_; + gchar* _tmp8_; + const gchar* _tmp9_; #line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7921,7 +7933,7 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (Publish if (!_tmp4_) { #line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7889 "GalleryConnector.c" +#line 7901 "GalleryConnector.c" } #line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = self->priv->session; @@ -7931,7 +7943,7 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (Publish if (_tmp6_) { #line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7899 "GalleryConnector.c" +#line 7911 "GalleryConnector.c" } #line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = txn; @@ -7947,17 +7959,17 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (Publish if (_tmp9_ == NULL) { #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:1178: key doesn\'t exist"); -#line 7915 "GalleryConnector.c" +#line 7927 "GalleryConnector.c" } else { gchar* url = NULL; - gchar* _tmp10_ = NULL; + gchar* _tmp10_; gchar* username = NULL; - gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - PublishingGallery3Session* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; + gchar* _tmp11_; + const gchar* _tmp12_; + PublishingGallery3Session* _tmp13_; + const gchar* _tmp14_; + const gchar* _tmp15_; + const gchar* _tmp16_; #line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp10_ = publishing_gallery3_gallery_publisher_get_gallery_url (self); #line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7988,24 +8000,24 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (Publish _g_free0 (username); #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (url); -#line 7956 "GalleryConnector.c" +#line 7968 "GalleryConnector.c" } } static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingGallery3Session* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - PublishingRESTSupportTransaction* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - PublishingRESTSupportTransaction* _tmp10_ = NULL; - guint _tmp11_ = 0U; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingGallery3Session* _tmp5_; + gboolean _tmp6_; + PublishingRESTSupportTransaction* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + PublishingRESTSupportTransaction* _tmp10_; + guint _tmp11_; #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8028,7 +8040,7 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (Pub if (!_tmp4_) { #line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7996 "GalleryConnector.c" +#line 8008 "GalleryConnector.c" } #line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = self->priv->session; @@ -8038,7 +8050,7 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (Pub if (!_tmp6_) { #line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8006 "GalleryConnector.c" +#line 8018 "GalleryConnector.c" } #line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = bad_txn; @@ -8058,10 +8070,10 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (Pub if (_tmp11_ == ((guint) 403)) { #line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY); -#line 8026 "GalleryConnector.c" +#line 8038 "GalleryConnector.c" } else { - PublishingRESTSupportTransaction* _tmp12_ = NULL; - guint _tmp13_ = 0U; + PublishingRESTSupportTransaction* _tmp12_; + guint _tmp13_; #line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp12_ = bad_txn; #line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8070,38 +8082,38 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (Pub if (_tmp13_ == ((guint) 400)) { #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL); -#line 8038 "GalleryConnector.c" +#line 8050 "GalleryConnector.c" } else { - SpitPublishingPluginHost* _tmp14_ = NULL; - GError* _tmp15_ = NULL; + SpitPublishingPluginHost* _tmp14_; + GError* _tmp15_; #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp14_ = self->priv->host; #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp15_ = err; #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_); -#line 8048 "GalleryConnector.c" +#line 8060 "GalleryConnector.c" } } } static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingGallery3Session* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingGallery3Session* _tmp5_; + gboolean _tmp6_; gchar** album_urls = NULL; - PublishingRESTSupportTransaction* _tmp7_ = NULL; - gint _tmp8_ = 0; - gchar** _tmp9_ = NULL; - gint album_urls_length1 = 0; - gint _album_urls_size_ = 0; - gchar** _tmp10_ = NULL; - gint _tmp10__length1 = 0; + PublishingRESTSupportTransaction* _tmp7_; + gint _tmp8_; + gchar** _tmp9_; + gint album_urls_length1; + gint _album_urls_size_; + gchar** _tmp10_; + gint _tmp10__length1; #line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8124,7 +8136,7 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete ( if (!_tmp4_) { #line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8092 "GalleryConnector.c" +#line 8104 "GalleryConnector.c" } #line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = self->priv->session; @@ -8134,7 +8146,7 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete ( if (!_tmp6_) { #line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8102 "GalleryConnector.c" +#line 8114 "GalleryConnector.c" } #line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:1242: EVENT: retrieving all album URLs."); @@ -8154,19 +8166,19 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete ( _tmp10__length1 = album_urls_length1; #line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (NULL == _tmp10_) { -#line 8122 "GalleryConnector.c" +#line 8134 "GalleryConnector.c" gchar* url = NULL; - PublishingGallery3Session* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; + PublishingGallery3Session* _tmp11_; + const gchar* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; gchar* username = NULL; - PublishingGallery3Session* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; + PublishingGallery3Session* _tmp15_; + const gchar* _tmp16_; + const gchar* _tmp17_; + gchar* _tmp18_; + const gchar* _tmp19_; + const gchar* _tmp20_; #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp11_ = self->priv->session; #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8197,37 +8209,37 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete ( _g_free0 (username); #line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (url); -#line 8165 "GalleryConnector.c" +#line 8177 "GalleryConnector.c" } else { - gchar** _tmp21_ = NULL; - gint _tmp21__length1 = 0; + gchar** _tmp21_; + gint _tmp21__length1; #line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp21_ = album_urls; #line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp21__length1 = album_urls_length1; #line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_fetch_albums (self, _tmp21_, _tmp21__length1, (guint) 0); -#line 8175 "GalleryConnector.c" +#line 8187 "GalleryConnector.c" } #line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" album_urls = (_vala_array_free (album_urls, album_urls_length1, (GDestroyNotify) g_free), NULL); -#line 8179 "GalleryConnector.c" +#line 8191 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_album_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingGallery3Session* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - PublishingRESTSupportTransaction* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - PublishingRESTSupportTransaction* _tmp10_ = NULL; - guint _tmp11_ = 0U; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingGallery3Session* _tmp5_; + gboolean _tmp6_; + PublishingRESTSupportTransaction* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + PublishingRESTSupportTransaction* _tmp10_; + guint _tmp11_; #line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8250,7 +8262,7 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_error (Publishi if (!_tmp4_) { #line 1266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8218 "GalleryConnector.c" +#line 8230 "GalleryConnector.c" } #line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = self->priv->session; @@ -8260,7 +8272,7 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_error (Publishi if (!_tmp6_) { #line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8228 "GalleryConnector.c" +#line 8240 "GalleryConnector.c" } #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = bad_txn; @@ -8280,10 +8292,10 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_error (Publishi if (_tmp11_ == ((guint) 403)) { #line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY); -#line 8248 "GalleryConnector.c" +#line 8260 "GalleryConnector.c" } else { - PublishingRESTSupportTransaction* _tmp12_ = NULL; - guint _tmp13_ = 0U; + PublishingRESTSupportTransaction* _tmp12_; + guint _tmp13_; #line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp12_ = bad_txn; #line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8292,53 +8304,53 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_error (Publishi if (_tmp13_ == ((guint) 400)) { #line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL); -#line 8260 "GalleryConnector.c" +#line 8272 "GalleryConnector.c" } else { - SpitPublishingPluginHost* _tmp14_ = NULL; - GError* _tmp15_ = NULL; + SpitPublishingPluginHost* _tmp14_; + GError* _tmp15_; #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp14_ = self->priv->host; #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp15_ = err; #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_); -#line 8270 "GalleryConnector.c" +#line 8282 "GalleryConnector.c" } } } -static void _vala_array_add5 (PublishingGallery3Album*** array, int* length, int* size, PublishingGallery3Album* value) { +static void _vala_array_add5 (PublishingGallery3Album** * array, int* length, int* size, PublishingGallery3Album* value) { #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if ((*length) == (*size)) { #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *array = g_renew (PublishingGallery3Album*, *array, (*size) + 1); -#line 8283 "GalleryConnector.c" +#line 8295 "GalleryConnector.c" } #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" (*array)[(*length)++] = value; #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" (*array)[*length] = NULL; -#line 8289 "GalleryConnector.c" +#line 8301 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; PublishingGallery3Album** new_albums = NULL; - gint new_albums_length1 = 0; - gint _new_albums_size_ = 0; - gboolean _tmp4_ = FALSE; - PublishingGallery3Session* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - PublishingRESTSupportTransaction* _tmp23_ = NULL; - gboolean _tmp24_ = FALSE; - gboolean _tmp25_ = FALSE; + gint new_albums_length1; + gint _new_albums_size_; + gboolean _tmp4_; + PublishingGallery3Session* _tmp5_; + gboolean _tmp6_; + PublishingRESTSupportTransaction* _tmp23_; + gboolean _tmp24_; + gboolean _tmp25_; GError * _inner_error_ = NULL; #line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); @@ -8370,7 +8382,7 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi new_albums = (_vala_array_free (new_albums, new_albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL); #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8338 "GalleryConnector.c" +#line 8350 "GalleryConnector.c" } #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = self->priv->session; @@ -8382,21 +8394,21 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi new_albums = (_vala_array_free (new_albums, new_albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL); #line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8350 "GalleryConnector.c" +#line 8362 "GalleryConnector.c" } #line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:1309: EVENT: user is attempting to populate the " \ "album list."); -#line 8354 "GalleryConnector.c" +#line 8366 "GalleryConnector.c" { PublishingGallery3Album** _tmp7_ = NULL; - PublishingRESTSupportTransaction* _tmp8_ = NULL; - gint _tmp9_ = 0; - PublishingGallery3Album** _tmp10_ = NULL; - gint _tmp7__length1 = 0; - gint __tmp7__size_ = 0; - PublishingGallery3Album** _tmp11_ = NULL; - gint _tmp11__length1 = 0; + PublishingRESTSupportTransaction* _tmp8_; + gint _tmp9_; + PublishingGallery3Album** _tmp10_; + gint _tmp7__length1; + gint __tmp7__size_; + PublishingGallery3Album** _tmp11_; + gint _tmp11__length1; #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp8_ = txn; #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8411,7 +8423,7 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 8378 "GalleryConnector.c" +#line 8390 "GalleryConnector.c" goto __catch14_spit_publishing_publishing_error; } #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8422,7 +8434,7 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi g_clear_error (&_inner_error_); #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8389 "GalleryConnector.c" +#line 8401 "GalleryConnector.c" } #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp11_ = _tmp7_; @@ -8442,14 +8454,14 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi _new_albums_size_ = new_albums_length1; #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = (_vala_array_free (_tmp7_, _tmp7__length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL); -#line 8409 "GalleryConnector.c" +#line 8421 "GalleryConnector.c" } goto __finally14; __catch14_spit_publishing_publishing_error: { GError* err = NULL; - PublishingRESTSupportTransaction* _tmp12_ = NULL; - GError* _tmp13_ = NULL; + PublishingRESTSupportTransaction* _tmp12_; + GError* _tmp13_; #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" err = _inner_error_; #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8462,7 +8474,7 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi publishing_gallery3_gallery_publisher_on_album_fetch_error (self, _tmp12_, _tmp13_); #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (err); -#line 8429 "GalleryConnector.c" +#line 8441 "GalleryConnector.c" } __finally14: #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8475,39 +8487,39 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi g_clear_error (&_inner_error_); #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8442 "GalleryConnector.c" +#line 8454 "GalleryConnector.c" } { gint i = 0; #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" i = 0; -#line 8448 "GalleryConnector.c" +#line 8460 "GalleryConnector.c" { gboolean _tmp14_ = FALSE; #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp14_ = TRUE; #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" while (TRUE) { -#line 8455 "GalleryConnector.c" - gint _tmp16_ = 0; - PublishingGallery3Album** _tmp17_ = NULL; - gint _tmp17__length1 = 0; - PublishingGallery3Album** _tmp18_ = NULL; - gint _tmp18__length1 = 0; - PublishingGallery3Album** _tmp19_ = NULL; - gint _tmp19__length1 = 0; - gint _tmp20_ = 0; - PublishingGallery3Album* _tmp21_ = NULL; - PublishingGallery3Album* _tmp22_ = NULL; +#line 8467 "GalleryConnector.c" + gint _tmp16_; + PublishingGallery3Album** _tmp17_; + gint _tmp17__length1; + PublishingGallery3Album** _tmp18_; + gint _tmp18__length1; + PublishingGallery3Album** _tmp19_; + gint _tmp19__length1; + gint _tmp20_; + PublishingGallery3Album* _tmp21_; + PublishingGallery3Album* _tmp22_; #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!_tmp14_) { -#line 8468 "GalleryConnector.c" - gint _tmp15_ = 0; +#line 8480 "GalleryConnector.c" + gint _tmp15_; #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp15_ = i; #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" i = _tmp15_ + 1; -#line 8474 "GalleryConnector.c" +#line 8486 "GalleryConnector.c" } #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp14_ = FALSE; @@ -8521,7 +8533,7 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi if (!(_tmp16_ <= (_tmp17__length1 - 1))) { #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 8488 "GalleryConnector.c" +#line 8500 "GalleryConnector.c" } #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp18_ = self->priv->albums; @@ -8539,7 +8551,7 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi _tmp22_ = _publishing_gallery3_album_ref0 (_tmp21_); #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _vala_array_add5 (&self->priv->albums, &self->priv->albums_length1, &self->priv->_albums_size_, _tmp22_); -#line 8506 "GalleryConnector.c" +#line 8518 "GalleryConnector.c" } } } @@ -8551,15 +8563,15 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi _tmp25_ = _tmp24_; #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp25_) { -#line 8518 "GalleryConnector.c" - PublishingRESTSupportTransaction* _tmp26_ = NULL; - gchar** _tmp27_ = NULL; - gint _tmp27__length1 = 0; - gchar** _tmp28_ = NULL; - gint _tmp28__length1 = 0; - PublishingRESTSupportTransaction* _tmp29_ = NULL; - guint _tmp30_ = 0U; - guint _tmp31_ = 0U; +#line 8530 "GalleryConnector.c" + PublishingRESTSupportTransaction* _tmp26_; + gchar** _tmp27_; + gint _tmp27__length1; + gchar** _tmp28_; + gint _tmp28__length1; + PublishingRESTSupportTransaction* _tmp29_; + guint _tmp30_; + guint _tmp31_; #line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp26_ = txn; #line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8576,20 +8588,20 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi _tmp31_ = _tmp30_; #line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_fetch_albums (self, _tmp28_, _tmp28__length1, _tmp31_); -#line 8543 "GalleryConnector.c" +#line 8555 "GalleryConnector.c" } else { gchar* url = NULL; - PublishingGallery3Session* _tmp32_ = NULL; - const gchar* _tmp33_ = NULL; - const gchar* _tmp34_ = NULL; - gchar* _tmp35_ = NULL; + PublishingGallery3Session* _tmp32_; + const gchar* _tmp33_; + const gchar* _tmp34_; + gchar* _tmp35_; gchar* username = NULL; - PublishingGallery3Session* _tmp36_ = NULL; - const gchar* _tmp37_ = NULL; - const gchar* _tmp38_ = NULL; - gchar* _tmp39_ = NULL; - const gchar* _tmp40_ = NULL; - const gchar* _tmp41_ = NULL; + PublishingGallery3Session* _tmp36_; + const gchar* _tmp37_; + const gchar* _tmp38_; + gchar* _tmp39_; + const gchar* _tmp40_; + const gchar* _tmp41_; #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp32_ = self->priv->session; #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8620,27 +8632,27 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi _g_free0 (username); #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (url); -#line 8587 "GalleryConnector.c" +#line 8599 "GalleryConnector.c" } #line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" new_albums = (_vala_array_free (new_albums, new_albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL); -#line 8591 "GalleryConnector.c" +#line 8603 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_album_create_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingGallery3Session* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - PublishingRESTSupportTransaction* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - PublishingRESTSupportTransaction* _tmp10_ = NULL; - guint _tmp11_ = 0U; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingGallery3Session* _tmp5_; + gboolean _tmp6_; + PublishingRESTSupportTransaction* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + PublishingRESTSupportTransaction* _tmp10_; + guint _tmp11_; #line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8663,7 +8675,7 @@ static void publishing_gallery3_gallery_publisher_on_album_create_error (Publish if (!_tmp4_) { #line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8630 "GalleryConnector.c" +#line 8642 "GalleryConnector.c" } #line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = self->priv->session; @@ -8673,7 +8685,7 @@ static void publishing_gallery3_gallery_publisher_on_album_create_error (Publish if (!_tmp6_) { #line 1349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8640 "GalleryConnector.c" +#line 8652 "GalleryConnector.c" } #line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = bad_txn; @@ -8693,10 +8705,10 @@ static void publishing_gallery3_gallery_publisher_on_album_create_error (Publish if (_tmp11_ == ((guint) 403)) { #line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY); -#line 8660 "GalleryConnector.c" +#line 8672 "GalleryConnector.c" } else { - PublishingRESTSupportTransaction* _tmp12_ = NULL; - guint _tmp13_ = 0U; + PublishingRESTSupportTransaction* _tmp12_; + guint _tmp13_; #line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp12_ = bad_txn; #line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8705,43 +8717,43 @@ static void publishing_gallery3_gallery_publisher_on_album_create_error (Publish if (_tmp13_ == ((guint) 400)) { #line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL); -#line 8672 "GalleryConnector.c" +#line 8684 "GalleryConnector.c" } else { - SpitPublishingPluginHost* _tmp14_ = NULL; - GError* _tmp15_ = NULL; + SpitPublishingPluginHost* _tmp14_; + GError* _tmp15_; #line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp14_ = self->priv->host; #line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp15_ = err; #line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_); -#line 8682 "GalleryConnector.c" +#line 8694 "GalleryConnector.c" } } } static void publishing_gallery3_gallery_publisher_on_album_create_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingGallery3Session* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingGallery3Session* _tmp5_; + gboolean _tmp6_; PublishingGallery3PublishingParameters* new_params = NULL; - PublishingRESTSupportTransaction* _tmp7_ = NULL; - PublishingGallery3PublishingParameters* _tmp8_ = NULL; - PublishingGallery3PublishingParameters* _tmp9_ = NULL; - PublishingGallery3PublishingParameters* _tmp10_ = NULL; - PublishingGallery3PublishingParameters* _tmp11_ = NULL; - PublishingRESTSupportTransaction* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - PublishingGallery3PublishingParameters* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - PublishingGallery3PublishingParameters* _tmp18_ = NULL; + PublishingRESTSupportTransaction* _tmp7_; + PublishingGallery3PublishingParameters* _tmp8_; + PublishingGallery3PublishingParameters* _tmp9_; + PublishingGallery3PublishingParameters* _tmp10_; + PublishingGallery3PublishingParameters* _tmp11_; + PublishingRESTSupportTransaction* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + PublishingGallery3PublishingParameters* _tmp15_; + const gchar* _tmp16_; + const gchar* _tmp17_; + PublishingGallery3PublishingParameters* _tmp18_; #line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8764,7 +8776,7 @@ static void publishing_gallery3_gallery_publisher_on_album_create_complete (Publ if (!_tmp4_) { #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8731 "GalleryConnector.c" +#line 8743 "GalleryConnector.c" } #line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = self->priv->session; @@ -8774,7 +8786,7 @@ static void publishing_gallery3_gallery_publisher_on_album_create_complete (Publ if (!_tmp6_) { #line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8741 "GalleryConnector.c" +#line 8753 "GalleryConnector.c" } #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = txn; @@ -8813,42 +8825,42 @@ static void publishing_gallery3_gallery_publisher_on_album_create_complete (Publ publishing_gallery3_gallery_publisher_do_publish (self, _tmp18_); #line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_gallery3_publishing_parameters_unref0 (new_params); -#line 8779 "GalleryConnector.c" +#line 8791 "GalleryConnector.c" } static gpointer _publishing_rest_support_batch_uploader_ref0 (gpointer self) { #line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self ? publishing_rest_support_batch_uploader_ref (self) : NULL; -#line 8786 "GalleryConnector.c" +#line 8798 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportBatchUploader* _uploader, GError* err) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; PublishingGallery3Uploader* uploader = NULL; - PublishingRESTSupportBatchUploader* _tmp1_ = NULL; - PublishingGallery3Uploader* _tmp2_ = NULL; + PublishingRESTSupportBatchUploader* _tmp1_; + PublishingGallery3Uploader* _tmp2_; GError* g3_err = NULL; - GError* _tmp3_ = NULL; - GError* _tmp4_ = NULL; - GError* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - PublishingGallery3Uploader* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - PublishingGallery3Uploader* _tmp10_ = NULL; - guint _tmp11_ = 0U; - guint _tmp12_ = 0U; - PublishingGallery3Uploader* _tmp13_ = NULL; - guint _tmp14_ = 0U; - PublishingGallery3Uploader* _tmp15_ = NULL; - guint _tmp16_ = 0U; - PublishingGallery3Uploader* _tmp17_ = NULL; - guint _tmp18_ = 0U; - guint _tmp19_ = 0U; - SpitPublishingPluginHost* _tmp36_ = NULL; - GError* _tmp37_ = NULL; + GError* _tmp3_; + GError* _tmp4_; + GError* _tmp5_; + const gchar* _tmp6_; + PublishingGallery3Uploader* _tmp7_; + const gchar* _tmp8_; + const gchar* _tmp9_; + PublishingGallery3Uploader* _tmp10_; + guint _tmp11_; + guint _tmp12_; + PublishingGallery3Uploader* _tmp13_; + guint _tmp14_; + PublishingGallery3Uploader* _tmp15_; + guint _tmp16_; + PublishingGallery3Uploader* _tmp17_; + guint _tmp18_; + guint _tmp19_; + SpitPublishingPluginHost* _tmp36_; + GError* _tmp37_; #line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8859,7 +8871,7 @@ static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGa if (!_tmp0_) { #line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8825 "GalleryConnector.c" +#line 8837 "GalleryConnector.c" } #line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = _uploader; @@ -8911,19 +8923,19 @@ static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGa _tmp19_ = _tmp18_; #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp19_ == ((guint) 400)) { -#line 8877 "GalleryConnector.c" - GError* _tmp20_ = NULL; - GError* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; - PublishingGallery3Uploader* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - PublishingGallery3Uploader* _tmp29_ = NULL; - SpitPublishingPublisherMediaType _tmp30_ = 0; - SpitPublishingPublisherMediaType _tmp31_ = 0; +#line 8889 "GalleryConnector.c" + GError* _tmp20_; + GError* _tmp21_; + const gchar* _tmp22_; + PublishingGallery3Uploader* _tmp23_; + const gchar* _tmp24_; + const gchar* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + PublishingGallery3Uploader* _tmp29_; + SpitPublishingPublisherMediaType _tmp30_; + SpitPublishingPublisherMediaType _tmp31_; #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp20_ = g3_err; #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8956,11 +8968,11 @@ static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGa _tmp31_ = _tmp30_; #line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp31_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { -#line 8922 "GalleryConnector.c" - GError* _tmp32_ = NULL; - GError* _tmp33_ = NULL; - const gchar* _tmp34_ = NULL; - gchar* _tmp35_ = NULL; +#line 8934 "GalleryConnector.c" + GError* _tmp32_; + GError* _tmp33_; + const gchar* _tmp34_; + gchar* _tmp35_; #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp32_ = g3_err; #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8973,7 +8985,7 @@ static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGa _g_free0 (_tmp33_->message); #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp33_->message = _tmp35_; -#line 8939 "GalleryConnector.c" +#line 8951 "GalleryConnector.c" } } #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8986,19 +8998,19 @@ static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGa _g_error_free0 (g3_err); #line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_batch_uploader_unref0 (uploader); -#line 8952 "GalleryConnector.c" +#line 8964 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_upload_status_updated (PublishingGallery3GalleryPublisher* self, gint file_number, gdouble completed_fraction) { - gboolean _tmp0_ = FALSE; - gdouble _tmp1_ = 0.0; - SpitPublishingProgressCallback _tmp2_ = NULL; - void* _tmp2__target = NULL; - SpitPublishingProgressCallback _tmp3_ = NULL; - void* _tmp3__target = NULL; - gint _tmp4_ = 0; - gdouble _tmp5_ = 0.0; + gboolean _tmp0_; + gdouble _tmp1_; + SpitPublishingProgressCallback _tmp2_; + void* _tmp2__target; + SpitPublishingProgressCallback _tmp3_; + void* _tmp3__target; + gint _tmp4_; + gdouble _tmp5_; #line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9007,7 +9019,7 @@ static void publishing_gallery3_gallery_publisher_on_upload_status_updated (Publ if (!_tmp0_) { #line 1430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8973 "GalleryConnector.c" +#line 8985 "GalleryConnector.c" } #line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = completed_fraction; @@ -9030,19 +9042,19 @@ static void publishing_gallery3_gallery_publisher_on_upload_status_updated (Publ _tmp5_ = completed_fraction; #line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ (_tmp4_, _tmp5_, _tmp3__target); -#line 8995 "GalleryConnector.c" +#line 9007 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_publish_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) { - PublishingRESTSupportBatchUploader* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportBatchUploader* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingGallery3Session* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - gint _tmp7_ = 0; + PublishingRESTSupportBatchUploader* _tmp0_; + guint _tmp1_; + PublishingRESTSupportBatchUploader* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingGallery3Session* _tmp5_; + gboolean _tmp6_; + gint _tmp7_; #line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9065,7 +9077,7 @@ static void publishing_gallery3_gallery_publisher_on_publish_complete (Publishin if (!_tmp4_) { #line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 9030 "GalleryConnector.c" +#line 9042 "GalleryConnector.c" } #line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = self->priv->session; @@ -9075,7 +9087,7 @@ static void publishing_gallery3_gallery_publisher_on_publish_complete (Publishin if (!_tmp6_) { #line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 9040 "GalleryConnector.c" +#line 9052 "GalleryConnector.c" } #line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = num_published; @@ -9084,17 +9096,17 @@ static void publishing_gallery3_gallery_publisher_on_publish_complete (Publishin "shed", _tmp7_); #line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_success_pane (self); -#line 9048 "GalleryConnector.c" +#line 9060 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout (PublishingGallery3GalleryPublisher* self) { - PublishingGallery3PublishingOptionsPane* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingGallery3PublishingOptionsPane* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingGallery3Session* _tmp5_ = NULL; + PublishingGallery3PublishingOptionsPane* _tmp0_; + guint _tmp1_; + PublishingGallery3PublishingOptionsPane* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingGallery3Session* _tmp5_; #line 1461 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9115,7 +9127,7 @@ static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_log if (!_tmp4_) { #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 9079 "GalleryConnector.c" +#line 9091 "GalleryConnector.c" } #line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:1470: EVENT: user is attempting to log out."); @@ -9125,18 +9137,18 @@ static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_log publishing_gallery3_session_deauthenticate (_tmp5_); #line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (self); -#line 9089 "GalleryConnector.c" +#line 9101 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters) { - PublishingGallery3PublishingOptionsPane* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingGallery3PublishingOptionsPane* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingGallery3PublishingParameters* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + PublishingGallery3PublishingOptionsPane* _tmp0_; + guint _tmp1_; + PublishingGallery3PublishingOptionsPane* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingGallery3PublishingParameters* _tmp5_; + gboolean _tmp6_; #line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9159,7 +9171,7 @@ static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_pub if (!_tmp4_) { #line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 9123 "GalleryConnector.c" +#line 9135 "GalleryConnector.c" } #line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:1485: EVENT: user is attempting to publish somet" \ @@ -9170,11 +9182,11 @@ static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_pub _tmp6_ = publishing_gallery3_publishing_parameters_is_to_new_album (_tmp5_); #line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp6_) { -#line 9133 "GalleryConnector.c" - PublishingGallery3PublishingParameters* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - PublishingGallery3PublishingParameters* _tmp10_ = NULL; +#line 9145 "GalleryConnector.c" + PublishingGallery3PublishingParameters* _tmp7_; + const gchar* _tmp8_; + const gchar* _tmp9_; + PublishingGallery3PublishingParameters* _tmp10_; #line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = parameters; #line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9187,14 +9199,14 @@ static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_pub _tmp10_ = parameters; #line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_create_album (self, _tmp10_); -#line 9150 "GalleryConnector.c" +#line 9162 "GalleryConnector.c" } else { - PublishingGallery3PublishingParameters* _tmp11_ = NULL; + PublishingGallery3PublishingParameters* _tmp11_; #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp11_ = parameters; #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_publish (self, _tmp11_); -#line 9157 "GalleryConnector.c" +#line 9169 "GalleryConnector.c" } } @@ -9206,7 +9218,7 @@ static void publishing_gallery3_gallery_publisher_class_init (PublishingGallery3 g_type_class_add_private (klass, sizeof (PublishingGallery3GalleryPublisherPrivate)); #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (klass)->finalize = publishing_gallery3_gallery_publisher_finalize; -#line 9169 "GalleryConnector.c" +#line 9181 "GalleryConnector.c" } @@ -9214,14 +9226,14 @@ static void publishing_gallery3_gallery_publisher_spit_publishing_publisher_inte #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface); #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_gallery3_gallery_publisher_real_is_running; + iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_gallery3_gallery_publisher_real_is_running; #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_gallery3_gallery_publisher_real_get_service; + iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_gallery3_gallery_publisher_real_get_service; #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->start = (void (*)(SpitPublishingPublisher*)) publishing_gallery3_gallery_publisher_real_start; + iface->start = (void (*) (SpitPublishingPublisher *)) publishing_gallery3_gallery_publisher_real_start; #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_gallery3_gallery_publisher_real_stop; -#line 9184 "GalleryConnector.c" + iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_gallery3_gallery_publisher_real_stop; +#line 9196 "GalleryConnector.c" } @@ -9232,6 +9244,10 @@ static void publishing_gallery3_gallery_publisher_instance_init (PublishingGalle self->priv->host = NULL; #line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->progress_reporter = NULL; +#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" + self->priv->progress_reporter_target = self; +#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" + self->priv->progress_reporter_target_destroy_notify = NULL; #line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->service = NULL; #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9248,11 +9264,11 @@ static void publishing_gallery3_gallery_publisher_instance_init (PublishingGalle self->priv->key = NULL; #line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->publishing_options_pane = NULL; -#line 9211 "GalleryConnector.c" +#line 9227 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_finalize (GObject* obj) { +static void publishing_gallery3_gallery_publisher_finalize (GObject * obj) { PublishingGallery3GalleryPublisher * self; #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, PublishingGallery3GalleryPublisher); @@ -9274,7 +9290,7 @@ static void publishing_gallery3_gallery_publisher_finalize (GObject* obj) { _g_object_unref0 (self->priv->publishing_options_pane); #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (publishing_gallery3_gallery_publisher_parent_class)->finalize (obj); -#line 9237 "GalleryConnector.c" +#line 9253 "GalleryConnector.c" } @@ -9299,137 +9315,136 @@ static PublishingGallery3Album** _vala_array_dup3 (PublishingGallery3Album** sel result = g_new0 (PublishingGallery3Album*, length + 1); #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" for (i = 0; i < length; i++) { -#line 9262 "GalleryConnector.c" - PublishingGallery3Album* _tmp0_ = NULL; +#line 9278 "GalleryConnector.c" + PublishingGallery3Album* _tmp0_; #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = _publishing_gallery3_album_ref0 (self[i]); #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" result[i] = _tmp0_; -#line 9268 "GalleryConnector.c" +#line 9284 "GalleryConnector.c" } #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 9272 "GalleryConnector.c" +#line 9288 "GalleryConnector.c" } static void _publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked ((PublishingGallery3PublishingOptionsPane*) self); -#line 9279 "GalleryConnector.c" +#line 9295 "GalleryConnector.c" } static void _publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked ((PublishingGallery3PublishingOptionsPane*) self); -#line 9286 "GalleryConnector.c" +#line 9302 "GalleryConnector.c" } static void _publishing_gallery3_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_on_new_album_entry_changed ((PublishingGallery3PublishingOptionsPane*) self); -#line 9293 "GalleryConnector.c" +#line 9309 "GalleryConnector.c" } static void _publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed ((PublishingGallery3PublishingOptionsPane*) self); -#line 9300 "GalleryConnector.c" +#line 9316 "GalleryConnector.c" } static void _publishing_gallery3_publishing_options_pane_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_on_pixels_changed ((PublishingGallery3PublishingOptionsPane*) self); -#line 9307 "GalleryConnector.c" +#line 9323 "GalleryConnector.c" } static void _publishing_gallery3_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_on_logout_clicked ((PublishingGallery3PublishingOptionsPane*) self); -#line 9314 "GalleryConnector.c" +#line 9330 "GalleryConnector.c" } static void _publishing_gallery3_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_on_publish_clicked ((PublishingGallery3PublishingOptionsPane*) self); -#line 9321 "GalleryConnector.c" +#line 9337 "GalleryConnector.c" } PublishingGallery3PublishingOptionsPane* publishing_gallery3_publishing_options_pane_construct (GType object_type, SpitPublishingPluginHost* host, const gchar* url, const gchar* username, PublishingGallery3Album** albums, int albums_length1, GtkBuilder* builder, gboolean strip_metadata, gint scaling_id, gint scaling_pixels) { PublishingGallery3PublishingOptionsPane * self = NULL; - PublishingGallery3Album** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - PublishingGallery3Album** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - SpitPublishingPluginHost* _tmp2_ = NULL; - GtkBuilder* _tmp3_ = NULL; - GtkBuilder* _tmp4_ = NULL; - GtkBuilder* _tmp5_ = NULL; - GtkBuilder* _tmp6_ = NULL; - GSList* _tmp7_ = NULL; - GSList* _tmp8_ = NULL; - guint _tmp9_ = 0U; - GtkBuilder* _tmp10_ = NULL; - GObject* _tmp11_ = NULL; - GtkGrid* _tmp12_ = NULL; - GtkBuilder* _tmp13_ = NULL; - GObject* _tmp14_ = NULL; - GtkLabel* _tmp15_ = NULL; - GtkBuilder* _tmp16_ = NULL; - GObject* _tmp17_ = NULL; - GtkRadioButton* _tmp18_ = NULL; - GtkBuilder* _tmp19_ = NULL; - GObject* _tmp20_ = NULL; - GtkComboBoxText* _tmp21_ = NULL; - GtkBuilder* _tmp22_ = NULL; - GObject* _tmp23_ = NULL; - GtkComboBoxText* _tmp24_ = NULL; - GtkBuilder* _tmp25_ = NULL; - GObject* _tmp26_ = NULL; - GtkEntry* _tmp27_ = NULL; - GtkBuilder* _tmp28_ = NULL; - GObject* _tmp29_ = NULL; - GtkRadioButton* _tmp30_ = NULL; - GtkBuilder* _tmp31_ = NULL; - GObject* _tmp32_ = NULL; - GtkEntry* _tmp33_ = NULL; - GtkBuilder* _tmp34_ = NULL; - GObject* _tmp35_ = NULL; - GtkCheckButton* _tmp36_ = NULL; - GtkBuilder* _tmp37_ = NULL; - GObject* _tmp38_ = NULL; - GtkButton* _tmp39_ = NULL; - GtkBuilder* _tmp40_ = NULL; - GObject* _tmp41_ = NULL; - GtkButton* _tmp42_ = NULL; - GtkLabel* _tmp43_ = NULL; - const gchar* _tmp44_ = NULL; - const gchar* _tmp45_ = NULL; - const gchar* _tmp46_ = NULL; - gchar* _tmp47_ = NULL; - gchar* _tmp48_ = NULL; - GtkCheckButton* _tmp49_ = NULL; - gboolean _tmp50_ = FALSE; - GtkComboBoxText* _tmp51_ = NULL; - gint _tmp52_ = 0; - GtkEntry* _tmp53_ = NULL; - gint _tmp54_ = 0; - gchar* _tmp55_ = NULL; - gchar* _tmp56_ = NULL; - GtkRadioButton* _tmp57_ = NULL; - GtkRadioButton* _tmp58_ = NULL; - GtkEntry* _tmp59_ = NULL; - GtkComboBoxText* _tmp60_ = NULL; - GtkEntry* _tmp61_ = NULL; - GtkButton* _tmp62_ = NULL; - GtkButton* _tmp63_ = NULL; + PublishingGallery3Album** _tmp0_; + gint _tmp0__length1; + PublishingGallery3Album** _tmp1_; + gint _tmp1__length1; + SpitPublishingPluginHost* _tmp2_; + GtkBuilder* _tmp3_; + GtkBuilder* _tmp4_; + GtkBuilder* _tmp5_; + GtkBuilder* _tmp6_; + GSList* _tmp7_; + GSList* _tmp8_; + guint _tmp9_; + GtkBuilder* _tmp10_; + GObject* _tmp11_; + GtkGrid* _tmp12_; + GtkBuilder* _tmp13_; + GObject* _tmp14_; + GtkLabel* _tmp15_; + GtkBuilder* _tmp16_; + GObject* _tmp17_; + GtkRadioButton* _tmp18_; + GtkBuilder* _tmp19_; + GObject* _tmp20_; + GtkComboBoxText* _tmp21_; + GtkBuilder* _tmp22_; + GObject* _tmp23_; + GtkComboBoxText* _tmp24_; + GtkBuilder* _tmp25_; + GObject* _tmp26_; + GtkEntry* _tmp27_; + GtkBuilder* _tmp28_; + GObject* _tmp29_; + GtkRadioButton* _tmp30_; + GtkBuilder* _tmp31_; + GObject* _tmp32_; + GtkEntry* _tmp33_; + GtkBuilder* _tmp34_; + GObject* _tmp35_; + GtkCheckButton* _tmp36_; + GtkBuilder* _tmp37_; + GObject* _tmp38_; + GtkButton* _tmp39_; + GtkBuilder* _tmp40_; + GObject* _tmp41_; + GtkButton* _tmp42_; + GtkLabel* _tmp43_; + const gchar* _tmp44_; + const gchar* _tmp45_; + gchar* _tmp46_; + gchar* _tmp47_; + GtkCheckButton* _tmp48_; + gboolean _tmp49_; + GtkComboBoxText* _tmp50_; + gint _tmp51_; + GtkEntry* _tmp52_; + gint _tmp53_; + gchar* _tmp54_; + gchar* _tmp55_; + GtkRadioButton* _tmp56_; + GtkRadioButton* _tmp57_; + GtkEntry* _tmp58_; + GtkComboBoxText* _tmp59_; + GtkEntry* _tmp60_; + GtkButton* _tmp61_; + GtkButton* _tmp62_; #line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL); #line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9597,99 +9612,97 @@ PublishingGallery3PublishingOptionsPane* publishing_gallery3_publishing_options_ #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp43_ = self->priv->title_label; #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp44_ = _ ("Publishing to %s as %s."); -#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp45_ = url; + _tmp44_ = url; #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp46_ = username; + _tmp45_ = username; #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp47_ = g_strdup_printf (_tmp44_, _tmp45_, _tmp46_); + _tmp46_ = g_strdup_printf (_ ("Publishing to %s as %s."), _tmp44_, _tmp45_); #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp48_ = _tmp47_; + _tmp47_ = _tmp46_; #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_label_set_label (_tmp43_, _tmp48_); + gtk_label_set_label (_tmp43_, _tmp47_); #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp48_); + _g_free0 (_tmp47_); #line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp49_ = self->priv->strip_metadata_check; + _tmp48_ = self->priv->strip_metadata_check; #line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp50_ = strip_metadata; + _tmp49_ = strip_metadata; #line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp50_); + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp49_); #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp51_ = self->priv->scaling_combo; + _tmp50_ = self->priv->scaling_combo; #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp52_ = scaling_id; + _tmp51_ = scaling_id; #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_combo_box_get_type (), GtkComboBox), _tmp52_); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_combo_box_get_type (), GtkComboBox), _tmp51_); #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp53_ = self->priv->pixels; + _tmp52_ = self->priv->pixels; #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp54_ = scaling_pixels; + _tmp53_ = scaling_pixels; #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp55_ = g_strdup_printf ("%i", _tmp54_); + _tmp54_ = g_strdup_printf ("%i", _tmp53_); #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp56_ = _tmp55_; + _tmp55_ = _tmp54_; #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_entry_set_text (_tmp53_, _tmp56_); + gtk_entry_set_text (_tmp52_, _tmp55_); #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp56_); + _g_free0 (_tmp55_); #line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp57_ = self->priv->use_existing_radio; + _tmp56_ = self->priv->use_existing_radio; #line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0); #line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp58_ = self->priv->create_new_radio; + _tmp57_ = self->priv->create_new_radio; #line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0); #line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp59_ = self->priv->new_album_entry; + _tmp58_ = self->priv->new_album_entry; #line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed, self, 0); #line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp60_ = self->priv->scaling_combo; + _tmp59_ = self->priv->scaling_combo; #line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed_gtk_combo_box_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed_gtk_combo_box_changed, self, 0); #line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp61_ = self->priv->pixels; + _tmp60_ = self->priv->pixels; #line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_pixels_changed_gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_pixels_changed_gtk_editable_changed, self, 0); #line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp62_ = self->priv->logout_button; + _tmp61_ = self->priv->logout_button; #line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (_tmp62_, "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp61_, "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0); #line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp63_ = self->priv->publish_button; + _tmp62_ = self->priv->publish_button; #line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (_tmp63_, "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp62_, "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0); #line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 9627 "GalleryConnector.c" +#line 9640 "GalleryConnector.c" } PublishingGallery3PublishingOptionsPane* publishing_gallery3_publishing_options_pane_new (SpitPublishingPluginHost* host, const gchar* url, const gchar* username, PublishingGallery3Album** albums, int albums_length1, GtkBuilder* builder, gboolean strip_metadata, gint scaling_id, gint scaling_pixels) { #line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_publishing_options_pane_construct (PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, host, url, username, albums, albums_length1, builder, strip_metadata, scaling_id, scaling_pixels); -#line 9634 "GalleryConnector.c" +#line 9647 "GalleryConnector.c" } static void publishing_gallery3_publishing_options_pane_on_publish_clicked (PublishingGallery3PublishingOptionsPane* self) { gchar* album_name = NULL; gint _tmp0_ = 0; - GtkComboBoxText* _tmp1_ = NULL; - gint _tmp2_ = 0; + GtkComboBoxText* _tmp1_; + gint _tmp2_; gint photo_major_axis_size = 0; PublishingGallery3PublishingParameters* param = NULL; - GtkRadioButton* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; - PublishingGallery3PublishingParameters* _tmp34_ = NULL; - gint _tmp35_ = 0; - PublishingGallery3PublishingParameters* _tmp36_ = NULL; - GtkCheckButton* _tmp37_ = NULL; - gboolean _tmp38_ = FALSE; - PublishingGallery3PublishingParameters* _tmp39_ = NULL; + GtkRadioButton* _tmp6_; + gboolean _tmp7_; + PublishingGallery3PublishingParameters* _tmp34_; + gint _tmp35_; + PublishingGallery3PublishingParameters* _tmp36_; + GtkCheckButton* _tmp37_; + gboolean _tmp38_; + PublishingGallery3PublishingParameters* _tmp39_; #line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9698,10 +9711,10 @@ static void publishing_gallery3_publishing_options_pane_on_publish_clicked (Publ _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); #line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp2_ == 1) { -#line 9661 "GalleryConnector.c" - GtkEntry* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gint _tmp5_ = 0; +#line 9674 "GalleryConnector.c" + GtkEntry* _tmp3_; + const gchar* _tmp4_; + gint _tmp5_; #line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = self->priv->pixels; #line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9710,11 +9723,11 @@ static void publishing_gallery3_publishing_options_pane_on_publish_clicked (Publ _tmp5_ = atoi (_tmp4_); #line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = _tmp5_; -#line 9673 "GalleryConnector.c" +#line 9686 "GalleryConnector.c" } else { #line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = -1; -#line 9677 "GalleryConnector.c" +#line 9690 "GalleryConnector.c" } #line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" photo_major_axis_size = _tmp0_; @@ -9724,15 +9737,15 @@ static void publishing_gallery3_publishing_options_pane_on_publish_clicked (Publ _tmp7_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp7_) { -#line 9687 "GalleryConnector.c" - GtkEntry* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - SpitPublishingPluginHost* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - PublishingGallery3PublishingParameters* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; +#line 9700 "GalleryConnector.c" + GtkEntry* _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; + SpitPublishingPluginHost* _tmp11_; + const gchar* _tmp12_; + const gchar* _tmp13_; + PublishingGallery3PublishingParameters* _tmp14_; + const gchar* _tmp15_; #line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp8_ = self->priv->new_album_entry; #line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9761,29 +9774,29 @@ static void publishing_gallery3_publishing_options_pane_on_publish_clicked (Publ _tmp15_ = album_name; #line 1577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:1577: Trying to publish to \"%s\"", _tmp15_); -#line 9724 "GalleryConnector.c" +#line 9737 "GalleryConnector.c" } else { - PublishingGallery3Album** _tmp16_ = NULL; - gint _tmp16__length1 = 0; - GtkComboBoxText* _tmp17_ = NULL; - gint _tmp18_ = 0; - PublishingGallery3Album* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - SpitPublishingPluginHost* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; + PublishingGallery3Album** _tmp16_; + gint _tmp16__length1; + GtkComboBoxText* _tmp17_; + gint _tmp18_; + PublishingGallery3Album* _tmp19_; + const gchar* _tmp20_; + const gchar* _tmp21_; + gchar* _tmp22_; + SpitPublishingPluginHost* _tmp23_; + const gchar* _tmp24_; gchar* album_path = NULL; - PublishingGallery3Album** _tmp25_ = NULL; - gint _tmp25__length1 = 0; - GtkComboBoxText* _tmp26_ = NULL; - gint _tmp27_ = 0; - PublishingGallery3Album* _tmp28_ = NULL; - const gchar* _tmp29_ = NULL; - const gchar* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; - const gchar* _tmp32_ = NULL; - PublishingGallery3PublishingParameters* _tmp33_ = NULL; + PublishingGallery3Album** _tmp25_; + gint _tmp25__length1; + GtkComboBoxText* _tmp26_; + gint _tmp27_; + PublishingGallery3Album* _tmp28_; + const gchar* _tmp29_; + const gchar* _tmp30_; + gchar* _tmp31_; + const gchar* _tmp32_; + PublishingGallery3PublishingParameters* _tmp33_; #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp16_ = self->priv->albums; #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9838,7 +9851,7 @@ static void publishing_gallery3_publishing_options_pane_on_publish_clicked (Publ param = _tmp33_; #line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (album_path); -#line 9801 "GalleryConnector.c" +#line 9814 "GalleryConnector.c" } #line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp34_ = param; @@ -9857,19 +9870,19 @@ static void publishing_gallery3_publishing_options_pane_on_publish_clicked (Publ #line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp39_ = param; #line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_emit_by_name (self, "publish", _tmp39_); + g_signal_emit (self, publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp39_); #line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_gallery3_publishing_parameters_unref0 (param); #line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (album_name); -#line 9825 "GalleryConnector.c" +#line 9838 "GalleryConnector.c" } static void publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked (PublishingGallery3PublishingOptionsPane* self) { - GtkComboBoxText* _tmp0_ = NULL; - GtkEntry* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; + GtkComboBoxText* _tmp0_; + GtkEntry* _tmp1_; + GtkComboBoxText* _tmp2_; #line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9886,14 +9899,14 @@ static void publishing_gallery3_publishing_options_pane_on_use_existing_radio_cl gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); #line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (self); -#line 9849 "GalleryConnector.c" +#line 9862 "GalleryConnector.c" } static void publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked (PublishingGallery3PublishingOptionsPane* self) { - GtkEntry* _tmp0_ = NULL; - GtkComboBoxText* _tmp1_ = NULL; - GtkEntry* _tmp2_ = NULL; + GtkEntry* _tmp0_; + GtkComboBoxText* _tmp1_; + GtkEntry* _tmp2_; #line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9910,7 +9923,7 @@ static void publishing_gallery3_publishing_options_pane_on_create_new_radio_clic gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); #line 1605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (self); -#line 9873 "GalleryConnector.c" +#line 9886 "GalleryConnector.c" } @@ -9918,45 +9931,45 @@ static void publishing_gallery3_publishing_options_pane_on_logout_clicked (Publi #line 1608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_emit_by_name (self, "logout"); -#line 9882 "GalleryConnector.c" + g_signal_emit (self, publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0); +#line 9895 "GalleryConnector.c" } static gchar* string_strip (const gchar* self) { gchar* result = NULL; gchar* _result_ = NULL; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; -#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + const gchar* _tmp1_; +#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _result_; -#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 9905 "GalleryConnector.c" +#line 9918 "GalleryConnector.c" } static void publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (PublishingGallery3PublishingOptionsPane* self) { gchar* album_name = NULL; - GtkEntry* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + GtkEntry* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; gboolean _tmp3_ = FALSE; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; - GtkButton* _tmp10_ = NULL; + const gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gboolean _tmp7_; + GtkButton* _tmp10_; #line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9979,20 +9992,20 @@ static void publishing_gallery3_publishing_options_pane_update_publish_button_se _g_free0 (_tmp6_); #line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp7_) { -#line 9942 "GalleryConnector.c" - GtkRadioButton* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; +#line 9955 "GalleryConnector.c" + GtkRadioButton* _tmp8_; + gboolean _tmp9_; #line 1615 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp8_ = self->priv->create_new_radio; #line 1615 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp9_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 1615 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = _tmp9_; -#line 9951 "GalleryConnector.c" +#line 9964 "GalleryConnector.c" } else { #line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = FALSE; -#line 9955 "GalleryConnector.c" +#line 9968 "GalleryConnector.c" } #line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp10_ = self->priv->publish_button; @@ -10000,7 +10013,7 @@ static void publishing_gallery3_publishing_options_pane_update_publish_button_se gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), !_tmp3_); #line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (album_name); -#line 9963 "GalleryConnector.c" +#line 9976 "GalleryConnector.c" } @@ -10009,14 +10022,14 @@ static void publishing_gallery3_publishing_options_pane_on_new_album_entry_chang g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (self); -#line 9972 "GalleryConnector.c" +#line 9985 "GalleryConnector.c" } static void publishing_gallery3_publishing_options_pane_update_pixel_entry_sensitivity (PublishingGallery3PublishingOptionsPane* self) { - GtkEntry* _tmp0_ = NULL; - GtkComboBoxText* _tmp1_ = NULL; - gint _tmp2_ = 0; + GtkEntry* _tmp0_; + GtkComboBoxText* _tmp1_; + gint _tmp2_; #line 1622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10027,7 +10040,7 @@ static void publishing_gallery3_publishing_options_pane_update_pixel_entry_sensi _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp2_ == 1); -#line 9990 "GalleryConnector.c" +#line 10003 "GalleryConnector.c" } @@ -10036,50 +10049,50 @@ static void publishing_gallery3_publishing_options_pane_on_scaling_constraint_ch g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_update_pixel_entry_sensitivity (self); -#line 9999 "GalleryConnector.c" +#line 10012 "GalleryConnector.c" } static glong string_strnlen (gchar* str, glong maxlen) { glong result = 0L; gchar* end = NULL; - gchar* _tmp0_ = NULL; - glong _tmp1_ = 0L; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + glong _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = maxlen; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp2_; -#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = end; -#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { -#line 10022 "GalleryConnector.c" - glong _tmp4_ = 0L; -#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 10035 "GalleryConnector.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 10030 "GalleryConnector.c" +#line 10043 "GalleryConnector.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 10042 "GalleryConnector.c" +#line 10055 "GalleryConnector.c" } } @@ -10088,140 +10101,140 @@ 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 10066 "GalleryConnector.c" - glong _tmp2_ = 0L; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 10079 "GalleryConnector.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 10072 "GalleryConnector.c" +#line 10085 "GalleryConnector.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 10076 "GalleryConnector.c" +#line 10089 "GalleryConnector.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 10080 "GalleryConnector.c" - glong _tmp3_ = 0L; - glong _tmp4_ = 0L; - glong _tmp5_ = 0L; -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 10093 "GalleryConnector.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 10092 "GalleryConnector.c" +#line 10105 "GalleryConnector.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 10102 "GalleryConnector.c" +#line 10115 "GalleryConnector.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 10108 "GalleryConnector.c" - glong _tmp9_ = 0L; - glong _tmp10_ = 0L; - glong _tmp11_ = 0L; -#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 10121 "GalleryConnector.c" + glong _tmp9_; + glong _tmp10_; + glong _tmp11_; +#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = string_length; -#line 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 10122 "GalleryConnector.c" +#line 10135 "GalleryConnector.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 10132 "GalleryConnector.c" +#line 10145 "GalleryConnector.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 10138 "GalleryConnector.c" - glong _tmp15_ = 0L; - glong _tmp16_ = 0L; -#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 10151 "GalleryConnector.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 10147 "GalleryConnector.c" +#line 10160 "GalleryConnector.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 10167 "GalleryConnector.c" +#line 10180 "GalleryConnector.c" } static void publishing_gallery3_publishing_options_pane_on_pixels_changed (PublishingGallery3PublishingOptionsPane* self) { gchar* orig_text = NULL; - GtkEntry* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + GtkEntry* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; gchar last_char = '\0'; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gchar _tmp7_ = '\0'; - const gchar* _tmp8_ = NULL; - gint _tmp9_ = 0; - gint _tmp10_ = 0; + const gchar* _tmp3_; + const gchar* _tmp4_; + gint _tmp5_; + gint _tmp6_; + gchar _tmp7_; + const gchar* _tmp8_; + gint _tmp9_; + gint _tmp10_; #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10252,23 +10265,23 @@ static void publishing_gallery3_publishing_options_pane_on_pixels_changed (Publi _tmp10_ = _tmp9_; #line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp10_ > 0) { -#line 10215 "GalleryConnector.c" - gchar _tmp11_ = '\0'; - gboolean _tmp12_ = FALSE; +#line 10228 "GalleryConnector.c" + gchar _tmp11_; + gboolean _tmp12_; #line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp11_ = last_char; #line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp12_ = g_ascii_isdigit (_tmp11_); #line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!_tmp12_) { -#line 10224 "GalleryConnector.c" - GtkEntry* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - gint _tmp16_ = 0; - gint _tmp17_ = 0; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; +#line 10237 "GalleryConnector.c" + GtkEntry* _tmp13_; + const gchar* _tmp14_; + const gchar* _tmp15_; + gint _tmp16_; + gint _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp13_ = self->priv->pixels; #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10287,22 +10300,22 @@ static void publishing_gallery3_publishing_options_pane_on_pixels_changed (Publi gtk_entry_set_text (_tmp13_, _tmp19_); #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (_tmp19_); -#line 10250 "GalleryConnector.c" +#line 10263 "GalleryConnector.c" } } #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (orig_text); -#line 10255 "GalleryConnector.c" +#line 10268 "GalleryConnector.c" } void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3PublishingOptionsPane* self) { gint default_album_id = 0; gchar* last_album = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - PublishingGallery3Album** _tmp27_ = NULL; - gint _tmp27__length1 = 0; + SpitPublishingPluginHost* _tmp0_; + gchar* _tmp1_; + PublishingGallery3Album** _tmp27_; + gint _tmp27__length1; #line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10313,46 +10326,46 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu _tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_ALBUM_CONFIG_KEY, ""); #line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" last_album = _tmp1_; -#line 10276 "GalleryConnector.c" +#line 10289 "GalleryConnector.c" { gint i = 0; #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" i = 0; -#line 10281 "GalleryConnector.c" +#line 10294 "GalleryConnector.c" { gboolean _tmp2_ = FALSE; #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = TRUE; #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" while (TRUE) { -#line 10288 "GalleryConnector.c" - gint _tmp4_ = 0; - PublishingGallery3Album** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - GtkComboBoxText* _tmp6_ = NULL; - PublishingGallery3Album** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - gint _tmp8_ = 0; - PublishingGallery3Album* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; +#line 10301 "GalleryConnector.c" + gint _tmp4_; + PublishingGallery3Album** _tmp5_; + gint _tmp5__length1; + GtkComboBoxText* _tmp6_; + PublishingGallery3Album** _tmp7_; + gint _tmp7__length1; + gint _tmp8_; + PublishingGallery3Album* _tmp9_; + const gchar* _tmp10_; + const gchar* _tmp11_; gboolean _tmp12_ = FALSE; - PublishingGallery3Album** _tmp13_ = NULL; - gint _tmp13__length1 = 0; - gint _tmp14_ = 0; - PublishingGallery3Album* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; + PublishingGallery3Album** _tmp13_; + gint _tmp13__length1; + gint _tmp14_; + PublishingGallery3Album* _tmp15_; + const gchar* _tmp16_; + const gchar* _tmp17_; + const gchar* _tmp18_; #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!_tmp2_) { -#line 10309 "GalleryConnector.c" - gint _tmp3_ = 0; +#line 10322 "GalleryConnector.c" + gint _tmp3_; #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = i; #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" i = _tmp3_ + 1; -#line 10315 "GalleryConnector.c" +#line 10328 "GalleryConnector.c" } #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = FALSE; @@ -10366,7 +10379,7 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu if (!(_tmp4_ <= (_tmp5__length1 - 1))) { #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 10329 "GalleryConnector.c" +#line 10342 "GalleryConnector.c" } #line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp6_ = self->priv->existing_albums_combo; @@ -10402,15 +10415,15 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu if (g_strcmp0 (_tmp17_, _tmp18_) == 0) { #line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp12_ = TRUE; -#line 10365 "GalleryConnector.c" +#line 10378 "GalleryConnector.c" } else { gboolean _tmp19_ = FALSE; - PublishingGallery3Album** _tmp20_ = NULL; - gint _tmp20__length1 = 0; - gint _tmp21_ = 0; - PublishingGallery3Album* _tmp22_ = NULL; - const gchar* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; + PublishingGallery3Album** _tmp20_; + gint _tmp20__length1; + gint _tmp21_; + PublishingGallery3Album* _tmp22_; + const gchar* _tmp23_; + const gchar* _tmp24_; #line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp20_ = self->priv->albums; #line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10425,31 +10438,31 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu _tmp24_ = _tmp23_; #line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (g_strcmp0 (PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_DEFAULT_ALBUM_NAME, _tmp24_) == 0) { -#line 10388 "GalleryConnector.c" - gint _tmp25_ = 0; +#line 10401 "GalleryConnector.c" + gint _tmp25_; #line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp25_ = default_album_id; #line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp19_ = -1 == _tmp25_; -#line 10394 "GalleryConnector.c" +#line 10407 "GalleryConnector.c" } else { #line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp19_ = FALSE; -#line 10398 "GalleryConnector.c" +#line 10411 "GalleryConnector.c" } #line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp12_ = _tmp19_; -#line 10402 "GalleryConnector.c" +#line 10415 "GalleryConnector.c" } #line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp12_) { -#line 10406 "GalleryConnector.c" - gint _tmp26_ = 0; +#line 10419 "GalleryConnector.c" + gint _tmp26_; #line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp26_ = i; #line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" default_album_id = _tmp26_; -#line 10412 "GalleryConnector.c" +#line 10425 "GalleryConnector.c" } } } @@ -10460,12 +10473,12 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu _tmp27__length1 = self->priv->albums_length1; #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp27__length1 == 0) { -#line 10423 "GalleryConnector.c" - GtkComboBoxText* _tmp28_ = NULL; - GtkRadioButton* _tmp29_ = NULL; - GtkRadioButton* _tmp30_ = NULL; - GtkEntry* _tmp31_ = NULL; - GtkEntry* _tmp32_ = NULL; +#line 10436 "GalleryConnector.c" + GtkComboBoxText* _tmp28_; + GtkRadioButton* _tmp29_; + GtkRadioButton* _tmp30_; + GtkEntry* _tmp31_; + GtkEntry* _tmp32_; #line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp28_ = self->priv->existing_albums_combo; #line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10486,18 +10499,18 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu _tmp32_ = self->priv->new_album_entry; #line 1658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" gtk_entry_set_text (_tmp32_, PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_DEFAULT_ALBUM_NAME); -#line 10449 "GalleryConnector.c" +#line 10462 "GalleryConnector.c" } else { - gint _tmp33_ = 0; + gint _tmp33_; #line 1660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp33_ = default_album_id; #line 1660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp33_ >= 0) { -#line 10456 "GalleryConnector.c" - GtkRadioButton* _tmp34_ = NULL; - GtkComboBoxText* _tmp35_ = NULL; - gint _tmp36_ = 0; - GtkEntry* _tmp37_ = NULL; +#line 10469 "GalleryConnector.c" + GtkRadioButton* _tmp34_; + GtkComboBoxText* _tmp35_; + gint _tmp36_; + GtkEntry* _tmp37_; #line 1661 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp34_ = self->priv->use_existing_radio; #line 1661 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10512,12 +10525,12 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu _tmp37_ = self->priv->new_album_entry; #line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 10475 "GalleryConnector.c" +#line 10488 "GalleryConnector.c" } else { - GtkRadioButton* _tmp38_ = NULL; - GtkComboBoxText* _tmp39_ = NULL; - GtkEntry* _tmp40_ = NULL; - GtkEntry* _tmp41_ = NULL; + GtkRadioButton* _tmp38_; + GtkComboBoxText* _tmp39_; + GtkEntry* _tmp40_; + GtkEntry* _tmp41_; #line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp38_ = self->priv->create_new_radio; #line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10534,7 +10547,7 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu _tmp41_ = self->priv->new_album_entry; #line 1668 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget)); -#line 10497 "GalleryConnector.c" +#line 10510 "GalleryConnector.c" } } #line 1671 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10543,15 +10556,15 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu publishing_gallery3_publishing_options_pane_update_pixel_entry_sensitivity (self); #line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (last_album); -#line 10506 "GalleryConnector.c" +#line 10519 "GalleryConnector.c" } static GtkWidget* publishing_gallery3_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) { PublishingGallery3PublishingOptionsPane * self; GtkWidget* result = NULL; - GtkGrid* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkGrid* _tmp0_; + GtkWidget* _tmp1_; #line 1675 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, PublishingGallery3PublishingOptionsPane); #line 1676 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10562,7 +10575,7 @@ static GtkWidget* publishing_gallery3_publishing_options_pane_real_get_widget (S result = _tmp1_; #line 1676 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 10525 "GalleryConnector.c" +#line 10538 "GalleryConnector.c" } @@ -10575,7 +10588,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_gallery3_publishing_op result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; #line 1680 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 10538 "GalleryConnector.c" +#line 10551 "GalleryConnector.c" } @@ -10585,7 +10598,7 @@ static void publishing_gallery3_publishing_options_pane_real_on_pane_installed ( self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, PublishingGallery3PublishingOptionsPane); #line 1684 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_installed (self); -#line 10548 "GalleryConnector.c" +#line 10561 "GalleryConnector.c" } @@ -10593,7 +10606,7 @@ static void publishing_gallery3_publishing_options_pane_real_on_pane_uninstalled PublishingGallery3PublishingOptionsPane * self; #line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, PublishingGallery3PublishingOptionsPane); -#line 10556 "GalleryConnector.c" +#line 10569 "GalleryConnector.c" } @@ -10612,19 +10625,19 @@ static void g_cclosure_user_marshal_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMET data1 = closure->data; #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" data2 = param_values->data[0].v_pointer; -#line 10575 "GalleryConnector.c" +#line 10588 "GalleryConnector.c" } else { #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" data1 = param_values->data[0].v_pointer; #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" data2 = closure->data; -#line 10581 "GalleryConnector.c" +#line 10594 "GalleryConnector.c" } #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" callback = (GMarshalFunc_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS) (marshal_data ? marshal_data : cc->callback); #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" callback (data1, publishing_gallery3_value_get_publishing_parameters (param_values + 1), data2); -#line 10587 "GalleryConnector.c" +#line 10600 "GalleryConnector.c" } @@ -10636,10 +10649,10 @@ static void publishing_gallery3_publishing_options_pane_class_init (PublishingGa #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (klass)->finalize = publishing_gallery3_publishing_options_pane_finalize; #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_new ("publish", PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS, G_TYPE_NONE, 1, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS); + publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS, G_TYPE_NONE, 1, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS); #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_new ("logout", PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 10602 "GalleryConnector.c" + publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 10615 "GalleryConnector.c" } @@ -10647,14 +10660,14 @@ static void publishing_gallery3_publishing_options_pane_spit_publishing_dialog_p #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface); #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_gallery3_publishing_options_pane_real_get_widget; + iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_gallery3_publishing_options_pane_real_get_widget; #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_gallery3_publishing_options_pane_real_get_preferred_geometry; + iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_gallery3_publishing_options_pane_real_get_preferred_geometry; #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_gallery3_publishing_options_pane_real_on_pane_installed; + iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_gallery3_publishing_options_pane_real_on_pane_installed; #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_gallery3_publishing_options_pane_real_on_pane_uninstalled; -#line 10617 "GalleryConnector.c" + iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_gallery3_publishing_options_pane_real_on_pane_uninstalled; +#line 10630 "GalleryConnector.c" } @@ -10685,11 +10698,11 @@ static void publishing_gallery3_publishing_options_pane_instance_init (Publishin self->priv->publish_button = NULL; #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->logout_button = NULL; -#line 10648 "GalleryConnector.c" +#line 10661 "GalleryConnector.c" } -static void publishing_gallery3_publishing_options_pane_finalize (GObject* obj) { +static void publishing_gallery3_publishing_options_pane_finalize (GObject * obj) { PublishingGallery3PublishingOptionsPane * self; #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, PublishingGallery3PublishingOptionsPane); @@ -10721,7 +10734,7 @@ static void publishing_gallery3_publishing_options_pane_finalize (GObject* obj) self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL); #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (publishing_gallery3_publishing_options_pane_parent_class)->finalize (obj); -#line 10684 "GalleryConnector.c" +#line 10697 "GalleryConnector.c" } @@ -10745,54 +10758,54 @@ static PublishingGallery3PublishingParameters* publishing_gallery3_publishing_pa self = (PublishingGallery3PublishingParameters*) g_type_create_instance (object_type); #line 1710 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 10708 "GalleryConnector.c" +#line 10721 "GalleryConnector.c" } static PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new (void) { #line 1710 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_publishing_parameters_construct (PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS); -#line 10715 "GalleryConnector.c" +#line 10728 "GalleryConnector.c" } static gchar* string_delimit (const gchar* self, const gchar* delimiters, gchar new_delimiter) { gchar* result = NULL; gchar* _result_ = NULL; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar _tmp3_ = '\0'; -#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + gchar _tmp3_; +#line 1242 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1242 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (delimiters != NULL, NULL); -#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1243 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1243 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = delimiters; -#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = new_delimiter; -#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_strdelimit (_tmp1_, _tmp2_, _tmp3_); -#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1245 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _result_; -#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1245 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 10746 "GalleryConnector.c" +#line 10759 "GalleryConnector.c" } PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_new_album (GType object_type, const gchar* album_title) { PublishingGallery3PublishingParameters* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + const gchar* _tmp3_; #line 1713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (album_title != NULL, NULL); #line 1713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10813,20 +10826,20 @@ PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameter publishing_gallery3_publishing_parameters_set_album_title (self, _tmp3_); #line 1713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 10776 "GalleryConnector.c" +#line 10789 "GalleryConnector.c" } PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new_to_new_album (const gchar* album_title) { #line 1713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_publishing_parameters_construct_to_new_album (PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS, album_title); -#line 10783 "GalleryConnector.c" +#line 10796 "GalleryConnector.c" } PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_existing_album (GType object_type, const gchar* album_path) { PublishingGallery3PublishingParameters* self = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (album_path != NULL, NULL); #line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10837,20 +10850,20 @@ PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameter publishing_gallery3_publishing_parameters_set_album_path (self, _tmp0_); #line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 10800 "GalleryConnector.c" +#line 10813 "GalleryConnector.c" } PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new_to_existing_album (const gchar* album_path) { #line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_publishing_parameters_construct_to_existing_album (PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS, album_path); -#line 10807 "GalleryConnector.c" +#line 10820 "GalleryConnector.c" } gboolean publishing_gallery3_publishing_parameters_is_to_new_album (PublishingGallery3PublishingParameters* self) { gboolean result = FALSE; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 1723 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self), FALSE); #line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10859,14 +10872,14 @@ gboolean publishing_gallery3_publishing_parameters_is_to_new_album (PublishingGa result = g_strcmp0 (_tmp0_, "") != 0; #line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 10822 "GalleryConnector.c" +#line 10835 "GalleryConnector.c" } const gchar* publishing_gallery3_publishing_parameters_get_album_title (PublishingGallery3PublishingParameters* self) { const gchar* result; - gboolean _tmp0_ = FALSE; - const gchar* _tmp1_ = NULL; + gboolean _tmp0_; + const gchar* _tmp1_; #line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self), NULL); #line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10879,13 +10892,13 @@ const gchar* publishing_gallery3_publishing_parameters_get_album_title (Publishi result = _tmp1_; #line 1700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 10842 "GalleryConnector.c" +#line 10855 "GalleryConnector.c" } static void publishing_gallery3_publishing_parameters_set_album_title (PublishingGallery3PublishingParameters* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self)); #line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10896,13 +10909,13 @@ static void publishing_gallery3_publishing_parameters_set_album_title (Publishin _g_free0 (self->priv->_album_title); #line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_album_title = _tmp1_; -#line 10859 "GalleryConnector.c" +#line 10872 "GalleryConnector.c" } const gchar* publishing_gallery3_publishing_parameters_get_album_name (PublishingGallery3PublishingParameters* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self), NULL); #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10911,13 +10924,13 @@ const gchar* publishing_gallery3_publishing_parameters_get_album_name (Publishin result = _tmp0_; #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 10874 "GalleryConnector.c" +#line 10887 "GalleryConnector.c" } static void publishing_gallery3_publishing_parameters_set_album_name (PublishingGallery3PublishingParameters* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self)); #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10928,13 +10941,13 @@ static void publishing_gallery3_publishing_parameters_set_album_name (Publishing _g_free0 (self->priv->_album_name); #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_album_name = _tmp1_; -#line 10891 "GalleryConnector.c" +#line 10904 "GalleryConnector.c" } const gchar* publishing_gallery3_publishing_parameters_get_album_path (PublishingGallery3PublishingParameters* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self), NULL); #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10943,13 +10956,13 @@ const gchar* publishing_gallery3_publishing_parameters_get_album_path (Publishin result = _tmp0_; #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 10906 "GalleryConnector.c" +#line 10919 "GalleryConnector.c" } void publishing_gallery3_publishing_parameters_set_album_path (PublishingGallery3PublishingParameters* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self)); #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10960,13 +10973,13 @@ void publishing_gallery3_publishing_parameters_set_album_path (PublishingGallery _g_free0 (self->priv->_album_path); #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_album_path = _tmp1_; -#line 10923 "GalleryConnector.c" +#line 10936 "GalleryConnector.c" } const gchar* publishing_gallery3_publishing_parameters_get_entity_title (PublishingGallery3PublishingParameters* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self), NULL); #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10975,13 +10988,13 @@ const gchar* publishing_gallery3_publishing_parameters_get_entity_title (Publish result = _tmp0_; #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 10938 "GalleryConnector.c" +#line 10951 "GalleryConnector.c" } static void publishing_gallery3_publishing_parameters_set_entity_title (PublishingGallery3PublishingParameters* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self)); #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10992,13 +11005,13 @@ static void publishing_gallery3_publishing_parameters_set_entity_title (Publishi _g_free0 (self->priv->_entity_title); #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_entity_title = _tmp1_; -#line 10955 "GalleryConnector.c" +#line 10968 "GalleryConnector.c" } gint publishing_gallery3_publishing_parameters_get_photo_major_axis_size (PublishingGallery3PublishingParameters* self) { gint result; - gint _tmp0_ = 0; + gint _tmp0_; #line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self), 0); #line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11007,25 +11020,25 @@ gint publishing_gallery3_publishing_parameters_get_photo_major_axis_size (Publis result = _tmp0_; #line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 10970 "GalleryConnector.c" +#line 10983 "GalleryConnector.c" } void publishing_gallery3_publishing_parameters_set_photo_major_axis_size (PublishingGallery3PublishingParameters* self, gint value) { - gint _tmp0_ = 0; + gint _tmp0_; #line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self)); #line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = value; #line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_photo_major_axis_size = _tmp0_; -#line 10982 "GalleryConnector.c" +#line 10995 "GalleryConnector.c" } gboolean publishing_gallery3_publishing_parameters_get_strip_metadata (PublishingGallery3PublishingParameters* self) { gboolean result; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self), FALSE); #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11034,26 +11047,26 @@ gboolean publishing_gallery3_publishing_parameters_get_strip_metadata (Publishin result = _tmp0_; #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 10997 "GalleryConnector.c" +#line 11010 "GalleryConnector.c" } void publishing_gallery3_publishing_parameters_set_strip_metadata (PublishingGallery3PublishingParameters* self, gboolean value) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self)); #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = value; #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_strip_metadata = _tmp0_; -#line 11009 "GalleryConnector.c" +#line 11022 "GalleryConnector.c" } static void publishing_gallery3_value_publishing_parameters_init (GValue* value) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = NULL; -#line 11016 "GalleryConnector.c" +#line 11029 "GalleryConnector.c" } @@ -11062,7 +11075,7 @@ static void publishing_gallery3_value_publishing_parameters_free_value (GValue* if (value->data[0].v_pointer) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_parameters_unref (value->data[0].v_pointer); -#line 11025 "GalleryConnector.c" +#line 11038 "GalleryConnector.c" } } @@ -11072,11 +11085,11 @@ static void publishing_gallery3_value_publishing_parameters_copy_value (const GV if (src_value->data[0].v_pointer) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" dest_value->data[0].v_pointer = publishing_gallery3_publishing_parameters_ref (src_value->data[0].v_pointer); -#line 11035 "GalleryConnector.c" +#line 11048 "GalleryConnector.c" } else { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" dest_value->data[0].v_pointer = NULL; -#line 11039 "GalleryConnector.c" +#line 11052 "GalleryConnector.c" } } @@ -11084,66 +11097,66 @@ static void publishing_gallery3_value_publishing_parameters_copy_value (const GV static gpointer publishing_gallery3_value_publishing_parameters_peek_pointer (const GValue* value) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return value->data[0].v_pointer; -#line 11047 "GalleryConnector.c" +#line 11060 "GalleryConnector.c" } static gchar* publishing_gallery3_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (collect_values[0].v_pointer) { -#line 11054 "GalleryConnector.c" - PublishingGallery3PublishingParameters* object; +#line 11067 "GalleryConnector.c" + PublishingGallery3PublishingParameters * object; object = collect_values[0].v_pointer; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (object->parent_instance.g_class == NULL) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 11061 "GalleryConnector.c" +#line 11074 "GalleryConnector.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 11065 "GalleryConnector.c" +#line 11078 "GalleryConnector.c" } #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = publishing_gallery3_publishing_parameters_ref (object); -#line 11069 "GalleryConnector.c" +#line 11082 "GalleryConnector.c" } else { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = NULL; -#line 11073 "GalleryConnector.c" +#line 11086 "GalleryConnector.c" } #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 11077 "GalleryConnector.c" +#line 11090 "GalleryConnector.c" } static gchar* publishing_gallery3_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingGallery3PublishingParameters** object_p; + PublishingGallery3PublishingParameters ** object_p; object_p = collect_values[0].v_pointer; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!object_p) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 11088 "GalleryConnector.c" +#line 11101 "GalleryConnector.c" } #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!value->data[0].v_pointer) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *object_p = NULL; -#line 11094 "GalleryConnector.c" +#line 11107 "GalleryConnector.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *object_p = value->data[0].v_pointer; -#line 11098 "GalleryConnector.c" +#line 11111 "GalleryConnector.c" } else { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *object_p = publishing_gallery3_publishing_parameters_ref (value->data[0].v_pointer); -#line 11102 "GalleryConnector.c" +#line 11115 "GalleryConnector.c" } #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 11106 "GalleryConnector.c" +#line 11119 "GalleryConnector.c" } @@ -11157,7 +11170,7 @@ GParamSpec* publishing_gallery3_param_spec_publishing_parameters (const gchar* n G_PARAM_SPEC (spec)->value_type = object_type; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return G_PARAM_SPEC (spec); -#line 11120 "GalleryConnector.c" +#line 11133 "GalleryConnector.c" } @@ -11166,12 +11179,12 @@ gpointer publishing_gallery3_value_get_publishing_parameters (const GValue* valu g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS), NULL); #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return value->data[0].v_pointer; -#line 11129 "GalleryConnector.c" +#line 11142 "GalleryConnector.c" } void publishing_gallery3_value_set_publishing_parameters (GValue* value, gpointer v_object) { - PublishingGallery3PublishingParameters* old; + PublishingGallery3PublishingParameters * old; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS)); #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11186,23 +11199,23 @@ void publishing_gallery3_value_set_publishing_parameters (GValue* value, gpointe value->data[0].v_pointer = v_object; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_parameters_ref (value->data[0].v_pointer); -#line 11149 "GalleryConnector.c" +#line 11162 "GalleryConnector.c" } else { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = NULL; -#line 11153 "GalleryConnector.c" +#line 11166 "GalleryConnector.c" } #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (old) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_parameters_unref (old); -#line 11159 "GalleryConnector.c" +#line 11172 "GalleryConnector.c" } } void publishing_gallery3_value_take_publishing_parameters (GValue* value, gpointer v_object) { - PublishingGallery3PublishingParameters* old; + PublishingGallery3PublishingParameters * old; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS)); #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11215,17 +11228,17 @@ void publishing_gallery3_value_take_publishing_parameters (GValue* value, gpoint g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = v_object; -#line 11178 "GalleryConnector.c" +#line 11191 "GalleryConnector.c" } else { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = NULL; -#line 11182 "GalleryConnector.c" +#line 11195 "GalleryConnector.c" } #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (old) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_parameters_unref (old); -#line 11188 "GalleryConnector.c" +#line 11201 "GalleryConnector.c" } } @@ -11237,15 +11250,15 @@ static void publishing_gallery3_publishing_parameters_class_init (PublishingGall ((PublishingGallery3PublishingParametersClass *) klass)->finalize = publishing_gallery3_publishing_parameters_finalize; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_class_add_private (klass, sizeof (PublishingGallery3PublishingParametersPrivate)); -#line 11200 "GalleryConnector.c" +#line 11213 "GalleryConnector.c" } static void publishing_gallery3_publishing_parameters_instance_init (PublishingGallery3PublishingParameters * self) { - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS_GET_PRIVATE (self); #line 1694 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11270,11 +11283,11 @@ static void publishing_gallery3_publishing_parameters_instance_init (PublishingG self->priv->_strip_metadata = FALSE; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->ref_count = 1; -#line 11233 "GalleryConnector.c" +#line 11246 "GalleryConnector.c" } -static void publishing_gallery3_publishing_parameters_finalize (PublishingGallery3PublishingParameters* obj) { +static void publishing_gallery3_publishing_parameters_finalize (PublishingGallery3PublishingParameters * obj) { PublishingGallery3PublishingParameters * self; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS, PublishingGallery3PublishingParameters); @@ -11288,7 +11301,7 @@ static void publishing_gallery3_publishing_parameters_finalize (PublishingGaller _g_free0 (self->priv->_album_path); #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (self->priv->_entity_title); -#line 11251 "GalleryConnector.c" +#line 11264 "GalleryConnector.c" } @@ -11307,18 +11320,18 @@ GType publishing_gallery3_publishing_parameters_get_type (void) { gpointer publishing_gallery3_publishing_parameters_ref (gpointer instance) { - PublishingGallery3PublishingParameters* self; + PublishingGallery3PublishingParameters * self; self = instance; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_atomic_int_inc (&self->ref_count); #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return instance; -#line 11276 "GalleryConnector.c" +#line 11289 "GalleryConnector.c" } void publishing_gallery3_publishing_parameters_unref (gpointer instance) { - PublishingGallery3PublishingParameters* self; + PublishingGallery3PublishingParameters * self; self = instance; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -11326,7 +11339,7 @@ void publishing_gallery3_publishing_parameters_unref (gpointer instance) { PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self); #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_free_instance ((GTypeInstance *) self); -#line 11289 "GalleryConnector.c" +#line 11302 "GalleryConnector.c" } } @@ -11337,49 +11350,49 @@ gchar* publishing_gallery3_credentials_pane_mode_to_string (PublishingGallery3Cr switch (self) { #line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_INTRO: -#line 11300 "GalleryConnector.c" +#line 11313 "GalleryConnector.c" { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = g_strdup ("INTRO"); #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" result = _tmp0_; #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 11309 "GalleryConnector.c" +#line 11322 "GalleryConnector.c" } #line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY: -#line 11313 "GalleryConnector.c" +#line 11326 "GalleryConnector.c" { - gchar* _tmp1_ = NULL; + gchar* _tmp1_; #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = g_strdup ("FAILED_RETRY"); #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" result = _tmp1_; #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 11322 "GalleryConnector.c" +#line 11335 "GalleryConnector.c" } #line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL: -#line 11326 "GalleryConnector.c" +#line 11339 "GalleryConnector.c" { - gchar* _tmp2_ = NULL; + gchar* _tmp2_; #line 1743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = g_strdup ("NOT_GALLERY_URL"); #line 1743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" result = _tmp2_; #line 1743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 11335 "GalleryConnector.c" +#line 11348 "GalleryConnector.c" } default: { #line 1746 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:1746: unrecognized CredentialsPane.Mode enumerat" \ "ion value"); -#line 11341 "GalleryConnector.c" +#line 11354 "GalleryConnector.c" } } } @@ -11400,18 +11413,18 @@ GType publishing_gallery3_credentials_pane_mode_get_type (void) { PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construct (GType object_type, SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key) { PublishingGallery3CredentialsPane * self = NULL; GtkBuilder* builder = NULL; - GtkBuilder* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp10_ = NULL; - PublishingGallery3CredentialsPaneMode _tmp11_ = 0; - const gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - GtkBuilder* _tmp15_ = NULL; - PublishingGallery3CredentialsGrid* _tmp16_ = NULL; - PublishingGallery3CredentialsGrid* _tmp17_ = NULL; - GtkGrid* _tmp18_ = NULL; - GtkGrid* _tmp19_ = NULL; - GtkWidget* _tmp20_ = NULL; + GtkBuilder* _tmp0_; + SpitPublishingPluginHost* _tmp9_; + PublishingGallery3CredentialsPaneMode _tmp10_; + const gchar* _tmp11_; + const gchar* _tmp12_; + const gchar* _tmp13_; + GtkBuilder* _tmp14_; + PublishingGallery3CredentialsGrid* _tmp15_; + PublishingGallery3CredentialsGrid* _tmp16_; + GtkGrid* _tmp17_; + GtkGrid* _tmp18_; + GtkWidget* _tmp19_; GError * _inner_error_ = NULL; #line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL); @@ -11421,16 +11434,16 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc _tmp0_ = gtk_builder_new (); #line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" builder = _tmp0_; -#line 11383 "GalleryConnector.c" +#line 11396 "GalleryConnector.c" { - GtkBuilder* _tmp1_ = NULL; + GtkBuilder* _tmp1_; #line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = builder; #line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/gallery3_authentication_pane.ui", &_inner_error_); #line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 11392 "GalleryConnector.c" +#line 11405 "GalleryConnector.c" goto __catch15_g_error; } } @@ -11438,14 +11451,13 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc __catch15_g_error: { GError* e = NULL; - GError* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - SpitPublishingPluginHost* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GError* _tmp8_ = NULL; - GError* _tmp9_ = NULL; + GError* _tmp2_; + const gchar* _tmp3_; + SpitPublishingPluginHost* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + GError* _tmp7_; + GError* _tmp8_; #line 1765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" e = _inner_error_; #line 1765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11459,29 +11471,27 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp4_ = host; #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = _ ("A file required for publishing is unavailable. Publishing to %s can’t " \ -"continue."); -#line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = g_strdup_printf (_tmp5_, PUBLISHING_GALLERY3_SERVICE_NAME); + _tmp5_ = g_strdup_printf (_ ("A file required for publishing is unavailable. Publishing to %s can’t " \ +"continue."), PUBLISHING_GALLERY3_SERVICE_NAME); #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp7_); + _tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp6_); #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - spit_publishing_plugin_host_post_error (_tmp4_, _tmp9_); + spit_publishing_plugin_host_post_error (_tmp4_, _tmp8_); #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_error_free0 (_tmp9_); + _g_error_free0 (_tmp8_); #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (e); #line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (builder); #line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 11442 "GalleryConnector.c" +#line 11452 "GalleryConnector.c" } __finally15: #line 1765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11494,50 +11504,50 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc g_clear_error (&_inner_error_); #line 1765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 11455 "GalleryConnector.c" +#line 11465 "GalleryConnector.c" } #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = host; + _tmp9_ = host; #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = mode; + _tmp10_ = mode; #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = url; + _tmp11_ = url; #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = username; + _tmp12_ = username; #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = key; + _tmp13_ = key; #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp15_ = builder; + _tmp14_ = builder; #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp16_ = publishing_gallery3_credentials_grid_new (_tmp10_, _tmp11_, _tmp12_, _tmp13_, _tmp14_, _tmp15_); + _tmp15_ = publishing_gallery3_credentials_grid_new (_tmp9_, _tmp10_, _tmp11_, _tmp12_, _tmp13_, _tmp14_); #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->frame); #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->frame = _tmp16_; + self->priv->frame = _tmp15_; #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp17_ = self->priv->frame; + _tmp16_ = self->priv->frame; #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp18_ = publishing_gallery3_credentials_grid_get_pane_widget (_tmp17_); + _tmp17_ = publishing_gallery3_credentials_grid_get_pane_widget (_tmp16_); #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp19_) : NULL); + _tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp18_) : NULL); #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->grid_widget); #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->grid_widget = _tmp20_; + self->priv->grid_widget = _tmp19_; #line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (builder); #line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 11491 "GalleryConnector.c" +#line 11501 "GalleryConnector.c" } PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_new (SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key) { #line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_credentials_pane_construct (PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, host, mode, url, username, key); -#line 11498 "GalleryConnector.c" +#line 11508 "GalleryConnector.c" } @@ -11545,16 +11555,16 @@ void publishing_gallery3_credentials_pane_notify_go_back (PublishingGallery3Cred #line 1785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_PANE (self)); #line 1786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_emit_by_name (self, "go-back"); -#line 11507 "GalleryConnector.c" + g_signal_emit (self, publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_GO_BACK_SIGNAL], 0); +#line 11517 "GalleryConnector.c" } void publishing_gallery3_credentials_pane_notify_login (PublishingGallery3CredentialsPane* self, const gchar* url, const gchar* uname, const gchar* password, const gchar* key) { - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; #line 1789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_PANE (self)); #line 1789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11574,17 +11584,17 @@ void publishing_gallery3_credentials_pane_notify_login (PublishingGallery3Creden #line 1791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = key; #line 1791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_emit_by_name (self, "login", _tmp0_, _tmp1_, _tmp2_, _tmp3_); -#line 11536 "GalleryConnector.c" + g_signal_emit (self, publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_LOGIN_SIGNAL], 0, _tmp0_, _tmp1_, _tmp2_, _tmp3_); +#line 11546 "GalleryConnector.c" } static GtkWidget* publishing_gallery3_credentials_pane_real_get_widget (SpitPublishingDialogPane* base) { PublishingGallery3CredentialsPane * self; GtkWidget* result = NULL; - GtkWidget* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; - GtkWidget* _tmp2_ = NULL; + GtkWidget* _tmp0_; + GtkWidget* _tmp1_; + GtkWidget* _tmp2_; #line 1794 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, PublishingGallery3CredentialsPane); #line 1795 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11599,7 +11609,7 @@ static GtkWidget* publishing_gallery3_credentials_pane_real_get_widget (SpitPubl result = _tmp2_; #line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 11560 "GalleryConnector.c" +#line 11570 "GalleryConnector.c" } @@ -11612,29 +11622,29 @@ static SpitPublishingDialogPaneGeometryOptions publishing_gallery3_credentials_p result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; #line 1800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 11573 "GalleryConnector.c" +#line 11583 "GalleryConnector.c" } static void _publishing_gallery3_credentials_pane_notify_go_back_publishing_gallery3_credentials_grid_go_back (PublishingGallery3CredentialsGrid* _sender, gpointer self) { #line 1804 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_credentials_pane_notify_go_back ((PublishingGallery3CredentialsPane*) self); -#line 11580 "GalleryConnector.c" +#line 11590 "GalleryConnector.c" } static void _publishing_gallery3_credentials_pane_notify_login_publishing_gallery3_credentials_grid_login (PublishingGallery3CredentialsGrid* _sender, const gchar* url, const gchar* username, const gchar* password, const gchar* key, gpointer self) { #line 1805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_credentials_pane_notify_login ((PublishingGallery3CredentialsPane*) self, url, username, password, key); -#line 11587 "GalleryConnector.c" +#line 11597 "GalleryConnector.c" } static void publishing_gallery3_credentials_pane_real_on_pane_installed (SpitPublishingDialogPane* base) { PublishingGallery3CredentialsPane * self; - PublishingGallery3CredentialsGrid* _tmp0_ = NULL; - PublishingGallery3CredentialsGrid* _tmp1_ = NULL; - PublishingGallery3CredentialsGrid* _tmp2_ = NULL; + PublishingGallery3CredentialsGrid* _tmp0_; + PublishingGallery3CredentialsGrid* _tmp1_; + PublishingGallery3CredentialsGrid* _tmp2_; #line 1803 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, PublishingGallery3CredentialsPane); #line 1804 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11649,16 +11659,16 @@ static void publishing_gallery3_credentials_pane_real_on_pane_installed (SpitPub _tmp2_ = self->priv->frame; #line 1807 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_credentials_grid_installed (_tmp2_); -#line 11610 "GalleryConnector.c" +#line 11620 "GalleryConnector.c" } static void publishing_gallery3_credentials_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) { PublishingGallery3CredentialsPane * self; - PublishingGallery3CredentialsGrid* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingGallery3CredentialsGrid* _tmp2_ = NULL; - guint _tmp3_ = 0U; + PublishingGallery3CredentialsGrid* _tmp0_; + guint _tmp1_; + PublishingGallery3CredentialsGrid* _tmp2_; + guint _tmp3_; #line 1810 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, PublishingGallery3CredentialsPane); #line 1811 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11673,7 +11683,7 @@ static void publishing_gallery3_credentials_pane_real_on_pane_uninstalled (SpitP g_signal_parse_name ("login", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, &_tmp3_, NULL, FALSE); #line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_credentials_pane_notify_login_publishing_gallery3_credentials_grid_login, self); -#line 11634 "GalleryConnector.c" +#line 11644 "GalleryConnector.c" } @@ -11692,19 +11702,19 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING (GClosure data1 = closure->data; #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" data2 = param_values->data[0].v_pointer; -#line 11653 "GalleryConnector.c" +#line 11663 "GalleryConnector.c" } else { #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" data1 = param_values->data[0].v_pointer; #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" data2 = closure->data; -#line 11659 "GalleryConnector.c" +#line 11669 "GalleryConnector.c" } #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" callback = (GMarshalFunc_VOID__STRING_STRING_STRING_STRING) (marshal_data ? marshal_data : cc->callback); #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), g_value_get_string (param_values + 3), g_value_get_string (param_values + 4), data2); -#line 11665 "GalleryConnector.c" +#line 11675 "GalleryConnector.c" } @@ -11716,10 +11726,10 @@ static void publishing_gallery3_credentials_pane_class_init (PublishingGallery3C #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (klass)->finalize = publishing_gallery3_credentials_pane_finalize; #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_new ("go_back", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_GO_BACK_SIGNAL] = g_signal_new ("go-back", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_new ("login", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); -#line 11680 "GalleryConnector.c" + publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_LOGIN_SIGNAL] = g_signal_new ("login", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); +#line 11690 "GalleryConnector.c" } @@ -11727,14 +11737,14 @@ static void publishing_gallery3_credentials_pane_spit_publishing_dialog_pane_int #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_credentials_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface); #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_gallery3_credentials_pane_real_get_widget; + iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_gallery3_credentials_pane_real_get_widget; #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_gallery3_credentials_pane_real_get_preferred_geometry; + iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_gallery3_credentials_pane_real_get_preferred_geometry; #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_gallery3_credentials_pane_real_on_pane_installed; + iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_gallery3_credentials_pane_real_on_pane_installed; #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_gallery3_credentials_pane_real_on_pane_uninstalled; -#line 11695 "GalleryConnector.c" + iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_gallery3_credentials_pane_real_on_pane_uninstalled; +#line 11705 "GalleryConnector.c" } @@ -11745,11 +11755,11 @@ static void publishing_gallery3_credentials_pane_instance_init (PublishingGaller self->priv->frame = NULL; #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->grid_widget = NULL; -#line 11706 "GalleryConnector.c" +#line 11716 "GalleryConnector.c" } -static void publishing_gallery3_credentials_pane_finalize (GObject* obj) { +static void publishing_gallery3_credentials_pane_finalize (GObject * obj) { PublishingGallery3CredentialsPane * self; #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, PublishingGallery3CredentialsPane); @@ -11759,7 +11769,7 @@ static void publishing_gallery3_credentials_pane_finalize (GObject* obj) { _g_object_unref0 (self->priv->grid_widget); #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (publishing_gallery3_credentials_pane_parent_class)->finalize (obj); -#line 11720 "GalleryConnector.c" +#line 11730 "GalleryConnector.c" } @@ -11780,75 +11790,75 @@ GType publishing_gallery3_credentials_pane_get_type (void) { static void _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 1890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_credentials_grid_on_url_or_username_changed ((PublishingGallery3CredentialsGrid*) self); -#line 11741 "GalleryConnector.c" +#line 11751 "GalleryConnector.c" } static void _publishing_gallery3_credentials_grid_on_go_back_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_credentials_grid_on_go_back_button_clicked ((PublishingGallery3CredentialsGrid*) self); -#line 11748 "GalleryConnector.c" +#line 11758 "GalleryConnector.c" } static void _publishing_gallery3_credentials_grid_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_credentials_grid_on_login_button_clicked ((PublishingGallery3CredentialsGrid*) self); -#line 11755 "GalleryConnector.c" +#line 11765 "GalleryConnector.c" } PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_construct (GType object_type, SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key, GtkBuilder* builder) { PublishingGallery3CredentialsGrid * self = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - GtkBuilder* _tmp7_ = NULL; - GtkBuilder* _tmp8_ = NULL; - GtkBuilder* _tmp9_ = NULL; - GtkBuilder* _tmp10_ = NULL; - GSList* _tmp11_ = NULL; - GSList* _tmp12_ = NULL; - guint _tmp13_ = 0U; - GtkBuilder* _tmp14_ = NULL; - GObject* _tmp15_ = NULL; - GtkBuilder* _tmp16_ = NULL; - GObject* _tmp17_ = NULL; - GtkLabel* _tmp18_ = NULL; - GtkBuilder* _tmp19_ = NULL; - GObject* _tmp20_ = NULL; - GtkEntry* _tmp21_ = NULL; - GtkBuilder* _tmp22_ = NULL; - GObject* _tmp23_ = NULL; - GtkEntry* _tmp24_ = NULL; - GtkBuilder* _tmp25_ = NULL; - GObject* _tmp26_ = NULL; - GtkEntry* _tmp27_ = NULL; - GtkBuilder* _tmp28_ = NULL; - GObject* _tmp29_ = NULL; - GtkEntry* _tmp30_ = NULL; - GtkBuilder* _tmp31_ = NULL; - GObject* _tmp32_ = NULL; - GtkButton* _tmp33_ = NULL; - GtkBuilder* _tmp34_ = NULL; - GObject* _tmp35_ = NULL; - GtkButton* _tmp36_ = NULL; - PublishingGallery3CredentialsPaneMode _tmp37_ = 0; - const gchar* _tmp47_ = NULL; - GtkEntry* _tmp51_ = NULL; - const gchar* _tmp52_ = NULL; - GtkEntry* _tmp56_ = NULL; - const gchar* _tmp57_ = NULL; - GtkEntry* _tmp61_ = NULL; - GtkButton* _tmp62_ = NULL; - GtkButton* _tmp63_ = NULL; - gboolean _tmp64_ = FALSE; - const gchar* _tmp65_ = NULL; - GtkButton* _tmp67_ = NULL; + SpitPublishingPluginHost* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; + GtkBuilder* _tmp7_; + GtkBuilder* _tmp8_; + GtkBuilder* _tmp9_; + GtkBuilder* _tmp10_; + GSList* _tmp11_; + GSList* _tmp12_; + guint _tmp13_; + GtkBuilder* _tmp14_; + GObject* _tmp15_; + GtkBuilder* _tmp16_; + GObject* _tmp17_; + GtkLabel* _tmp18_; + GtkBuilder* _tmp19_; + GObject* _tmp20_; + GtkEntry* _tmp21_; + GtkBuilder* _tmp22_; + GObject* _tmp23_; + GtkEntry* _tmp24_; + GtkBuilder* _tmp25_; + GObject* _tmp26_; + GtkEntry* _tmp27_; + GtkBuilder* _tmp28_; + GObject* _tmp29_; + GtkEntry* _tmp30_; + GtkBuilder* _tmp31_; + GObject* _tmp32_; + GtkButton* _tmp33_; + GtkBuilder* _tmp34_; + GObject* _tmp35_; + GtkButton* _tmp36_; + PublishingGallery3CredentialsPaneMode _tmp37_; + const gchar* _tmp45_; + GtkEntry* _tmp49_; + const gchar* _tmp50_; + GtkEntry* _tmp54_; + const gchar* _tmp55_; + GtkEntry* _tmp59_; + GtkButton* _tmp60_; + GtkButton* _tmp61_; + gboolean _tmp62_ = FALSE; + const gchar* _tmp63_; + GtkButton* _tmp65_; #line 1840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL); #line 1840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11989,194 +11999,188 @@ PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_construc switch (_tmp37_) { #line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_INTRO: -#line 11950 "GalleryConnector.c" +#line 11960 "GalleryConnector.c" { - GtkLabel* _tmp38_ = NULL; + GtkLabel* _tmp38_; #line 1867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp38_ = self->priv->intro_message_label; #line 1867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" gtk_label_set_markup (_tmp38_, PUBLISHING_GALLERY3_CREDENTIALS_GRID_INTRO_MESSAGE); #line 1868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 11959 "GalleryConnector.c" +#line 11969 "GalleryConnector.c" } #line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY: -#line 11963 "GalleryConnector.c" +#line 11973 "GalleryConnector.c" { - GtkLabel* _tmp39_ = NULL; - const gchar* _tmp40_ = NULL; - gchar* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; + GtkLabel* _tmp39_; + gchar* _tmp40_; + gchar* _tmp41_; #line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp39_ = self->priv->intro_message_label; #line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp40_ = _ ("Unrecognized User"); + _tmp40_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Unrecognized User"), PUBLISHING_GALLERY3_CREDENTIALS_GRID_FAILED_RETRY_MESSAGE); #line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp41_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp40_, PUBLISHING_GALLERY3_CREDENTIALS_GRID_FAILED_RETRY_MESSAGE); + _tmp41_ = _tmp40_; #line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp42_ = _tmp41_; + gtk_label_set_markup (_tmp39_, _tmp41_); #line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_label_set_markup (_tmp39_, _tmp42_); -#line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp42_); + _g_free0 (_tmp41_); #line 1873 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 11983 "GalleryConnector.c" +#line 11990 "GalleryConnector.c" } #line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL: -#line 11987 "GalleryConnector.c" +#line 11994 "GalleryConnector.c" { - GtkLabel* _tmp43_ = NULL; - const gchar* _tmp44_ = NULL; - gchar* _tmp45_ = NULL; - gchar* _tmp46_ = NULL; -#line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp43_ = self->priv->intro_message_label; + GtkLabel* _tmp42_; + gchar* _tmp43_; + gchar* _tmp44_; #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp44_ = _ (PUBLISHING_GALLERY3_SERVICE_NAME " Site Not Found"); + _tmp42_ = self->priv->intro_message_label; #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp45_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp44_, PUBLISHING_GALLERY3_CREDENTIALS_GRID_NOT_GALLERY_URL_MESSAGE); + _tmp43_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ (PUBLISHING_GALLERY3_SERVICE_NAME " Site Not Found"), PUBLISHING_GALLERY3_CREDENTIALS_GRID_NOT_GALLERY_URL_MESSAGE); #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp46_ = _tmp45_; + _tmp44_ = _tmp43_; #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_label_set_markup (_tmp43_, _tmp46_); + gtk_label_set_markup (_tmp42_, _tmp44_); #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp46_); + _g_free0 (_tmp44_); #line 1879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 12007 "GalleryConnector.c" +#line 12011 "GalleryConnector.c" } default: { #line 1882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:1882: Invalid CredentialsPane mode"); -#line 12013 "GalleryConnector.c" +#line 12017 "GalleryConnector.c" } } #line 1886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp47_ = url; + _tmp45_ = url; #line 1886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp47_ != NULL) { -#line 12020 "GalleryConnector.c" - GtkEntry* _tmp48_ = NULL; - const gchar* _tmp49_ = NULL; - GtkEntry* _tmp50_ = NULL; + if (_tmp45_ != NULL) { +#line 12024 "GalleryConnector.c" + GtkEntry* _tmp46_; + const gchar* _tmp47_; + GtkEntry* _tmp48_; #line 1887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp48_ = self->priv->url_entry; + _tmp46_ = self->priv->url_entry; #line 1887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp49_ = url; + _tmp47_ = url; #line 1887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_entry_set_text (_tmp48_, _tmp49_); + gtk_entry_set_text (_tmp46_, _tmp47_); #line 1888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp50_ = self->priv->username_entry; + _tmp48_ = self->priv->username_entry; #line 1888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget)); -#line 12034 "GalleryConnector.c" + gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget)); +#line 12038 "GalleryConnector.c" } #line 1890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp51_ = self->priv->url_entry; + _tmp49_ = self->priv->url_entry; #line 1890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0); #line 1892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp52_ = username; + _tmp50_ = username; #line 1892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp52_ != NULL) { -#line 12044 "GalleryConnector.c" - GtkEntry* _tmp53_ = NULL; - const gchar* _tmp54_ = NULL; - GtkEntry* _tmp55_ = NULL; + if (_tmp50_ != NULL) { +#line 12048 "GalleryConnector.c" + GtkEntry* _tmp51_; + const gchar* _tmp52_; + GtkEntry* _tmp53_; #line 1893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp53_ = self->priv->username_entry; + _tmp51_ = self->priv->username_entry; #line 1893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp54_ = username; + _tmp52_ = username; #line 1893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_entry_set_text (_tmp53_, _tmp54_); + gtk_entry_set_text (_tmp51_, _tmp52_); #line 1894 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp55_ = self->priv->password_entry; + _tmp53_ = self->priv->password_entry; #line 1894 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget)); -#line 12058 "GalleryConnector.c" + gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_widget_get_type (), GtkWidget)); +#line 12062 "GalleryConnector.c" } #line 1896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp56_ = self->priv->username_entry; + _tmp54_ = self->priv->username_entry; #line 1896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0); #line 1899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp57_ = key; + _tmp55_ = key; #line 1899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp57_ != NULL) { -#line 12068 "GalleryConnector.c" - GtkEntry* _tmp58_ = NULL; - const gchar* _tmp59_ = NULL; - GtkEntry* _tmp60_ = NULL; + if (_tmp55_ != NULL) { +#line 12072 "GalleryConnector.c" + GtkEntry* _tmp56_; + const gchar* _tmp57_; + GtkEntry* _tmp58_; #line 1900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp58_ = self->priv->key_entry; + _tmp56_ = self->priv->key_entry; #line 1900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp59_ = key; + _tmp57_ = key; #line 1900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_entry_set_text (_tmp58_, _tmp59_); + gtk_entry_set_text (_tmp56_, _tmp57_); #line 1901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp60_ = self->priv->key_entry; + _tmp58_ = self->priv->key_entry; #line 1901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget)); -#line 12082 "GalleryConnector.c" + gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget)); +#line 12086 "GalleryConnector.c" } #line 1903 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp61_ = self->priv->key_entry; + _tmp59_ = self->priv->key_entry; #line 1903 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0); #line 1906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp62_ = self->priv->go_back_button; + _tmp60_ = self->priv->go_back_button; #line 1906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (_tmp62_, "clicked", (GCallback) _publishing_gallery3_credentials_grid_on_go_back_button_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp60_, "clicked", (GCallback) _publishing_gallery3_credentials_grid_on_go_back_button_clicked_gtk_button_clicked, self, 0); #line 1907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp63_ = self->priv->login_button; + _tmp61_ = self->priv->login_button; #line 1907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (_tmp63_, "clicked", (GCallback) _publishing_gallery3_credentials_grid_on_login_button_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp61_, "clicked", (GCallback) _publishing_gallery3_credentials_grid_on_login_button_clicked_gtk_button_clicked, self, 0); #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp65_ = url; + _tmp63_ = url; #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp65_ != NULL) { -#line 12100 "GalleryConnector.c" - const gchar* _tmp66_ = NULL; + if (_tmp63_ != NULL) { +#line 12104 "GalleryConnector.c" + const gchar* _tmp64_; #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp66_ = username; + _tmp64_ = username; #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp64_ = _tmp66_ != NULL; -#line 12106 "GalleryConnector.c" + _tmp62_ = _tmp64_ != NULL; +#line 12110 "GalleryConnector.c" } else { #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp64_ = FALSE; -#line 12110 "GalleryConnector.c" + _tmp62_ = FALSE; +#line 12114 "GalleryConnector.c" } #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp67_ = self->priv->login_button; + _tmp65_ = self->priv->login_button; #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), _tmp64_); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget), _tmp62_); #line 1840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 12118 "GalleryConnector.c" +#line 12122 "GalleryConnector.c" } PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_new (SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key, GtkBuilder* builder) { #line 1840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_credentials_grid_construct (PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, host, mode, url, username, key, builder); -#line 12125 "GalleryConnector.c" +#line 12129 "GalleryConnector.c" } static void publishing_gallery3_credentials_grid_on_login_button_clicked (PublishingGallery3CredentialsGrid* self) { - GtkEntry* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - GtkEntry* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - GtkEntry* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - GtkEntry* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; + GtkEntry* _tmp0_; + const gchar* _tmp1_; + GtkEntry* _tmp2_; + const gchar* _tmp3_; + GtkEntry* _tmp4_; + const gchar* _tmp5_; + GtkEntry* _tmp6_; + const gchar* _tmp7_; #line 1911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_GRID (self)); #line 1912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12196,8 +12200,8 @@ static void publishing_gallery3_credentials_grid_on_login_button_clicked (Publis #line 1912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = gtk_entry_get_text (_tmp6_); #line 1912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_emit_by_name (self, "login", _tmp1_, _tmp3_, _tmp5_, _tmp7_); -#line 12158 "GalleryConnector.c" + g_signal_emit (self, publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_LOGIN_SIGNAL], 0, _tmp1_, _tmp3_, _tmp5_, _tmp7_); +#line 12162 "GalleryConnector.c" } @@ -12205,17 +12209,17 @@ static void publishing_gallery3_credentials_grid_on_go_back_button_clicked (Publ #line 1916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_GRID (self)); #line 1917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_emit_by_name (self, "go-back"); -#line 12167 "GalleryConnector.c" + g_signal_emit (self, publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_GO_BACK_SIGNAL], 0); +#line 12171 "GalleryConnector.c" } static void publishing_gallery3_credentials_grid_on_url_or_username_changed (PublishingGallery3CredentialsGrid* self) { gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - GtkEntry* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - GtkButton* _tmp8_ = NULL; + GtkEntry* _tmp2_; + const gchar* _tmp3_; + GtkButton* _tmp8_; #line 1920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_GRID (self)); #line 1922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12224,49 +12228,49 @@ static void publishing_gallery3_credentials_grid_on_url_or_username_changed (Pub _tmp3_ = gtk_entry_get_text (_tmp2_); #line 1922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (g_strcmp0 (_tmp3_, "") != 0) { -#line 12185 "GalleryConnector.c" - GtkEntry* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; +#line 12189 "GalleryConnector.c" + GtkEntry* _tmp4_; + const gchar* _tmp5_; #line 1923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp4_ = self->priv->username_entry; #line 1923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = gtk_entry_get_text (_tmp4_); #line 1923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = g_strcmp0 (_tmp5_, "") != 0; -#line 12194 "GalleryConnector.c" +#line 12198 "GalleryConnector.c" } else { #line 1922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = FALSE; -#line 12198 "GalleryConnector.c" +#line 12202 "GalleryConnector.c" } #line 1922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp1_) { #line 1922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = TRUE; -#line 12204 "GalleryConnector.c" +#line 12208 "GalleryConnector.c" } else { - GtkEntry* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; + GtkEntry* _tmp6_; + const gchar* _tmp7_; #line 1924 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp6_ = self->priv->key_entry; #line 1924 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = gtk_entry_get_text (_tmp6_); #line 1924 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = g_strcmp0 (_tmp7_, "") != 0; -#line 12214 "GalleryConnector.c" +#line 12218 "GalleryConnector.c" } #line 1921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp8_ = self->priv->login_button; #line 1921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp0_); -#line 12220 "GalleryConnector.c" +#line 12224 "GalleryConnector.c" } void publishing_gallery3_credentials_grid_installed (PublishingGallery3CredentialsGrid* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; - GtkButton* _tmp2_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; + GtkButton* _tmp2_; #line 1927 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_GRID (self)); #line 1928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12279,13 +12283,13 @@ void publishing_gallery3_credentials_grid_installed (PublishingGallery3Credentia _tmp2_ = self->priv->login_button; #line 1931 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_publishing_plugin_host_set_dialog_default_widget (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); -#line 12240 "GalleryConnector.c" +#line 12244 "GalleryConnector.c" } GtkGrid* publishing_gallery3_credentials_grid_get_pane_widget (PublishingGallery3CredentialsGrid* self) { GtkGrid* result; - GtkGrid* _tmp0_ = NULL; + GtkGrid* _tmp0_; #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_GRID (self), NULL); #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12294,26 +12298,30 @@ GtkGrid* publishing_gallery3_credentials_grid_get_pane_widget (PublishingGallery result = _tmp0_; #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12255 "GalleryConnector.c" +#line 12259 "GalleryConnector.c" } static void publishing_gallery3_credentials_grid_set_pane_widget (PublishingGallery3CredentialsGrid* self, GtkGrid* value) { - GtkGrid* _tmp0_ = NULL; - GtkGrid* _tmp1_ = NULL; #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_GRID (self)); #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = value; + if (publishing_gallery3_credentials_grid_get_pane_widget (self) != value) { +#line 12268 "GalleryConnector.c" + GtkGrid* _tmp0_; + GtkGrid* _tmp1_; #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_object_unref0 (self->priv->_pane_widget); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->_pane_widget = _tmp1_; + _g_object_unref0 (self->priv->_pane_widget); #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_object_notify ((GObject *) self, "pane-widget"); -#line 12274 "GalleryConnector.c" + self->priv->_pane_widget = _tmp1_; +#line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" + g_object_notify ((GObject *) self, "pane-widget"); +#line 12281 "GalleryConnector.c" + } } @@ -12329,12 +12337,12 @@ static void publishing_gallery3_credentials_grid_class_init (PublishingGallery3C #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (klass)->finalize = publishing_gallery3_credentials_grid_finalize; #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET, g_param_spec_object ("pane-widget", "pane-widget", "pane-widget", gtk_grid_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY, g_param_spec_object ("pane-widget", "pane-widget", "pane-widget", gtk_grid_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_new ("go_back", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_GO_BACK_SIGNAL] = g_signal_new ("go-back", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_new ("login", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); -#line 12295 "GalleryConnector.c" + publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_LOGIN_SIGNAL] = g_signal_new ("login", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); +#line 12303 "GalleryConnector.c" } @@ -12367,11 +12375,11 @@ static void publishing_gallery3_credentials_grid_instance_init (PublishingGaller self->priv->username = NULL; #line 1834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->key = NULL; -#line 12328 "GalleryConnector.c" +#line 12336 "GalleryConnector.c" } -static void publishing_gallery3_credentials_grid_finalize (GObject* obj) { +static void publishing_gallery3_credentials_grid_finalize (GObject * obj) { PublishingGallery3CredentialsGrid * self; #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, PublishingGallery3CredentialsGrid); @@ -12401,7 +12409,7 @@ static void publishing_gallery3_credentials_grid_finalize (GObject* obj) { _g_free0 (self->priv->key); #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (publishing_gallery3_credentials_grid_parent_class)->finalize (obj); -#line 12362 "GalleryConnector.c" +#line 12370 "GalleryConnector.c" } @@ -12423,18 +12431,18 @@ static void _vala_publishing_gallery3_credentials_grid_get_property (GObject * o #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" switch (property_id) { #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - case PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET: + case PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY: #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_value_set_object (value, publishing_gallery3_credentials_grid_get_pane_widget (self)); #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 12389 "GalleryConnector.c" +#line 12397 "GalleryConnector.c" default: #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 12395 "GalleryConnector.c" +#line 12403 "GalleryConnector.c" } } @@ -12445,18 +12453,18 @@ static void _vala_publishing_gallery3_credentials_grid_set_property (GObject * o #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" switch (property_id) { #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - case PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET: + case PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY: #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_credentials_grid_set_pane_widget (self, g_value_get_object (value)); #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 12411 "GalleryConnector.c" +#line 12419 "GalleryConnector.c" default: #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 12417 "GalleryConnector.c" +#line 12425 "GalleryConnector.c" } } @@ -12467,21 +12475,21 @@ PublishingGallery3Session* publishing_gallery3_session_construct (GType object_t self = (PublishingGallery3Session*) publishing_rest_support_session_construct (object_type, NULL); #line 1942 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 12428 "GalleryConnector.c" +#line 12436 "GalleryConnector.c" } PublishingGallery3Session* publishing_gallery3_session_new (void) { #line 1942 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_session_construct (PUBLISHING_GALLERY3_TYPE_SESSION); -#line 12435 "GalleryConnector.c" +#line 12443 "GalleryConnector.c" } static gboolean publishing_gallery3_session_real_is_authenticated (PublishingRESTSupportSession* base) { PublishingGallery3Session * self; gboolean result = FALSE; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 1945 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_SESSION, PublishingGallery3Session); #line 1946 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12490,14 +12498,14 @@ static gboolean publishing_gallery3_session_real_is_authenticated (PublishingRES result = NULL != _tmp0_; #line 1946 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12451 "GalleryConnector.c" +#line 12459 "GalleryConnector.c" } void publishing_gallery3_session_authenticate (PublishingGallery3Session* self, const gchar* gallery_url, const gchar* username, const gchar* key) { - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; #line 1949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self)); #line 1949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12520,7 +12528,7 @@ void publishing_gallery3_session_authenticate (PublishingGallery3Session* self, publishing_gallery3_session_set_key (self, _tmp2_); #line 1954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_rest_support_session_notify_authenticated (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); -#line 12481 "GalleryConnector.c" +#line 12489 "GalleryConnector.c" } @@ -12533,13 +12541,13 @@ void publishing_gallery3_session_deauthenticate (PublishingGallery3Session* self publishing_gallery3_session_set_username (self, NULL); #line 1960 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_session_set_key (self, NULL); -#line 12494 "GalleryConnector.c" +#line 12502 "GalleryConnector.c" } const gchar* publishing_gallery3_session_get_url (PublishingGallery3Session* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self), NULL); #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12548,13 +12556,13 @@ const gchar* publishing_gallery3_session_get_url (PublishingGallery3Session* sel result = _tmp0_; #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12509 "GalleryConnector.c" +#line 12517 "GalleryConnector.c" } static void publishing_gallery3_session_set_url (PublishingGallery3Session* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self)); #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12565,13 +12573,13 @@ static void publishing_gallery3_session_set_url (PublishingGallery3Session* self _g_free0 (self->priv->_url); #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_url = _tmp1_; -#line 12526 "GalleryConnector.c" +#line 12534 "GalleryConnector.c" } const gchar* publishing_gallery3_session_get_username (PublishingGallery3Session* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self), NULL); #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12580,13 +12588,13 @@ const gchar* publishing_gallery3_session_get_username (PublishingGallery3Session result = _tmp0_; #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12541 "GalleryConnector.c" +#line 12549 "GalleryConnector.c" } static void publishing_gallery3_session_set_username (PublishingGallery3Session* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self)); #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12597,13 +12605,13 @@ static void publishing_gallery3_session_set_username (PublishingGallery3Session* _g_free0 (self->priv->_username); #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_username = _tmp1_; -#line 12558 "GalleryConnector.c" +#line 12566 "GalleryConnector.c" } const gchar* publishing_gallery3_session_get_key (PublishingGallery3Session* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self), NULL); #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12612,13 +12620,13 @@ const gchar* publishing_gallery3_session_get_key (PublishingGallery3Session* sel result = _tmp0_; #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12573 "GalleryConnector.c" +#line 12581 "GalleryConnector.c" } static void publishing_gallery3_session_set_key (PublishingGallery3Session* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self)); #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12629,7 +12637,7 @@ static void publishing_gallery3_session_set_key (PublishingGallery3Session* self _g_free0 (self->priv->_key); #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_key = _tmp1_; -#line 12590 "GalleryConnector.c" +#line 12598 "GalleryConnector.c" } @@ -12641,8 +12649,8 @@ static void publishing_gallery3_session_class_init (PublishingGallery3SessionCla #line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_class_add_private (klass, sizeof (PublishingGallery3SessionPrivate)); #line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_gallery3_session_real_is_authenticated; -#line 12603 "GalleryConnector.c" + ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_gallery3_session_real_is_authenticated; +#line 12611 "GalleryConnector.c" } @@ -12655,11 +12663,11 @@ static void publishing_gallery3_session_instance_init (PublishingGallery3Session self->priv->_username = NULL; #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_key = NULL; -#line 12616 "GalleryConnector.c" +#line 12624 "GalleryConnector.c" } -static void publishing_gallery3_session_finalize (PublishingRESTSupportSession* obj) { +static void publishing_gallery3_session_finalize (PublishingRESTSupportSession * obj) { PublishingGallery3Session * self; #line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_SESSION, PublishingGallery3Session); @@ -12671,7 +12679,7 @@ static void publishing_gallery3_session_finalize (PublishingRESTSupportSession* _g_free0 (self->priv->_key); #line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_gallery3_session_parent_class)->finalize (obj); -#line 12632 "GalleryConnector.c" +#line 12640 "GalleryConnector.c" } @@ -12689,11 +12697,11 @@ GType publishing_gallery3_session_get_type (void) { PublishingGallery3Uploader* publishing_gallery3_uploader_construct (GType object_type, PublishingGallery3Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingGallery3PublishingParameters* parameters) { PublishingGallery3Uploader* self = NULL; - PublishingGallery3Session* _tmp0_ = NULL; - SpitPublishingPublishable** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - PublishingGallery3PublishingParameters* _tmp2_ = NULL; - PublishingGallery3PublishingParameters* _tmp3_ = NULL; + PublishingGallery3Session* _tmp0_; + SpitPublishingPublishable** _tmp1_; + gint _tmp1__length1; + PublishingGallery3PublishingParameters* _tmp2_; + PublishingGallery3PublishingParameters* _tmp3_; #line 1990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL); #line 1990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12716,21 +12724,21 @@ PublishingGallery3Uploader* publishing_gallery3_uploader_construct (GType object self->priv->parameters = _tmp3_; #line 1990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 12677 "GalleryConnector.c" +#line 12685 "GalleryConnector.c" } PublishingGallery3Uploader* publishing_gallery3_uploader_new (PublishingGallery3Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingGallery3PublishingParameters* parameters) { #line 1990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_uploader_construct (PUBLISHING_GALLERY3_TYPE_UPLOADER, session, publishables, publishables_length1, parameters); -#line 12684 "GalleryConnector.c" +#line 12692 "GalleryConnector.c" } static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) { #line 2011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self ? publishing_rest_support_transaction_ref (self) : NULL; -#line 12691 "GalleryConnector.c" +#line 12699 "GalleryConnector.c" } @@ -12738,15 +12746,15 @@ static PublishingRESTSupportTransaction* publishing_gallery3_uploader_real_creat PublishingGallery3Uploader * self; PublishingRESTSupportTransaction* result = NULL; SpitPublishingPublishable* p = NULL; - SpitPublishingPublishable* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - SpitPublishingPublisherMediaType _tmp2_ = 0; - PublishingRESTSupportSession* _tmp3_ = NULL; - PublishingGallery3Session* _tmp4_ = NULL; - PublishingGallery3PublishingParameters* _tmp5_ = NULL; - PublishingGallery3GalleryUploadTransaction* _tmp6_ = NULL; - PublishingRESTSupportTransaction* _tmp7_ = NULL; - PublishingRESTSupportTransaction* _tmp8_ = NULL; + SpitPublishingPublishable* _tmp0_; + gchar* _tmp1_; + SpitPublishingPublisherMediaType _tmp2_; + PublishingRESTSupportSession* _tmp3_; + PublishingGallery3Session* _tmp4_; + PublishingGallery3PublishingParameters* _tmp5_; + PublishingGallery3GalleryUploadTransaction* _tmp6_; + PublishingRESTSupportTransaction* _tmp7_; + PublishingRESTSupportTransaction* _tmp8_; #line 2000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_UPLOADER, PublishingGallery3Uploader); #line 2000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12789,13 +12797,13 @@ static PublishingRESTSupportTransaction* publishing_gallery3_uploader_real_creat _g_object_unref0 (p); #line 2011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12750 "GalleryConnector.c" +#line 12758 "GalleryConnector.c" } const gchar* publishing_gallery3_uploader_get_current_publishable_name (PublishingGallery3Uploader* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 1974 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_UPLOADER (self), NULL); #line 1975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12804,14 +12812,14 @@ const gchar* publishing_gallery3_uploader_get_current_publishable_name (Publishi result = _tmp0_; #line 1975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12765 "GalleryConnector.c" +#line 12773 "GalleryConnector.c" } guint publishing_gallery3_uploader_get_status_code (PublishingGallery3Uploader* self) { guint result; - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; #line 1979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_UPLOADER (self), 0U); #line 1980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12822,13 +12830,13 @@ guint publishing_gallery3_uploader_get_status_code (PublishingGallery3Uploader* result = _tmp1_; #line 1980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12783 "GalleryConnector.c" +#line 12791 "GalleryConnector.c" } SpitPublishingPublisherMediaType publishing_gallery3_uploader_get_current_publishable_type (PublishingGallery3Uploader* self) { SpitPublishingPublisherMediaType result; - SpitPublishingPublisherMediaType _tmp0_ = 0; + SpitPublishingPublisherMediaType _tmp0_; #line 1985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_UPLOADER (self), 0); #line 1986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12837,7 +12845,7 @@ SpitPublishingPublisherMediaType publishing_gallery3_uploader_get_current_publis result = _tmp0_; #line 1986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12798 "GalleryConnector.c" +#line 12806 "GalleryConnector.c" } @@ -12849,19 +12857,19 @@ static void publishing_gallery3_uploader_class_init (PublishingGallery3UploaderC #line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_class_add_private (klass, sizeof (PublishingGallery3UploaderPrivate)); #line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_gallery3_uploader_real_create_transaction; -#line 12811 "GalleryConnector.c" + ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_gallery3_uploader_real_create_transaction; +#line 12819 "GalleryConnector.c" } static void publishing_gallery3_uploader_instance_init (PublishingGallery3Uploader * self) { #line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = PUBLISHING_GALLERY3_UPLOADER_GET_PRIVATE (self); -#line 12818 "GalleryConnector.c" +#line 12826 "GalleryConnector.c" } -static void publishing_gallery3_uploader_finalize (PublishingRESTSupportBatchUploader* obj) { +static void publishing_gallery3_uploader_finalize (PublishingRESTSupportBatchUploader * obj) { PublishingGallery3Uploader * self; #line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_UPLOADER, PublishingGallery3Uploader); @@ -12873,7 +12881,7 @@ static void publishing_gallery3_uploader_finalize (PublishingRESTSupportBatchUpl _publishing_rest_support_transaction_unref0 (self->priv->_current_transaction); #line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_gallery3_uploader_parent_class)->finalize (obj); -#line 12834 "GalleryConnector.c" +#line 12842 "GalleryConnector.c" } @@ -12892,55 +12900,55 @@ GType publishing_gallery3_uploader_get_type (void) { static gint string_last_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 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; +#line 1021 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1021 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, 0); -#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = needle; -#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = g_strrstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_); -#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1024 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1024 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 12873 "GalleryConnector.c" - gchar* _tmp4_ = NULL; -#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 12881 "GalleryConnector.c" + gchar* _tmp4_; +#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 12881 "GalleryConnector.c" +#line 12889 "GalleryConnector.c" } else { -#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1027 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = -1; -#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1027 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 12887 "GalleryConnector.c" +#line 12895 "GalleryConnector.c" } } gchar* publishing_gallery3_strip_session_url (const gchar* url) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; gint item_loc = 0; - const gchar* _tmp1_ = NULL; - gint _tmp2_ = 0; - const gchar* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gchar* _tmp7_ = NULL; + const gchar* _tmp1_; + gint _tmp2_; + const gchar* _tmp4_; + gint _tmp5_; + gint _tmp6_; + gchar* _tmp7_; #line 2017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (url != NULL, NULL); #line 2020 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12955,13 +12963,13 @@ gchar* publishing_gallery3_strip_session_url (const gchar* url) { item_loc = _tmp2_; #line 2025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (-1 == item_loc) { -#line 12916 "GalleryConnector.c" - const gchar* _tmp3_ = NULL; +#line 12924 "GalleryConnector.c" + const gchar* _tmp3_; #line 2026 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = url; #line 2026 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("Did not find \"%s\" in the base of the new item " "URL \"%s\"", PUBLISHING_GALLERY3_REST_PATH, _tmp3_); -#line 12922 "GalleryConnector.c" +#line 12930 "GalleryConnector.c" } #line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp4_ = url; @@ -12975,7 +12983,7 @@ gchar* publishing_gallery3_strip_session_url (const gchar* url) { result = _tmp7_; #line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12936 "GalleryConnector.c" +#line 12944 "GalleryConnector.c" } diff --git a/plugins/shotwell-publishing-extras/RajcePublishing.c b/plugins/shotwell-publishing-extras/RajcePublishing.c index 475b3d2..c63d685 100644 --- a/plugins/shotwell-publishing-extras/RajcePublishing.c +++ b/plugins/shotwell-publishing-extras/RajcePublishing.c @@ -1,4 +1,4 @@ -/* RajcePublishing.c generated by valac 0.34.7, the Vala compiler +/* RajcePublishing.c generated by valac 0.36.6, the Vala compiler * generated from RajcePublishing.vala, do not modify */ /* Copyright 2014 rajce.net @@ -203,7 +203,18 @@ typedef struct _PublishingRajceUploaderPrivate PublishingRajceUploaderPrivate; typedef struct _PublishingRajceAddPhotoTransaction PublishingRajceAddPhotoTransaction; typedef struct _PublishingRajceAddPhotoTransactionClass PublishingRajceAddPhotoTransactionClass; typedef struct _PublishingRajceAuthenticationPanePrivate PublishingRajceAuthenticationPanePrivate; +enum { + PUBLISHING_RAJCE_AUTHENTICATION_PANE_LOGIN_SIGNAL, + PUBLISHING_RAJCE_AUTHENTICATION_PANE_LAST_SIGNAL +}; +static guint publishing_rajce_authentication_pane_signals[PUBLISHING_RAJCE_AUTHENTICATION_PANE_LAST_SIGNAL] = {0}; typedef struct _PublishingRajcePublishingOptionsPanePrivate PublishingRajcePublishingOptionsPanePrivate; +enum { + PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL, + PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL, + PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL +}; +static guint publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0}; typedef struct _PublishingRajceParamSpecPublishingParameters PublishingRajceParamSpecPublishingParameters; typedef struct _PublishingRajceSessionPrivate PublishingRajceSessionPrivate; @@ -552,10 +563,10 @@ static gint rajce_service_icon_pixbuf_set_length1; static GdkPixbuf** rajce_service_icon_pixbuf_set = NULL; static gint rajce_service_icon_pixbuf_set_length1 = 0; static gint _rajce_service_icon_pixbuf_set_size_ = 0; -static SpitPluggableIface* rajce_service_spit_pluggable_parent_iface = NULL; -static SpitPublishingServiceIface* rajce_service_spit_publishing_service_parent_iface = NULL; +static SpitPluggableIface * rajce_service_spit_pluggable_parent_iface = NULL; +static SpitPublishingServiceIface * rajce_service_spit_publishing_service_parent_iface = NULL; static gpointer publishing_rajce_rajce_publisher_parent_class = NULL; -static SpitPublishingPublisherIface* publishing_rajce_rajce_publisher_spit_publishing_publisher_parent_iface = NULL; +static SpitPublishingPublisherIface * publishing_rajce_rajce_publisher_spit_publishing_publisher_parent_iface = NULL; static gpointer publishing_rajce_album_parent_class = NULL; static gpointer publishing_rajce_uploader_parent_class = NULL; static gpointer publishing_rajce_authentication_pane_parent_class = NULL; @@ -563,9 +574,9 @@ static gchar* publishing_rajce_authentication_pane_INTRO_MESSAGE; static gchar* publishing_rajce_authentication_pane_INTRO_MESSAGE = NULL; static gchar* publishing_rajce_authentication_pane_FAILED_RETRY_USER_MESSAGE; static gchar* publishing_rajce_authentication_pane_FAILED_RETRY_USER_MESSAGE = NULL; -static SpitPublishingDialogPaneIface* publishing_rajce_authentication_pane_spit_publishing_dialog_pane_parent_iface = NULL; +static SpitPublishingDialogPaneIface * publishing_rajce_authentication_pane_spit_publishing_dialog_pane_parent_iface = NULL; static gpointer publishing_rajce_publishing_options_pane_parent_class = NULL; -static SpitPublishingDialogPaneIface* publishing_rajce_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL; +static SpitPublishingDialogPaneIface * publishing_rajce_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL; static gpointer publishing_rajce_publishing_parameters_parent_class = NULL; static gpointer publishing_rajce_session_parent_class = NULL; static gpointer publishing_rajce_arg_item_parent_class = NULL; @@ -598,7 +609,7 @@ PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_construct (GType GType publishing_rajce_rajce_publisher_get_type (void) G_GNUC_CONST; static SpitPublishingPublisherMediaType rajce_service_real_get_supported_media (SpitPublishingService* base); static void rajce_service_real_activation (SpitPluggable* base, gboolean enabled); -static void rajce_service_finalize (GObject* obj); +static void rajce_service_finalize (GObject * obj); GType publishing_rajce_session_get_type (void) G_GNUC_CONST; gpointer publishing_rajce_album_ref (gpointer instance); void publishing_rajce_album_unref (gpointer instance); @@ -685,7 +696,7 @@ static void _publishing_rajce_rajce_publisher_on_publishing_options_pane_publish GtkWidget* publishing_rajce_publishing_options_pane_get_default_widget (PublishingRajcePublishingOptionsPane* self); void publishing_rajce_session_deauthenticate (PublishingRajceSession* self); static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRajcePublisher* self); -static gboolean _int_equal (const gint* s1, const gint* s2); +static gboolean _int_equal (const gint * s1, const gint * s2); GType publishing_rajce_create_album_transaction_get_type (void) G_GNUC_CONST; PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction_new (PublishingRajceSession* session, const gchar* url, const gchar* albumName, gboolean hidden); PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url, const gchar* albumName, gboolean hidden); @@ -734,11 +745,11 @@ static void _publishing_rajce_rajce_publisher_on_close_album_complete_publishing static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRajceRajcePublisher* self); gchar* publishing_rajce_session_get_albumticket (PublishingRajceSession* self); static void publishing_rajce_rajce_publisher_do_show_error_message (PublishingRajceRajcePublisher* self, const gchar* message); -static void publishing_rajce_rajce_publisher_finalize (GObject* obj); +static void publishing_rajce_rajce_publisher_finalize (GObject * obj); enum { PUBLISHING_RAJCE_ALBUM_DUMMY_PROPERTY }; -static void publishing_rajce_album_finalize (PublishingRajceAlbum* obj); +static void publishing_rajce_album_finalize (PublishingRajceAlbum * obj); #define PUBLISHING_RAJCE_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_RAJCE_TYPE_UPLOADER, PublishingRajceUploaderPrivate)) enum { PUBLISHING_RAJCE_UPLOADER_DUMMY_PROPERTY @@ -747,7 +758,7 @@ static PublishingRESTSupportTransaction* publishing_rajce_uploader_real_create_t PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_new (PublishingRajceSession* session, const gchar* url, PublishingRajcePublishingParameters* parameters, SpitPublishingPublishable* publishable); PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url, PublishingRajcePublishingParameters* parameters, SpitPublishingPublishable* publishable); GType publishing_rajce_add_photo_transaction_get_type (void) G_GNUC_CONST; -static void publishing_rajce_uploader_finalize (PublishingRESTSupportBatchUploader* obj); +static void publishing_rajce_uploader_finalize (PublishingRESTSupportBatchUploader * obj); #define PUBLISHING_RAJCE_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, PublishingRajceAuthenticationPanePrivate)) enum { PUBLISHING_RAJCE_AUTHENTICATION_PANE_DUMMY_PROPERTY @@ -764,7 +775,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_rajce_authentication_p static void publishing_rajce_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base); static void publishing_rajce_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base); static void g_cclosure_user_marshal_VOID__STRING_STRING_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void publishing_rajce_authentication_pane_finalize (GObject* obj); +static void publishing_rajce_authentication_pane_finalize (GObject * obj); #define PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingRajcePublishingOptionsPanePrivate)) enum { PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY @@ -795,13 +806,13 @@ static void _publishing_rajce_publishing_options_pane_notify_publish_publishing_ static void _publishing_rajce_publishing_options_pane_notify_logout_publishing_rajce_publishing_options_pane_logout (PublishingRajcePublishingOptionsPane* _sender, gpointer self); static void publishing_rajce_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base); static void g_cclosure_user_marshal_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void publishing_rajce_publishing_options_pane_finalize (GObject* obj); +static void publishing_rajce_publishing_options_pane_finalize (GObject * obj); enum { PUBLISHING_RAJCE_PUBLISHING_PARAMETERS_DUMMY_PROPERTY }; static PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new (void); static PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_construct (GType object_type); -static void publishing_rajce_publishing_parameters_finalize (PublishingRajcePublishingParameters* obj); +static void publishing_rajce_publishing_parameters_finalize (PublishingRajcePublishingParameters * obj); #define PUBLISHING_RAJCE_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_RAJCE_TYPE_SESSION, PublishingRajceSessionPrivate)) enum { PUBLISHING_RAJCE_SESSION_DUMMY_PROPERTY @@ -809,7 +820,7 @@ enum { static gboolean publishing_rajce_session_real_is_authenticated (PublishingRESTSupportSession* base); gchar* publishing_rajce_session_get_usertoken (PublishingRajceSession* self); gchar* publishing_rajce_session_get_albumtoken (PublishingRajceSession* self); -static void publishing_rajce_session_finalize (PublishingRESTSupportSession* obj); +static void publishing_rajce_session_finalize (PublishingRESTSupportSession * obj); gpointer publishing_rajce_arg_item_ref (gpointer instance); void publishing_rajce_arg_item_unref (gpointer instance); GParamSpec* publishing_rajce_param_spec_arg_item (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -823,9 +834,9 @@ enum { PublishingRajceArgItem* publishing_rajce_arg_item_new (const gchar* k, const gchar* v); PublishingRajceArgItem* publishing_rajce_arg_item_construct (GType object_type, const gchar* k, const gchar* v); void publishing_rajce_arg_item_AddChild (PublishingRajceArgItem* self, PublishingRajceArgItem* child); -static void _vala_array_add6 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value); +static void _vala_array_add6 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value); void publishing_rajce_arg_item_AddChildren (PublishingRajceArgItem* self, PublishingRajceArgItem** newchildren, int newchildren_length1); -static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem* obj); +static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem * obj); gpointer publishing_rajce_live_api_request_ref (gpointer instance); void publishing_rajce_live_api_request_unref (gpointer instance); GParamSpec* publishing_rajce_param_spec_live_api_request (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -840,14 +851,14 @@ enum { PublishingRajceLiveApiRequest* publishing_rajce_live_api_request_new (const gchar* cmd); PublishingRajceLiveApiRequest* publishing_rajce_live_api_request_construct (GType object_type, const gchar* cmd); void publishing_rajce_live_api_request_AddParam (PublishingRajceLiveApiRequest* self, const gchar* name, const gchar* val); -static void _vala_array_add7 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value); +static void _vala_array_add7 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value); void publishing_rajce_live_api_request_AddParamBool (PublishingRajceLiveApiRequest* self, const gchar* name, gboolean val); void publishing_rajce_live_api_request_AddParamInt (PublishingRajceLiveApiRequest* self, const gchar* name, gint val); void publishing_rajce_live_api_request_AddParamNode (PublishingRajceLiveApiRequest* self, const gchar* name, PublishingRajceArgItem** val, int val_length1); -static void _vala_array_add8 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value); +static void _vala_array_add8 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value); gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveApiRequest* self, gboolean urlencode); static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, PublishingRajceArgItem* arg); -static void publishing_rajce_live_api_request_finalize (PublishingRajceLiveApiRequest* obj); +static void publishing_rajce_live_api_request_finalize (PublishingRajceLiveApiRequest * obj); enum { PUBLISHING_RAJCE_TRANSACTION_DUMMY_PROPERTY }; @@ -859,11 +870,11 @@ enum { enum { PUBLISHING_RAJCE_GET_ALBUMS_TRANSACTION_DUMMY_PROPERTY }; -static void _vala_array_add9 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value); -static void _vala_array_add10 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value); -static void _vala_array_add11 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value); -static void _vala_array_add12 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value); -static void _vala_array_add13 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value); +static void _vala_array_add9 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value); +static void _vala_array_add10 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value); +static void _vala_array_add11 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value); +static void _vala_array_add12 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value); +static void _vala_array_add13 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value); enum { PUBLISHING_RAJCE_CREATE_ALBUM_TRANSACTION_DUMMY_PROPERTY }; @@ -887,15 +898,15 @@ enum { PUBLISHING_RAJCE_ADD_PHOTO_TRANSACTION_DUMMY_PROPERTY }; static void _g_free0_ (gpointer var); -static void publishing_rajce_add_photo_transaction_finalize (PublishingRESTSupportTransaction* obj); +static void publishing_rajce_add_photo_transaction_finalize (PublishingRESTSupportTransaction * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); RajceService* rajce_service_construct (GType object_type, GFile* resource_directory) { RajceService * self = NULL; - GdkPixbuf** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + GdkPixbuf** _tmp0_; + gint _tmp0__length1; #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (G_IS_FILE (resource_directory), NULL); #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -906,9 +917,9 @@ RajceService* rajce_service_construct (GType object_type, GFile* resource_direct _tmp0__length1 = rajce_service_icon_pixbuf_set_length1; #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp0_ == NULL) { -#line 910 "RajcePublishing.c" - gint _tmp1_ = 0; - GdkPixbuf** _tmp2_ = NULL; +#line 921 "RajcePublishing.c" + gint _tmp1_; + GdkPixbuf** _tmp2_; #line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" RAJCE_SERVICE_ICON_FILENAME, &_tmp1_); #line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -919,27 +930,27 @@ RajceService* rajce_service_construct (GType object_type, GFile* resource_direct rajce_service_icon_pixbuf_set_length1 = _tmp1_; #line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _rajce_service_icon_pixbuf_set_size_ = rajce_service_icon_pixbuf_set_length1; -#line 923 "RajcePublishing.c" +#line 934 "RajcePublishing.c" } #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 927 "RajcePublishing.c" +#line 938 "RajcePublishing.c" } RajceService* rajce_service_new (GFile* resource_directory) { #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return rajce_service_construct (TYPE_RAJCE_SERVICE, resource_directory); -#line 934 "RajcePublishing.c" +#line 945 "RajcePublishing.c" } static gint rajce_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) { RajceService * self; gint result = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAJCE_SERVICE, RajceService); #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -952,7 +963,7 @@ static gint rajce_service_real_get_pluggable_interface (SpitPluggable* base, gin result = _tmp2_; #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 956 "RajcePublishing.c" +#line 967 "RajcePublishing.c" } @@ -965,7 +976,7 @@ static const gchar* rajce_service_real_get_id (SpitPluggable* base) { result = "org.yorba.shotwell.publishing.rajce"; #line 29 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 969 "RajcePublishing.c" +#line 980 "RajcePublishing.c" } @@ -978,14 +989,14 @@ static const gchar* rajce_service_real_get_pluggable_name (SpitPluggable* base) result = "Rajce"; #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 982 "RajcePublishing.c" +#line 993 "RajcePublishing.c" } static gpointer _g_object_ref0 (gpointer self) { #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self ? g_object_ref (self) : NULL; -#line 989 "RajcePublishing.c" +#line 1000 "RajcePublishing.c" } @@ -996,34 +1007,33 @@ static GdkPixbuf** _vala_array_dup4 (GdkPixbuf** self, int length) { result = g_new0 (GdkPixbuf*, length + 1); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" for (i = 0; i < length; i++) { -#line 1000 "RajcePublishing.c" - GdkPixbuf* _tmp0_ = NULL; +#line 1011 "RajcePublishing.c" + GdkPixbuf* _tmp0_; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result[i] = _tmp0_; -#line 1006 "RajcePublishing.c" +#line 1017 "RajcePublishing.c" } #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 1010 "RajcePublishing.c" +#line 1021 "RajcePublishing.c" } static void rajce_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) { RajceService * self; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GdkPixbuf** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - GdkPixbuf** _tmp9_ = NULL; - gint _tmp9__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + GdkPixbuf** _tmp7_; + gint _tmp7__length1; + GdkPixbuf** _tmp8_; + gint _tmp8__length1; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAJCE_SERVICE, RajceService); #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1035,68 +1045,66 @@ static void rajce_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*info).authors = _tmp0_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp1_ = _ ("Copyright © 2013 rajce.net"); -#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp1_ = g_strdup (_ ("Copyright © 2013 rajce.net")); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 ((*info).copyright); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - (*info).copyright = _tmp2_; + (*info).copyright = _tmp1_; #line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp3_ = g_strdup (RESOURCES_TRANSLATORS); + _tmp2_ = g_strdup (RESOURCES_TRANSLATORS); #line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 ((*info).translators); #line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - (*info).translators = _tmp3_; + (*info).translators = _tmp2_; #line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp4_ = g_strdup (_VERSION); + _tmp3_ = g_strdup (_VERSION); #line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 ((*info).version); #line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - (*info).version = _tmp4_; + (*info).version = _tmp3_; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp5_ = g_strdup (RESOURCES_WEBSITE_NAME); + _tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 ((*info).website_name); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - (*info).website_name = _tmp5_; + (*info).website_name = _tmp4_; #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp6_ = g_strdup (RESOURCES_WEBSITE_URL); + _tmp5_ = g_strdup (RESOURCES_WEBSITE_URL); #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 ((*info).website_url); #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - (*info).website_url = _tmp6_; + (*info).website_url = _tmp5_; #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*info).is_license_wordwrapped = FALSE; #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp7_ = g_strdup (RESOURCES_LICENSE); + _tmp6_ = g_strdup (RESOURCES_LICENSE); #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 ((*info).license); #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - (*info).license = _tmp7_; + (*info).license = _tmp6_; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp8_ = rajce_service_icon_pixbuf_set; + _tmp7_ = rajce_service_icon_pixbuf_set; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp8__length1 = rajce_service_icon_pixbuf_set_length1; + _tmp7__length1 = rajce_service_icon_pixbuf_set_length1; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup4 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_); + _tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup4 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp9__length1 = _tmp8__length1; + _tmp8__length1 = _tmp7__length1; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - (*info).icons = _tmp9_; + (*info).icons = _tmp8_; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - (*info).icons_length1 = _tmp9__length1; -#line 1092 "RajcePublishing.c" + (*info).icons_length1 = _tmp8__length1; +#line 1100 "RajcePublishing.c" } static SpitPublishingPublisher* rajce_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) { RajceService * self; SpitPublishingPublisher* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - PublishingRajceRajcePublisher* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + PublishingRajceRajcePublisher* _tmp1_; #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAJCE_SERVICE, RajceService); #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1109,7 +1117,7 @@ static SpitPublishingPublisher* rajce_service_real_create_publisher (SpitPublish result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher); #line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 1113 "RajcePublishing.c" +#line 1121 "RajcePublishing.c" } @@ -1122,7 +1130,7 @@ static SpitPublishingPublisherMediaType rajce_service_real_get_supported_media ( result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO; #line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 1126 "RajcePublishing.c" +#line 1134 "RajcePublishing.c" } @@ -1130,7 +1138,7 @@ static void rajce_service_real_activation (SpitPluggable* base, gboolean enabled RajceService * self; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAJCE_SERVICE, RajceService); -#line 1134 "RajcePublishing.c" +#line 1142 "RajcePublishing.c" } @@ -1139,7 +1147,7 @@ static void rajce_service_class_init (RajceServiceClass * klass) { rajce_service_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" G_OBJECT_CLASS (klass)->finalize = rajce_service_finalize; -#line 1143 "RajcePublishing.c" +#line 1151 "RajcePublishing.c" } @@ -1147,16 +1155,16 @@ static void rajce_service_spit_pluggable_interface_init (SpitPluggableIface * if #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" rajce_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) rajce_service_real_get_pluggable_interface; + iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) rajce_service_real_get_pluggable_interface; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - iface->get_id = (const gchar* (*)(SpitPluggable*)) rajce_service_real_get_id; + iface->get_id = (const gchar* (*) (SpitPluggable *)) rajce_service_real_get_id; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) rajce_service_real_get_pluggable_name; + iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) rajce_service_real_get_pluggable_name; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) rajce_service_real_get_info; + iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) rajce_service_real_get_info; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - iface->activation = (void (*)(SpitPluggable*, gboolean)) rajce_service_real_activation; -#line 1160 "RajcePublishing.c" + iface->activation = (void (*) (SpitPluggable *, gboolean)) rajce_service_real_activation; +#line 1168 "RajcePublishing.c" } @@ -1164,10 +1172,10 @@ static void rajce_service_spit_publishing_service_interface_init (SpitPublishing #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" rajce_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) rajce_service_real_create_publisher; + iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) rajce_service_real_create_publisher; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) rajce_service_real_get_supported_media; -#line 1171 "RajcePublishing.c" + iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) rajce_service_real_get_supported_media; +#line 1179 "RajcePublishing.c" } @@ -1175,13 +1183,13 @@ static void rajce_service_instance_init (RajceService * self) { } -static void rajce_service_finalize (GObject* obj) { +static void rajce_service_finalize (GObject * obj) { RajceService * self; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RAJCE_SERVICE, RajceService); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" G_OBJECT_CLASS (rajce_service_parent_class)->finalize (obj); -#line 1185 "RajcePublishing.c" +#line 1193 "RajcePublishing.c" } @@ -1203,14 +1211,14 @@ GType rajce_service_get_type (void) { PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) { PublishingRajceRajcePublisher * self = NULL; - SpitPublishingService* _tmp0_ = NULL; - SpitPublishingService* _tmp1_ = NULL; - SpitPublishingPluginHost* _tmp2_ = NULL; - SpitPublishingPluginHost* _tmp3_ = NULL; - PublishingRajceSession* _tmp4_ = NULL; - SpitPublishingPluginHost* _tmp5_ = NULL; - gint _tmp6_ = 0; - SpitPublishingPublishable** _tmp7_ = NULL; + SpitPublishingService* _tmp0_; + SpitPublishingService* _tmp1_; + SpitPublishingPluginHost* _tmp2_; + SpitPublishingPluginHost* _tmp3_; + PublishingRajceSession* _tmp4_; + SpitPublishingPluginHost* _tmp5_; + gint _tmp6_; + SpitPublishingPublishable** _tmp7_; #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL); #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1245,7 +1253,7 @@ PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_construct (GType _tmp5_ = host; #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = spit_publishing_plugin_host_get_publishables (_tmp5_, &_tmp6_); -#line 1249 "RajcePublishing.c" +#line 1257 "RajcePublishing.c" { SpitPublishingPublishable** p_collection = NULL; gint p_collection_length1 = 0; @@ -1257,18 +1265,18 @@ PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_construct (GType p_collection_length1 = _tmp6_; #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" for (p_it = 0; p_it < _tmp6_; p_it = p_it + 1) { -#line 1261 "RajcePublishing.c" - SpitPublishingPublishable* _tmp8_ = NULL; +#line 1269 "RajcePublishing.c" + SpitPublishingPublishable* _tmp8_; SpitPublishingPublishable* p = NULL; #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp8_ = _g_object_ref0 (p_collection[p_it]); #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" p = _tmp8_; -#line 1268 "RajcePublishing.c" +#line 1276 "RajcePublishing.c" { - SpitPublishingPublisherMediaType _tmp9_ = 0; - SpitPublishingPublishable* _tmp10_ = NULL; - SpitPublishingPublisherMediaType _tmp11_ = 0; + SpitPublishingPublisherMediaType _tmp9_; + SpitPublishingPublishable* _tmp10_; + SpitPublishingPublisherMediaType _tmp11_; #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp9_ = self->priv->media_type; #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1279,29 +1287,29 @@ PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_construct (GType self->priv->media_type = _tmp9_ | _tmp11_; #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (p); -#line 1283 "RajcePublishing.c" +#line 1291 "RajcePublishing.c" } } #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" p_collection = (_vala_array_free (p_collection, p_collection_length1, (GDestroyNotify) g_object_unref), NULL); -#line 1288 "RajcePublishing.c" +#line 1296 "RajcePublishing.c" } #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 1292 "RajcePublishing.c" +#line 1300 "RajcePublishing.c" } PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) { #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_rajce_publisher_construct (PUBLISHING_RAJCE_TYPE_RAJCE_PUBLISHER, service, host); -#line 1299 "RajcePublishing.c" +#line 1307 "RajcePublishing.c" } static gchar* publishing_rajce_rajce_publisher_get_rajce_url (PublishingRajceRajcePublisher* self) { gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self), NULL); #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1310,15 +1318,15 @@ static gchar* publishing_rajce_rajce_publisher_get_rajce_url (PublishingRajceRaj result = _tmp0_; #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 1314 "RajcePublishing.c" +#line 1322 "RajcePublishing.c" } static SpitPublishingService* publishing_rajce_rajce_publisher_real_get_service (SpitPublishingPublisher* base) { PublishingRajceRajcePublisher * self; SpitPublishingService* result = NULL; - SpitPublishingService* _tmp0_ = NULL; - SpitPublishingService* _tmp1_ = NULL; + SpitPublishingService* _tmp0_; + SpitPublishingService* _tmp1_; #line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_RAJCE_PUBLISHER, PublishingRajceRajcePublisher); #line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1329,14 +1337,14 @@ static SpitPublishingService* publishing_rajce_rajce_publisher_real_get_service result = _tmp1_; #line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 1333 "RajcePublishing.c" +#line 1341 "RajcePublishing.c" } SpitPublishingPluginHost* publishing_rajce_rajce_publisher_get_host (PublishingRajceRajcePublisher* self) { SpitPublishingPluginHost* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; #line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self), NULL); #line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1347,14 +1355,14 @@ SpitPublishingPluginHost* publishing_rajce_rajce_publisher_get_host (PublishingR result = _tmp1_; #line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 1351 "RajcePublishing.c" +#line 1359 "RajcePublishing.c" } static gboolean publishing_rajce_rajce_publisher_real_is_running (SpitPublishingPublisher* base) { PublishingRajceRajcePublisher * self; gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_RAJCE_PUBLISHER, PublishingRajceRajcePublisher); #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1363,7 +1371,7 @@ static gboolean publishing_rajce_rajce_publisher_real_is_running (SpitPublishing result = _tmp0_; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 1367 "RajcePublishing.c" +#line 1375 "RajcePublishing.c" } @@ -1375,22 +1383,22 @@ static gboolean* _bool_dup (gboolean* self) { memcpy (dup, self, sizeof (gboolean)); #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return dup; -#line 1379 "RajcePublishing.c" +#line 1387 "RajcePublishing.c" } static gpointer __bool_dup0 (gpointer self) { #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self ? _bool_dup (self) : NULL; -#line 1386 "RajcePublishing.c" +#line 1394 "RajcePublishing.c" } static void publishing_rajce_rajce_publisher_real_start (SpitPublishingPublisher* base) { PublishingRajceRajcePublisher * self; - gboolean _tmp0_ = FALSE; - PublishingRajceSession* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + gboolean _tmp0_; + PublishingRajceSession* _tmp1_; + gboolean _tmp2_; #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_RAJCE_PUBLISHER, PublishingRajceRajcePublisher); #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1399,7 +1407,7 @@ static void publishing_rajce_rajce_publisher_real_start (SpitPublishingPublisher if (_tmp0_) { #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 1403 "RajcePublishing.c" +#line 1411 "RajcePublishing.c" } #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_debug ("RajcePublishing.vala:111: RajcePublisher: start"); @@ -1415,17 +1423,17 @@ static void publishing_rajce_rajce_publisher_real_start (SpitPublishingPublisher g_debug ("RajcePublishing.vala:116: RajcePublisher: session is authenticated."); #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_do_fetch_albums (self); -#line 1419 "RajcePublishing.c" +#line 1427 "RajcePublishing.c" } else { gchar* persistent_username = NULL; - gchar* _tmp3_ = NULL; + gchar* _tmp3_; gchar* persistent_token = NULL; - gchar* _tmp4_ = NULL; + gchar* _tmp4_; gboolean* persistent_remember = NULL; - gboolean _tmp5_ = FALSE; - gboolean* _tmp6_ = NULL; + gboolean _tmp5_; + gboolean* _tmp6_; gboolean _tmp7_ = FALSE; - const gchar* _tmp8_ = NULL; + const gchar* _tmp8_; #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_debug ("RajcePublishing.vala:121: RajcePublisher: session is not authenticated" \ "."); @@ -1447,24 +1455,24 @@ static void publishing_rajce_rajce_publisher_real_start (SpitPublishingPublisher _tmp8_ = persistent_username; #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp8_ != NULL) { -#line 1450 "RajcePublishing.c" - const gchar* _tmp9_ = NULL; +#line 1458 "RajcePublishing.c" + const gchar* _tmp9_; #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp9_ = persistent_token; #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = _tmp9_ != NULL; -#line 1456 "RajcePublishing.c" +#line 1464 "RajcePublishing.c" } else { #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = FALSE; -#line 1460 "RajcePublishing.c" +#line 1468 "RajcePublishing.c" } #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp7_) { -#line 1464 "RajcePublishing.c" - const gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - gboolean* _tmp12_ = NULL; +#line 1472 "RajcePublishing.c" + const gchar* _tmp10_; + const gchar* _tmp11_; + gboolean* _tmp12_; #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp10_ = persistent_username; #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1473,11 +1481,11 @@ static void publishing_rajce_rajce_publisher_real_start (SpitPublishingPublisher _tmp12_ = persistent_remember; #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_do_network_login (self, _tmp10_, _tmp11_, *_tmp12_); -#line 1476 "RajcePublishing.c" +#line 1484 "RajcePublishing.c" } else { #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_do_show_authentication_pane (self, PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_INTRO); -#line 1480 "RajcePublishing.c" +#line 1488 "RajcePublishing.c" } #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (persistent_remember); @@ -1485,7 +1493,7 @@ static void publishing_rajce_rajce_publisher_real_start (SpitPublishingPublisher _g_free0 (persistent_token); #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (persistent_username); -#line 1488 "RajcePublishing.c" +#line 1496 "RajcePublishing.c" } } @@ -1498,13 +1506,13 @@ static void publishing_rajce_rajce_publisher_real_stop (SpitPublishingPublisher* g_debug ("RajcePublishing.vala:134: RajcePublisher: stop"); #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->running = FALSE; -#line 1501 "RajcePublishing.c" +#line 1509 "RajcePublishing.c" } gchar* publishing_rajce_rajce_publisher_get_url (PublishingRajceRajcePublisher* self) { gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self), NULL); #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1513,14 +1521,14 @@ gchar* publishing_rajce_rajce_publisher_get_url (PublishingRajceRajcePublisher* result = _tmp0_; #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 1516 "RajcePublishing.c" +#line 1524 "RajcePublishing.c" } gchar* publishing_rajce_rajce_publisher_get_username (PublishingRajceRajcePublisher* self) { gchar* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gchar* _tmp1_; #line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self), NULL); #line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1531,13 +1539,13 @@ gchar* publishing_rajce_rajce_publisher_get_username (PublishingRajceRajcePublis result = _tmp1_; #line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 1534 "RajcePublishing.c" +#line 1542 "RajcePublishing.c" } static void publishing_rajce_rajce_publisher_set_username (PublishingRajceRajcePublisher* self, const gchar* username) { - SpitPublishingPluginHost* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + const gchar* _tmp1_; #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1548,14 +1556,14 @@ static void publishing_rajce_rajce_publisher_set_username (PublishingRajceRajceP _tmp1_ = username; #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "username", _tmp1_); -#line 1551 "RajcePublishing.c" +#line 1559 "RajcePublishing.c" } gchar* publishing_rajce_rajce_publisher_get_token (PublishingRajceRajcePublisher* self) { gchar* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gchar* _tmp1_; #line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self), NULL); #line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1566,13 +1574,13 @@ gchar* publishing_rajce_rajce_publisher_get_token (PublishingRajceRajcePublisher result = _tmp1_; #line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 1569 "RajcePublishing.c" +#line 1577 "RajcePublishing.c" } static void publishing_rajce_rajce_publisher_set_token (PublishingRajceRajcePublisher* self, const gchar* token) { - SpitPublishingPluginHost* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + const gchar* _tmp1_; #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1581,14 +1589,14 @@ static void publishing_rajce_rajce_publisher_set_token (PublishingRajceRajcePubl _tmp1_ = token; #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "token", _tmp1_); -#line 1584 "RajcePublishing.c" +#line 1592 "RajcePublishing.c" } gboolean publishing_rajce_rajce_publisher_get_remember (PublishingRajceRajcePublisher* self) { gboolean result = FALSE; - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; #line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self), FALSE); #line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1599,13 +1607,13 @@ gboolean publishing_rajce_rajce_publisher_get_remember (PublishingRajceRajcePubl result = _tmp1_; #line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 1602 "RajcePublishing.c" +#line 1610 "RajcePublishing.c" } static void publishing_rajce_rajce_publisher_set_remember (PublishingRajceRajcePublisher* self, gboolean remember) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1614,14 +1622,14 @@ static void publishing_rajce_rajce_publisher_set_remember (PublishingRajceRajceP _tmp1_ = remember; #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember", _tmp1_); -#line 1617 "RajcePublishing.c" +#line 1625 "RajcePublishing.c" } gboolean publishing_rajce_rajce_publisher_get_hide_album (PublishingRajceRajcePublisher* self) { gboolean result = FALSE; - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; #line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self), FALSE); #line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1632,13 +1640,13 @@ gboolean publishing_rajce_rajce_publisher_get_hide_album (PublishingRajceRajcePu result = _tmp1_; #line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 1635 "RajcePublishing.c" +#line 1643 "RajcePublishing.c" } void publishing_rajce_rajce_publisher_set_hide_album (PublishingRajceRajcePublisher* self, gboolean hide_album) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1647,14 +1655,14 @@ void publishing_rajce_rajce_publisher_set_hide_album (PublishingRajceRajcePublis _tmp1_ = hide_album; #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "hide-album", _tmp1_); -#line 1650 "RajcePublishing.c" +#line 1658 "RajcePublishing.c" } gboolean publishing_rajce_rajce_publisher_get_show_album (PublishingRajceRajcePublisher* self) { gboolean result = FALSE; - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self), FALSE); #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1665,13 +1673,13 @@ gboolean publishing_rajce_rajce_publisher_get_show_album (PublishingRajceRajcePu result = _tmp1_; #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 1668 "RajcePublishing.c" +#line 1676 "RajcePublishing.c" } void publishing_rajce_rajce_publisher_set_show_album (PublishingRajceRajcePublisher* self, gboolean show_album) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; #line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1680,7 +1688,7 @@ void publishing_rajce_rajce_publisher_set_show_album (PublishingRajceRajcePublis _tmp1_ = show_album; #line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "show-album", _tmp1_); -#line 1683 "RajcePublishing.c" +#line 1691 "RajcePublishing.c" } @@ -1690,19 +1698,19 @@ void publishing_rajce_rajce_publisher_set_show_album (PublishingRajceRajcePublis static void _publishing_rajce_rajce_publisher_on_authentication_pane_login_clicked_publishing_rajce_authentication_pane_login (PublishingRajceAuthenticationPane* _sender, const gchar* user, const gchar* token, gboolean remember, gpointer self) { #line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_on_authentication_pane_login_clicked ((PublishingRajceRajcePublisher*) self, user, token, remember); -#line 1693 "RajcePublishing.c" +#line 1701 "RajcePublishing.c" } static void publishing_rajce_rajce_publisher_do_show_authentication_pane (PublishingRajceRajcePublisher* self, PublishingRajceAuthenticationPaneMode mode) { - SpitPublishingPluginHost* _tmp0_ = NULL; + SpitPublishingPluginHost* _tmp0_; PublishingRajceAuthenticationPane* authentication_pane = NULL; - PublishingRajceAuthenticationPaneMode _tmp1_ = 0; - PublishingRajceAuthenticationPane* _tmp2_ = NULL; - SpitPublishingPluginHost* _tmp3_ = NULL; - SpitPublishingPluginHost* _tmp4_ = NULL; - GtkWidget* _tmp5_ = NULL; - GtkWidget* _tmp6_ = NULL; + PublishingRajceAuthenticationPaneMode _tmp1_; + PublishingRajceAuthenticationPane* _tmp2_; + SpitPublishingPluginHost* _tmp3_; + SpitPublishingPluginHost* _tmp4_; + GtkWidget* _tmp5_; + GtkWidget* _tmp6_; #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1735,7 +1743,7 @@ static void publishing_rajce_rajce_publisher_do_show_authentication_pane (Publis _g_object_unref0 (_tmp6_); #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (authentication_pane); -#line 1738 "RajcePublishing.c" +#line 1746 "RajcePublishing.c" } @@ -1743,10 +1751,10 @@ static void publishing_rajce_rajce_publisher_do_show_authentication_pane (Publis * Event triggered when the login button in the authentication panel is clicked. */ static void publishing_rajce_rajce_publisher_on_authentication_pane_login_clicked (PublishingRajceRajcePublisher* self, const gchar* username, const gchar* token, gboolean remember) { - gboolean _tmp0_ = FALSE; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + gboolean _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + gboolean _tmp3_; #line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1761,7 +1769,7 @@ static void publishing_rajce_rajce_publisher_on_authentication_pane_login_clicke if (!_tmp0_) { #line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 1764 "RajcePublishing.c" +#line 1772 "RajcePublishing.c" } #line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = username; @@ -1771,7 +1779,7 @@ static void publishing_rajce_rajce_publisher_on_authentication_pane_login_clicke _tmp3_ = remember; #line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_do_network_login (self, _tmp1_, _tmp2_, _tmp3_); -#line 1774 "RajcePublishing.c" +#line 1782 "RajcePublishing.c" } @@ -1781,32 +1789,32 @@ static void publishing_rajce_rajce_publisher_on_authentication_pane_login_clicke static void _publishing_rajce_rajce_publisher_on_login_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_on_login_network_error ((PublishingRajceRajcePublisher*) self, _sender, err); -#line 1784 "RajcePublishing.c" +#line 1792 "RajcePublishing.c" } static void _publishing_rajce_rajce_publisher_on_login_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_on_login_network_complete ((PublishingRajceRajcePublisher*) self, _sender); -#line 1791 "RajcePublishing.c" +#line 1799 "RajcePublishing.c" } static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRajcePublisher* self, const gchar* username, const gchar* token, gboolean remember) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - const gchar* _tmp3_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; + gboolean _tmp2_; + const gchar* _tmp3_; const gchar* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + gboolean _tmp5_; PublishingRajceSessionLoginTransaction* login_trans = NULL; - PublishingRajceSession* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - PublishingRajceSessionLoginTransaction* _tmp12_ = NULL; - PublishingRajceSessionLoginTransaction* _tmp13_ = NULL; + PublishingRajceSession* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + const gchar* _tmp10_; + const gchar* _tmp11_; + PublishingRajceSessionLoginTransaction* _tmp12_; + PublishingRajceSessionLoginTransaction* _tmp13_; GError * _inner_error_ = NULL; #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); @@ -1836,17 +1844,17 @@ static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRa _tmp5_ = remember; #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp5_) { -#line 1839 "RajcePublishing.c" - const gchar* _tmp6_ = NULL; +#line 1847 "RajcePublishing.c" + const gchar* _tmp6_; #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = token; #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = _tmp6_; -#line 1845 "RajcePublishing.c" +#line 1853 "RajcePublishing.c" } else { #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = NULL; -#line 1849 "RajcePublishing.c" +#line 1857 "RajcePublishing.c" } #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_set_token (self, _tmp4_); @@ -1872,7 +1880,7 @@ static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRa g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rajce_rajce_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self, 0); #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rajce_rajce_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self, 0); -#line 1875 "RajcePublishing.c" +#line 1883 "RajcePublishing.c" { #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -1880,7 +1888,7 @@ static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRa if (G_UNLIKELY (_inner_error_ != NULL)) { #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 1883 "RajcePublishing.c" +#line 1891 "RajcePublishing.c" goto __catch16_spit_publishing_publishing_error; } #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1891,14 +1899,14 @@ static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRa g_clear_error (&_inner_error_); #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 1894 "RajcePublishing.c" +#line 1902 "RajcePublishing.c" } } goto __finally16; __catch16_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp14_ = NULL; + GError* _tmp14_; #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" err = _inner_error_; #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1911,7 +1919,7 @@ static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRa publishing_rajce_rajce_publisher_do_show_error (self, _tmp14_); #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_error_free0 (err); -#line 1914 "RajcePublishing.c" +#line 1922 "RajcePublishing.c" } __finally16: #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -1924,11 +1932,11 @@ static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRa g_clear_error (&_inner_error_); #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 1927 "RajcePublishing.c" +#line 1935 "RajcePublishing.c" } #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rest_support_transaction_unref0 (login_trans); -#line 1931 "RajcePublishing.c" +#line 1939 "RajcePublishing.c" } @@ -1940,15 +1948,15 @@ static gchar* _publishing_rajce_transaction_validate_xml_publishing_rest_support result = publishing_rajce_transaction_validate_xml (doc); #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 1943 "RajcePublishing.c" +#line 1951 "RajcePublishing.c" } static void publishing_rajce_rajce_publisher_on_login_network_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; GError * _inner_error_ = NULL; #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); @@ -1968,63 +1976,63 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE); #line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self); -#line 1971 "RajcePublishing.c" +#line 1979 "RajcePublishing.c" { PublishingRESTSupportXmlDocument* doc = NULL; - PublishingRESTSupportTransaction* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - PublishingRESTSupportXmlDocument* _tmp7_ = NULL; - PublishingRESTSupportXmlDocument* _tmp8_ = NULL; + PublishingRESTSupportTransaction* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + PublishingRESTSupportXmlDocument* _tmp7_; + PublishingRESTSupportXmlDocument* _tmp8_; xmlNode* response = NULL; - PublishingRESTSupportXmlDocument* _tmp9_ = NULL; - xmlNode* _tmp10_ = NULL; + PublishingRESTSupportXmlDocument* _tmp9_; + xmlNode* _tmp10_; xmlNode* sessionToken = NULL; - PublishingRESTSupportXmlDocument* _tmp11_ = NULL; - xmlNode* _tmp12_ = NULL; - xmlNode* _tmp13_ = NULL; + PublishingRESTSupportXmlDocument* _tmp11_; + xmlNode* _tmp12_; + xmlNode* _tmp13_; xmlNode* maxWidth = NULL; - PublishingRESTSupportXmlDocument* _tmp14_ = NULL; - xmlNode* _tmp15_ = NULL; - xmlNode* _tmp16_ = NULL; + PublishingRESTSupportXmlDocument* _tmp14_; + xmlNode* _tmp15_; + xmlNode* _tmp16_; xmlNode* maxHeight = NULL; - PublishingRESTSupportXmlDocument* _tmp17_ = NULL; - xmlNode* _tmp18_ = NULL; - xmlNode* _tmp19_ = NULL; + PublishingRESTSupportXmlDocument* _tmp17_; + xmlNode* _tmp18_; + xmlNode* _tmp19_; xmlNode* quality = NULL; - PublishingRESTSupportXmlDocument* _tmp20_ = NULL; - xmlNode* _tmp21_ = NULL; - xmlNode* _tmp22_ = NULL; + PublishingRESTSupportXmlDocument* _tmp20_; + xmlNode* _tmp21_; + xmlNode* _tmp22_; xmlNode* nick = NULL; - PublishingRESTSupportXmlDocument* _tmp23_ = NULL; - xmlNode* _tmp24_ = NULL; - xmlNode* _tmp25_ = NULL; + PublishingRESTSupportXmlDocument* _tmp23_; + xmlNode* _tmp24_; + xmlNode* _tmp25_; gint maxW = 0; - xmlNode* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - gint _tmp29_ = 0; - gint _tmp30_ = 0; + xmlNode* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + gint _tmp29_; + gint _tmp30_; gint maxH = 0; - xmlNode* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; - gint _tmp34_ = 0; - gint _tmp35_ = 0; - gint _tmp36_ = 0; - gint _tmp37_ = 0; - PublishingRajceSession* _tmp39_ = NULL; - xmlNode* _tmp40_ = NULL; - gchar* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; - xmlNode* _tmp43_ = NULL; - gchar* _tmp44_ = NULL; - gchar* _tmp45_ = NULL; - gint _tmp46_ = 0; - xmlNode* _tmp47_ = NULL; - gchar* _tmp48_ = NULL; - gchar* _tmp49_ = NULL; - gint _tmp50_ = 0; + xmlNode* _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; + gint _tmp34_; + gint _tmp35_; + gint _tmp36_; + gint _tmp37_; + PublishingRajceSession* _tmp39_; + xmlNode* _tmp40_; + gchar* _tmp41_; + gchar* _tmp42_; + xmlNode* _tmp43_; + gchar* _tmp44_; + gchar* _tmp45_; + gint _tmp46_; + xmlNode* _tmp47_; + gchar* _tmp48_; + gchar* _tmp49_; + gint _tmp50_; #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = txn; #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -2043,7 +2051,7 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi if (G_UNLIKELY (_inner_error_ != NULL)) { #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2046 "RajcePublishing.c" +#line 2054 "RajcePublishing.c" goto __catch17_spit_publishing_publishing_error; } #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -2052,7 +2060,7 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi g_clear_error (&_inner_error_); #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 2055 "RajcePublishing.c" +#line 2063 "RajcePublishing.c" } #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp9_ = doc; @@ -2074,7 +2082,7 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi _publishing_rest_support_xml_document_unref0 (doc); #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2077 "RajcePublishing.c" +#line 2085 "RajcePublishing.c" goto __catch17_spit_publishing_publishing_error; } #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -2085,7 +2093,7 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi g_clear_error (&_inner_error_); #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 2088 "RajcePublishing.c" +#line 2096 "RajcePublishing.c" } #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp14_ = doc; @@ -2101,7 +2109,7 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi _publishing_rest_support_xml_document_unref0 (doc); #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2104 "RajcePublishing.c" +#line 2112 "RajcePublishing.c" goto __catch17_spit_publishing_publishing_error; } #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -2112,7 +2120,7 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi g_clear_error (&_inner_error_); #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 2115 "RajcePublishing.c" +#line 2123 "RajcePublishing.c" } #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp17_ = doc; @@ -2128,7 +2136,7 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi _publishing_rest_support_xml_document_unref0 (doc); #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2131 "RajcePublishing.c" +#line 2139 "RajcePublishing.c" goto __catch17_spit_publishing_publishing_error; } #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -2139,7 +2147,7 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi g_clear_error (&_inner_error_); #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 2142 "RajcePublishing.c" +#line 2150 "RajcePublishing.c" } #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp20_ = doc; @@ -2155,7 +2163,7 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi _publishing_rest_support_xml_document_unref0 (doc); #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2158 "RajcePublishing.c" +#line 2166 "RajcePublishing.c" goto __catch17_spit_publishing_publishing_error; } #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -2166,7 +2174,7 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi g_clear_error (&_inner_error_); #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 2169 "RajcePublishing.c" +#line 2177 "RajcePublishing.c" } #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp23_ = doc; @@ -2182,7 +2190,7 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi _publishing_rest_support_xml_document_unref0 (doc); #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2185 "RajcePublishing.c" +#line 2193 "RajcePublishing.c" goto __catch17_spit_publishing_publishing_error; } #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -2193,7 +2201,7 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi g_clear_error (&_inner_error_); #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 2196 "RajcePublishing.c" +#line 2204 "RajcePublishing.c" } #line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp26_ = maxWidth; @@ -2229,13 +2237,13 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi _tmp37_ = maxH; #line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp36_ > _tmp37_) { -#line 2232 "RajcePublishing.c" - gint _tmp38_ = 0; +#line 2240 "RajcePublishing.c" + gint _tmp38_; #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp38_ = maxW; #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" maxH = _tmp38_; -#line 2238 "RajcePublishing.c" +#line 2246 "RajcePublishing.c" } #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp39_ = self->priv->session; @@ -2271,17 +2279,17 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi _g_free0 (_tmp42_); #line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rest_support_xml_document_unref0 (doc); -#line 2274 "RajcePublishing.c" +#line 2282 "RajcePublishing.c" } goto __finally17; __catch17_spit_publishing_publishing_error: { GError* err = NULL; gint code_int = 0; - GError* _tmp51_ = NULL; - const gchar* _tmp52_ = NULL; - gint _tmp53_ = 0; - gint _tmp54_ = 0; + GError* _tmp51_; + const gchar* _tmp52_; + gint _tmp53_; + gint _tmp54_; #line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" err = _inner_error_; #line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -2302,22 +2310,22 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi g_debug ("RajcePublishing.vala:239: ERROR: on_login_network_complete, code 999"); #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_do_show_authentication_pane (self, PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER); -#line 2305 "RajcePublishing.c" +#line 2313 "RajcePublishing.c" } else { - GError* _tmp55_ = NULL; + GError* _tmp55_; #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_debug ("RajcePublishing.vala:244: ERROR: on_login_network_complete"); #line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp55_ = err; #line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_do_show_error (self, _tmp55_); -#line 2314 "RajcePublishing.c" +#line 2322 "RajcePublishing.c" } #line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_error_free0 (err); #line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 2320 "RajcePublishing.c" +#line 2328 "RajcePublishing.c" } __finally17: #line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -2328,11 +2336,11 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi g_clear_error (&_inner_error_); #line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 2331 "RajcePublishing.c" +#line 2339 "RajcePublishing.c" } #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_do_fetch_albums (self); -#line 2335 "RajcePublishing.c" +#line 2343 "RajcePublishing.c" } @@ -2340,10 +2348,10 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi * Event triggered when a network login action fails due to a network error. */ static void publishing_rajce_rajce_publisher_on_login_network_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; #line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -2364,7 +2372,7 @@ static void publishing_rajce_rajce_publisher_on_login_network_error (PublishingR g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self); #line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_do_show_authentication_pane (self, PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER); -#line 2367 "RajcePublishing.c" +#line 2375 "RajcePublishing.c" } @@ -2374,26 +2382,26 @@ static void publishing_rajce_rajce_publisher_on_login_network_error (PublishingR static void _publishing_rajce_rajce_publisher_on_albums_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_on_albums_fetch_error ((PublishingRajceRajcePublisher*) self, _sender, err); -#line 2377 "RajcePublishing.c" +#line 2385 "RajcePublishing.c" } static void _publishing_rajce_rajce_publisher_on_albums_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_on_albums_fetch_complete ((PublishingRajceRajcePublisher*) self, _sender); -#line 2384 "RajcePublishing.c" +#line 2392 "RajcePublishing.c" } static void publishing_rajce_rajce_publisher_do_fetch_albums (PublishingRajceRajcePublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; PublishingRajceGetAlbumsTransaction* get_albums_trans = NULL; - PublishingRajceSession* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - PublishingRajceGetAlbumsTransaction* _tmp5_ = NULL; - PublishingRajceGetAlbumsTransaction* _tmp6_ = NULL; + PublishingRajceSession* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + PublishingRajceGetAlbumsTransaction* _tmp5_; + PublishingRajceGetAlbumsTransaction* _tmp6_; GError * _inner_error_ = NULL; #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); @@ -2425,7 +2433,7 @@ static void publishing_rajce_rajce_publisher_do_fetch_albums (PublishingRajceRaj g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (get_albums_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rajce_rajce_publisher_on_albums_fetch_error_publishing_rest_support_transaction_network_error, self, 0); #line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (get_albums_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rajce_rajce_publisher_on_albums_fetch_complete_publishing_rest_support_transaction_completed, self, 0); -#line 2428 "RajcePublishing.c" +#line 2436 "RajcePublishing.c" { #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (get_albums_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -2433,7 +2441,7 @@ static void publishing_rajce_rajce_publisher_do_fetch_albums (PublishingRajceRaj if (G_UNLIKELY (_inner_error_ != NULL)) { #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2436 "RajcePublishing.c" +#line 2444 "RajcePublishing.c" goto __catch18_spit_publishing_publishing_error; } #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -2444,14 +2452,14 @@ static void publishing_rajce_rajce_publisher_do_fetch_albums (PublishingRajceRaj g_clear_error (&_inner_error_); #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 2447 "RajcePublishing.c" +#line 2455 "RajcePublishing.c" } } goto __finally18; __catch18_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp7_ = NULL; + GError* _tmp7_; #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" err = _inner_error_; #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -2464,7 +2472,7 @@ static void publishing_rajce_rajce_publisher_do_fetch_albums (PublishingRajceRaj publishing_rajce_rajce_publisher_do_show_error (self, _tmp7_); #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_error_free0 (err); -#line 2467 "RajcePublishing.c" +#line 2475 "RajcePublishing.c" } __finally18: #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -2477,11 +2485,11 @@ static void publishing_rajce_rajce_publisher_do_fetch_albums (PublishingRajceRaj g_clear_error (&_inner_error_); #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 2480 "RajcePublishing.c" +#line 2488 "RajcePublishing.c" } #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rest_support_transaction_unref0 (get_albums_trans); -#line 2484 "RajcePublishing.c" +#line 2492 "RajcePublishing.c" } @@ -2493,22 +2501,22 @@ static gint _publishing_rajce_album_compare_albums_gcompare_data_func (gconstpoi result = publishing_rajce_album_compare_albums ((PublishingRajceAlbum*) a, (PublishingRajceAlbum*) b); #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 2496 "RajcePublishing.c" +#line 2504 "RajcePublishing.c" } static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - PublishingRESTSupportTransaction* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - PublishingRajceAlbum** _tmp7_ = NULL; - gint _tmp7__length1 = 0; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + PublishingRESTSupportTransaction* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + PublishingRajceAlbum** _tmp7_; + gint _tmp7__length1; GeeArrayList* list = NULL; - GeeArrayList* _tmp8_ = NULL; + GeeArrayList* _tmp8_; GError * _inner_error_ = NULL; #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); @@ -2552,39 +2560,39 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin self->priv->albums_length1 = 0; #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->_albums_size_ = self->priv->albums_length1; -#line 2555 "RajcePublishing.c" +#line 2563 "RajcePublishing.c" } #line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp8_ = gee_array_list_new (PUBLISHING_RAJCE_TYPE_ALBUM, (GBoxedCopyFunc) publishing_rajce_album_ref, (GDestroyNotify) publishing_rajce_album_unref, NULL, NULL, NULL); #line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" list = _tmp8_; -#line 2561 "RajcePublishing.c" +#line 2569 "RajcePublishing.c" { PublishingRESTSupportXmlDocument* doc = NULL; - PublishingRESTSupportTransaction* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - PublishingRESTSupportXmlDocument* _tmp12_ = NULL; - PublishingRESTSupportXmlDocument* _tmp13_ = NULL; + PublishingRESTSupportTransaction* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + PublishingRESTSupportXmlDocument* _tmp12_; + PublishingRESTSupportXmlDocument* _tmp13_; xmlNode* response = NULL; - PublishingRESTSupportXmlDocument* _tmp14_ = NULL; - xmlNode* _tmp15_ = NULL; + PublishingRESTSupportXmlDocument* _tmp14_; + xmlNode* _tmp15_; xmlNode* sessionToken = NULL; - PublishingRESTSupportXmlDocument* _tmp16_ = NULL; - xmlNode* _tmp17_ = NULL; - xmlNode* _tmp18_ = NULL; + PublishingRESTSupportXmlDocument* _tmp16_; + xmlNode* _tmp17_; + xmlNode* _tmp18_; xmlNode* nodealbums = NULL; - PublishingRESTSupportXmlDocument* _tmp19_ = NULL; - xmlNode* _tmp20_ = NULL; - xmlNode* _tmp21_ = NULL; - GeeArrayList* _tmp96_ = NULL; - GeeArrayList* _tmp97_ = NULL; - gint _tmp98_ = 0; - gpointer* _tmp99_ = NULL; - PublishingRajceSession* _tmp100_ = NULL; - xmlNode* _tmp101_ = NULL; - gchar* _tmp102_ = NULL; - gchar* _tmp103_ = NULL; + PublishingRESTSupportXmlDocument* _tmp19_; + xmlNode* _tmp20_; + xmlNode* _tmp21_; + GeeArrayList* _tmp96_; + GeeArrayList* _tmp97_; + gint _tmp98_; + gpointer* _tmp99_; + PublishingRajceSession* _tmp100_; + xmlNode* _tmp101_; + gchar* _tmp102_; + gchar* _tmp103_; #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp9_ = txn; #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -2603,7 +2611,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin if (G_UNLIKELY (_inner_error_ != NULL)) { #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2606 "RajcePublishing.c" +#line 2614 "RajcePublishing.c" goto __catch19_spit_publishing_publishing_error; } #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -2614,7 +2622,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin g_clear_error (&_inner_error_); #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 2617 "RajcePublishing.c" +#line 2625 "RajcePublishing.c" } #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp14_ = doc; @@ -2636,7 +2644,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin _publishing_rest_support_xml_document_unref0 (doc); #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2639 "RajcePublishing.c" +#line 2647 "RajcePublishing.c" goto __catch19_spit_publishing_publishing_error; } #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -2649,7 +2657,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin g_clear_error (&_inner_error_); #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 2652 "RajcePublishing.c" +#line 2660 "RajcePublishing.c" } #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp19_ = doc; @@ -2665,7 +2673,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin _publishing_rest_support_xml_document_unref0 (doc); #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2668 "RajcePublishing.c" +#line 2676 "RajcePublishing.c" goto __catch19_spit_publishing_publishing_error; } #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -2678,116 +2686,116 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin g_clear_error (&_inner_error_); #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 2681 "RajcePublishing.c" +#line 2689 "RajcePublishing.c" } { xmlNode* album = NULL; - xmlNode* _tmp22_ = NULL; - xmlNode* _tmp23_ = NULL; + xmlNode* _tmp22_; + xmlNode* _tmp23_; #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp22_ = nodealbums; #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp23_ = _tmp22_->children; #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" album = _tmp23_; -#line 2693 "RajcePublishing.c" +#line 2701 "RajcePublishing.c" { gboolean _tmp24_ = FALSE; #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp24_ = TRUE; #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" while (TRUE) { -#line 2700 "RajcePublishing.c" - xmlNode* _tmp27_ = NULL; +#line 2708 "RajcePublishing.c" + xmlNode* _tmp27_; gint id = 0; - xmlNode* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - gint _tmp31_ = 0; - gint _tmp32_ = 0; + xmlNode* _tmp28_; + gchar* _tmp29_; + gchar* _tmp30_; + gint _tmp31_; + gint _tmp32_; xmlNode* _tmp33_ = NULL; - PublishingRESTSupportXmlDocument* _tmp34_ = NULL; - xmlNode* _tmp35_ = NULL; - xmlNode* _tmp36_ = NULL; + PublishingRESTSupportXmlDocument* _tmp34_; + xmlNode* _tmp35_; + xmlNode* _tmp36_; gchar* albumName = NULL; - gchar* _tmp37_ = NULL; + gchar* _tmp37_; xmlNode* _tmp38_ = NULL; - PublishingRESTSupportXmlDocument* _tmp39_ = NULL; - xmlNode* _tmp40_ = NULL; - xmlNode* _tmp41_ = NULL; + PublishingRESTSupportXmlDocument* _tmp39_; + xmlNode* _tmp40_; + xmlNode* _tmp41_; gchar* url = NULL; - gchar* _tmp42_ = NULL; + gchar* _tmp42_; xmlNode* _tmp43_ = NULL; - PublishingRESTSupportXmlDocument* _tmp44_ = NULL; - xmlNode* _tmp45_ = NULL; - xmlNode* _tmp46_ = NULL; + PublishingRESTSupportXmlDocument* _tmp44_; + xmlNode* _tmp45_; + xmlNode* _tmp46_; gchar* thumbUrl = NULL; - gchar* _tmp47_ = NULL; + gchar* _tmp47_; xmlNode* _tmp48_ = NULL; - PublishingRESTSupportXmlDocument* _tmp49_ = NULL; - xmlNode* _tmp50_ = NULL; - xmlNode* _tmp51_ = NULL; + PublishingRESTSupportXmlDocument* _tmp49_; + xmlNode* _tmp50_; + xmlNode* _tmp51_; gchar* createDate = NULL; - gchar* _tmp52_ = NULL; + gchar* _tmp52_; xmlNode* _tmp53_ = NULL; - PublishingRESTSupportXmlDocument* _tmp54_ = NULL; - xmlNode* _tmp55_ = NULL; - xmlNode* _tmp56_ = NULL; + PublishingRESTSupportXmlDocument* _tmp54_; + xmlNode* _tmp55_; + xmlNode* _tmp56_; gchar* updateDate = NULL; - gchar* _tmp57_ = NULL; + gchar* _tmp57_; gboolean _tmp58_ = FALSE; xmlNode* _tmp59_ = NULL; - PublishingRESTSupportXmlDocument* _tmp60_ = NULL; - xmlNode* _tmp61_ = NULL; - xmlNode* _tmp62_ = NULL; - gchar* _tmp63_ = NULL; - gchar* _tmp64_ = NULL; - gint _tmp65_ = 0; - gboolean _tmp66_ = FALSE; + PublishingRESTSupportXmlDocument* _tmp60_; + xmlNode* _tmp61_; + xmlNode* _tmp62_; + gchar* _tmp63_; + gchar* _tmp64_; + gint _tmp65_; + gboolean _tmp66_; gboolean hidden = FALSE; gboolean _tmp67_ = FALSE; xmlNode* _tmp68_ = NULL; - PublishingRESTSupportXmlDocument* _tmp69_ = NULL; - xmlNode* _tmp70_ = NULL; - xmlNode* _tmp71_ = NULL; - gchar* _tmp72_ = NULL; - gchar* _tmp73_ = NULL; - gint _tmp74_ = 0; - gboolean _tmp75_ = FALSE; + PublishingRESTSupportXmlDocument* _tmp69_; + xmlNode* _tmp70_; + xmlNode* _tmp71_; + gchar* _tmp72_; + gchar* _tmp73_; + gint _tmp74_; + gboolean _tmp75_; gboolean secure = FALSE; xmlNode* _tmp76_ = NULL; - PublishingRESTSupportXmlDocument* _tmp77_ = NULL; - xmlNode* _tmp78_ = NULL; - xmlNode* _tmp79_ = NULL; + PublishingRESTSupportXmlDocument* _tmp77_; + xmlNode* _tmp78_; + xmlNode* _tmp79_; gint photoCount = 0; - gchar* _tmp80_ = NULL; - gchar* _tmp81_ = NULL; - gint _tmp82_ = 0; - gint _tmp83_ = 0; - GeeArrayList* _tmp84_ = NULL; - gint _tmp85_ = 0; - const gchar* _tmp86_ = NULL; - const gchar* _tmp87_ = NULL; - const gchar* _tmp88_ = NULL; - const gchar* _tmp89_ = NULL; - const gchar* _tmp90_ = NULL; - gboolean _tmp91_ = FALSE; - gboolean _tmp92_ = FALSE; - gint _tmp93_ = 0; - PublishingRajceAlbum* _tmp94_ = NULL; - PublishingRajceAlbum* _tmp95_ = NULL; + gchar* _tmp80_; + gchar* _tmp81_; + gint _tmp82_; + gint _tmp83_; + GeeArrayList* _tmp84_; + gint _tmp85_; + const gchar* _tmp86_; + const gchar* _tmp87_; + const gchar* _tmp88_; + const gchar* _tmp89_; + const gchar* _tmp90_; + gboolean _tmp91_; + gboolean _tmp92_; + gint _tmp93_; + PublishingRajceAlbum* _tmp94_; + PublishingRajceAlbum* _tmp95_; #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (!_tmp24_) { -#line 2781 "RajcePublishing.c" - xmlNode* _tmp25_ = NULL; - xmlNode* _tmp26_ = NULL; +#line 2789 "RajcePublishing.c" + xmlNode* _tmp25_; + xmlNode* _tmp26_; #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp25_ = album; #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp26_ = _tmp25_->next; #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" album = _tmp26_; -#line 2790 "RajcePublishing.c" +#line 2798 "RajcePublishing.c" } #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp24_ = FALSE; @@ -2797,7 +2805,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin if (!(_tmp27_ != NULL)) { #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" break; -#line 2800 "RajcePublishing.c" +#line 2808 "RajcePublishing.c" } #line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp28_ = album; @@ -2827,7 +2835,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin _publishing_rest_support_xml_document_unref0 (doc); #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2830 "RajcePublishing.c" +#line 2838 "RajcePublishing.c" goto __catch19_spit_publishing_publishing_error; } #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -2840,7 +2848,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin g_clear_error (&_inner_error_); #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 2843 "RajcePublishing.c" +#line 2851 "RajcePublishing.c" } #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp37_ = (gchar*) xmlNodeGetContent (_tmp33_); @@ -2862,7 +2870,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin _publishing_rest_support_xml_document_unref0 (doc); #line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2865 "RajcePublishing.c" +#line 2873 "RajcePublishing.c" goto __catch19_spit_publishing_publishing_error; } #line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -2877,7 +2885,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin g_clear_error (&_inner_error_); #line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 2880 "RajcePublishing.c" +#line 2888 "RajcePublishing.c" } #line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp42_ = (gchar*) xmlNodeGetContent (_tmp38_); @@ -2901,7 +2909,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin _publishing_rest_support_xml_document_unref0 (doc); #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2904 "RajcePublishing.c" +#line 2912 "RajcePublishing.c" goto __catch19_spit_publishing_publishing_error; } #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -2918,7 +2926,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin g_clear_error (&_inner_error_); #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 2921 "RajcePublishing.c" +#line 2929 "RajcePublishing.c" } #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp47_ = (gchar*) xmlNodeGetContent (_tmp43_); @@ -2944,7 +2952,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin _publishing_rest_support_xml_document_unref0 (doc); #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2947 "RajcePublishing.c" +#line 2955 "RajcePublishing.c" goto __catch19_spit_publishing_publishing_error; } #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -2963,7 +2971,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin g_clear_error (&_inner_error_); #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 2966 "RajcePublishing.c" +#line 2974 "RajcePublishing.c" } #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp52_ = (gchar*) xmlNodeGetContent (_tmp48_); @@ -2991,7 +2999,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin _publishing_rest_support_xml_document_unref0 (doc); #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2994 "RajcePublishing.c" +#line 3002 "RajcePublishing.c" goto __catch19_spit_publishing_publishing_error; } #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3012,7 +3020,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin g_clear_error (&_inner_error_); #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 3015 "RajcePublishing.c" +#line 3023 "RajcePublishing.c" } #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp57_ = (gchar*) xmlNodeGetContent (_tmp53_); @@ -3042,7 +3050,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin _publishing_rest_support_xml_document_unref0 (doc); #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3045 "RajcePublishing.c" +#line 3053 "RajcePublishing.c" goto __catch19_spit_publishing_publishing_error; } #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3065,7 +3073,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin g_clear_error (&_inner_error_); #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 3068 "RajcePublishing.c" +#line 3076 "RajcePublishing.c" } #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp63_ = (gchar*) xmlNodeGetContent (_tmp59_); @@ -3081,11 +3089,11 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin if (_tmp66_) { #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp58_ = TRUE; -#line 3084 "RajcePublishing.c" +#line 3092 "RajcePublishing.c" } else { #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp58_ = FALSE; -#line 3088 "RajcePublishing.c" +#line 3096 "RajcePublishing.c" } #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" hidden = _tmp58_; @@ -3113,7 +3121,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin _publishing_rest_support_xml_document_unref0 (doc); #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3116 "RajcePublishing.c" +#line 3124 "RajcePublishing.c" goto __catch19_spit_publishing_publishing_error; } #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3136,7 +3144,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin g_clear_error (&_inner_error_); #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 3139 "RajcePublishing.c" +#line 3147 "RajcePublishing.c" } #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp72_ = (gchar*) xmlNodeGetContent (_tmp68_); @@ -3152,11 +3160,11 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin if (_tmp75_) { #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp67_ = TRUE; -#line 3155 "RajcePublishing.c" +#line 3163 "RajcePublishing.c" } else { #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp67_ = FALSE; -#line 3159 "RajcePublishing.c" +#line 3167 "RajcePublishing.c" } #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" secure = _tmp67_; @@ -3184,7 +3192,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin _publishing_rest_support_xml_document_unref0 (doc); #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3187 "RajcePublishing.c" +#line 3195 "RajcePublishing.c" goto __catch19_spit_publishing_publishing_error; } #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3207,7 +3215,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin g_clear_error (&_inner_error_); #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 3210 "RajcePublishing.c" +#line 3218 "RajcePublishing.c" } #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp80_ = (gchar*) xmlNodeGetContent (_tmp76_); @@ -3259,7 +3267,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin _g_free0 (url); #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (albumName); -#line 3262 "RajcePublishing.c" +#line 3270 "RajcePublishing.c" } } } @@ -3293,13 +3301,13 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin _g_free0 (_tmp103_); #line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rest_support_xml_document_unref0 (doc); -#line 3296 "RajcePublishing.c" +#line 3304 "RajcePublishing.c" } goto __finally19; __catch19_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp104_ = NULL; + GError* _tmp104_; #line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" err = _inner_error_; #line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3316,7 +3324,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin _g_object_unref0 (list); #line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 3319 "RajcePublishing.c" +#line 3327 "RajcePublishing.c" } __finally19: #line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3329,13 +3337,13 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin g_clear_error (&_inner_error_); #line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 3332 "RajcePublishing.c" +#line 3340 "RajcePublishing.c" } #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_do_show_publishing_options_pane (self); #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (list); -#line 3338 "RajcePublishing.c" +#line 3346 "RajcePublishing.c" } @@ -3343,12 +3351,12 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin * Event triggered when the fetch albums transaction fails due to a network error. */ static void publishing_rajce_rajce_publisher_on_albums_fetch_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - PublishingRESTSupportTransaction* _tmp4_ = NULL; - GError* _tmp5_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + PublishingRESTSupportTransaction* _tmp4_; + GError* _tmp5_; #line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3373,7 +3381,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_error (PublishingRa _tmp5_ = err; #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_on_network_error (self, _tmp4_, _tmp5_); -#line 3376 "RajcePublishing.c" +#line 3384 "RajcePublishing.c" } @@ -3383,31 +3391,31 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_error (PublishingRa static void _publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_clicked_publishing_rajce_publishing_options_pane_logout (PublishingRajcePublishingOptionsPane* _sender, gpointer self) { #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_clicked ((PublishingRajceRajcePublisher*) self); -#line 3386 "RajcePublishing.c" +#line 3394 "RajcePublishing.c" } static void _publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_clicked_publishing_rajce_publishing_options_pane_publish (PublishingRajcePublishingOptionsPane* _sender, PublishingRajcePublishingParameters* parameters, gpointer self) { #line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_clicked ((PublishingRajceRajcePublisher*) self, parameters); -#line 3393 "RajcePublishing.c" +#line 3401 "RajcePublishing.c" } static void publishing_rajce_rajce_publisher_do_show_publishing_options_pane (PublishingRajceRajcePublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; + SpitPublishingPluginHost* _tmp0_; PublishingRajcePublishingOptionsPane* opts_pane = NULL; - PublishingRajceSession* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - PublishingRajceAlbum** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - PublishingRajcePublishingOptionsPane* _tmp5_ = NULL; - PublishingRajcePublishingOptionsPane* _tmp6_ = NULL; - SpitPublishingPluginHost* _tmp7_ = NULL; - SpitPublishingPluginHost* _tmp8_ = NULL; - GtkWidget* _tmp9_ = NULL; - GtkWidget* _tmp10_ = NULL; + PublishingRajceSession* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + PublishingRajceAlbum** _tmp4_; + gint _tmp4__length1; + PublishingRajcePublishingOptionsPane* _tmp5_; + PublishingRajcePublishingOptionsPane* _tmp6_; + SpitPublishingPluginHost* _tmp7_; + SpitPublishingPluginHost* _tmp8_; + GtkWidget* _tmp9_; + GtkWidget* _tmp10_; #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3454,7 +3462,7 @@ static void publishing_rajce_rajce_publisher_do_show_publishing_options_pane (Pu _g_object_unref0 (_tmp10_); #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (opts_pane); -#line 3457 "RajcePublishing.c" +#line 3465 "RajcePublishing.c" } @@ -3462,7 +3470,7 @@ static void publishing_rajce_rajce_publisher_do_show_publishing_options_pane (Pu * Event triggered when the user clicks logout in the publishing options pane. */ static void publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_clicked (PublishingRajceRajcePublisher* self) { - PublishingRajceSession* _tmp0_ = NULL; + PublishingRajceSession* _tmp0_; #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3474,7 +3482,7 @@ static void publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_c publishing_rajce_session_deauthenticate (_tmp0_); #line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_do_show_authentication_pane (self, PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_INTRO); -#line 3476 "RajcePublishing.c" +#line 3484 "RajcePublishing.c" } @@ -3486,13 +3494,13 @@ static void publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_c static gpointer _publishing_rajce_publishing_parameters_ref0 (gpointer self) { #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self ? publishing_rajce_publishing_parameters_ref (self) : NULL; -#line 3488 "RajcePublishing.c" +#line 3496 "RajcePublishing.c" } static void publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_clicked (PublishingRajceRajcePublisher* self, PublishingRajcePublishingParameters* parameters) { - PublishingRajcePublishingParameters* _tmp0_ = NULL; - PublishingRajcePublishingParameters* _tmp1_ = NULL; + PublishingRajcePublishingParameters* _tmp0_; + PublishingRajcePublishingParameters* _tmp1_; #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3510,71 +3518,71 @@ static void publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_ self->priv->parameters = _tmp1_; #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_do_begin_upload (self); -#line 3511 "RajcePublishing.c" +#line 3519 "RajcePublishing.c" } /** * Begin upload action: open existing album or create a new one */ -static gboolean _int_equal (const gint* s1, const gint* s2) { +static gboolean _int_equal (const gint * s1, const gint * s2) { #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (s1 == s2) { #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return TRUE; -#line 3523 "RajcePublishing.c" +#line 3531 "RajcePublishing.c" } #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (s1 == NULL) { #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return FALSE; -#line 3529 "RajcePublishing.c" +#line 3537 "RajcePublishing.c" } #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (s2 == NULL) { #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return FALSE; -#line 3535 "RajcePublishing.c" +#line 3543 "RajcePublishing.c" } #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return (*s1) == (*s2); -#line 3539 "RajcePublishing.c" +#line 3547 "RajcePublishing.c" } static void _publishing_rajce_rajce_publisher_on_create_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_on_create_album_error ((PublishingRajceRajcePublisher*) self, _sender, err); -#line 3546 "RajcePublishing.c" +#line 3554 "RajcePublishing.c" } static void _publishing_rajce_rajce_publisher_on_create_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_on_create_album_complete ((PublishingRajceRajcePublisher*) self, _sender); -#line 3553 "RajcePublishing.c" +#line 3561 "RajcePublishing.c" } static void _publishing_rajce_rajce_publisher_on_open_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_on_open_album_error ((PublishingRajceRajcePublisher*) self, _sender, err); -#line 3560 "RajcePublishing.c" +#line 3568 "RajcePublishing.c" } static void _publishing_rajce_rajce_publisher_on_open_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_on_open_album_complete ((PublishingRajceRajcePublisher*) self, _sender); -#line 3567 "RajcePublishing.c" +#line 3575 "RajcePublishing.c" } static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRajcePublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - PublishingRajcePublishingParameters* _tmp1_ = NULL; - gint* _tmp2_ = NULL; - gint _tmp3_ = 0; + SpitPublishingPluginHost* _tmp0_; + PublishingRajcePublishingParameters* _tmp1_; + gint* _tmp2_; + gint _tmp3_; GError * _inner_error_ = NULL; #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); @@ -3590,19 +3598,19 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj _tmp3_ = 0; #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_int_equal (_tmp2_, &_tmp3_) == TRUE) { -#line 3591 "RajcePublishing.c" +#line 3599 "RajcePublishing.c" PublishingRajceCreateAlbumTransaction* create_album_trans = NULL; - PublishingRajceSession* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - PublishingRajcePublishingParameters* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - PublishingRajcePublishingParameters* _tmp9_ = NULL; - gboolean* _tmp10_ = NULL; - PublishingRajceCreateAlbumTransaction* _tmp11_ = NULL; - PublishingRajceCreateAlbumTransaction* _tmp12_ = NULL; - PublishingRajceCreateAlbumTransaction* _tmp13_ = NULL; - PublishingRajceCreateAlbumTransaction* _tmp14_ = NULL; + PublishingRajceSession* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + PublishingRajcePublishingParameters* _tmp7_; + const gchar* _tmp8_; + PublishingRajcePublishingParameters* _tmp9_; + gboolean* _tmp10_; + PublishingRajceCreateAlbumTransaction* _tmp11_; + PublishingRajceCreateAlbumTransaction* _tmp12_; + PublishingRajceCreateAlbumTransaction* _tmp13_; + PublishingRajceCreateAlbumTransaction* _tmp14_; #line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_debug ("RajcePublishing.vala:389: ACTION: closing album"); #line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3635,9 +3643,9 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj _tmp14_ = create_album_trans; #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rajce_rajce_publisher_on_create_album_complete_publishing_rest_support_transaction_completed, self, 0); -#line 3636 "RajcePublishing.c" +#line 3644 "RajcePublishing.c" { - PublishingRajceCreateAlbumTransaction* _tmp15_ = NULL; + PublishingRajceCreateAlbumTransaction* _tmp15_; #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp15_ = create_album_trans; #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3646,7 +3654,7 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj if (G_UNLIKELY (_inner_error_ != NULL)) { #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3647 "RajcePublishing.c" +#line 3655 "RajcePublishing.c" goto __catch20_spit_publishing_publishing_error; } #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3657,14 +3665,14 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj g_clear_error (&_inner_error_); #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 3658 "RajcePublishing.c" +#line 3666 "RajcePublishing.c" } } goto __finally20; __catch20_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp16_ = NULL; + GError* _tmp16_; #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" err = _inner_error_; #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3677,7 +3685,7 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj publishing_rajce_rajce_publisher_do_show_error (self, _tmp16_); #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_error_free0 (err); -#line 3678 "RajcePublishing.c" +#line 3686 "RajcePublishing.c" } __finally20: #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3690,22 +3698,22 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj g_clear_error (&_inner_error_); #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 3691 "RajcePublishing.c" +#line 3699 "RajcePublishing.c" } #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rest_support_transaction_unref0 (create_album_trans); -#line 3695 "RajcePublishing.c" +#line 3703 "RajcePublishing.c" } else { PublishingRajceOpenAlbumTransaction* open_album_trans = NULL; - PublishingRajceSession* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - PublishingRajcePublishingParameters* _tmp20_ = NULL; - gint* _tmp21_ = NULL; - PublishingRajceOpenAlbumTransaction* _tmp22_ = NULL; - PublishingRajceOpenAlbumTransaction* _tmp23_ = NULL; - PublishingRajceOpenAlbumTransaction* _tmp24_ = NULL; - PublishingRajceOpenAlbumTransaction* _tmp25_ = NULL; + PublishingRajceSession* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + PublishingRajcePublishingParameters* _tmp20_; + gint* _tmp21_; + PublishingRajceOpenAlbumTransaction* _tmp22_; + PublishingRajceOpenAlbumTransaction* _tmp23_; + PublishingRajceOpenAlbumTransaction* _tmp24_; + PublishingRajceOpenAlbumTransaction* _tmp25_; #line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_debug ("RajcePublishing.vala:406: ACTION: opening album"); #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3734,9 +3742,9 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj _tmp25_ = open_album_trans; #line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rajce_rajce_publisher_on_open_album_complete_publishing_rest_support_transaction_completed, self, 0); -#line 3735 "RajcePublishing.c" +#line 3743 "RajcePublishing.c" { - PublishingRajceOpenAlbumTransaction* _tmp26_ = NULL; + PublishingRajceOpenAlbumTransaction* _tmp26_; #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp26_ = open_album_trans; #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3745,7 +3753,7 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj if (G_UNLIKELY (_inner_error_ != NULL)) { #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3746 "RajcePublishing.c" +#line 3754 "RajcePublishing.c" goto __catch21_spit_publishing_publishing_error; } #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3756,14 +3764,14 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj g_clear_error (&_inner_error_); #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 3757 "RajcePublishing.c" +#line 3765 "RajcePublishing.c" } } goto __finally21; __catch21_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp27_ = NULL; + GError* _tmp27_; #line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" err = _inner_error_; #line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3776,7 +3784,7 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj publishing_rajce_rajce_publisher_do_show_error (self, _tmp27_); #line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_error_free0 (err); -#line 3777 "RajcePublishing.c" +#line 3785 "RajcePublishing.c" } __finally21: #line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3789,11 +3797,11 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj g_clear_error (&_inner_error_); #line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 3790 "RajcePublishing.c" +#line 3798 "RajcePublishing.c" } #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rest_support_transaction_unref0 (open_album_trans); -#line 3794 "RajcePublishing.c" +#line 3802 "RajcePublishing.c" } } @@ -3809,25 +3817,25 @@ static gint* _int_dup (gint* self) { memcpy (dup, self, sizeof (gint)); #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return dup; -#line 3810 "RajcePublishing.c" +#line 3818 "RajcePublishing.c" } static gpointer __int_dup0 (gpointer self) { #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self ? _int_dup (self) : NULL; -#line 3817 "RajcePublishing.c" +#line 3825 "RajcePublishing.c" } static void publishing_rajce_rajce_publisher_on_create_album_complete (PublishingRajceRajcePublisher* 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_; GError * _inner_error_ = NULL; #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); @@ -3857,42 +3865,42 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin g_debug ("RajcePublishing.vala:430: RajcePlugin: create album: %s", _tmp6_); #line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (_tmp6_); -#line 3858 "RajcePublishing.c" +#line 3866 "RajcePublishing.c" { PublishingRESTSupportXmlDocument* doc = NULL; - PublishingRESTSupportTransaction* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - PublishingRESTSupportXmlDocument* _tmp10_ = NULL; - PublishingRESTSupportXmlDocument* _tmp11_ = NULL; + PublishingRESTSupportTransaction* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + PublishingRESTSupportXmlDocument* _tmp10_; + PublishingRESTSupportXmlDocument* _tmp11_; xmlNode* response = NULL; - PublishingRESTSupportXmlDocument* _tmp12_ = NULL; - xmlNode* _tmp13_ = NULL; + PublishingRESTSupportXmlDocument* _tmp12_; + xmlNode* _tmp13_; xmlNode* _tmp14_ = NULL; - PublishingRESTSupportXmlDocument* _tmp15_ = NULL; - xmlNode* _tmp16_ = NULL; - xmlNode* _tmp17_ = NULL; + PublishingRESTSupportXmlDocument* _tmp15_; + xmlNode* _tmp16_; + xmlNode* _tmp17_; gchar* sessionToken = NULL; - gchar* _tmp18_ = NULL; + gchar* _tmp18_; xmlNode* _tmp19_ = NULL; - PublishingRESTSupportXmlDocument* _tmp20_ = NULL; - xmlNode* _tmp21_ = NULL; - xmlNode* _tmp22_ = NULL; + PublishingRESTSupportXmlDocument* _tmp20_; + xmlNode* _tmp21_; + xmlNode* _tmp22_; gchar* albumToken = NULL; - gchar* _tmp23_ = NULL; + gchar* _tmp23_; xmlNode* _tmp24_ = NULL; - PublishingRESTSupportXmlDocument* _tmp25_ = NULL; - xmlNode* _tmp26_ = NULL; - xmlNode* _tmp27_ = NULL; - PublishingRajcePublishingParameters* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - gint _tmp31_ = 0; - gint* _tmp32_ = NULL; - PublishingRajceSession* _tmp33_ = NULL; - const gchar* _tmp34_ = NULL; - PublishingRajceSession* _tmp35_ = NULL; - const gchar* _tmp36_ = NULL; + PublishingRESTSupportXmlDocument* _tmp25_; + xmlNode* _tmp26_; + xmlNode* _tmp27_; + PublishingRajcePublishingParameters* _tmp28_; + gchar* _tmp29_; + gchar* _tmp30_; + gint _tmp31_; + gint* _tmp32_; + PublishingRajceSession* _tmp33_; + const gchar* _tmp34_; + PublishingRajceSession* _tmp35_; + const gchar* _tmp36_; #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = txn; #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3911,7 +3919,7 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin if (G_UNLIKELY (_inner_error_ != NULL)) { #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3912 "RajcePublishing.c" +#line 3920 "RajcePublishing.c" goto __catch22_spit_publishing_publishing_error; } #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3920,7 +3928,7 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin g_clear_error (&_inner_error_); #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 3921 "RajcePublishing.c" +#line 3929 "RajcePublishing.c" } #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp12_ = doc; @@ -3942,7 +3950,7 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin _publishing_rest_support_xml_document_unref0 (doc); #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3943 "RajcePublishing.c" +#line 3951 "RajcePublishing.c" goto __catch22_spit_publishing_publishing_error; } #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3953,7 +3961,7 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin g_clear_error (&_inner_error_); #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 3954 "RajcePublishing.c" +#line 3962 "RajcePublishing.c" } #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp18_ = (gchar*) xmlNodeGetContent (_tmp14_); @@ -3975,7 +3983,7 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin _publishing_rest_support_xml_document_unref0 (doc); #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3976 "RajcePublishing.c" +#line 3984 "RajcePublishing.c" goto __catch22_spit_publishing_publishing_error; } #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -3988,7 +3996,7 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin g_clear_error (&_inner_error_); #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 3989 "RajcePublishing.c" +#line 3997 "RajcePublishing.c" } #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp23_ = (gchar*) xmlNodeGetContent (_tmp19_); @@ -4012,7 +4020,7 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin _publishing_rest_support_xml_document_unref0 (doc); #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4013 "RajcePublishing.c" +#line 4021 "RajcePublishing.c" goto __catch22_spit_publishing_publishing_error; } #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4027,7 +4035,7 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin g_clear_error (&_inner_error_); #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 4028 "RajcePublishing.c" +#line 4036 "RajcePublishing.c" } #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp28_ = self->priv->parameters; @@ -4063,13 +4071,13 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin _g_free0 (sessionToken); #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rest_support_xml_document_unref0 (doc); -#line 4064 "RajcePublishing.c" +#line 4072 "RajcePublishing.c" } goto __finally22; __catch22_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp37_ = NULL; + GError* _tmp37_; #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" err = _inner_error_; #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4084,7 +4092,7 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin _g_error_free0 (err); #line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 4085 "RajcePublishing.c" +#line 4093 "RajcePublishing.c" } __finally22: #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4095,11 +4103,11 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin g_clear_error (&_inner_error_); #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 4096 "RajcePublishing.c" +#line 4104 "RajcePublishing.c" } #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_do_upload_photos (self); -#line 4100 "RajcePublishing.c" +#line 4108 "RajcePublishing.c" } @@ -4107,12 +4115,12 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin * Event triggered when the create album transaction fails due to a network error. */ static void publishing_rajce_rajce_publisher_on_create_album_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - PublishingRESTSupportTransaction* _tmp4_ = NULL; - GError* _tmp5_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + PublishingRESTSupportTransaction* _tmp4_; + GError* _tmp5_; #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4137,7 +4145,7 @@ static void publishing_rajce_rajce_publisher_on_create_album_error (PublishingRa _tmp5_ = err; #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_on_network_error (self, _tmp4_, _tmp5_); -#line 4138 "RajcePublishing.c" +#line 4146 "RajcePublishing.c" } @@ -4145,13 +4153,13 @@ static void publishing_rajce_rajce_publisher_on_create_album_error (PublishingRa * Event triggered when the open album completes successfully. */ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingRajceRajcePublisher* 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_; GError * _inner_error_ = NULL; #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); @@ -4181,33 +4189,33 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR g_debug ("RajcePublishing.vala:469: RajcePlugin: open album: %s", _tmp6_); #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (_tmp6_); -#line 4182 "RajcePublishing.c" +#line 4190 "RajcePublishing.c" { PublishingRESTSupportXmlDocument* doc = NULL; - PublishingRESTSupportTransaction* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - PublishingRESTSupportXmlDocument* _tmp10_ = NULL; - PublishingRESTSupportXmlDocument* _tmp11_ = NULL; + PublishingRESTSupportTransaction* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + PublishingRESTSupportXmlDocument* _tmp10_; + PublishingRESTSupportXmlDocument* _tmp11_; xmlNode* response = NULL; - PublishingRESTSupportXmlDocument* _tmp12_ = NULL; - xmlNode* _tmp13_ = NULL; + PublishingRESTSupportXmlDocument* _tmp12_; + xmlNode* _tmp13_; xmlNode* _tmp14_ = NULL; - PublishingRESTSupportXmlDocument* _tmp15_ = NULL; - xmlNode* _tmp16_ = NULL; - xmlNode* _tmp17_ = NULL; + PublishingRESTSupportXmlDocument* _tmp15_; + xmlNode* _tmp16_; + xmlNode* _tmp17_; gchar* sessionToken = NULL; - gchar* _tmp18_ = NULL; + gchar* _tmp18_; xmlNode* _tmp19_ = NULL; - PublishingRESTSupportXmlDocument* _tmp20_ = NULL; - xmlNode* _tmp21_ = NULL; - xmlNode* _tmp22_ = NULL; + PublishingRESTSupportXmlDocument* _tmp20_; + xmlNode* _tmp21_; + xmlNode* _tmp22_; gchar* albumToken = NULL; - gchar* _tmp23_ = NULL; - PublishingRajceSession* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; - PublishingRajceSession* _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; + gchar* _tmp23_; + PublishingRajceSession* _tmp24_; + const gchar* _tmp25_; + PublishingRajceSession* _tmp26_; + const gchar* _tmp27_; #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = txn; #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4226,7 +4234,7 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR if (G_UNLIKELY (_inner_error_ != NULL)) { #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4227 "RajcePublishing.c" +#line 4235 "RajcePublishing.c" goto __catch23_spit_publishing_publishing_error; } #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4235,7 +4243,7 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR g_clear_error (&_inner_error_); #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 4236 "RajcePublishing.c" +#line 4244 "RajcePublishing.c" } #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp12_ = doc; @@ -4257,7 +4265,7 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR _publishing_rest_support_xml_document_unref0 (doc); #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4258 "RajcePublishing.c" +#line 4266 "RajcePublishing.c" goto __catch23_spit_publishing_publishing_error; } #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4268,7 +4276,7 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR g_clear_error (&_inner_error_); #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 4269 "RajcePublishing.c" +#line 4277 "RajcePublishing.c" } #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp18_ = (gchar*) xmlNodeGetContent (_tmp14_); @@ -4290,7 +4298,7 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR _publishing_rest_support_xml_document_unref0 (doc); #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4291 "RajcePublishing.c" +#line 4299 "RajcePublishing.c" goto __catch23_spit_publishing_publishing_error; } #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4303,7 +4311,7 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR g_clear_error (&_inner_error_); #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 4304 "RajcePublishing.c" +#line 4312 "RajcePublishing.c" } #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp23_ = (gchar*) xmlNodeGetContent (_tmp19_); @@ -4327,13 +4335,13 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR _g_free0 (sessionToken); #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rest_support_xml_document_unref0 (doc); -#line 4328 "RajcePublishing.c" +#line 4336 "RajcePublishing.c" } goto __finally23; __catch23_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp28_ = NULL; + GError* _tmp28_; #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" err = _inner_error_; #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4348,7 +4356,7 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR _g_error_free0 (err); #line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 4349 "RajcePublishing.c" +#line 4357 "RajcePublishing.c" } __finally23: #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4359,11 +4367,11 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR g_clear_error (&_inner_error_); #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 4360 "RajcePublishing.c" +#line 4368 "RajcePublishing.c" } #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_do_upload_photos (self); -#line 4364 "RajcePublishing.c" +#line 4372 "RajcePublishing.c" } @@ -4371,12 +4379,12 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR * Event triggered when the open album transaction fails due to a network error. */ static void publishing_rajce_rajce_publisher_on_open_album_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - PublishingRESTSupportTransaction* _tmp4_ = NULL; - GError* _tmp5_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + PublishingRESTSupportTransaction* _tmp4_; + GError* _tmp5_; #line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4401,7 +4409,7 @@ static void publishing_rajce_rajce_publisher_on_open_album_error (PublishingRajc _tmp5_ = err; #line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_on_network_error (self, _tmp4_, _tmp5_); -#line 4402 "RajcePublishing.c" +#line 4410 "RajcePublishing.c" } @@ -4411,44 +4419,44 @@ static void publishing_rajce_rajce_publisher_on_open_album_error (PublishingRajc static void _publishing_rajce_rajce_publisher_on_upload_photos_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) { #line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_on_upload_photos_complete ((PublishingRajceRajcePublisher*) self, _sender, num_photos_published); -#line 4412 "RajcePublishing.c" +#line 4420 "RajcePublishing.c" } static void _publishing_rajce_rajce_publisher_on_upload_photos_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) { #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_on_upload_photos_error ((PublishingRajceRajcePublisher*) self, _sender, err); -#line 4419 "RajcePublishing.c" +#line 4427 "RajcePublishing.c" } static void _publishing_rajce_rajce_publisher_on_upload_photos_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) { #line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_on_upload_photos_status_updated ((PublishingRajceRajcePublisher*) self, file_number, fraction_complete); -#line 4426 "RajcePublishing.c" +#line 4434 "RajcePublishing.c" } static void publishing_rajce_rajce_publisher_do_upload_photos (PublishingRajceRajcePublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - PublishingRajceSession* _tmp1_ = NULL; - gint _tmp2_ = 0; - void* _tmp3_ = NULL; - GDestroyNotify _tmp4_ = NULL; - SpitPublishingProgressCallback _tmp5_ = NULL; + SpitPublishingPluginHost* _tmp0_; + PublishingRajceSession* _tmp1_; + gint _tmp2_; + void* _tmp3_; + GDestroyNotify _tmp4_; + SpitPublishingProgressCallback _tmp5_; SpitPublishingPublishable** publishables = NULL; - SpitPublishingPluginHost* _tmp6_ = NULL; - gint _tmp7_ = 0; - SpitPublishingPublishable** _tmp8_ = NULL; - gint publishables_length1 = 0; - gint _publishables_size_ = 0; + SpitPublishingPluginHost* _tmp6_; + gint _tmp7_; + SpitPublishingPublishable** _tmp8_; + gint publishables_length1; + gint _publishables_size_; PublishingRajceUploader* uploader = NULL; - PublishingRajceSession* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - PublishingRajcePublishingParameters* _tmp12_ = NULL; - PublishingRajceUploader* _tmp13_ = NULL; - PublishingRajceUploader* _tmp14_ = NULL; + PublishingRajceSession* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + PublishingRajcePublishingParameters* _tmp12_; + PublishingRajceUploader* _tmp13_; + PublishingRajceUploader* _tmp14_; #line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4511,7 +4519,7 @@ static void publishing_rajce_rajce_publisher_do_upload_photos (PublishingRajceRa _publishing_rest_support_batch_uploader_unref0 (uploader); #line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL); -#line 4512 "RajcePublishing.c" +#line 4520 "RajcePublishing.c" } @@ -4520,10 +4528,10 @@ static void publishing_rajce_rajce_publisher_do_upload_photos (PublishingRajceRa * network transactions encapsulating uploads has completed successfully */ static void publishing_rajce_rajce_publisher_on_upload_photos_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) { - PublishingRESTSupportBatchUploader* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportBatchUploader* _tmp2_ = NULL; - guint _tmp3_ = 0U; + PublishingRESTSupportBatchUploader* _tmp0_; + guint _tmp1_; + PublishingRESTSupportBatchUploader* _tmp2_; + guint _tmp3_; #line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4544,7 +4552,7 @@ static void publishing_rajce_rajce_publisher_on_upload_photos_complete (Publishi g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_upload_photos_error_publishing_rest_support_batch_uploader_upload_error, self); #line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_do_end_upload (self); -#line 4545 "RajcePublishing.c" +#line 4553 "RajcePublishing.c" } @@ -4553,11 +4561,11 @@ static void publishing_rajce_rajce_publisher_on_upload_photos_complete (Publishi * network transactions encapsulating uploads has caused a network error */ static void publishing_rajce_rajce_publisher_on_upload_photos_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) { - PublishingRESTSupportBatchUploader* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportBatchUploader* _tmp2_ = NULL; - guint _tmp3_ = 0U; - GError* _tmp4_ = NULL; + PublishingRESTSupportBatchUploader* _tmp0_; + guint _tmp1_; + PublishingRESTSupportBatchUploader* _tmp2_; + guint _tmp3_; + GError* _tmp4_; #line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4580,7 +4588,7 @@ static void publishing_rajce_rajce_publisher_on_upload_photos_error (PublishingR _tmp4_ = err; #line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_do_show_error (self, _tmp4_); -#line 4581 "RajcePublishing.c" +#line 4589 "RajcePublishing.c" } @@ -4588,21 +4596,21 @@ static void publishing_rajce_rajce_publisher_on_upload_photos_error (PublishingR * Event triggered when upload progresses and the status needs to be updated. */ static void publishing_rajce_rajce_publisher_on_upload_photos_status_updated (PublishingRajceRajcePublisher* self, gint file_number, gdouble completed_fraction) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp0_) { -#line 4596 "RajcePublishing.c" - gdouble _tmp1_ = 0.0; - SpitPublishingProgressCallback _tmp2_ = NULL; - void* _tmp2__target = NULL; - SpitPublishingProgressCallback _tmp3_ = NULL; - void* _tmp3__target = NULL; - gint _tmp4_ = 0; - gdouble _tmp5_ = 0.0; +#line 4604 "RajcePublishing.c" + gdouble _tmp1_; + SpitPublishingProgressCallback _tmp2_; + void* _tmp2__target; + SpitPublishingProgressCallback _tmp3_; + void* _tmp3__target; + gint _tmp4_; + gdouble _tmp5_; #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = completed_fraction; #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4624,13 +4632,13 @@ static void publishing_rajce_rajce_publisher_on_upload_photos_status_updated (Pu _tmp5_ = completed_fraction; #line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ (_tmp4_, _tmp5_, _tmp3__target); -#line 4624 "RajcePublishing.c" +#line 4632 "RajcePublishing.c" } } static void publishing_rajce_rajce_publisher_do_end_upload (PublishingRajceRajcePublisher* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4639,11 +4647,11 @@ static void publishing_rajce_rajce_publisher_do_end_upload (PublishingRajceRajce if (_tmp0_) { #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_do_get_album_url (self); -#line 4639 "RajcePublishing.c" +#line 4647 "RajcePublishing.c" } else { #line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_do_close_album (self); -#line 4643 "RajcePublishing.c" +#line 4651 "RajcePublishing.c" } } @@ -4654,25 +4662,25 @@ static void publishing_rajce_rajce_publisher_do_end_upload (PublishingRajceRajce static void _publishing_rajce_rajce_publisher_on_get_album_url_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_on_get_album_url_error ((PublishingRajceRajcePublisher*) self, _sender, err); -#line 4654 "RajcePublishing.c" +#line 4662 "RajcePublishing.c" } static void _publishing_rajce_rajce_publisher_on_get_album_url_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_on_get_album_url_complete ((PublishingRajceRajcePublisher*) self, _sender); -#line 4661 "RajcePublishing.c" +#line 4669 "RajcePublishing.c" } static void publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRajcePublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; + SpitPublishingPluginHost* _tmp0_; PublishingRajceGetAlbumUrlTransaction* get_album_url_trans = NULL; - PublishingRajceSession* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - PublishingRajceGetAlbumUrlTransaction* _tmp4_ = NULL; - PublishingRajceGetAlbumUrlTransaction* _tmp5_ = NULL; + PublishingRajceSession* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + PublishingRajceGetAlbumUrlTransaction* _tmp4_; + PublishingRajceGetAlbumUrlTransaction* _tmp5_; GError * _inner_error_ = NULL; #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); @@ -4700,7 +4708,7 @@ static void publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRa g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (get_album_url_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rajce_rajce_publisher_on_get_album_url_error_publishing_rest_support_transaction_network_error, self, 0); #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (get_album_url_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rajce_rajce_publisher_on_get_album_url_complete_publishing_rest_support_transaction_completed, self, 0); -#line 4700 "RajcePublishing.c" +#line 4708 "RajcePublishing.c" { #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (get_album_url_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -4708,7 +4716,7 @@ static void publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRa if (G_UNLIKELY (_inner_error_ != NULL)) { #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4708 "RajcePublishing.c" +#line 4716 "RajcePublishing.c" goto __catch24_spit_publishing_publishing_error; } #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4719,14 +4727,14 @@ static void publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRa g_clear_error (&_inner_error_); #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 4719 "RajcePublishing.c" +#line 4727 "RajcePublishing.c" } } goto __finally24; __catch24_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp6_ = NULL; + GError* _tmp6_; #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" err = _inner_error_; #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4739,7 +4747,7 @@ static void publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRa publishing_rajce_rajce_publisher_do_show_error (self, _tmp6_); #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_error_free0 (err); -#line 4739 "RajcePublishing.c" +#line 4747 "RajcePublishing.c" } __finally24: #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4752,11 +4760,11 @@ static void publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRa g_clear_error (&_inner_error_); #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 4752 "RajcePublishing.c" +#line 4760 "RajcePublishing.c" } #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rest_support_transaction_unref0 (get_album_url_trans); -#line 4756 "RajcePublishing.c" +#line 4764 "RajcePublishing.c" } @@ -4764,13 +4772,13 @@ static void publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRa * Event triggered when the get album url completes successfully. */ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_ = 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_; GError * _inner_error_ = NULL; #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); @@ -4800,33 +4808,33 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi g_debug ("RajcePublishing.vala:594: RajcePlugin: get album url: %s", _tmp6_); #line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (_tmp6_); -#line 4800 "RajcePublishing.c" +#line 4808 "RajcePublishing.c" { PublishingRESTSupportXmlDocument* doc = NULL; - PublishingRESTSupportTransaction* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - PublishingRESTSupportXmlDocument* _tmp10_ = NULL; - PublishingRESTSupportXmlDocument* _tmp11_ = NULL; + PublishingRESTSupportTransaction* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + PublishingRESTSupportXmlDocument* _tmp10_; + PublishingRESTSupportXmlDocument* _tmp11_; xmlNode* response = NULL; - PublishingRESTSupportXmlDocument* _tmp12_ = NULL; - xmlNode* _tmp13_ = NULL; + PublishingRESTSupportXmlDocument* _tmp12_; + xmlNode* _tmp13_; xmlNode* _tmp14_ = NULL; - PublishingRESTSupportXmlDocument* _tmp15_ = NULL; - xmlNode* _tmp16_ = NULL; - xmlNode* _tmp17_ = NULL; + PublishingRESTSupportXmlDocument* _tmp15_; + xmlNode* _tmp16_; + xmlNode* _tmp17_; gchar* sessionToken = NULL; - gchar* _tmp18_ = NULL; + gchar* _tmp18_; xmlNode* _tmp19_ = NULL; - PublishingRESTSupportXmlDocument* _tmp20_ = NULL; - xmlNode* _tmp21_ = NULL; - xmlNode* _tmp22_ = NULL; + PublishingRESTSupportXmlDocument* _tmp20_; + xmlNode* _tmp21_; + xmlNode* _tmp22_; gchar* url = NULL; - gchar* _tmp23_ = NULL; - PublishingRajceSession* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; - PublishingRajceSession* _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; + gchar* _tmp23_; + PublishingRajceSession* _tmp24_; + const gchar* _tmp25_; + PublishingRajceSession* _tmp26_; + const gchar* _tmp27_; #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = txn; #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4845,7 +4853,7 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi if (G_UNLIKELY (_inner_error_ != NULL)) { #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4845 "RajcePublishing.c" +#line 4853 "RajcePublishing.c" goto __catch25_spit_publishing_publishing_error; } #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4854,7 +4862,7 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi g_clear_error (&_inner_error_); #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 4854 "RajcePublishing.c" +#line 4862 "RajcePublishing.c" } #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp12_ = doc; @@ -4876,7 +4884,7 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi _publishing_rest_support_xml_document_unref0 (doc); #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4876 "RajcePublishing.c" +#line 4884 "RajcePublishing.c" goto __catch25_spit_publishing_publishing_error; } #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4887,7 +4895,7 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi g_clear_error (&_inner_error_); #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 4887 "RajcePublishing.c" +#line 4895 "RajcePublishing.c" } #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp18_ = (gchar*) xmlNodeGetContent (_tmp14_); @@ -4909,7 +4917,7 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi _publishing_rest_support_xml_document_unref0 (doc); #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4909 "RajcePublishing.c" +#line 4917 "RajcePublishing.c" goto __catch25_spit_publishing_publishing_error; } #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4922,7 +4930,7 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi g_clear_error (&_inner_error_); #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 4922 "RajcePublishing.c" +#line 4930 "RajcePublishing.c" } #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp23_ = (gchar*) xmlNodeGetContent (_tmp19_); @@ -4946,7 +4954,7 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi _g_free0 (sessionToken); #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rest_support_xml_document_unref0 (doc); -#line 4946 "RajcePublishing.c" +#line 4954 "RajcePublishing.c" } goto __finally25; __catch25_spit_publishing_publishing_error: @@ -4960,7 +4968,7 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi g_debug ("RajcePublishing.vala:606: ERROR: on_get_album_url_complete"); #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_error_free0 (err); -#line 4960 "RajcePublishing.c" +#line 4968 "RajcePublishing.c" } __finally25: #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -4971,11 +4979,11 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi g_clear_error (&_inner_error_); #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 4971 "RajcePublishing.c" +#line 4979 "RajcePublishing.c" } #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_do_close_album (self); -#line 4975 "RajcePublishing.c" +#line 4983 "RajcePublishing.c" } @@ -4983,10 +4991,10 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi * Event triggered when the get album url transaction fails due to a network error. */ static void publishing_rajce_rajce_publisher_on_get_album_url_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; #line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -5007,7 +5015,7 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_error (PublishingR g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_get_album_url_error_publishing_rest_support_transaction_network_error, self); #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_do_close_album (self); -#line 5007 "RajcePublishing.c" +#line 5015 "RajcePublishing.c" } @@ -5017,25 +5025,25 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_error (PublishingR static void _publishing_rajce_rajce_publisher_on_close_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_on_close_album_error ((PublishingRajceRajcePublisher*) self, _sender, err); -#line 5017 "RajcePublishing.c" +#line 5025 "RajcePublishing.c" } static void _publishing_rajce_rajce_publisher_on_close_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_on_close_album_complete ((PublishingRajceRajcePublisher*) self, _sender); -#line 5024 "RajcePublishing.c" +#line 5032 "RajcePublishing.c" } static void publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajcePublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; + SpitPublishingPluginHost* _tmp0_; PublishingRajceCloseAlbumTransaction* close_album_trans = NULL; - PublishingRajceSession* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - PublishingRajceCloseAlbumTransaction* _tmp4_ = NULL; - PublishingRajceCloseAlbumTransaction* _tmp5_ = NULL; + PublishingRajceSession* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + PublishingRajceCloseAlbumTransaction* _tmp4_; + PublishingRajceCloseAlbumTransaction* _tmp5_; GError * _inner_error_ = NULL; #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); @@ -5063,7 +5071,7 @@ static void publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajc g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (close_album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rajce_rajce_publisher_on_close_album_error_publishing_rest_support_transaction_network_error, self, 0); #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (close_album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rajce_rajce_publisher_on_close_album_complete_publishing_rest_support_transaction_completed, self, 0); -#line 5063 "RajcePublishing.c" +#line 5071 "RajcePublishing.c" { #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (close_album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -5071,7 +5079,7 @@ static void publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajc if (G_UNLIKELY (_inner_error_ != NULL)) { #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 5071 "RajcePublishing.c" +#line 5079 "RajcePublishing.c" goto __catch26_spit_publishing_publishing_error; } #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -5082,14 +5090,14 @@ static void publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajc g_clear_error (&_inner_error_); #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 5082 "RajcePublishing.c" +#line 5090 "RajcePublishing.c" } } goto __finally26; __catch26_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp6_ = NULL; + GError* _tmp6_; #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" err = _inner_error_; #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -5102,7 +5110,7 @@ static void publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajc publishing_rajce_rajce_publisher_do_show_error (self, _tmp6_); #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_error_free0 (err); -#line 5102 "RajcePublishing.c" +#line 5110 "RajcePublishing.c" } __finally26: #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -5115,11 +5123,11 @@ static void publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajc g_clear_error (&_inner_error_); #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 5115 "RajcePublishing.c" +#line 5123 "RajcePublishing.c" } #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rest_support_transaction_unref0 (close_album_trans); -#line 5119 "RajcePublishing.c" +#line 5127 "RajcePublishing.c" } @@ -5127,13 +5135,13 @@ static void publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajc * Event triggered when the close album completes successfully. */ static void publishing_rajce_rajce_publisher_on_close_album_complete (PublishingRajceRajcePublisher* 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_; GError * _inner_error_ = NULL; #line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); @@ -5163,26 +5171,26 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing g_debug ("RajcePublishing.vala:657: RajcePlugin: close album: %s", _tmp6_); #line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (_tmp6_); -#line 5163 "RajcePublishing.c" +#line 5171 "RajcePublishing.c" { PublishingRESTSupportXmlDocument* doc = NULL; - PublishingRESTSupportTransaction* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - PublishingRESTSupportXmlDocument* _tmp10_ = NULL; - PublishingRESTSupportXmlDocument* _tmp11_ = NULL; + PublishingRESTSupportTransaction* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + PublishingRESTSupportXmlDocument* _tmp10_; + PublishingRESTSupportXmlDocument* _tmp11_; xmlNode* response = NULL; - PublishingRESTSupportXmlDocument* _tmp12_ = NULL; - xmlNode* _tmp13_ = NULL; + PublishingRESTSupportXmlDocument* _tmp12_; + xmlNode* _tmp13_; xmlNode* _tmp14_ = NULL; - PublishingRESTSupportXmlDocument* _tmp15_ = NULL; - xmlNode* _tmp16_ = NULL; - xmlNode* _tmp17_ = NULL; + PublishingRESTSupportXmlDocument* _tmp15_; + xmlNode* _tmp16_; + xmlNode* _tmp17_; gchar* sessionToken = NULL; - gchar* _tmp18_ = NULL; - PublishingRajceSession* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - PublishingRajceSession* _tmp21_ = NULL; + gchar* _tmp18_; + PublishingRajceSession* _tmp19_; + const gchar* _tmp20_; + PublishingRajceSession* _tmp21_; #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = txn; #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -5201,7 +5209,7 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing if (G_UNLIKELY (_inner_error_ != NULL)) { #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 5201 "RajcePublishing.c" +#line 5209 "RajcePublishing.c" goto __catch27_spit_publishing_publishing_error; } #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -5210,7 +5218,7 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing g_clear_error (&_inner_error_); #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 5210 "RajcePublishing.c" +#line 5218 "RajcePublishing.c" } #line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp12_ = doc; @@ -5232,7 +5240,7 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing _publishing_rest_support_xml_document_unref0 (doc); #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 5232 "RajcePublishing.c" +#line 5240 "RajcePublishing.c" goto __catch27_spit_publishing_publishing_error; } #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -5243,7 +5251,7 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing g_clear_error (&_inner_error_); #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 5243 "RajcePublishing.c" +#line 5251 "RajcePublishing.c" } #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp18_ = (gchar*) xmlNodeGetContent (_tmp14_); @@ -5263,13 +5271,13 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing _g_free0 (sessionToken); #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rest_support_xml_document_unref0 (doc); -#line 5263 "RajcePublishing.c" +#line 5271 "RajcePublishing.c" } goto __finally27; __catch27_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp22_ = NULL; + GError* _tmp22_; #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" err = _inner_error_; #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -5284,7 +5292,7 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing _g_error_free0 (err); #line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 5284 "RajcePublishing.c" +#line 5292 "RajcePublishing.c" } __finally27: #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -5295,11 +5303,11 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing g_clear_error (&_inner_error_); #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 5295 "RajcePublishing.c" +#line 5303 "RajcePublishing.c" } #line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_do_show_success_pane (self); -#line 5299 "RajcePublishing.c" +#line 5307 "RajcePublishing.c" } @@ -5307,10 +5315,10 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing * Event triggered when the close album transaction fails due to a network error. */ static void publishing_rajce_rajce_publisher_on_close_album_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; #line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -5331,7 +5339,7 @@ static void publishing_rajce_rajce_publisher_on_close_album_error (PublishingRaj g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_close_album_error_publishing_rest_support_transaction_network_error, self); #line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_do_show_success_pane (self); -#line 5331 "RajcePublishing.c" +#line 5339 "RajcePublishing.c" } @@ -5340,9 +5348,9 @@ static void publishing_rajce_rajce_publisher_on_close_album_error (PublishingRaj */ static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRajceRajcePublisher* self) { gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; - SpitPublishingPluginHost* _tmp10_ = NULL; - SpitPublishingPluginHost* _tmp11_ = NULL; + gboolean _tmp1_; + SpitPublishingPluginHost* _tmp10_; + SpitPublishingPluginHost* _tmp11_; GError * _inner_error_ = NULL; #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); @@ -5352,10 +5360,10 @@ static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRaj _tmp1_ = publishing_rajce_rajce_publisher_get_show_album (self); #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp1_) { -#line 5352 "RajcePublishing.c" - PublishingRajceSession* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; +#line 5360 "RajcePublishing.c" + PublishingRajceSession* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = self->priv->session; #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -5366,21 +5374,21 @@ static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRaj _tmp0_ = _tmp4_ != NULL; #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (_tmp4_); -#line 5366 "RajcePublishing.c" +#line 5374 "RajcePublishing.c" } else { #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = FALSE; -#line 5370 "RajcePublishing.c" +#line 5378 "RajcePublishing.c" } #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp0_) { -#line 5374 "RajcePublishing.c" +#line 5382 "RajcePublishing.c" { - PublishingRajceSession* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; + PublishingRajceSession* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = self->priv->session; #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -5401,7 +5409,7 @@ static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRaj if (G_UNLIKELY (_inner_error_ != NULL)) { #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == G_SPAWN_ERROR) { -#line 5401 "RajcePublishing.c" +#line 5409 "RajcePublishing.c" goto __catch28_g_spawn_error; } #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -5410,7 +5418,7 @@ static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRaj g_clear_error (&_inner_error_); #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 5410 "RajcePublishing.c" +#line 5418 "RajcePublishing.c" } } goto __finally28; @@ -5423,7 +5431,7 @@ static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRaj _inner_error_ = NULL; #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_error_free0 (e); -#line 5423 "RajcePublishing.c" +#line 5431 "RajcePublishing.c" } __finally28: #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -5434,7 +5442,7 @@ static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRaj g_clear_error (&_inner_error_); #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 5434 "RajcePublishing.c" +#line 5442 "RajcePublishing.c" } } #line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -5445,7 +5453,7 @@ static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRaj _tmp11_ = self->priv->host; #line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" spit_publishing_plugin_host_install_success_pane (_tmp11_); -#line 5445 "RajcePublishing.c" +#line 5453 "RajcePublishing.c" } @@ -5453,7 +5461,7 @@ static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRaj * Helper event to handle network errors. */ static void publishing_rajce_rajce_publisher_on_network_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - GError* _tmp0_ = NULL; + GError* _tmp0_; #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -5464,7 +5472,7 @@ static void publishing_rajce_rajce_publisher_on_network_error (PublishingRajceRa _tmp0_ = err; #line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_do_show_error (self, _tmp0_); -#line 5464 "RajcePublishing.c" +#line 5472 "RajcePublishing.c" } @@ -5473,14 +5481,13 @@ static void publishing_rajce_rajce_publisher_on_network_error (PublishingRajceRa */ static void publishing_rajce_rajce_publisher_do_show_error (PublishingRajceRajcePublisher* self, GError* e) { gchar* error_type = NULL; - gchar* _tmp0_ = NULL; - GError* _tmp1_ = NULL; - const gchar* _tmp14_ = NULL; - GError* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; + gchar* _tmp0_; + GError* _tmp1_; + const gchar* _tmp14_; + GError* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; #line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -5499,97 +5506,97 @@ static void publishing_rajce_rajce_publisher_do_show_error (PublishingRajceRajce _g_free0 (error_type); #line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return; -#line 5499 "RajcePublishing.c" +#line 5506 "RajcePublishing.c" } else { - GError* _tmp2_ = NULL; + GError* _tmp2_; #line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = e; #line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (g_error_matches (_tmp2_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_COMMUNICATION_FAILED)) { -#line 5506 "RajcePublishing.c" - gchar* _tmp3_ = NULL; +#line 5513 "RajcePublishing.c" + gchar* _tmp3_; #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = g_strdup ("COMMUNICATION_FAILED"); #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (error_type); #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" error_type = _tmp3_; -#line 5514 "RajcePublishing.c" +#line 5521 "RajcePublishing.c" } else { - GError* _tmp4_ = NULL; + GError* _tmp4_; #line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = e; #line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (g_error_matches (_tmp4_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_PROTOCOL_ERROR)) { -#line 5521 "RajcePublishing.c" - gchar* _tmp5_ = NULL; +#line 5528 "RajcePublishing.c" + gchar* _tmp5_; #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = g_strdup ("PROTOCOL_ERROR"); #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (error_type); #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" error_type = _tmp5_; -#line 5529 "RajcePublishing.c" +#line 5536 "RajcePublishing.c" } else { - GError* _tmp6_ = NULL; + GError* _tmp6_; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = e; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (g_error_matches (_tmp6_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SERVICE_ERROR)) { -#line 5536 "RajcePublishing.c" - gchar* _tmp7_ = NULL; +#line 5543 "RajcePublishing.c" + gchar* _tmp7_; #line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = g_strdup ("SERVICE_ERROR"); #line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (error_type); #line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" error_type = _tmp7_; -#line 5544 "RajcePublishing.c" +#line 5551 "RajcePublishing.c" } else { - GError* _tmp8_ = NULL; + GError* _tmp8_; #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp8_ = e; #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (g_error_matches (_tmp8_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE)) { -#line 5551 "RajcePublishing.c" - gchar* _tmp9_ = NULL; +#line 5558 "RajcePublishing.c" + gchar* _tmp9_; #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp9_ = g_strdup ("MALFORMED_RESPONSE"); #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (error_type); #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" error_type = _tmp9_; -#line 5559 "RajcePublishing.c" +#line 5566 "RajcePublishing.c" } else { - GError* _tmp10_ = NULL; + GError* _tmp10_; #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp10_ = e; #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (g_error_matches (_tmp10_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR)) { -#line 5566 "RajcePublishing.c" - gchar* _tmp11_ = NULL; +#line 5573 "RajcePublishing.c" + gchar* _tmp11_; #line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp11_ = g_strdup ("LOCAL_FILE_ERROR"); #line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (error_type); #line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" error_type = _tmp11_; -#line 5574 "RajcePublishing.c" +#line 5581 "RajcePublishing.c" } else { - GError* _tmp12_ = NULL; + GError* _tmp12_; #line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp12_ = e; #line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (g_error_matches (_tmp12_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) { -#line 5581 "RajcePublishing.c" - gchar* _tmp13_ = NULL; +#line 5588 "RajcePublishing.c" + gchar* _tmp13_; #line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp13_ = g_strdup ("EXPIRED_SESSION"); #line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (error_type); #line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" error_type = _tmp13_; -#line 5589 "RajcePublishing.c" +#line 5596 "RajcePublishing.c" } } } @@ -5612,12 +5619,10 @@ static void publishing_rajce_rajce_publisher_do_show_error (PublishingRajceRajce #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (_tmp18_); #line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp19_ = _ ("An error message occurred when publishing to Rajce. Please try again."); -#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - publishing_rajce_rajce_publisher_do_show_error_message (self, _tmp19_); + publishing_rajce_rajce_publisher_do_show_error_message (self, _ ("An error message occurred when publishing to Rajce. Please try again.")); #line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (error_type); -#line 5617 "RajcePublishing.c" +#line 5622 "RajcePublishing.c" } @@ -5625,8 +5630,8 @@ static void publishing_rajce_rajce_publisher_do_show_error (PublishingRajceRajce * Action to display an error message to the user. */ static void publishing_rajce_rajce_publisher_do_show_error_message (PublishingRajceRajcePublisher* self, const gchar* message) { - SpitPublishingPluginHost* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + const gchar* _tmp1_; #line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self)); #line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -5639,7 +5644,7 @@ static void publishing_rajce_rajce_publisher_do_show_error_message (PublishingRa _tmp1_ = message; #line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" spit_publishing_plugin_host_install_static_message_pane (_tmp0_, _tmp1_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE); -#line 5639 "RajcePublishing.c" +#line 5644 "RajcePublishing.c" } @@ -5650,7 +5655,7 @@ static void publishing_rajce_rajce_publisher_class_init (PublishingRajceRajcePub g_type_class_add_private (klass, sizeof (PublishingRajceRajcePublisherPrivate)); #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_rajce_rajce_publisher_finalize; -#line 5650 "RajcePublishing.c" +#line 5655 "RajcePublishing.c" } @@ -5658,14 +5663,14 @@ static void publishing_rajce_rajce_publisher_spit_publishing_publisher_interface #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_rajce_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface); #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_rajce_rajce_publisher_real_get_service; + iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_rajce_rajce_publisher_real_get_service; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_rajce_rajce_publisher_real_is_running; + iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_rajce_rajce_publisher_real_is_running; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - iface->start = (void (*)(SpitPublishingPublisher*)) publishing_rajce_rajce_publisher_real_start; + iface->start = (void (*) (SpitPublishingPublisher *)) publishing_rajce_rajce_publisher_real_start; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_rajce_rajce_publisher_real_stop; -#line 5665 "RajcePublishing.c" + iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_rajce_rajce_publisher_real_stop; +#line 5670 "RajcePublishing.c" } @@ -5676,6 +5681,10 @@ static void publishing_rajce_rajce_publisher_instance_init (PublishingRajceRajce self->priv->host = NULL; #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->progress_reporter = NULL; +#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->progress_reporter_target = self; +#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->progress_reporter_target_destroy_notify = NULL; #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->service = NULL; #line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -5690,11 +5699,11 @@ static void publishing_rajce_rajce_publisher_instance_init (PublishingRajceRajce self->priv->parameters = NULL; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->media_type = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_NONE; -#line 5690 "RajcePublishing.c" +#line 5699 "RajcePublishing.c" } -static void publishing_rajce_rajce_publisher_finalize (GObject* obj) { +static void publishing_rajce_rajce_publisher_finalize (GObject * obj) { PublishingRajceRajcePublisher * self; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_RAJCE_PUBLISHER, PublishingRajceRajcePublisher); @@ -5718,7 +5727,7 @@ static void publishing_rajce_rajce_publisher_finalize (GObject* obj) { _publishing_rajce_publishing_parameters_unref0 (self->priv->parameters); #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" G_OBJECT_CLASS (publishing_rajce_rajce_publisher_parent_class)->finalize (obj); -#line 5718 "RajcePublishing.c" +#line 5727 "RajcePublishing.c" } @@ -5738,20 +5747,20 @@ GType publishing_rajce_rajce_publisher_get_type (void) { PublishingRajceAlbum* publishing_rajce_album_construct (GType object_type, gint id, const gchar* albumName, const gchar* url, const gchar* thumbUrl, const gchar* createDate, const gchar* updateDate, gboolean hidden, gboolean secure, gint photoCount) { PublishingRajceAlbum* self = NULL; - gint _tmp0_ = 0; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; - gboolean _tmp12_ = FALSE; - gint _tmp13_ = 0; + gint _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; + const gchar* _tmp7_; + gchar* _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; + gboolean _tmp11_; + gboolean _tmp12_; + gint _tmp13_; #line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (albumName != NULL, NULL); #line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -5822,26 +5831,26 @@ PublishingRajceAlbum* publishing_rajce_album_construct (GType object_type, gint self->photoCount = _tmp13_; #line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 5822 "RajcePublishing.c" +#line 5831 "RajcePublishing.c" } PublishingRajceAlbum* publishing_rajce_album_new (gint id, const gchar* albumName, const gchar* url, const gchar* thumbUrl, const gchar* createDate, const gchar* updateDate, gboolean hidden, gboolean secure, gint photoCount) { #line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_album_construct (PUBLISHING_RAJCE_TYPE_ALBUM, id, albumName, url, thumbUrl, createDate, updateDate, hidden, secure, photoCount); -#line 5829 "RajcePublishing.c" +#line 5838 "RajcePublishing.c" } gint publishing_rajce_album_compare_albums (PublishingRajceAlbum* a, PublishingRajceAlbum* b) { gint result = 0; gboolean _tmp0_ = FALSE; - PublishingRajceAlbum* _tmp1_ = NULL; - PublishingRajceAlbum* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - PublishingRajceAlbum* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - gint _tmp13_ = 0; + PublishingRajceAlbum* _tmp1_; + PublishingRajceAlbum* _tmp9_; + const gchar* _tmp10_; + PublishingRajceAlbum* _tmp11_; + const gchar* _tmp12_; + gint _tmp13_; #line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail ((a == NULL) || PUBLISHING_RAJCE_IS_ALBUM (a), 0); #line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -5850,17 +5859,17 @@ gint publishing_rajce_album_compare_albums (PublishingRajceAlbum* a, PublishingR _tmp1_ = a; #line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp1_ == NULL) { -#line 5850 "RajcePublishing.c" - PublishingRajceAlbum* _tmp2_ = NULL; +#line 5859 "RajcePublishing.c" + PublishingRajceAlbum* _tmp2_; #line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = b; #line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = _tmp2_ == NULL; -#line 5856 "RajcePublishing.c" +#line 5865 "RajcePublishing.c" } else { #line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = FALSE; -#line 5860 "RajcePublishing.c" +#line 5869 "RajcePublishing.c" } #line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp0_) { @@ -5868,25 +5877,25 @@ gint publishing_rajce_album_compare_albums (PublishingRajceAlbum* a, PublishingR result = 0; #line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 5868 "RajcePublishing.c" +#line 5877 "RajcePublishing.c" } else { gboolean _tmp3_ = FALSE; - PublishingRajceAlbum* _tmp4_ = NULL; + PublishingRajceAlbum* _tmp4_; #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = a; #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp4_ == NULL) { -#line 5876 "RajcePublishing.c" - PublishingRajceAlbum* _tmp5_ = NULL; +#line 5885 "RajcePublishing.c" + PublishingRajceAlbum* _tmp5_; #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = b; #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = _tmp5_ != NULL; -#line 5882 "RajcePublishing.c" +#line 5891 "RajcePublishing.c" } else { #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = FALSE; -#line 5886 "RajcePublishing.c" +#line 5895 "RajcePublishing.c" } #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp3_) { @@ -5894,25 +5903,25 @@ gint publishing_rajce_album_compare_albums (PublishingRajceAlbum* a, PublishingR result = 1; #line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 5894 "RajcePublishing.c" +#line 5903 "RajcePublishing.c" } else { gboolean _tmp6_ = FALSE; - PublishingRajceAlbum* _tmp7_ = NULL; + PublishingRajceAlbum* _tmp7_; #line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = a; #line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp7_ != NULL) { -#line 5902 "RajcePublishing.c" - PublishingRajceAlbum* _tmp8_ = NULL; +#line 5911 "RajcePublishing.c" + PublishingRajceAlbum* _tmp8_; #line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp8_ = b; #line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = _tmp8_ == NULL; -#line 5908 "RajcePublishing.c" +#line 5917 "RajcePublishing.c" } else { #line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = FALSE; -#line 5912 "RajcePublishing.c" +#line 5921 "RajcePublishing.c" } #line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp6_) { @@ -5920,7 +5929,7 @@ gint publishing_rajce_album_compare_albums (PublishingRajceAlbum* a, PublishingR result = -1; #line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 5920 "RajcePublishing.c" +#line 5929 "RajcePublishing.c" } } } @@ -5938,14 +5947,14 @@ gint publishing_rajce_album_compare_albums (PublishingRajceAlbum* a, PublishingR result = _tmp13_; #line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 5938 "RajcePublishing.c" +#line 5947 "RajcePublishing.c" } static void publishing_rajce_value_album_init (GValue* value) { #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 5945 "RajcePublishing.c" +#line 5954 "RajcePublishing.c" } @@ -5954,7 +5963,7 @@ static void publishing_rajce_value_album_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_album_unref (value->data[0].v_pointer); -#line 5954 "RajcePublishing.c" +#line 5963 "RajcePublishing.c" } } @@ -5964,11 +5973,11 @@ static void publishing_rajce_value_album_copy_value (const GValue* src_value, GV if (src_value->data[0].v_pointer) { #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" dest_value->data[0].v_pointer = publishing_rajce_album_ref (src_value->data[0].v_pointer); -#line 5964 "RajcePublishing.c" +#line 5973 "RajcePublishing.c" } else { #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 5968 "RajcePublishing.c" +#line 5977 "RajcePublishing.c" } } @@ -5976,66 +5985,66 @@ static void publishing_rajce_value_album_copy_value (const GValue* src_value, GV static gpointer publishing_rajce_value_album_peek_pointer (const GValue* value) { #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return value->data[0].v_pointer; -#line 5976 "RajcePublishing.c" +#line 5985 "RajcePublishing.c" } static gchar* publishing_rajce_value_album_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (collect_values[0].v_pointer) { -#line 5983 "RajcePublishing.c" - PublishingRajceAlbum* object; +#line 5992 "RajcePublishing.c" + PublishingRajceAlbum * object; object = collect_values[0].v_pointer; #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (object->parent_instance.g_class == NULL) { #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 5990 "RajcePublishing.c" +#line 5999 "RajcePublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 5994 "RajcePublishing.c" +#line 6003 "RajcePublishing.c" } #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = publishing_rajce_album_ref (object); -#line 5998 "RajcePublishing.c" +#line 6007 "RajcePublishing.c" } else { #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 6002 "RajcePublishing.c" +#line 6011 "RajcePublishing.c" } #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 6006 "RajcePublishing.c" +#line 6015 "RajcePublishing.c" } static gchar* publishing_rajce_value_album_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingRajceAlbum** object_p; + PublishingRajceAlbum ** object_p; object_p = collect_values[0].v_pointer; #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (!object_p) { #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 6017 "RajcePublishing.c" +#line 6026 "RajcePublishing.c" } #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (!value->data[0].v_pointer) { #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *object_p = NULL; -#line 6023 "RajcePublishing.c" +#line 6032 "RajcePublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *object_p = value->data[0].v_pointer; -#line 6027 "RajcePublishing.c" +#line 6036 "RajcePublishing.c" } else { #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *object_p = publishing_rajce_album_ref (value->data[0].v_pointer); -#line 6031 "RajcePublishing.c" +#line 6040 "RajcePublishing.c" } #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 6035 "RajcePublishing.c" +#line 6044 "RajcePublishing.c" } @@ -6049,7 +6058,7 @@ GParamSpec* publishing_rajce_param_spec_album (const gchar* name, const gchar* n G_PARAM_SPEC (spec)->value_type = object_type; #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return G_PARAM_SPEC (spec); -#line 6049 "RajcePublishing.c" +#line 6058 "RajcePublishing.c" } @@ -6058,12 +6067,12 @@ gpointer publishing_rajce_value_get_album (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ALBUM), NULL); #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return value->data[0].v_pointer; -#line 6058 "RajcePublishing.c" +#line 6067 "RajcePublishing.c" } void publishing_rajce_value_set_album (GValue* value, gpointer v_object) { - PublishingRajceAlbum* old; + PublishingRajceAlbum * old; #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ALBUM)); #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -6078,23 +6087,23 @@ void publishing_rajce_value_set_album (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_album_ref (value->data[0].v_pointer); -#line 6078 "RajcePublishing.c" +#line 6087 "RajcePublishing.c" } else { #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 6082 "RajcePublishing.c" +#line 6091 "RajcePublishing.c" } #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (old) { #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_album_unref (old); -#line 6088 "RajcePublishing.c" +#line 6097 "RajcePublishing.c" } } void publishing_rajce_value_take_album (GValue* value, gpointer v_object) { - PublishingRajceAlbum* old; + PublishingRajceAlbum * old; #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ALBUM)); #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -6107,17 +6116,17 @@ void publishing_rajce_value_take_album (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = v_object; -#line 6107 "RajcePublishing.c" +#line 6116 "RajcePublishing.c" } else { #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 6111 "RajcePublishing.c" +#line 6120 "RajcePublishing.c" } #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (old) { #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_album_unref (old); -#line 6117 "RajcePublishing.c" +#line 6126 "RajcePublishing.c" } } @@ -6127,18 +6136,18 @@ static void publishing_rajce_album_class_init (PublishingRajceAlbumClass * klass publishing_rajce_album_parent_class = g_type_class_peek_parent (klass); #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" ((PublishingRajceAlbumClass *) klass)->finalize = publishing_rajce_album_finalize; -#line 6127 "RajcePublishing.c" +#line 6136 "RajcePublishing.c" } static void publishing_rajce_album_instance_init (PublishingRajceAlbum * self) { #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->ref_count = 1; -#line 6134 "RajcePublishing.c" +#line 6143 "RajcePublishing.c" } -static void publishing_rajce_album_finalize (PublishingRajceAlbum* obj) { +static void publishing_rajce_album_finalize (PublishingRajceAlbum * obj) { PublishingRajceAlbum * self; #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_ALBUM, PublishingRajceAlbum); @@ -6154,7 +6163,7 @@ static void publishing_rajce_album_finalize (PublishingRajceAlbum* obj) { _g_free0 (self->createDate); #line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->updateDate); -#line 6154 "RajcePublishing.c" +#line 6163 "RajcePublishing.c" } @@ -6173,18 +6182,18 @@ GType publishing_rajce_album_get_type (void) { gpointer publishing_rajce_album_ref (gpointer instance) { - PublishingRajceAlbum* self; + PublishingRajceAlbum * self; self = instance; #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_atomic_int_inc (&self->ref_count); #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return instance; -#line 6179 "RajcePublishing.c" +#line 6188 "RajcePublishing.c" } void publishing_rajce_album_unref (gpointer instance) { - PublishingRajceAlbum* self; + PublishingRajceAlbum * self; self = instance; #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -6192,20 +6201,20 @@ void publishing_rajce_album_unref (gpointer instance) { PUBLISHING_RAJCE_ALBUM_GET_CLASS (self)->finalize (self); #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 6192 "RajcePublishing.c" +#line 6201 "RajcePublishing.c" } } PublishingRajceUploader* publishing_rajce_uploader_construct (GType object_type, PublishingRajceSession* session, const gchar* url, SpitPublishingPublishable** publishables, int publishables_length1, PublishingRajcePublishingParameters* parameters) { PublishingRajceUploader* self = NULL; - PublishingRajceSession* _tmp0_ = NULL; - SpitPublishingPublishable** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - PublishingRajcePublishingParameters* _tmp2_ = NULL; - PublishingRajcePublishingParameters* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + PublishingRajceSession* _tmp0_; + SpitPublishingPublishable** _tmp1_; + gint _tmp1__length1; + PublishingRajcePublishingParameters* _tmp2_; + PublishingRajcePublishingParameters* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL); #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -6238,27 +6247,27 @@ PublishingRajceUploader* publishing_rajce_uploader_construct (GType object_type, self->priv->url = _tmp5_; #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 6238 "RajcePublishing.c" +#line 6247 "RajcePublishing.c" } PublishingRajceUploader* publishing_rajce_uploader_new (PublishingRajceSession* session, const gchar* url, SpitPublishingPublishable** publishables, int publishables_length1, PublishingRajcePublishingParameters* parameters) { #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_uploader_construct (PUBLISHING_RAJCE_TYPE_UPLOADER, session, url, publishables, publishables_length1, parameters); -#line 6245 "RajcePublishing.c" +#line 6254 "RajcePublishing.c" } static PublishingRESTSupportTransaction* publishing_rajce_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) { PublishingRajceUploader * self; PublishingRESTSupportTransaction* result = NULL; - PublishingRESTSupportSession* _tmp0_ = NULL; - PublishingRajceSession* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PublishingRajcePublishingParameters* _tmp3_ = NULL; - SpitPublishingPublishable* _tmp4_ = NULL; - PublishingRajceAddPhotoTransaction* _tmp5_ = NULL; - PublishingRESTSupportTransaction* _tmp6_ = NULL; + PublishingRESTSupportSession* _tmp0_; + PublishingRajceSession* _tmp1_; + const gchar* _tmp2_; + PublishingRajcePublishingParameters* _tmp3_; + SpitPublishingPublishable* _tmp4_; + PublishingRajceAddPhotoTransaction* _tmp5_; + PublishingRESTSupportTransaction* _tmp6_; #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_UPLOADER, PublishingRajceUploader); #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -6283,7 +6292,7 @@ static PublishingRESTSupportTransaction* publishing_rajce_uploader_real_create_t result = _tmp6_; #line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 6283 "RajcePublishing.c" +#line 6292 "RajcePublishing.c" } @@ -6295,19 +6304,19 @@ static void publishing_rajce_uploader_class_init (PublishingRajceUploaderClass * #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_type_class_add_private (klass, sizeof (PublishingRajceUploaderPrivate)); #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_rajce_uploader_real_create_transaction; -#line 6296 "RajcePublishing.c" + ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_rajce_uploader_real_create_transaction; +#line 6305 "RajcePublishing.c" } static void publishing_rajce_uploader_instance_init (PublishingRajceUploader * self) { #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv = PUBLISHING_RAJCE_UPLOADER_GET_PRIVATE (self); -#line 6303 "RajcePublishing.c" +#line 6312 "RajcePublishing.c" } -static void publishing_rajce_uploader_finalize (PublishingRESTSupportBatchUploader* obj) { +static void publishing_rajce_uploader_finalize (PublishingRESTSupportBatchUploader * obj) { PublishingRajceUploader * self; #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_UPLOADER, PublishingRajceUploader); @@ -6317,7 +6326,7 @@ static void publishing_rajce_uploader_finalize (PublishingRESTSupportBatchUpload _g_free0 (self->priv->url); #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_rajce_uploader_parent_class)->finalize (obj); -#line 6317 "RajcePublishing.c" +#line 6326 "RajcePublishing.c" } @@ -6348,27 +6357,27 @@ GType publishing_rajce_authentication_pane_mode_get_type (void) { static void _publishing_rajce_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_authentication_pane_on_user_changed ((PublishingRajceAuthenticationPane*) self); -#line 6348 "RajcePublishing.c" +#line 6357 "RajcePublishing.c" } static void _publishing_rajce_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_authentication_pane_on_password_changed ((PublishingRajceAuthenticationPane*) self); -#line 6355 "RajcePublishing.c" +#line 6364 "RajcePublishing.c" } static void _publishing_rajce_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_authentication_pane_on_login_button_clicked ((PublishingRajceAuthenticationPane*) self); -#line 6362 "RajcePublishing.c" +#line 6371 "RajcePublishing.c" } PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construct (GType object_type, PublishingRajceRajcePublisher* publisher, PublishingRajceAuthenticationPaneMode mode) { PublishingRajceAuthenticationPane * self = NULL; - GtkBox* _tmp0_ = NULL; + GtkBox* _tmp0_; GError * _inner_error_ = NULL; #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (publisher), NULL); @@ -6382,72 +6391,68 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc _g_object_unref0 (self->priv->pane_widget); #line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->pane_widget = _tmp0_; -#line 6382 "RajcePublishing.c" +#line 6391 "RajcePublishing.c" { - GtkBuilder* _tmp1_ = NULL; - GtkBuilder* _tmp2_ = NULL; - GtkBuilder* _tmp3_ = NULL; + GtkBuilder* _tmp1_; + GtkBuilder* _tmp2_; + GtkBuilder* _tmp3_; GtkBox* content = NULL; - GtkBuilder* _tmp4_ = NULL; - GObject* _tmp5_ = NULL; - GtkBox* _tmp6_ = NULL; + GtkBuilder* _tmp4_; + GObject* _tmp5_; + GtkBox* _tmp6_; GtkLabel* message_label = NULL; - GtkBuilder* _tmp7_ = NULL; - GObject* _tmp8_ = NULL; - GtkLabel* _tmp9_ = NULL; - PublishingRajceAuthenticationPaneMode _tmp10_ = 0; - GtkBuilder* _tmp18_ = NULL; - GObject* _tmp19_ = NULL; - GtkEntry* _tmp20_ = NULL; + GtkBuilder* _tmp7_; + GObject* _tmp8_; + GtkLabel* _tmp9_; + PublishingRajceAuthenticationPaneMode _tmp10_; + GtkBuilder* _tmp17_; + GObject* _tmp18_; + GtkEntry* _tmp19_; gchar* persistent_username = NULL; - PublishingRajceRajcePublisher* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - const gchar* _tmp23_ = NULL; - GtkBuilder* _tmp26_ = NULL; - GObject* _tmp27_ = NULL; - GtkEntry* _tmp28_ = NULL; + PublishingRajceRajcePublisher* _tmp20_; + gchar* _tmp21_; + const gchar* _tmp22_; + GtkBuilder* _tmp25_; + GObject* _tmp26_; + GtkEntry* _tmp27_; gchar* persistent_token = NULL; - PublishingRajceRajcePublisher* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - const gchar* _tmp31_ = NULL; - GtkBuilder* _tmp34_ = NULL; - GObject* _tmp35_ = NULL; - GtkCheckButton* _tmp36_ = NULL; - GtkCheckButton* _tmp37_ = NULL; - PublishingRajceRajcePublisher* _tmp38_ = NULL; - gboolean _tmp39_ = FALSE; - GtkBuilder* _tmp40_ = NULL; - GObject* _tmp41_ = NULL; - GtkButton* _tmp42_ = NULL; + PublishingRajceRajcePublisher* _tmp28_; + gchar* _tmp29_; + const gchar* _tmp30_; + GtkBuilder* _tmp33_; + GObject* _tmp34_; + GtkCheckButton* _tmp35_; + GtkCheckButton* _tmp36_; + PublishingRajceRajcePublisher* _tmp37_; + gboolean _tmp38_; + GtkBuilder* _tmp39_; + GObject* _tmp40_; + GtkButton* _tmp41_; GtkLabel* label2 = NULL; - GtkBuilder* _tmp43_ = NULL; - GObject* _tmp44_ = NULL; - GtkLabel* _tmp45_ = NULL; + GtkBuilder* _tmp42_; + GObject* _tmp43_; + GtkLabel* _tmp44_; GtkLabel* label3 = NULL; - GtkBuilder* _tmp46_ = NULL; - GObject* _tmp47_ = NULL; - GtkLabel* _tmp48_ = NULL; - GtkLabel* _tmp49_ = NULL; - const gchar* _tmp50_ = NULL; - GtkLabel* _tmp51_ = NULL; - const gchar* _tmp52_ = NULL; - GtkCheckButton* _tmp53_ = NULL; - const gchar* _tmp54_ = NULL; - GtkButton* _tmp55_ = NULL; - const gchar* _tmp56_ = NULL; - GtkEntry* _tmp57_ = NULL; - GtkEntry* _tmp58_ = NULL; - GtkButton* _tmp59_ = NULL; - GtkBox* _tmp60_ = NULL; - GtkContainer* _tmp61_ = NULL; - GtkContainer* _tmp62_ = NULL; - GtkBox* _tmp63_ = NULL; - GtkBox* _tmp64_ = NULL; - GtkBox* _tmp65_ = NULL; - PublishingRajceRajcePublisher* _tmp66_ = NULL; - SpitPublishingPluginHost* _tmp67_ = NULL; - SpitPublishingPluginHost* _tmp68_ = NULL; - GtkButton* _tmp69_ = NULL; + GtkBuilder* _tmp45_; + GObject* _tmp46_; + GtkLabel* _tmp47_; + GtkLabel* _tmp48_; + GtkLabel* _tmp49_; + GtkCheckButton* _tmp50_; + GtkButton* _tmp51_; + GtkEntry* _tmp52_; + GtkEntry* _tmp53_; + GtkButton* _tmp54_; + GtkBox* _tmp55_; + GtkContainer* _tmp56_; + GtkContainer* _tmp57_; + GtkBox* _tmp58_; + GtkBox* _tmp59_; + GtkBox* _tmp60_; + PublishingRajceRajcePublisher* _tmp61_; + SpitPublishingPluginHost* _tmp62_; + SpitPublishingPluginHost* _tmp63_; + GtkButton* _tmp64_; #line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = gtk_builder_new (); #line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -6460,7 +6465,7 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/rajce_authentication_pane.ui", &_inner_error_); #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6460 "RajcePublishing.c" +#line 6465 "RajcePublishing.c" goto __catch29_g_error; } #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -6489,10 +6494,10 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc switch (_tmp10_) { #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" case PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_INTRO: -#line 6489 "RajcePublishing.c" +#line 6494 "RajcePublishing.c" { - GtkLabel* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; + GtkLabel* _tmp11_; + const gchar* _tmp12_; #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp11_ = message_label; #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -6501,216 +6506,205 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc gtk_label_set_text (_tmp11_, _tmp12_); #line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" break; -#line 6501 "RajcePublishing.c" +#line 6506 "RajcePublishing.c" } #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" case PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER: -#line 6505 "RajcePublishing.c" +#line 6510 "RajcePublishing.c" { - GtkLabel* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; + GtkLabel* _tmp13_; + const gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; #line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp13_ = message_label; #line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp14_ = _ ("Invalid User Email or Password"); -#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp15_ = publishing_rajce_authentication_pane_FAILED_RETRY_USER_MESSAGE; + _tmp14_ = publishing_rajce_authentication_pane_FAILED_RETRY_USER_MESSAGE; #line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp16_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp14_, _tmp15_); + _tmp15_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Invalid User Email or Password"), _tmp14_); #line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_label_set_markup (_tmp13_, _tmp17_); + gtk_label_set_markup (_tmp13_, _tmp16_); #line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp16_); #line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" break; -#line 6528 "RajcePublishing.c" +#line 6530 "RajcePublishing.c" } default: #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" break; -#line 6533 "RajcePublishing.c" +#line 6535 "RajcePublishing.c" } #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp18_ = self->priv->builder; + _tmp17_ = self->priv->builder; #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp19_ = gtk_builder_get_object (_tmp18_, "username_entry"); + _tmp18_ = gtk_builder_get_object (_tmp17_, "username_entry"); #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp19_) : NULL); + _tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp18_) : NULL); #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (self->priv->username_entry); #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->username_entry = _tmp20_; + self->priv->username_entry = _tmp19_; #line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp21_ = publisher; + _tmp20_ = publisher; #line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp22_ = publishing_rajce_rajce_publisher_get_username (_tmp21_); + _tmp21_ = publishing_rajce_rajce_publisher_get_username (_tmp20_); #line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - persistent_username = _tmp22_; + persistent_username = _tmp21_; #line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp23_ = persistent_username; + _tmp22_ = persistent_username; #line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - if (_tmp23_ != NULL) { -#line 6555 "RajcePublishing.c" - GtkEntry* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; + if (_tmp22_ != NULL) { +#line 6557 "RajcePublishing.c" + GtkEntry* _tmp23_; + const gchar* _tmp24_; #line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp24_ = self->priv->username_entry; + _tmp23_ = self->priv->username_entry; #line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp25_ = persistent_username; + _tmp24_ = persistent_username; #line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_entry_set_text (_tmp24_, _tmp25_); -#line 6564 "RajcePublishing.c" + gtk_entry_set_text (_tmp23_, _tmp24_); +#line 6566 "RajcePublishing.c" } #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp26_ = self->priv->builder; + _tmp25_ = self->priv->builder; #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp27_ = gtk_builder_get_object (_tmp26_, "password_entry"); + _tmp26_ = gtk_builder_get_object (_tmp25_, "password_entry"); #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp27_) : NULL); + _tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp26_) : NULL); #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (self->priv->password_entry); #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->password_entry = _tmp28_; + self->priv->password_entry = _tmp27_; #line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp29_ = publisher; + _tmp28_ = publisher; #line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp30_ = publishing_rajce_rajce_publisher_get_token (_tmp29_); + _tmp29_ = publishing_rajce_rajce_publisher_get_token (_tmp28_); #line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - persistent_token = _tmp30_; + persistent_token = _tmp29_; #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp31_ = persistent_token; + _tmp30_ = persistent_token; #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - if (_tmp31_ != NULL) { -#line 6586 "RajcePublishing.c" - GtkEntry* _tmp32_ = NULL; - const gchar* _tmp33_ = NULL; + if (_tmp30_ != NULL) { +#line 6588 "RajcePublishing.c" + GtkEntry* _tmp31_; + const gchar* _tmp32_; #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp32_ = self->priv->password_entry; + _tmp31_ = self->priv->password_entry; #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp33_ = persistent_token; + _tmp32_ = persistent_token; #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_entry_set_text (_tmp32_, _tmp33_); + gtk_entry_set_text (_tmp31_, _tmp32_); #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->crypt = FALSE; -#line 6597 "RajcePublishing.c" +#line 6599 "RajcePublishing.c" } else { #line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->crypt = TRUE; -#line 6601 "RajcePublishing.c" +#line 6603 "RajcePublishing.c" } #line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp34_ = self->priv->builder; + _tmp33_ = self->priv->builder; #line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp35_ = gtk_builder_get_object (_tmp34_, "remember_checkbutton"); + _tmp34_ = gtk_builder_get_object (_tmp33_, "remember_checkbutton"); #line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp35_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp35_) : NULL); + _tmp35_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp34_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp34_) : NULL); #line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (self->priv->remember_checkbutton); #line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->remember_checkbutton = _tmp36_; + self->priv->remember_checkbutton = _tmp35_; #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp37_ = self->priv->remember_checkbutton; + _tmp36_ = self->priv->remember_checkbutton; #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp38_ = publisher; + _tmp37_ = publisher; #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp39_ = publishing_rajce_rajce_publisher_get_remember (_tmp38_); + _tmp38_ = publishing_rajce_rajce_publisher_get_remember (_tmp37_); #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp39_); + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp38_); #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp40_ = self->priv->builder; + _tmp39_ = self->priv->builder; #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp41_ = gtk_builder_get_object (_tmp40_, "login_button"); + _tmp40_ = gtk_builder_get_object (_tmp39_, "login_button"); #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp42_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, gtk_button_get_type ()) ? ((GtkButton*) _tmp41_) : NULL); + _tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, gtk_button_get_type ()) ? ((GtkButton*) _tmp40_) : NULL); #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (self->priv->login_button); #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->login_button = _tmp42_; + self->priv->login_button = _tmp41_; #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp43_ = self->priv->builder; + _tmp42_ = self->priv->builder; #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp44_ = gtk_builder_get_object (_tmp43_, "label2"); + _tmp43_ = gtk_builder_get_object (_tmp42_, "label2"); #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp45_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp44_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp44_) : NULL); + _tmp44_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp43_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp43_) : NULL); #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - label2 = _tmp45_; + label2 = _tmp44_; #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp46_ = self->priv->builder; + _tmp45_ = self->priv->builder; #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp47_ = gtk_builder_get_object (_tmp46_, "label3"); + _tmp46_ = gtk_builder_get_object (_tmp45_, "label3"); #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp47_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp47_) : NULL); + _tmp47_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp46_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp46_) : NULL); #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - label3 = _tmp48_; + label3 = _tmp47_; #line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp49_ = label2; + _tmp48_ = label2; #line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp50_ = _ ("_Email address"); -#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_label_set_label (_tmp49_, _tmp50_); -#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp51_ = label3; + gtk_label_set_label (_tmp48_, _ ("_Email address")); #line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp52_ = _ ("_Password"); + _tmp49_ = label3; #line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_label_set_label (_tmp51_, _tmp52_); + gtk_label_set_label (_tmp49_, _ ("_Password")); #line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp53_ = self->priv->remember_checkbutton; + _tmp50_ = self->priv->remember_checkbutton; #line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp54_ = _ ("_Remember"); -#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_button_get_type (), GtkButton), _tmp54_); -#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp55_ = self->priv->login_button; + gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_button_get_type (), GtkButton), _ ("_Remember")); #line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp56_ = _ ("Log in"); + _tmp51_ = self->priv->login_button; #line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_button_set_label (_tmp55_, _tmp56_); + gtk_button_set_label (_tmp51_, _ ("Log in")); #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp57_ = self->priv->username_entry; + _tmp52_ = self->priv->username_entry; #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_rajce_authentication_pane_on_user_changed_gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_rajce_authentication_pane_on_user_changed_gtk_editable_changed, self, 0); #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp58_ = self->priv->password_entry; + _tmp53_ = self->priv->password_entry; #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_rajce_authentication_pane_on_password_changed_gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_rajce_authentication_pane_on_password_changed_gtk_editable_changed, self, 0); #line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp59_ = self->priv->login_button; + _tmp54_ = self->priv->login_button; #line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_signal_connect_object (_tmp59_, "clicked", (GCallback) _publishing_rajce_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp54_, "clicked", (GCallback) _publishing_rajce_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0); #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp60_ = content; + _tmp55_ = content; #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp61_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget)); + _tmp56_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget)); #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp62_ = _tmp61_; + _tmp57_ = _tmp56_; #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp63_ = content; + _tmp58_ = content; #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_container_remove (_tmp62_, G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget)); + gtk_container_remove (_tmp57_, G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget)); #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp64_ = self->priv->pane_widget; + _tmp59_ = self->priv->pane_widget; #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp65_ = content; + _tmp60_ = content; #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget)); #line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp66_ = publisher; + _tmp61_ = publisher; #line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp67_ = publishing_rajce_rajce_publisher_get_host (_tmp66_); + _tmp62_ = publishing_rajce_rajce_publisher_get_host (_tmp61_); #line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp68_ = _tmp67_; + _tmp63_ = _tmp62_; #line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp69_ = self->priv->login_button; + _tmp64_ = self->priv->login_button; #line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - spit_publishing_plugin_host_set_dialog_default_widget (_tmp68_, G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget)); + spit_publishing_plugin_host_set_dialog_default_widget (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget)); #line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_object_unref0 (_tmp68_); + _g_object_unref0 (_tmp63_); #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (label3); #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -6723,27 +6717,27 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc _g_object_unref0 (message_label); #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (content); -#line 6723 "RajcePublishing.c" +#line 6717 "RajcePublishing.c" } goto __finally29; __catch29_g_error: { GError* e = NULL; - GError* _tmp70_ = NULL; - const gchar* _tmp71_ = NULL; + GError* _tmp65_; + const gchar* _tmp66_; #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" e = _inner_error_; #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _inner_error_ = NULL; #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp70_ = e; + _tmp65_ = e; #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp71_ = _tmp70_->message; + _tmp66_ = _tmp65_->message; #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_warning ("RajcePublishing.vala:906: Could not load UI: %s", _tmp71_); + g_warning ("RajcePublishing.vala:906: Could not load UI: %s", _tmp66_); #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_error_free0 (e); -#line 6743 "RajcePublishing.c" +#line 6737 "RajcePublishing.c" } __finally29: #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -6754,25 +6748,25 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc g_clear_error (&_inner_error_); #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 6754 "RajcePublishing.c" +#line 6748 "RajcePublishing.c" } #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 6758 "RajcePublishing.c" +#line 6752 "RajcePublishing.c" } PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_new (PublishingRajceRajcePublisher* publisher, PublishingRajceAuthenticationPaneMode mode) { #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_authentication_pane_construct (PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, publisher, mode); -#line 6765 "RajcePublishing.c" +#line 6759 "RajcePublishing.c" } GtkWidget* publishing_rajce_authentication_pane_get_default_widget (PublishingRajceAuthenticationPane* self) { GtkWidget* result = NULL; - GtkButton* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkButton* _tmp0_; + GtkWidget* _tmp1_; #line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_AUTHENTICATION_PANE (self), NULL); #line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -6783,21 +6777,21 @@ GtkWidget* publishing_rajce_authentication_pane_get_default_widget (PublishingRa result = _tmp1_; #line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 6783 "RajcePublishing.c" +#line 6777 "RajcePublishing.c" } static void publishing_rajce_authentication_pane_on_login_button_clicked (PublishingRajceAuthenticationPane* self) { gchar* token = NULL; - GtkEntry* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - GtkEntry* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - GtkCheckButton* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; + GtkEntry* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + gboolean _tmp3_; + GtkEntry* _tmp6_; + const gchar* _tmp7_; + const gchar* _tmp8_; + GtkCheckButton* _tmp9_; + gboolean _tmp10_; #line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_AUTHENTICATION_PANE (self)); #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -6812,9 +6806,9 @@ static void publishing_rajce_authentication_pane_on_login_button_clicked (Publis _tmp3_ = self->priv->crypt; #line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp3_) { -#line 6812 "RajcePublishing.c" - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; +#line 6806 "RajcePublishing.c" + const gchar* _tmp4_; + gchar* _tmp5_; #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = token; #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -6823,7 +6817,7 @@ static void publishing_rajce_authentication_pane_on_login_button_clicked (Publis _g_free0 (token); #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" token = _tmp5_; -#line 6823 "RajcePublishing.c" +#line 6817 "RajcePublishing.c" } #line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = self->priv->username_entry; @@ -6836,10 +6830,10 @@ static void publishing_rajce_authentication_pane_on_login_button_clicked (Publis #line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp10_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_signal_emit_by_name (self, "login", _tmp7_, _tmp8_, _tmp10_); + g_signal_emit (self, publishing_rajce_authentication_pane_signals[PUBLISHING_RAJCE_AUTHENTICATION_PANE_LOGIN_SIGNAL], 0, _tmp7_, _tmp8_, _tmp10_); #line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (token); -#line 6839 "RajcePublishing.c" +#line 6833 "RajcePublishing.c" } @@ -6848,7 +6842,7 @@ static void publishing_rajce_authentication_pane_on_user_changed (PublishingRajc g_return_if_fail (PUBLISHING_RAJCE_IS_AUTHENTICATION_PANE (self)); #line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_authentication_pane_update_login_button_sensitivity (self); -#line 6848 "RajcePublishing.c" +#line 6842 "RajcePublishing.c" } @@ -6859,16 +6853,16 @@ static void publishing_rajce_authentication_pane_on_password_changed (Publishing self->priv->crypt = TRUE; #line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_authentication_pane_update_login_button_sensitivity (self); -#line 6859 "RajcePublishing.c" +#line 6853 "RajcePublishing.c" } static void publishing_rajce_authentication_pane_update_login_button_sensitivity (PublishingRajceAuthenticationPane* self) { gboolean _tmp0_ = FALSE; - GtkEntry* _tmp1_ = NULL; - guint _tmp2_ = 0U; - guint _tmp3_ = 0U; - GtkButton* _tmp7_ = NULL; + GtkEntry* _tmp1_; + guint _tmp2_; + guint _tmp3_; + GtkButton* _tmp7_; #line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_AUTHENTICATION_PANE (self)); #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -6879,10 +6873,10 @@ static void publishing_rajce_authentication_pane_update_login_button_sensitivity _tmp3_ = _tmp2_; #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp3_ > ((guint) 0)) { -#line 6879 "RajcePublishing.c" - GtkEntry* _tmp4_ = NULL; - guint _tmp5_ = 0U; - guint _tmp6_ = 0U; +#line 6873 "RajcePublishing.c" + GtkEntry* _tmp4_; + guint _tmp5_; + guint _tmp6_; #line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = self->priv->password_entry; #line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -6891,25 +6885,25 @@ static void publishing_rajce_authentication_pane_update_login_button_sensitivity _tmp6_ = _tmp5_; #line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = _tmp6_ > ((guint) 0); -#line 6891 "RajcePublishing.c" +#line 6885 "RajcePublishing.c" } else { #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = FALSE; -#line 6895 "RajcePublishing.c" +#line 6889 "RajcePublishing.c" } #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = self->priv->login_button; #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), _tmp0_); -#line 6901 "RajcePublishing.c" +#line 6895 "RajcePublishing.c" } static GtkWidget* publishing_rajce_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) { PublishingRajceAuthenticationPane * self; GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, PublishingRajceAuthenticationPane); #line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -6920,7 +6914,7 @@ static GtkWidget* publishing_rajce_authentication_pane_real_get_widget (SpitPubl result = _tmp1_; #line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 6920 "RajcePublishing.c" +#line 6914 "RajcePublishing.c" } @@ -6933,15 +6927,15 @@ static SpitPublishingDialogPaneGeometryOptions publishing_rajce_authentication_p result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; #line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 6933 "RajcePublishing.c" +#line 6927 "RajcePublishing.c" } static void publishing_rajce_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base) { PublishingRajceAuthenticationPane * self; - GtkEntry* _tmp0_ = NULL; - GtkEntry* _tmp1_ = NULL; - GtkButton* _tmp2_ = NULL; + GtkEntry* _tmp0_; + GtkEntry* _tmp1_; + GtkButton* _tmp2_; #line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, PublishingRajceAuthenticationPane); #line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -6958,7 +6952,7 @@ static void publishing_rajce_authentication_pane_real_on_pane_installed (SpitPub gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE); #line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_authentication_pane_update_login_button_sensitivity (self); -#line 6958 "RajcePublishing.c" +#line 6952 "RajcePublishing.c" } @@ -6966,7 +6960,7 @@ static void publishing_rajce_authentication_pane_real_on_pane_uninstalled (SpitP PublishingRajceAuthenticationPane * self; #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, PublishingRajceAuthenticationPane); -#line 6966 "RajcePublishing.c" +#line 6960 "RajcePublishing.c" } @@ -6985,27 +6979,25 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_BOOLEAN (GClosure * clos data1 = closure->data; #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" data2 = param_values->data[0].v_pointer; -#line 6985 "RajcePublishing.c" +#line 6979 "RajcePublishing.c" } else { #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" data1 = param_values->data[0].v_pointer; #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" data2 = closure->data; -#line 6991 "RajcePublishing.c" +#line 6985 "RajcePublishing.c" } #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" callback = (GMarshalFunc_VOID__STRING_STRING_BOOLEAN) (marshal_data ? marshal_data : cc->callback); #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), g_value_get_boolean (param_values + 3), data2); -#line 6997 "RajcePublishing.c" +#line 6991 "RajcePublishing.c" } static void publishing_rajce_authentication_pane_class_init (PublishingRajceAuthenticationPaneClass * klass) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_authentication_pane_parent_class = g_type_class_peek_parent (klass); #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -7013,20 +7005,16 @@ static void publishing_rajce_authentication_pane_class_init (PublishingRajceAuth #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_rajce_authentication_pane_finalize; #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_signal_new ("login", PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_BOOLEAN, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN); -#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp0_ = _ ("Enter email and password associated with your Rajce account."); + publishing_rajce_authentication_pane_signals[PUBLISHING_RAJCE_AUTHENTICATION_PANE_LOGIN_SIGNAL] = g_signal_new ("login", PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_BOOLEAN, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN); #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (_ ("Enter email and password associated with your Rajce account.")); #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - publishing_rajce_authentication_pane_INTRO_MESSAGE = _tmp1_; -#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp2_ = _ ("Invalid email and/or password. Please try again"); + publishing_rajce_authentication_pane_INTRO_MESSAGE = _tmp0_; #line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp1_ = g_strdup (_ ("Invalid email and/or password. Please try again")); #line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - publishing_rajce_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp3_; -#line 7026 "RajcePublishing.c" + publishing_rajce_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp1_; +#line 7014 "RajcePublishing.c" } @@ -7034,14 +7022,14 @@ static void publishing_rajce_authentication_pane_spit_publishing_dialog_pane_int #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_authentication_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface); #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_rajce_authentication_pane_real_get_widget; + iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_rajce_authentication_pane_real_get_widget; #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_rajce_authentication_pane_real_get_preferred_geometry; + iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_rajce_authentication_pane_real_get_preferred_geometry; #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_rajce_authentication_pane_real_on_pane_installed; + iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_rajce_authentication_pane_real_on_pane_installed; #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_rajce_authentication_pane_real_on_pane_uninstalled; -#line 7041 "RajcePublishing.c" + iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_rajce_authentication_pane_real_on_pane_uninstalled; +#line 7029 "RajcePublishing.c" } @@ -7052,11 +7040,11 @@ static void publishing_rajce_authentication_pane_instance_init (PublishingRajceA self->priv->pane_widget = NULL; #line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->crypt = TRUE; -#line 7052 "RajcePublishing.c" +#line 7040 "RajcePublishing.c" } -static void publishing_rajce_authentication_pane_finalize (GObject* obj) { +static void publishing_rajce_authentication_pane_finalize (GObject * obj) { PublishingRajceAuthenticationPane * self; #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, PublishingRajceAuthenticationPane); @@ -7074,7 +7062,7 @@ static void publishing_rajce_authentication_pane_finalize (GObject* obj) { _g_object_unref0 (self->priv->login_button); #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" G_OBJECT_CLASS (publishing_rajce_authentication_pane_parent_class)->finalize (obj); -#line 7074 "RajcePublishing.c" +#line 7062 "RajcePublishing.c" } @@ -7099,7 +7087,7 @@ GType publishing_rajce_authentication_pane_get_type (void) { static gpointer _publishing_rajce_album_ref0 (gpointer self) { #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self ? publishing_rajce_album_ref (self) : NULL; -#line 7099 "RajcePublishing.c" +#line 7087 "RajcePublishing.c" } @@ -7110,66 +7098,66 @@ static PublishingRajceAlbum** _vala_array_dup5 (PublishingRajceAlbum** self, int result = g_new0 (PublishingRajceAlbum*, length + 1); #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" for (i = 0; i < length; i++) { -#line 7110 "RajcePublishing.c" - PublishingRajceAlbum* _tmp0_ = NULL; +#line 7098 "RajcePublishing.c" + PublishingRajceAlbum* _tmp0_; #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = _publishing_rajce_album_ref0 (self[i]); #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result[i] = _tmp0_; -#line 7116 "RajcePublishing.c" +#line 7104 "RajcePublishing.c" } #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 7120 "RajcePublishing.c" +#line 7108 "RajcePublishing.c" } static void _publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked ((PublishingRajcePublishingOptionsPane*) self); -#line 7127 "RajcePublishing.c" +#line 7115 "RajcePublishing.c" } static void _publishing_rajce_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_options_pane_on_create_new_radio_clicked ((PublishingRajcePublishingOptionsPane*) self); -#line 7134 "RajcePublishing.c" +#line 7122 "RajcePublishing.c" } static void _publishing_rajce_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_options_pane_on_new_album_entry_changed ((PublishingRajcePublishingOptionsPane*) self); -#line 7141 "RajcePublishing.c" +#line 7129 "RajcePublishing.c" } static void _publishing_rajce_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_options_pane_on_logout_clicked ((PublishingRajcePublishingOptionsPane*) self); -#line 7148 "RajcePublishing.c" +#line 7136 "RajcePublishing.c" } static void _publishing_rajce_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_options_pane_on_publish_clicked ((PublishingRajcePublishingOptionsPane*) self); -#line 7155 "RajcePublishing.c" +#line 7143 "RajcePublishing.c" } PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_construct (GType object_type, PublishingRajceRajcePublisher* publisher, const gchar* username, PublishingRajceAlbum** albums, int albums_length1) { PublishingRajcePublishingOptionsPane * self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - PublishingRajceAlbum** _tmp2_ = NULL; - gint _tmp2__length1 = 0; - PublishingRajceAlbum** _tmp3_ = NULL; - gint _tmp3__length1 = 0; - PublishingRajceRajcePublisher* _tmp4_ = NULL; - PublishingRajceRajcePublisher* _tmp5_ = NULL; - GtkBox* _tmp6_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + PublishingRajceAlbum** _tmp2_; + gint _tmp2__length1; + PublishingRajceAlbum** _tmp3_; + gint _tmp3__length1; + PublishingRajceRajcePublisher* _tmp4_; + PublishingRajceRajcePublisher* _tmp5_; + GtkBox* _tmp6_; GError * _inner_error_ = NULL; #line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (publisher), NULL); @@ -7217,74 +7205,66 @@ PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_c _g_object_unref0 (self->priv->pane_widget); #line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->pane_widget = _tmp6_; -#line 7217 "RajcePublishing.c" +#line 7205 "RajcePublishing.c" { - GtkBuilder* _tmp7_ = NULL; - GtkBuilder* _tmp8_ = NULL; - GtkBuilder* _tmp9_ = NULL; - GtkBuilder* _tmp10_ = NULL; - GObject* _tmp11_ = NULL; - GtkBox* _tmp12_ = NULL; - GtkBuilder* _tmp13_ = NULL; - GObject* _tmp14_ = NULL; - GtkLabel* _tmp15_ = NULL; - GtkBuilder* _tmp16_ = NULL; - GObject* _tmp17_ = NULL; - GtkLabel* _tmp18_ = NULL; - GtkBuilder* _tmp19_ = NULL; - GObject* _tmp20_ = NULL; - GtkRadioButton* _tmp21_ = NULL; - GtkBuilder* _tmp22_ = NULL; - GObject* _tmp23_ = NULL; - GtkComboBoxText* _tmp24_ = NULL; - GtkBuilder* _tmp25_ = NULL; - GObject* _tmp26_ = NULL; - GtkRadioButton* _tmp27_ = NULL; - GtkBuilder* _tmp28_ = NULL; - GObject* _tmp29_ = NULL; - GtkEntry* _tmp30_ = NULL; - GtkBuilder* _tmp31_ = NULL; - GObject* _tmp32_ = NULL; - GtkCheckButton* _tmp33_ = NULL; - GtkCheckButton* _tmp34_ = NULL; - const gchar* _tmp35_ = NULL; - GtkBuilder* _tmp36_ = NULL; - GObject* _tmp37_ = NULL; - GtkCheckButton* _tmp38_ = NULL; - GtkBuilder* _tmp39_ = NULL; - GObject* _tmp40_ = NULL; - GtkButton* _tmp41_ = NULL; - GtkBuilder* _tmp42_ = NULL; - GObject* _tmp43_ = NULL; - GtkButton* _tmp44_ = NULL; - GtkCheckButton* _tmp45_ = NULL; - PublishingRajceRajcePublisher* _tmp46_ = NULL; - gboolean _tmp47_ = FALSE; - GtkCheckButton* _tmp48_ = NULL; - PublishingRajceRajcePublisher* _tmp49_ = NULL; - gboolean _tmp50_ = FALSE; - GtkLabel* _tmp51_ = NULL; - const gchar* _tmp52_ = NULL; - const gchar* _tmp53_ = NULL; - gchar* _tmp54_ = NULL; - gchar* _tmp55_ = NULL; - GtkLabel* _tmp56_ = NULL; - const gchar* _tmp57_ = NULL; - GtkRadioButton* _tmp58_ = NULL; - const gchar* _tmp59_ = NULL; - GtkRadioButton* _tmp60_ = NULL; - const gchar* _tmp61_ = NULL; - GtkCheckButton* _tmp62_ = NULL; - const gchar* _tmp63_ = NULL; - GtkButton* _tmp64_ = NULL; - const gchar* _tmp65_ = NULL; - GtkButton* _tmp66_ = NULL; - const gchar* _tmp67_ = NULL; - GtkRadioButton* _tmp68_ = NULL; - GtkRadioButton* _tmp69_ = NULL; - GtkEntry* _tmp70_ = NULL; - GtkButton* _tmp71_ = NULL; - GtkButton* _tmp72_ = NULL; + GtkBuilder* _tmp7_; + GtkBuilder* _tmp8_; + GtkBuilder* _tmp9_; + GtkBuilder* _tmp10_; + GObject* _tmp11_; + GtkBox* _tmp12_; + GtkBuilder* _tmp13_; + GObject* _tmp14_; + GtkLabel* _tmp15_; + GtkBuilder* _tmp16_; + GObject* _tmp17_; + GtkLabel* _tmp18_; + GtkBuilder* _tmp19_; + GObject* _tmp20_; + GtkRadioButton* _tmp21_; + GtkBuilder* _tmp22_; + GObject* _tmp23_; + GtkComboBoxText* _tmp24_; + GtkBuilder* _tmp25_; + GObject* _tmp26_; + GtkRadioButton* _tmp27_; + GtkBuilder* _tmp28_; + GObject* _tmp29_; + GtkEntry* _tmp30_; + GtkBuilder* _tmp31_; + GObject* _tmp32_; + GtkCheckButton* _tmp33_; + GtkCheckButton* _tmp34_; + GtkBuilder* _tmp35_; + GObject* _tmp36_; + GtkCheckButton* _tmp37_; + GtkBuilder* _tmp38_; + GObject* _tmp39_; + GtkButton* _tmp40_; + GtkBuilder* _tmp41_; + GObject* _tmp42_; + GtkButton* _tmp43_; + GtkCheckButton* _tmp44_; + PublishingRajceRajcePublisher* _tmp45_; + gboolean _tmp46_; + GtkCheckButton* _tmp47_; + PublishingRajceRajcePublisher* _tmp48_; + gboolean _tmp49_; + GtkLabel* _tmp50_; + const gchar* _tmp51_; + gchar* _tmp52_; + gchar* _tmp53_; + GtkLabel* _tmp54_; + GtkRadioButton* _tmp55_; + GtkRadioButton* _tmp56_; + GtkCheckButton* _tmp57_; + GtkButton* _tmp58_; + GtkButton* _tmp59_; + GtkRadioButton* _tmp60_; + GtkRadioButton* _tmp61_; + GtkEntry* _tmp62_; + GtkButton* _tmp63_; + GtkButton* _tmp64_; #line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = gtk_builder_new (); #line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -7297,7 +7277,7 @@ PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_c gtk_builder_add_from_resource (_tmp8_, PLUGIN_RESOURCE_PATH "/rajce_publishing_options_pane.ui", &_inner_error_); #line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7297 "RajcePublishing.c" +#line 7277 "RajcePublishing.c" goto __catch30_g_error; } #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -7387,146 +7367,130 @@ PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_c #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp34_ = self->priv->hide_check; #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp35_ = _ ("_Hide album"); -#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_button_get_type (), GtkButton), _tmp35_); + gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_button_get_type (), GtkButton), _ ("_Hide album")); #line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp36_ = self->priv->builder; + _tmp35_ = self->priv->builder; #line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp37_ = gtk_builder_get_object (_tmp36_, "show_check"); + _tmp36_ = gtk_builder_get_object (_tmp35_, "show_check"); #line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp38_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_check_button_get_type (), GtkCheckButton)); + _tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_check_button_get_type (), GtkCheckButton)); #line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (self->priv->show_check); #line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->show_check = _tmp38_; + self->priv->show_check = _tmp37_; #line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp39_ = self->priv->builder; + _tmp38_ = self->priv->builder; #line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp40_ = gtk_builder_get_object (_tmp39_, "publish_button"); + _tmp39_ = gtk_builder_get_object (_tmp38_, "publish_button"); #line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_button_get_type (), GtkButton)); + _tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_button_get_type (), GtkButton)); #line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (self->priv->publish_button); #line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->publish_button = _tmp41_; + self->priv->publish_button = _tmp40_; #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp42_ = self->priv->builder; + _tmp41_ = self->priv->builder; #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp43_ = gtk_builder_get_object (_tmp42_, "logout_button"); + _tmp42_ = gtk_builder_get_object (_tmp41_, "logout_button"); #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp44_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_button_get_type (), GtkButton)); + _tmp43_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_button_get_type (), GtkButton)); #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (self->priv->logout_button); #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->logout_button = _tmp44_; + self->priv->logout_button = _tmp43_; #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp45_ = self->priv->hide_check; + _tmp44_ = self->priv->hide_check; #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp46_ = publisher; + _tmp45_ = publisher; #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp47_ = publishing_rajce_rajce_publisher_get_hide_album (_tmp46_); + _tmp46_ = publishing_rajce_rajce_publisher_get_hide_album (_tmp45_); #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp47_); + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp46_); #line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp48_ = self->priv->show_check; + _tmp47_ = self->priv->show_check; #line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp49_ = publisher; + _tmp48_ = publisher; #line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp50_ = publishing_rajce_rajce_publisher_get_show_album (_tmp49_); + _tmp49_ = publishing_rajce_rajce_publisher_get_show_album (_tmp48_); #line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp50_); -#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp51_ = self->priv->login_identity_label; + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp49_); #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp52_ = _ ("You are logged into Rajce as %s."); + _tmp50_ = self->priv->login_identity_label; #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp53_ = username; + _tmp51_ = username; #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp54_ = g_strdup_printf (_tmp52_, _tmp53_); + _tmp52_ = g_strdup_printf (_ ("You are logged into Rajce as %s."), _tmp51_); #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp55_ = _tmp54_; + _tmp53_ = _tmp52_; #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_label_set_label (_tmp51_, _tmp55_); + gtk_label_set_label (_tmp50_, _tmp53_); #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_free0 (_tmp55_); + _g_free0 (_tmp53_); #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp56_ = self->priv->publish_to_label; + _tmp54_ = self->priv->publish_to_label; #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp57_ = _ ("Photos will appear in:"); -#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_label_set_label (_tmp56_, _tmp57_); -#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp58_ = self->priv->use_existing_radio; + gtk_label_set_label (_tmp54_, _ ("Photos will appear in:")); #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp59_ = _ ("An _existing album:"); + _tmp55_ = self->priv->use_existing_radio; #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_button_get_type (), GtkButton), _tmp59_); -#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp60_ = self->priv->create_new_radio; + gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_button_get_type (), GtkButton), _ ("An _existing album:")); #line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp61_ = _ ("A _new album named:"); + _tmp56_ = self->priv->create_new_radio; #line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_button_get_type (), GtkButton), _tmp61_); + gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_button_get_type (), GtkButton), _ ("A _new album named:")); #line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp62_ = self->priv->show_check; + _tmp57_ = self->priv->show_check; #line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp63_ = _ ("Open target _album in browser"); -#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_button_get_type (), GtkButton), _tmp63_); -#line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp64_ = self->priv->publish_button; + gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_button_get_type (), GtkButton), _ ("Open target _album in browser")); #line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp65_ = _ ("_Publish"); + _tmp58_ = self->priv->publish_button; #line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_button_set_label (_tmp64_, _tmp65_); -#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp66_ = self->priv->logout_button; + gtk_button_set_label (_tmp58_, _ ("_Publish")); #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp67_ = _ ("_Logout"); + _tmp59_ = self->priv->logout_button; #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_button_set_label (_tmp66_, _tmp67_); + gtk_button_set_label (_tmp59_, _ ("_Logout")); #line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp68_ = self->priv->use_existing_radio; + _tmp60_ = self->priv->use_existing_radio; #line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0); #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp69_ = self->priv->create_new_radio; + _tmp61_ = self->priv->create_new_radio; #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0); #line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp70_ = self->priv->new_album_entry; + _tmp62_ = self->priv->new_album_entry; #line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_rajce_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_rajce_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed, self, 0); #line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp71_ = self->priv->logout_button; + _tmp63_ = self->priv->logout_button; #line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_signal_connect_object (_tmp71_, "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp63_, "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0); #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp72_ = self->priv->publish_button; + _tmp64_ = self->priv->publish_button; #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_signal_connect_object (_tmp72_, "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0); -#line 7506 "RajcePublishing.c" + g_signal_connect_object (_tmp64_, "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0); +#line 7470 "RajcePublishing.c" } goto __finally30; __catch30_g_error: { GError* e = NULL; - GError* _tmp73_ = NULL; - const gchar* _tmp74_ = NULL; + GError* _tmp65_; + const gchar* _tmp66_; #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" e = _inner_error_; #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _inner_error_ = NULL; #line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp73_ = e; + _tmp65_ = e; #line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp74_ = _tmp73_->message; + _tmp66_ = _tmp65_->message; #line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_warning ("RajcePublishing.vala:1029: Could not load UI: %s", _tmp74_); + g_warning ("RajcePublishing.vala:1029: Could not load UI: %s", _tmp66_); #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_error_free0 (e); -#line 7526 "RajcePublishing.c" +#line 7490 "RajcePublishing.c" } __finally30: #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -7537,29 +7501,29 @@ PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_c g_clear_error (&_inner_error_); #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 7537 "RajcePublishing.c" +#line 7501 "RajcePublishing.c" } #line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 7541 "RajcePublishing.c" +#line 7505 "RajcePublishing.c" } PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_new (PublishingRajceRajcePublisher* publisher, const gchar* username, PublishingRajceAlbum** albums, int albums_length1) { #line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_publishing_options_pane_construct (PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, publisher, username, albums, albums_length1); -#line 7548 "RajcePublishing.c" +#line 7512 "RajcePublishing.c" } static void publishing_rajce_publishing_options_pane_on_publish_clicked (PublishingRajcePublishingOptionsPane* self) { gboolean show_album = FALSE; - GtkCheckButton* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - PublishingRajceRajcePublisher* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - GtkRadioButton* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + GtkCheckButton* _tmp0_; + gboolean _tmp1_; + PublishingRajceRajcePublisher* _tmp2_; + gboolean _tmp3_; + GtkRadioButton* _tmp4_; + gboolean _tmp5_; #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -7580,20 +7544,20 @@ static void publishing_rajce_publishing_options_pane_on_publish_clicked (Publish _tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp5_) { -#line 7580 "RajcePublishing.c" +#line 7544 "RajcePublishing.c" gchar* album_name = NULL; - GtkEntry* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + GtkEntry* _tmp6_; + const gchar* _tmp7_; + gchar* _tmp8_; gboolean hide_album = FALSE; - GtkCheckButton* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; - PublishingRajceRajcePublisher* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - const gchar* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; - PublishingRajcePublishingParameters* _tmp15_ = NULL; - PublishingRajcePublishingParameters* _tmp16_ = NULL; + GtkCheckButton* _tmp9_; + gboolean _tmp10_; + PublishingRajceRajcePublisher* _tmp11_; + gboolean _tmp12_; + const gchar* _tmp13_; + gboolean _tmp14_; + PublishingRajcePublishingParameters* _tmp15_; + PublishingRajcePublishingParameters* _tmp16_; #line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = self->priv->new_album_entry; #line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -7623,32 +7587,32 @@ static void publishing_rajce_publishing_options_pane_on_publish_clicked (Publish #line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp16_ = _tmp15_; #line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_signal_emit_by_name (self, "publish", _tmp16_); + g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp16_); #line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_publishing_parameters_unref0 (_tmp16_); #line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (album_name); -#line 7628 "RajcePublishing.c" +#line 7592 "RajcePublishing.c" } else { gint id = 0; - PublishingRajceAlbum** _tmp17_ = NULL; - gint _tmp17__length1 = 0; - GtkComboBoxText* _tmp18_ = NULL; - gint _tmp19_ = 0; - PublishingRajceAlbum* _tmp20_ = NULL; - gint _tmp21_ = 0; + PublishingRajceAlbum** _tmp17_; + gint _tmp17__length1; + GtkComboBoxText* _tmp18_; + gint _tmp19_; + PublishingRajceAlbum* _tmp20_; + gint _tmp21_; gchar* album_name = NULL; - PublishingRajceAlbum** _tmp22_ = NULL; - gint _tmp22__length1 = 0; - GtkComboBoxText* _tmp23_ = NULL; - gint _tmp24_ = 0; - PublishingRajceAlbum* _tmp25_ = NULL; - const gchar* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; - const gchar* _tmp28_ = NULL; - gint _tmp29_ = 0; - PublishingRajcePublishingParameters* _tmp30_ = NULL; - PublishingRajcePublishingParameters* _tmp31_ = NULL; + PublishingRajceAlbum** _tmp22_; + gint _tmp22__length1; + GtkComboBoxText* _tmp23_; + gint _tmp24_; + PublishingRajceAlbum* _tmp25_; + const gchar* _tmp26_; + gchar* _tmp27_; + const gchar* _tmp28_; + gint _tmp29_; + PublishingRajcePublishingParameters* _tmp30_; + PublishingRajcePublishingParameters* _tmp31_; #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp17_ = self->priv->albums; #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -7688,21 +7652,21 @@ static void publishing_rajce_publishing_options_pane_on_publish_clicked (Publish #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp31_ = _tmp30_; #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_signal_emit_by_name (self, "publish", _tmp31_); + g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp31_); #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_publishing_parameters_unref0 (_tmp31_); #line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (album_name); -#line 7693 "RajcePublishing.c" +#line 7657 "RajcePublishing.c" } } static void publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked (PublishingRajcePublishingOptionsPane* self) { - GtkComboBoxText* _tmp0_ = NULL; - GtkEntry* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - GtkCheckButton* _tmp3_ = NULL; + GtkComboBoxText* _tmp0_; + GtkEntry* _tmp1_; + GtkComboBoxText* _tmp2_; + GtkCheckButton* _tmp3_; #line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -7723,15 +7687,15 @@ static void publishing_rajce_publishing_options_pane_on_use_existing_radio_click _tmp3_ = self->priv->hide_check; #line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 7723 "RajcePublishing.c" +#line 7687 "RajcePublishing.c" } static void publishing_rajce_publishing_options_pane_on_create_new_radio_clicked (PublishingRajcePublishingOptionsPane* self) { - GtkEntry* _tmp0_ = NULL; - GtkComboBoxText* _tmp1_ = NULL; - GtkEntry* _tmp2_ = NULL; - GtkCheckButton* _tmp3_ = NULL; + GtkEntry* _tmp0_; + GtkComboBoxText* _tmp1_; + GtkEntry* _tmp2_; + GtkCheckButton* _tmp3_; #line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -7752,7 +7716,7 @@ static void publishing_rajce_publishing_options_pane_on_create_new_radio_clicked _tmp3_ = self->priv->hide_check; #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 7752 "RajcePublishing.c" +#line 7716 "RajcePublishing.c" } @@ -7760,45 +7724,45 @@ static void publishing_rajce_publishing_options_pane_on_logout_clicked (Publishi #line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_signal_emit_by_name (self, "logout"); -#line 7761 "RajcePublishing.c" + g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0); +#line 7725 "RajcePublishing.c" } static gchar* string_strip (const gchar* self) { gchar* result = NULL; gchar* _result_ = NULL; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; -#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + const gchar* _tmp1_; +#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _result_; -#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 7784 "RajcePublishing.c" +#line 7748 "RajcePublishing.c" } static void publishing_rajce_publishing_options_pane_update_publish_button_sensitivity (PublishingRajcePublishingOptionsPane* self) { gchar* album_name = NULL; - GtkEntry* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + GtkEntry* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; gboolean _tmp3_ = FALSE; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; - GtkButton* _tmp10_ = NULL; + const gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gboolean _tmp7_; + GtkButton* _tmp10_; #line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -7823,17 +7787,17 @@ static void publishing_rajce_publishing_options_pane_update_publish_button_sensi if (_tmp7_) { #line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = TRUE; -#line 7823 "RajcePublishing.c" +#line 7787 "RajcePublishing.c" } else { - GtkRadioButton* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; + GtkRadioButton* _tmp8_; + gboolean _tmp9_; #line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp8_ = self->priv->create_new_radio; #line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp9_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = !_tmp9_; -#line 7833 "RajcePublishing.c" +#line 7797 "RajcePublishing.c" } #line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp10_ = self->priv->publish_button; @@ -7841,7 +7805,7 @@ static void publishing_rajce_publishing_options_pane_update_publish_button_sensi gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), _tmp3_); #line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (album_name); -#line 7841 "RajcePublishing.c" +#line 7805 "RajcePublishing.c" } @@ -7850,47 +7814,47 @@ static void publishing_rajce_publishing_options_pane_on_new_album_entry_changed g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_options_pane_update_publish_button_sensitivity (self); -#line 7850 "RajcePublishing.c" +#line 7814 "RajcePublishing.c" } void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishingOptionsPane* self) { - PublishingRajceAlbum** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - GtkRadioButton* _tmp15_ = NULL; + PublishingRajceAlbum** _tmp9_; + gint _tmp9__length1; + GtkRadioButton* _tmp15_; #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 7860 "RajcePublishing.c" +#line 7824 "RajcePublishing.c" { gint i = 0; #line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" i = 0; -#line 7865 "RajcePublishing.c" +#line 7829 "RajcePublishing.c" { gboolean _tmp0_ = FALSE; #line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = TRUE; #line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" while (TRUE) { -#line 7872 "RajcePublishing.c" - gint _tmp2_ = 0; - PublishingRajceAlbum** _tmp3_ = NULL; - gint _tmp3__length1 = 0; - GtkComboBoxText* _tmp4_ = NULL; - PublishingRajceAlbum** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - gint _tmp6_ = 0; - PublishingRajceAlbum* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; +#line 7836 "RajcePublishing.c" + gint _tmp2_; + PublishingRajceAlbum** _tmp3_; + gint _tmp3__length1; + GtkComboBoxText* _tmp4_; + PublishingRajceAlbum** _tmp5_; + gint _tmp5__length1; + gint _tmp6_; + PublishingRajceAlbum* _tmp7_; + const gchar* _tmp8_; #line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (!_tmp0_) { -#line 7884 "RajcePublishing.c" - gint _tmp1_ = 0; +#line 7848 "RajcePublishing.c" + gint _tmp1_; #line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = i; #line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" i = _tmp1_ + 1; -#line 7890 "RajcePublishing.c" +#line 7854 "RajcePublishing.c" } #line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = FALSE; @@ -7904,7 +7868,7 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi if (!(_tmp2_ < _tmp3__length1)) { #line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" break; -#line 7904 "RajcePublishing.c" +#line 7868 "RajcePublishing.c" } #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = self->priv->existing_albums_combo; @@ -7920,7 +7884,7 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi _tmp8_ = _tmp7_->albumName; #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" gtk_combo_box_text_append_text (_tmp4_, _tmp8_); -#line 7920 "RajcePublishing.c" +#line 7884 "RajcePublishing.c" } } } @@ -7930,9 +7894,9 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi _tmp9__length1 = self->priv->albums_length1; #line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp9__length1 == 0) { -#line 7930 "RajcePublishing.c" - GtkComboBoxText* _tmp10_ = NULL; - GtkRadioButton* _tmp11_ = NULL; +#line 7894 "RajcePublishing.c" + GtkComboBoxText* _tmp10_; + GtkRadioButton* _tmp11_; #line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp10_ = self->priv->existing_albums_combo; #line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -7941,11 +7905,11 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi _tmp11_ = self->priv->use_existing_radio; #line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 7941 "RajcePublishing.c" +#line 7905 "RajcePublishing.c" } else { - GtkComboBoxText* _tmp12_ = NULL; - GtkComboBoxText* _tmp13_ = NULL; - GtkRadioButton* _tmp14_ = NULL; + GtkComboBoxText* _tmp12_; + GtkComboBoxText* _tmp13_; + GtkRadioButton* _tmp14_; #line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp12_ = self->priv->existing_albums_combo; #line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -7958,7 +7922,7 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi _tmp14_ = self->priv->use_existing_radio; #line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 7958 "RajcePublishing.c" +#line 7922 "RajcePublishing.c" } #line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp15_ = self->priv->create_new_radio; @@ -7966,12 +7930,12 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); #line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_options_pane_on_create_new_radio_clicked (self); -#line 7966 "RajcePublishing.c" +#line 7930 "RajcePublishing.c" } void publishing_rajce_publishing_options_pane_notify_publish (PublishingRajcePublishingOptionsPane* self, PublishingRajcePublishingParameters* parameters) { - PublishingRajcePublishingParameters* _tmp0_ = NULL; + PublishingRajcePublishingParameters* _tmp0_; #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -7979,8 +7943,8 @@ void publishing_rajce_publishing_options_pane_notify_publish (PublishingRajcePub #line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = parameters; #line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_signal_emit_by_name (self, "publish", _tmp0_); -#line 7980 "RajcePublishing.c" + g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp0_); +#line 7944 "RajcePublishing.c" } @@ -7988,15 +7952,15 @@ void publishing_rajce_publishing_options_pane_notify_logout (PublishingRajcePubl #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_signal_emit_by_name (self, "logout"); -#line 7989 "RajcePublishing.c" + g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0); +#line 7953 "RajcePublishing.c" } GtkWidget* publishing_rajce_publishing_options_pane_get_default_widget (PublishingRajcePublishingOptionsPane* self) { GtkWidget* result = NULL; - GtkButton* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkButton* _tmp0_; + GtkWidget* _tmp1_; #line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self), NULL); #line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -8007,15 +7971,15 @@ GtkWidget* publishing_rajce_publishing_options_pane_get_default_widget (Publishi result = _tmp1_; #line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 8007 "RajcePublishing.c" +#line 7971 "RajcePublishing.c" } static GtkWidget* publishing_rajce_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) { PublishingRajcePublishingOptionsPane * self; GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingRajcePublishingOptionsPane); #line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -8026,7 +7990,7 @@ static GtkWidget* publishing_rajce_publishing_options_pane_real_get_widget (Spit result = _tmp1_; #line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 8026 "RajcePublishing.c" +#line 7990 "RajcePublishing.c" } @@ -8039,21 +8003,21 @@ static SpitPublishingDialogPaneGeometryOptions publishing_rajce_publishing_optio result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; #line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 8039 "RajcePublishing.c" +#line 8003 "RajcePublishing.c" } static void _publishing_rajce_publishing_options_pane_notify_publish_publishing_rajce_publishing_options_pane_publish (PublishingRajcePublishingOptionsPane* _sender, PublishingRajcePublishingParameters* parameters, gpointer self) { #line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_options_pane_notify_publish ((PublishingRajcePublishingOptionsPane*) self, parameters); -#line 8046 "RajcePublishing.c" +#line 8010 "RajcePublishing.c" } static void _publishing_rajce_publishing_options_pane_notify_logout_publishing_rajce_publishing_options_pane_logout (PublishingRajcePublishingOptionsPane* _sender, gpointer self) { #line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_options_pane_notify_logout ((PublishingRajcePublishingOptionsPane*) self); -#line 8053 "RajcePublishing.c" +#line 8017 "RajcePublishing.c" } @@ -8067,14 +8031,14 @@ static void publishing_rajce_publishing_options_pane_real_on_pane_installed (Spi g_signal_connect_object (self, "publish", (GCallback) _publishing_rajce_publishing_options_pane_notify_publish_publishing_rajce_publishing_options_pane_publish, self, 0); #line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_connect_object (self, "logout", (GCallback) _publishing_rajce_publishing_options_pane_notify_logout_publishing_rajce_publishing_options_pane_logout, self, 0); -#line 8067 "RajcePublishing.c" +#line 8031 "RajcePublishing.c" } static void publishing_rajce_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) { PublishingRajcePublishingOptionsPane * self; - guint _tmp0_ = 0U; - guint _tmp1_ = 0U; + guint _tmp0_; + guint _tmp1_; #line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingRajcePublishingOptionsPane); #line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -8085,7 +8049,7 @@ static void publishing_rajce_publishing_options_pane_real_on_pane_uninstalled (S g_signal_parse_name ("logout", PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE); #line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_publishing_options_pane_notify_logout_publishing_rajce_publishing_options_pane_logout, self); -#line 8085 "RajcePublishing.c" +#line 8049 "RajcePublishing.c" } @@ -8104,19 +8068,19 @@ static void g_cclosure_user_marshal_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS data1 = closure->data; #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" data2 = param_values->data[0].v_pointer; -#line 8104 "RajcePublishing.c" +#line 8068 "RajcePublishing.c" } else { #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" data1 = param_values->data[0].v_pointer; #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" data2 = closure->data; -#line 8110 "RajcePublishing.c" +#line 8074 "RajcePublishing.c" } #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" callback = (GMarshalFunc_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS) (marshal_data ? marshal_data : cc->callback); #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" callback (data1, publishing_rajce_value_get_publishing_parameters (param_values + 1), data2); -#line 8116 "RajcePublishing.c" +#line 8080 "RajcePublishing.c" } @@ -8128,10 +8092,10 @@ static void publishing_rajce_publishing_options_pane_class_init (PublishingRajce #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_rajce_publishing_options_pane_finalize; #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_signal_new ("publish", PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS, G_TYPE_NONE, 1, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS); + publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS, G_TYPE_NONE, 1, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS); #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_signal_new ("logout", PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 8131 "RajcePublishing.c" + publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 8095 "RajcePublishing.c" } @@ -8139,14 +8103,14 @@ static void publishing_rajce_publishing_options_pane_spit_publishing_dialog_pane #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface); #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_rajce_publishing_options_pane_real_get_widget; + iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_rajce_publishing_options_pane_real_get_widget; #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_rajce_publishing_options_pane_real_get_preferred_geometry; + iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_rajce_publishing_options_pane_real_get_preferred_geometry; #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_rajce_publishing_options_pane_real_on_pane_installed; + iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_rajce_publishing_options_pane_real_on_pane_installed; #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_rajce_publishing_options_pane_real_on_pane_uninstalled; -#line 8146 "RajcePublishing.c" + iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_rajce_publishing_options_pane_real_on_pane_uninstalled; +#line 8110 "RajcePublishing.c" } @@ -8177,11 +8141,11 @@ static void publishing_rajce_publishing_options_pane_instance_init (PublishingRa self->priv->publish_button = NULL; #line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->logout_button = NULL; -#line 8177 "RajcePublishing.c" +#line 8141 "RajcePublishing.c" } -static void publishing_rajce_publishing_options_pane_finalize (GObject* obj) { +static void publishing_rajce_publishing_options_pane_finalize (GObject * obj) { PublishingRajcePublishingOptionsPane * self; #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingRajcePublishingOptionsPane); @@ -8217,7 +8181,7 @@ static void publishing_rajce_publishing_options_pane_finalize (GObject* obj) { _g_object_unref0 (self->priv->logout_button); #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" G_OBJECT_CLASS (publishing_rajce_publishing_options_pane_parent_class)->finalize (obj); -#line 8217 "RajcePublishing.c" +#line 8181 "RajcePublishing.c" } @@ -8241,25 +8205,25 @@ static PublishingRajcePublishingParameters* publishing_rajce_publishing_paramete self = (PublishingRajcePublishingParameters*) g_type_create_instance (object_type); #line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 8241 "RajcePublishing.c" +#line 8205 "RajcePublishing.c" } static PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new (void) { #line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_publishing_parameters_construct (PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS); -#line 8248 "RajcePublishing.c" +#line 8212 "RajcePublishing.c" } PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_construct_to_new_album (GType object_type, const gchar* album_name, gboolean album_hidden) { PublishingRajcePublishingParameters* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gboolean* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint* _tmp5_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + gboolean _tmp2_; + gboolean* _tmp3_; + gint _tmp4_; + gint* _tmp5_; #line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (album_name != NULL, NULL); #line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -8290,23 +8254,23 @@ PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_cons self->album_id = _tmp5_; #line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 8290 "RajcePublishing.c" +#line 8254 "RajcePublishing.c" } PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new_to_new_album (const gchar* album_name, gboolean album_hidden) { #line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_publishing_parameters_construct_to_new_album (PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS, album_name, album_hidden); -#line 8297 "RajcePublishing.c" +#line 8261 "RajcePublishing.c" } PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_construct_to_existing_album (GType object_type, const gchar* album_name, gint album_id) { PublishingRajcePublishingParameters* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint* _tmp3_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + gint _tmp2_; + gint* _tmp3_; #line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (album_name != NULL, NULL); #line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -8333,21 +8297,21 @@ PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_cons self->album_id = _tmp3_; #line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 8333 "RajcePublishing.c" +#line 8297 "RajcePublishing.c" } PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new_to_existing_album (const gchar* album_name, gint album_id) { #line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_publishing_parameters_construct_to_existing_album (PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS, album_name, album_id); -#line 8340 "RajcePublishing.c" +#line 8304 "RajcePublishing.c" } static void publishing_rajce_value_publishing_parameters_init (GValue* value) { #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 8347 "RajcePublishing.c" +#line 8311 "RajcePublishing.c" } @@ -8356,7 +8320,7 @@ static void publishing_rajce_value_publishing_parameters_free_value (GValue* val if (value->data[0].v_pointer) { #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_parameters_unref (value->data[0].v_pointer); -#line 8356 "RajcePublishing.c" +#line 8320 "RajcePublishing.c" } } @@ -8366,11 +8330,11 @@ static void publishing_rajce_value_publishing_parameters_copy_value (const GValu if (src_value->data[0].v_pointer) { #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" dest_value->data[0].v_pointer = publishing_rajce_publishing_parameters_ref (src_value->data[0].v_pointer); -#line 8366 "RajcePublishing.c" +#line 8330 "RajcePublishing.c" } else { #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 8370 "RajcePublishing.c" +#line 8334 "RajcePublishing.c" } } @@ -8378,66 +8342,66 @@ static void publishing_rajce_value_publishing_parameters_copy_value (const GValu static gpointer publishing_rajce_value_publishing_parameters_peek_pointer (const GValue* value) { #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return value->data[0].v_pointer; -#line 8378 "RajcePublishing.c" +#line 8342 "RajcePublishing.c" } static gchar* publishing_rajce_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (collect_values[0].v_pointer) { -#line 8385 "RajcePublishing.c" - PublishingRajcePublishingParameters* object; +#line 8349 "RajcePublishing.c" + PublishingRajcePublishingParameters * object; object = collect_values[0].v_pointer; #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (object->parent_instance.g_class == NULL) { #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8392 "RajcePublishing.c" +#line 8356 "RajcePublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8396 "RajcePublishing.c" +#line 8360 "RajcePublishing.c" } #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = publishing_rajce_publishing_parameters_ref (object); -#line 8400 "RajcePublishing.c" +#line 8364 "RajcePublishing.c" } else { #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 8404 "RajcePublishing.c" +#line 8368 "RajcePublishing.c" } #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 8408 "RajcePublishing.c" +#line 8372 "RajcePublishing.c" } static gchar* publishing_rajce_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingRajcePublishingParameters** object_p; + PublishingRajcePublishingParameters ** object_p; object_p = collect_values[0].v_pointer; #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (!object_p) { #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 8419 "RajcePublishing.c" +#line 8383 "RajcePublishing.c" } #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (!value->data[0].v_pointer) { #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *object_p = NULL; -#line 8425 "RajcePublishing.c" +#line 8389 "RajcePublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *object_p = value->data[0].v_pointer; -#line 8429 "RajcePublishing.c" +#line 8393 "RajcePublishing.c" } else { #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *object_p = publishing_rajce_publishing_parameters_ref (value->data[0].v_pointer); -#line 8433 "RajcePublishing.c" +#line 8397 "RajcePublishing.c" } #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 8437 "RajcePublishing.c" +#line 8401 "RajcePublishing.c" } @@ -8451,7 +8415,7 @@ GParamSpec* publishing_rajce_param_spec_publishing_parameters (const gchar* name G_PARAM_SPEC (spec)->value_type = object_type; #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return G_PARAM_SPEC (spec); -#line 8451 "RajcePublishing.c" +#line 8415 "RajcePublishing.c" } @@ -8460,12 +8424,12 @@ gpointer publishing_rajce_value_get_publishing_parameters (const GValue* value) g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS), NULL); #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return value->data[0].v_pointer; -#line 8460 "RajcePublishing.c" +#line 8424 "RajcePublishing.c" } void publishing_rajce_value_set_publishing_parameters (GValue* value, gpointer v_object) { - PublishingRajcePublishingParameters* old; + PublishingRajcePublishingParameters * old; #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS)); #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -8480,23 +8444,23 @@ void publishing_rajce_value_set_publishing_parameters (GValue* value, gpointer v value->data[0].v_pointer = v_object; #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_parameters_ref (value->data[0].v_pointer); -#line 8480 "RajcePublishing.c" +#line 8444 "RajcePublishing.c" } else { #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 8484 "RajcePublishing.c" +#line 8448 "RajcePublishing.c" } #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (old) { #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_parameters_unref (old); -#line 8490 "RajcePublishing.c" +#line 8454 "RajcePublishing.c" } } void publishing_rajce_value_take_publishing_parameters (GValue* value, gpointer v_object) { - PublishingRajcePublishingParameters* old; + PublishingRajcePublishingParameters * old; #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS)); #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -8509,17 +8473,17 @@ void publishing_rajce_value_take_publishing_parameters (GValue* value, gpointer g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = v_object; -#line 8509 "RajcePublishing.c" +#line 8473 "RajcePublishing.c" } else { #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 8513 "RajcePublishing.c" +#line 8477 "RajcePublishing.c" } #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (old) { #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_parameters_unref (old); -#line 8519 "RajcePublishing.c" +#line 8483 "RajcePublishing.c" } } @@ -8529,18 +8493,18 @@ static void publishing_rajce_publishing_parameters_class_init (PublishingRajcePu publishing_rajce_publishing_parameters_parent_class = g_type_class_peek_parent (klass); #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" ((PublishingRajcePublishingParametersClass *) klass)->finalize = publishing_rajce_publishing_parameters_finalize; -#line 8529 "RajcePublishing.c" +#line 8493 "RajcePublishing.c" } static void publishing_rajce_publishing_parameters_instance_init (PublishingRajcePublishingParameters * self) { #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->ref_count = 1; -#line 8536 "RajcePublishing.c" +#line 8500 "RajcePublishing.c" } -static void publishing_rajce_publishing_parameters_finalize (PublishingRajcePublishingParameters* obj) { +static void publishing_rajce_publishing_parameters_finalize (PublishingRajcePublishingParameters * obj) { PublishingRajcePublishingParameters * self; #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS, PublishingRajcePublishingParameters); @@ -8552,7 +8516,7 @@ static void publishing_rajce_publishing_parameters_finalize (PublishingRajcePubl _g_free0 (self->album_hidden); #line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->album_id); -#line 8552 "RajcePublishing.c" +#line 8516 "RajcePublishing.c" } @@ -8571,18 +8535,18 @@ GType publishing_rajce_publishing_parameters_get_type (void) { gpointer publishing_rajce_publishing_parameters_ref (gpointer instance) { - PublishingRajcePublishingParameters* self; + PublishingRajcePublishingParameters * self; self = instance; #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_atomic_int_inc (&self->ref_count); #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return instance; -#line 8577 "RajcePublishing.c" +#line 8541 "RajcePublishing.c" } void publishing_rajce_publishing_parameters_unref (gpointer instance) { - PublishingRajcePublishingParameters* self; + PublishingRajcePublishingParameters * self; self = instance; #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -8590,7 +8554,7 @@ void publishing_rajce_publishing_parameters_unref (gpointer instance) { PUBLISHING_RAJCE_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self); #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 8590 "RajcePublishing.c" +#line 8554 "RajcePublishing.c" } } @@ -8601,14 +8565,14 @@ PublishingRajceSession* publishing_rajce_session_construct (GType object_type) { self = (PublishingRajceSession*) publishing_rest_support_session_construct (object_type, ""); #line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 8601 "RajcePublishing.c" +#line 8565 "RajcePublishing.c" } PublishingRajceSession* publishing_rajce_session_new (void) { #line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_session_construct (PUBLISHING_RAJCE_TYPE_SESSION); -#line 8608 "RajcePublishing.c" +#line 8572 "RajcePublishing.c" } @@ -8617,58 +8581,58 @@ static gboolean publishing_rajce_session_real_is_authenticated (PublishingRESTSu gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - gint* _tmp2_ = NULL; + gint* _tmp2_; #line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_SESSION, PublishingRajceSession); #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = self->priv->userid; #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp2_ != NULL) { -#line 8624 "RajcePublishing.c" - const gchar* _tmp3_ = NULL; +#line 8588 "RajcePublishing.c" + const gchar* _tmp3_; #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = self->priv->usertoken; #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = _tmp3_ != NULL; -#line 8630 "RajcePublishing.c" +#line 8594 "RajcePublishing.c" } else { #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = FALSE; -#line 8634 "RajcePublishing.c" +#line 8598 "RajcePublishing.c" } #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp1_) { -#line 8638 "RajcePublishing.c" - const gchar* _tmp4_ = NULL; +#line 8602 "RajcePublishing.c" + const gchar* _tmp4_; #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = self->priv->username; #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = _tmp4_ != NULL; -#line 8644 "RajcePublishing.c" +#line 8608 "RajcePublishing.c" } else { #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = FALSE; -#line 8648 "RajcePublishing.c" +#line 8612 "RajcePublishing.c" } #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result = _tmp0_; #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 8654 "RajcePublishing.c" +#line 8618 "RajcePublishing.c" } void publishing_rajce_session_authenticate (PublishingRajceSession* self, const gchar* token, const gchar* name, gint id, gint maxsize, gint quality) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint* _tmp5_ = NULL; - gint _tmp6_ = 0; - gint* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint* _tmp9_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; + gint _tmp4_; + gint* _tmp5_; + gint _tmp6_; + gint* _tmp7_; + gint _tmp8_; + gint* _tmp9_; #line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self)); #line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -8715,7 +8679,7 @@ void publishing_rajce_session_authenticate (PublishingRajceSession* self, const _g_free0 (self->priv->quality); #line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->quality = _tmp9_; -#line 8715 "RajcePublishing.c" +#line 8679 "RajcePublishing.c" } @@ -8750,13 +8714,13 @@ void publishing_rajce_session_deauthenticate (PublishingRajceSession* self) { _g_free0 (self->priv->quality); #line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->quality = NULL; -#line 8750 "RajcePublishing.c" +#line 8714 "RajcePublishing.c" } void publishing_rajce_session_set_usertoken (PublishingRajceSession* self, const gchar* usertoken) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self)); #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -8767,13 +8731,13 @@ void publishing_rajce_session_set_usertoken (PublishingRajceSession* self, const _g_free0 (self->priv->usertoken); #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->usertoken = _tmp1_; -#line 8767 "RajcePublishing.c" +#line 8731 "RajcePublishing.c" } void publishing_rajce_session_set_albumtoken (PublishingRajceSession* self, const gchar* albumtoken) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self)); #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -8784,13 +8748,13 @@ void publishing_rajce_session_set_albumtoken (PublishingRajceSession* self, cons _g_free0 (self->priv->albumtoken); #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->albumtoken = _tmp1_; -#line 8784 "RajcePublishing.c" +#line 8748 "RajcePublishing.c" } void publishing_rajce_session_set_albumticket (PublishingRajceSession* self, const gchar* albumticket) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self)); #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -8801,14 +8765,14 @@ void publishing_rajce_session_set_albumticket (PublishingRajceSession* self, con _g_free0 (self->priv->albumticket); #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->albumticket = _tmp1_; -#line 8801 "RajcePublishing.c" +#line 8765 "RajcePublishing.c" } gchar* publishing_rajce_session_get_usertoken (PublishingRajceSession* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (self), NULL); #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -8819,14 +8783,14 @@ gchar* publishing_rajce_session_get_usertoken (PublishingRajceSession* self) { result = _tmp1_; #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 8819 "RajcePublishing.c" +#line 8783 "RajcePublishing.c" } gchar* publishing_rajce_session_get_albumtoken (PublishingRajceSession* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (self), NULL); #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -8837,14 +8801,14 @@ gchar* publishing_rajce_session_get_albumtoken (PublishingRajceSession* self) { result = _tmp1_; #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 8837 "RajcePublishing.c" +#line 8801 "RajcePublishing.c" } gchar* publishing_rajce_session_get_albumticket (PublishingRajceSession* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (self), NULL); #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -8855,14 +8819,14 @@ gchar* publishing_rajce_session_get_albumticket (PublishingRajceSession* self) { result = _tmp1_; #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 8855 "RajcePublishing.c" +#line 8819 "RajcePublishing.c" } gchar* publishing_rajce_session_get_username (PublishingRajceSession* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (self), NULL); #line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -8873,13 +8837,13 @@ gchar* publishing_rajce_session_get_username (PublishingRajceSession* self) { result = _tmp1_; #line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 8873 "RajcePublishing.c" +#line 8837 "RajcePublishing.c" } gint publishing_rajce_session_get_maxsize (PublishingRajceSession* self) { gint result = 0; - gint* _tmp0_ = NULL; + gint* _tmp0_; #line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (self), 0); #line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -8888,7 +8852,7 @@ gint publishing_rajce_session_get_maxsize (PublishingRajceSession* self) { result = *_tmp0_; #line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 8888 "RajcePublishing.c" +#line 8852 "RajcePublishing.c" } @@ -8900,8 +8864,8 @@ static void publishing_rajce_session_class_init (PublishingRajceSessionClass * k #line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_type_class_add_private (klass, sizeof (PublishingRajceSessionPrivate)); #line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_rajce_session_real_is_authenticated; -#line 8901 "RajcePublishing.c" + ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_rajce_session_real_is_authenticated; +#line 8865 "RajcePublishing.c" } @@ -8922,11 +8886,11 @@ static void publishing_rajce_session_instance_init (PublishingRajceSession * sel self->priv->maxsize = NULL; #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->quality = NULL; -#line 8922 "RajcePublishing.c" +#line 8886 "RajcePublishing.c" } -static void publishing_rajce_session_finalize (PublishingRESTSupportSession* obj) { +static void publishing_rajce_session_finalize (PublishingRESTSupportSession * obj) { PublishingRajceSession * self; #line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_SESSION, PublishingRajceSession); @@ -8946,7 +8910,7 @@ static void publishing_rajce_session_finalize (PublishingRESTSupportSession* obj _g_free0 (self->priv->quality); #line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_rajce_session_parent_class)->finalize (obj); -#line 8946 "RajcePublishing.c" +#line 8910 "RajcePublishing.c" } @@ -8968,17 +8932,17 @@ GType publishing_rajce_session_get_type (void) { static gpointer _publishing_rajce_arg_item_ref0 (gpointer self) { #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self ? publishing_rajce_arg_item_ref (self) : NULL; -#line 8968 "RajcePublishing.c" +#line 8932 "RajcePublishing.c" } PublishingRajceArgItem* publishing_rajce_arg_item_construct (GType object_type, const gchar* k, const gchar* v) { PublishingRajceArgItem* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - PublishingRajceArgItem** _tmp4_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; + PublishingRajceArgItem** _tmp4_; #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = (PublishingRajceArgItem*) g_type_create_instance (object_type); #line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -9009,39 +8973,39 @@ PublishingRajceArgItem* publishing_rajce_arg_item_construct (GType object_type, self->_children_size_ = self->children_length1; #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 9009 "RajcePublishing.c" +#line 8973 "RajcePublishing.c" } PublishingRajceArgItem* publishing_rajce_arg_item_new (const gchar* k, const gchar* v) { #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_arg_item_construct (PUBLISHING_RAJCE_TYPE_ARG_ITEM, k, v); -#line 9016 "RajcePublishing.c" +#line 8980 "RajcePublishing.c" } -static void _vala_array_add6 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) { +static void _vala_array_add6 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) { #line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if ((*length) == (*size)) { #line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1); -#line 9027 "RajcePublishing.c" +#line 8991 "RajcePublishing.c" } #line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[(*length)++] = value; #line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[*length] = NULL; -#line 9033 "RajcePublishing.c" +#line 8997 "RajcePublishing.c" } void publishing_rajce_arg_item_AddChild (PublishingRajceArgItem* self, PublishingRajceArgItem* child) { - PublishingRajceArgItem** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - PublishingRajceArgItem* _tmp1_ = NULL; - PublishingRajceArgItem* _tmp2_ = NULL; + PublishingRajceArgItem** _tmp0_; + gint _tmp0__length1; + PublishingRajceArgItem* _tmp1_; + PublishingRajceArgItem* _tmp2_; #line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_ARG_ITEM (self)); #line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -9056,20 +9020,20 @@ void publishing_rajce_arg_item_AddChild (PublishingRajceArgItem* self, Publishin _tmp2_ = _publishing_rajce_arg_item_ref0 (_tmp1_); #line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _vala_array_add6 (&self->children, &self->children_length1, &self->_children_size_, _tmp2_); -#line 9056 "RajcePublishing.c" +#line 9020 "RajcePublishing.c" } void publishing_rajce_arg_item_AddChildren (PublishingRajceArgItem* self, PublishingRajceArgItem** newchildren, int newchildren_length1) { - PublishingRajceArgItem** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + PublishingRajceArgItem** _tmp0_; + gint _tmp0__length1; #line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_ARG_ITEM (self)); #line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = newchildren; #line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0__length1 = newchildren_length1; -#line 9069 "RajcePublishing.c" +#line 9033 "RajcePublishing.c" { PublishingRajceArgItem** child_collection = NULL; gint child_collection_length1 = 0; @@ -9081,23 +9045,23 @@ void publishing_rajce_arg_item_AddChildren (PublishingRajceArgItem* self, Publis child_collection_length1 = _tmp0__length1; #line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" for (child_it = 0; child_it < _tmp0__length1; child_it = child_it + 1) { -#line 9081 "RajcePublishing.c" - PublishingRajceArgItem* _tmp1_ = NULL; +#line 9045 "RajcePublishing.c" + PublishingRajceArgItem* _tmp1_; PublishingRajceArgItem* child = NULL; #line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = _publishing_rajce_arg_item_ref0 (child_collection[child_it]); #line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" child = _tmp1_; -#line 9088 "RajcePublishing.c" +#line 9052 "RajcePublishing.c" { - PublishingRajceArgItem* _tmp2_ = NULL; + PublishingRajceArgItem* _tmp2_; #line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = child; #line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_arg_item_AddChild (self, _tmp2_); #line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_arg_item_unref0 (child); -#line 9097 "RajcePublishing.c" +#line 9061 "RajcePublishing.c" } } } @@ -9107,7 +9071,7 @@ void publishing_rajce_arg_item_AddChildren (PublishingRajceArgItem* self, Publis static void publishing_rajce_value_arg_item_init (GValue* value) { #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 9107 "RajcePublishing.c" +#line 9071 "RajcePublishing.c" } @@ -9116,7 +9080,7 @@ static void publishing_rajce_value_arg_item_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_arg_item_unref (value->data[0].v_pointer); -#line 9116 "RajcePublishing.c" +#line 9080 "RajcePublishing.c" } } @@ -9126,11 +9090,11 @@ static void publishing_rajce_value_arg_item_copy_value (const GValue* src_value, if (src_value->data[0].v_pointer) { #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" dest_value->data[0].v_pointer = publishing_rajce_arg_item_ref (src_value->data[0].v_pointer); -#line 9126 "RajcePublishing.c" +#line 9090 "RajcePublishing.c" } else { #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 9130 "RajcePublishing.c" +#line 9094 "RajcePublishing.c" } } @@ -9138,66 +9102,66 @@ static void publishing_rajce_value_arg_item_copy_value (const GValue* src_value, static gpointer publishing_rajce_value_arg_item_peek_pointer (const GValue* value) { #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return value->data[0].v_pointer; -#line 9138 "RajcePublishing.c" +#line 9102 "RajcePublishing.c" } static gchar* publishing_rajce_value_arg_item_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (collect_values[0].v_pointer) { -#line 9145 "RajcePublishing.c" - PublishingRajceArgItem* object; +#line 9109 "RajcePublishing.c" + PublishingRajceArgItem * object; object = collect_values[0].v_pointer; #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (object->parent_instance.g_class == NULL) { #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 9152 "RajcePublishing.c" +#line 9116 "RajcePublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 9156 "RajcePublishing.c" +#line 9120 "RajcePublishing.c" } #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = publishing_rajce_arg_item_ref (object); -#line 9160 "RajcePublishing.c" +#line 9124 "RajcePublishing.c" } else { #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 9164 "RajcePublishing.c" +#line 9128 "RajcePublishing.c" } #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 9168 "RajcePublishing.c" +#line 9132 "RajcePublishing.c" } static gchar* publishing_rajce_value_arg_item_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingRajceArgItem** object_p; + PublishingRajceArgItem ** object_p; object_p = collect_values[0].v_pointer; #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (!object_p) { #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 9179 "RajcePublishing.c" +#line 9143 "RajcePublishing.c" } #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (!value->data[0].v_pointer) { #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *object_p = NULL; -#line 9185 "RajcePublishing.c" +#line 9149 "RajcePublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *object_p = value->data[0].v_pointer; -#line 9189 "RajcePublishing.c" +#line 9153 "RajcePublishing.c" } else { #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *object_p = publishing_rajce_arg_item_ref (value->data[0].v_pointer); -#line 9193 "RajcePublishing.c" +#line 9157 "RajcePublishing.c" } #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 9197 "RajcePublishing.c" +#line 9161 "RajcePublishing.c" } @@ -9211,7 +9175,7 @@ GParamSpec* publishing_rajce_param_spec_arg_item (const gchar* name, const gchar G_PARAM_SPEC (spec)->value_type = object_type; #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return G_PARAM_SPEC (spec); -#line 9211 "RajcePublishing.c" +#line 9175 "RajcePublishing.c" } @@ -9220,12 +9184,12 @@ gpointer publishing_rajce_value_get_arg_item (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ARG_ITEM), NULL); #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return value->data[0].v_pointer; -#line 9220 "RajcePublishing.c" +#line 9184 "RajcePublishing.c" } void publishing_rajce_value_set_arg_item (GValue* value, gpointer v_object) { - PublishingRajceArgItem* old; + PublishingRajceArgItem * old; #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ARG_ITEM)); #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -9240,23 +9204,23 @@ void publishing_rajce_value_set_arg_item (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_arg_item_ref (value->data[0].v_pointer); -#line 9240 "RajcePublishing.c" +#line 9204 "RajcePublishing.c" } else { #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 9244 "RajcePublishing.c" +#line 9208 "RajcePublishing.c" } #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (old) { #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_arg_item_unref (old); -#line 9250 "RajcePublishing.c" +#line 9214 "RajcePublishing.c" } } void publishing_rajce_value_take_arg_item (GValue* value, gpointer v_object) { - PublishingRajceArgItem* old; + PublishingRajceArgItem * old; #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ARG_ITEM)); #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -9269,17 +9233,17 @@ void publishing_rajce_value_take_arg_item (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = v_object; -#line 9269 "RajcePublishing.c" +#line 9233 "RajcePublishing.c" } else { #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 9273 "RajcePublishing.c" +#line 9237 "RajcePublishing.c" } #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (old) { #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_arg_item_unref (old); -#line 9279 "RajcePublishing.c" +#line 9243 "RajcePublishing.c" } } @@ -9289,21 +9253,21 @@ static void publishing_rajce_arg_item_class_init (PublishingRajceArgItemClass * publishing_rajce_arg_item_parent_class = g_type_class_peek_parent (klass); #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" ((PublishingRajceArgItemClass *) klass)->finalize = publishing_rajce_arg_item_finalize; -#line 9289 "RajcePublishing.c" +#line 9253 "RajcePublishing.c" } static void publishing_rajce_arg_item_instance_init (PublishingRajceArgItem * self) { #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->ref_count = 1; -#line 9296 "RajcePublishing.c" +#line 9260 "RajcePublishing.c" } -static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem* obj) { +static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem * obj) { PublishingRajceArgItem * self; - PublishingRajceArgItem** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + PublishingRajceArgItem** _tmp0_; + gint _tmp0__length1; #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_ARG_ITEM, PublishingRajceArgItem); #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -9312,7 +9276,7 @@ static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem* obj) { _tmp0_ = self->children; #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0__length1 = self->children_length1; -#line 9312 "RajcePublishing.c" +#line 9276 "RajcePublishing.c" { PublishingRajceArgItem** child_collection = NULL; gint child_collection_length1 = 0; @@ -9324,14 +9288,14 @@ static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem* obj) { child_collection_length1 = _tmp0__length1; #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" for (child_it = 0; child_it < _tmp0__length1; child_it = child_it + 1) { -#line 9324 "RajcePublishing.c" - PublishingRajceArgItem* _tmp1_ = NULL; +#line 9288 "RajcePublishing.c" + PublishingRajceArgItem* _tmp1_; PublishingRajceArgItem* child = NULL; #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = _publishing_rajce_arg_item_ref0 (child_collection[child_it]); #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" child = _tmp1_; -#line 9331 "RajcePublishing.c" +#line 9295 "RajcePublishing.c" { #line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_arg_item_unref0 (child); @@ -9339,7 +9303,7 @@ static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem* obj) { child = NULL; #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_arg_item_unref0 (child); -#line 9339 "RajcePublishing.c" +#line 9303 "RajcePublishing.c" } } } @@ -9349,7 +9313,7 @@ static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem* obj) { _g_free0 (self->val); #line 1227 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->children = (_vala_array_free (self->children, self->children_length1, (GDestroyNotify) publishing_rajce_arg_item_unref), NULL); -#line 9349 "RajcePublishing.c" +#line 9313 "RajcePublishing.c" } @@ -9368,18 +9332,18 @@ GType publishing_rajce_arg_item_get_type (void) { gpointer publishing_rajce_arg_item_ref (gpointer instance) { - PublishingRajceArgItem* self; + PublishingRajceArgItem * self; self = instance; #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_atomic_int_inc (&self->ref_count); #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return instance; -#line 9374 "RajcePublishing.c" +#line 9338 "RajcePublishing.c" } void publishing_rajce_arg_item_unref (gpointer instance) { - PublishingRajceArgItem* self; + PublishingRajceArgItem * self; self = instance; #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -9387,16 +9351,16 @@ void publishing_rajce_arg_item_unref (gpointer instance) { PUBLISHING_RAJCE_ARG_ITEM_GET_CLASS (self)->finalize (self); #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 9387 "RajcePublishing.c" +#line 9351 "RajcePublishing.c" } } PublishingRajceLiveApiRequest* publishing_rajce_live_api_request_construct (GType object_type, const gchar* cmd) { PublishingRajceLiveApiRequest* self = NULL; - PublishingRajceArgItem** _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + PublishingRajceArgItem** _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; #line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (cmd != NULL, NULL); #line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -9421,40 +9385,40 @@ PublishingRajceLiveApiRequest* publishing_rajce_live_api_request_construct (GTyp self->priv->_cmd = _tmp2_; #line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 9421 "RajcePublishing.c" +#line 9385 "RajcePublishing.c" } PublishingRajceLiveApiRequest* publishing_rajce_live_api_request_new (const gchar* cmd) { #line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_live_api_request_construct (PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST, cmd); -#line 9428 "RajcePublishing.c" +#line 9392 "RajcePublishing.c" } -static void _vala_array_add7 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) { +static void _vala_array_add7 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) { #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if ((*length) == (*size)) { #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1); -#line 9439 "RajcePublishing.c" +#line 9403 "RajcePublishing.c" } #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[(*length)++] = value; #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[*length] = NULL; -#line 9445 "RajcePublishing.c" +#line 9409 "RajcePublishing.c" } void publishing_rajce_live_api_request_AddParam (PublishingRajceLiveApiRequest* self, const gchar* name, const gchar* val) { - PublishingRajceArgItem** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PublishingRajceArgItem* _tmp3_ = NULL; + PublishingRajceArgItem** _tmp0_; + gint _tmp0__length1; + const gchar* _tmp1_; + const gchar* _tmp2_; + PublishingRajceArgItem* _tmp3_; #line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self)); #line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -9473,14 +9437,14 @@ void publishing_rajce_live_api_request_AddParam (PublishingRajceLiveApiRequest* _tmp3_ = publishing_rajce_arg_item_new (_tmp1_, _tmp2_); #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _vala_array_add7 (&self->priv->_params, &self->priv->_params_length1, &self->priv->__params_size_, _tmp3_); -#line 9473 "RajcePublishing.c" +#line 9437 "RajcePublishing.c" } void publishing_rajce_live_api_request_AddParamBool (PublishingRajceLiveApiRequest* self, const gchar* name, gboolean val) { const gchar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - const gchar* _tmp2_ = NULL; + gboolean _tmp1_; + const gchar* _tmp2_; #line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self)); #line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -9491,25 +9455,25 @@ void publishing_rajce_live_api_request_AddParamBool (PublishingRajceLiveApiReque if (_tmp1_) { #line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = "1"; -#line 9491 "RajcePublishing.c" +#line 9455 "RajcePublishing.c" } else { #line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = "0"; -#line 9495 "RajcePublishing.c" +#line 9459 "RajcePublishing.c" } #line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = name; #line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_AddParam (self, _tmp2_, _tmp0_); -#line 9501 "RajcePublishing.c" +#line 9465 "RajcePublishing.c" } void publishing_rajce_live_api_request_AddParamInt (PublishingRajceLiveApiRequest* self, const gchar* name, gint val) { - const gchar* _tmp0_ = NULL; - gint _tmp1_ = 0; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + gint _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; #line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self)); #line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -9526,36 +9490,36 @@ void publishing_rajce_live_api_request_AddParamInt (PublishingRajceLiveApiReques publishing_rajce_live_api_request_AddParam (self, _tmp0_, _tmp3_); #line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (_tmp3_); -#line 9526 "RajcePublishing.c" +#line 9490 "RajcePublishing.c" } -static void _vala_array_add8 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) { +static void _vala_array_add8 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) { #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if ((*length) == (*size)) { #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1); -#line 9537 "RajcePublishing.c" +#line 9501 "RajcePublishing.c" } #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[(*length)++] = value; #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[*length] = NULL; -#line 9543 "RajcePublishing.c" +#line 9507 "RajcePublishing.c" } void publishing_rajce_live_api_request_AddParamNode (PublishingRajceLiveApiRequest* self, const gchar* name, PublishingRajceArgItem** val, int val_length1) { PublishingRajceArgItem* newItem = NULL; - const gchar* _tmp0_ = NULL; - PublishingRajceArgItem* _tmp1_ = NULL; - PublishingRajceArgItem** _tmp2_ = NULL; - gint _tmp2__length1 = 0; - PublishingRajceArgItem** _tmp3_ = NULL; - gint _tmp3__length1 = 0; - PublishingRajceArgItem* _tmp4_ = NULL; + const gchar* _tmp0_; + PublishingRajceArgItem* _tmp1_; + PublishingRajceArgItem** _tmp2_; + gint _tmp2__length1; + PublishingRajceArgItem** _tmp3_; + gint _tmp3__length1; + PublishingRajceArgItem* _tmp4_; #line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self)); #line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -9582,30 +9546,30 @@ void publishing_rajce_live_api_request_AddParamNode (PublishingRajceLiveApiReque _vala_array_add8 (&self->priv->_params, &self->priv->_params_length1, &self->priv->__params_size_, _tmp4_); #line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_arg_item_unref0 (newItem); -#line 9582 "RajcePublishing.c" +#line 9546 "RajcePublishing.c" } gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveApiRequest* self, gboolean urlencode) { gchar* result = NULL; xmlDoc* doc = NULL; - xmlDoc* _tmp0_ = NULL; + xmlDoc* _tmp0_; xmlNode* root = NULL; - xmlNode* _tmp1_ = NULL; - xmlDoc* _tmp2_ = NULL; - xmlNode* _tmp3_ = NULL; - xmlNode* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; + xmlNode* _tmp1_; + xmlDoc* _tmp2_; + xmlNode* _tmp3_; + xmlNode* _tmp4_; + const gchar* _tmp5_; xmlNode* par = NULL; - xmlNode* _tmp6_ = NULL; - xmlNode* _tmp7_ = NULL; - PublishingRajceArgItem** _tmp8_ = NULL; - gint _tmp8__length1 = 0; + xmlNode* _tmp6_; + xmlNode* _tmp7_; + PublishingRajceArgItem** _tmp8_; + gint _tmp8__length1; gchar* xmlstr = NULL; - xmlDoc* _tmp12_ = NULL; + xmlDoc* _tmp12_; gchar* _tmp13_ = NULL; - xmlDoc* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; + xmlDoc* _tmp14_; + gboolean _tmp15_; #line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self), NULL); #line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -9638,7 +9602,7 @@ gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveAp _tmp8_ = self->priv->_params; #line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp8__length1 = self->priv->_params_length1; -#line 9638 "RajcePublishing.c" +#line 9602 "RajcePublishing.c" { PublishingRajceArgItem** arg_collection = NULL; gint arg_collection_length1 = 0; @@ -9650,17 +9614,17 @@ gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveAp arg_collection_length1 = _tmp8__length1; #line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" for (arg_it = 0; arg_it < _tmp8__length1; arg_it = arg_it + 1) { -#line 9650 "RajcePublishing.c" - PublishingRajceArgItem* _tmp9_ = NULL; +#line 9614 "RajcePublishing.c" + PublishingRajceArgItem* _tmp9_; PublishingRajceArgItem* arg = NULL; #line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp9_ = _publishing_rajce_arg_item_ref0 (arg_collection[arg_it]); #line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" arg = _tmp9_; -#line 9657 "RajcePublishing.c" +#line 9621 "RajcePublishing.c" { - xmlNode* _tmp10_ = NULL; - PublishingRajceArgItem* _tmp11_ = NULL; + xmlNode* _tmp10_; + PublishingRajceArgItem* _tmp11_; #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp10_ = par; #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -9669,7 +9633,7 @@ gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveAp publishing_rajce_live_api_request_WriteParam (_tmp10_, _tmp11_); #line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_arg_item_unref0 (arg); -#line 9669 "RajcePublishing.c" +#line 9633 "RajcePublishing.c" } } } @@ -9689,9 +9653,9 @@ gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveAp _tmp15_ = urlencode; #line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp15_) { -#line 9689 "RajcePublishing.c" - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; +#line 9653 "RajcePublishing.c" + const gchar* _tmp16_; + gchar* _tmp17_; #line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp16_ = xmlstr; #line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -9702,20 +9666,20 @@ gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveAp _g_free0 (xmlstr); #line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 9702 "RajcePublishing.c" +#line 9666 "RajcePublishing.c" } #line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result = xmlstr; #line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 9708 "RajcePublishing.c" +#line 9672 "RajcePublishing.c" } static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, PublishingRajceArgItem* arg) { - PublishingRajceArgItem* _tmp0_ = NULL; - PublishingRajceArgItem** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + PublishingRajceArgItem* _tmp0_; + PublishingRajceArgItem** _tmp1_; + gint _tmp1__length1; #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_ARG_ITEM (arg)); #line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -9726,12 +9690,12 @@ static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, Publish _tmp1__length1 = _tmp0_->children_length1; #line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp1__length1 == 0) { -#line 9726 "RajcePublishing.c" - xmlNode* _tmp2_ = NULL; - PublishingRajceArgItem* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - PublishingRajceArgItem* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; +#line 9690 "RajcePublishing.c" + xmlNode* _tmp2_; + PublishingRajceArgItem* _tmp3_; + const gchar* _tmp4_; + PublishingRajceArgItem* _tmp5_; + const gchar* _tmp6_; #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = node; #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -9744,16 +9708,16 @@ static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, Publish _tmp6_ = _tmp5_->val; #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" xmlNewTextChild (_tmp2_, NULL, (xmlChar*) _tmp4_, (xmlChar*) _tmp6_); -#line 9744 "RajcePublishing.c" +#line 9708 "RajcePublishing.c" } else { xmlNode* subnode = NULL; - xmlNode* _tmp7_ = NULL; - PublishingRajceArgItem* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - xmlNode* _tmp10_ = NULL; - PublishingRajceArgItem* _tmp11_ = NULL; - PublishingRajceArgItem** _tmp12_ = NULL; - gint _tmp12__length1 = 0; + xmlNode* _tmp7_; + PublishingRajceArgItem* _tmp8_; + const gchar* _tmp9_; + xmlNode* _tmp10_; + PublishingRajceArgItem* _tmp11_; + PublishingRajceArgItem** _tmp12_; + gint _tmp12__length1; #line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = node; #line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -9770,7 +9734,7 @@ static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, Publish _tmp12_ = _tmp11_->children; #line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp12__length1 = _tmp11_->children_length1; -#line 9770 "RajcePublishing.c" +#line 9734 "RajcePublishing.c" { PublishingRajceArgItem** child_collection = NULL; gint child_collection_length1 = 0; @@ -9782,17 +9746,17 @@ static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, Publish child_collection_length1 = _tmp12__length1; #line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" for (child_it = 0; child_it < _tmp12__length1; child_it = child_it + 1) { -#line 9782 "RajcePublishing.c" - PublishingRajceArgItem* _tmp13_ = NULL; +#line 9746 "RajcePublishing.c" + PublishingRajceArgItem* _tmp13_; PublishingRajceArgItem* child = NULL; #line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp13_ = _publishing_rajce_arg_item_ref0 (child_collection[child_it]); #line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" child = _tmp13_; -#line 9789 "RajcePublishing.c" +#line 9753 "RajcePublishing.c" { - xmlNode* _tmp14_ = NULL; - PublishingRajceArgItem* _tmp15_ = NULL; + xmlNode* _tmp14_; + PublishingRajceArgItem* _tmp15_; #line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp14_ = subnode; #line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -9801,7 +9765,7 @@ static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, Publish publishing_rajce_live_api_request_WriteParam (_tmp14_, _tmp15_); #line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_arg_item_unref0 (child); -#line 9801 "RajcePublishing.c" +#line 9765 "RajcePublishing.c" } } } @@ -9812,7 +9776,7 @@ static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, Publish static void publishing_rajce_value_live_api_request_init (GValue* value) { #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 9812 "RajcePublishing.c" +#line 9776 "RajcePublishing.c" } @@ -9821,7 +9785,7 @@ static void publishing_rajce_value_live_api_request_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_unref (value->data[0].v_pointer); -#line 9821 "RajcePublishing.c" +#line 9785 "RajcePublishing.c" } } @@ -9831,11 +9795,11 @@ static void publishing_rajce_value_live_api_request_copy_value (const GValue* sr if (src_value->data[0].v_pointer) { #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" dest_value->data[0].v_pointer = publishing_rajce_live_api_request_ref (src_value->data[0].v_pointer); -#line 9831 "RajcePublishing.c" +#line 9795 "RajcePublishing.c" } else { #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 9835 "RajcePublishing.c" +#line 9799 "RajcePublishing.c" } } @@ -9843,66 +9807,66 @@ static void publishing_rajce_value_live_api_request_copy_value (const GValue* sr static gpointer publishing_rajce_value_live_api_request_peek_pointer (const GValue* value) { #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return value->data[0].v_pointer; -#line 9843 "RajcePublishing.c" +#line 9807 "RajcePublishing.c" } static gchar* publishing_rajce_value_live_api_request_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (collect_values[0].v_pointer) { -#line 9850 "RajcePublishing.c" - PublishingRajceLiveApiRequest* object; +#line 9814 "RajcePublishing.c" + PublishingRajceLiveApiRequest * object; object = collect_values[0].v_pointer; #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (object->parent_instance.g_class == NULL) { #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 9857 "RajcePublishing.c" +#line 9821 "RajcePublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 9861 "RajcePublishing.c" +#line 9825 "RajcePublishing.c" } #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = publishing_rajce_live_api_request_ref (object); -#line 9865 "RajcePublishing.c" +#line 9829 "RajcePublishing.c" } else { #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 9869 "RajcePublishing.c" +#line 9833 "RajcePublishing.c" } #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 9873 "RajcePublishing.c" +#line 9837 "RajcePublishing.c" } static gchar* publishing_rajce_value_live_api_request_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingRajceLiveApiRequest** object_p; + PublishingRajceLiveApiRequest ** object_p; object_p = collect_values[0].v_pointer; #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (!object_p) { #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 9884 "RajcePublishing.c" +#line 9848 "RajcePublishing.c" } #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (!value->data[0].v_pointer) { #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *object_p = NULL; -#line 9890 "RajcePublishing.c" +#line 9854 "RajcePublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *object_p = value->data[0].v_pointer; -#line 9894 "RajcePublishing.c" +#line 9858 "RajcePublishing.c" } else { #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *object_p = publishing_rajce_live_api_request_ref (value->data[0].v_pointer); -#line 9898 "RajcePublishing.c" +#line 9862 "RajcePublishing.c" } #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 9902 "RajcePublishing.c" +#line 9866 "RajcePublishing.c" } @@ -9916,7 +9880,7 @@ GParamSpec* publishing_rajce_param_spec_live_api_request (const gchar* name, con G_PARAM_SPEC (spec)->value_type = object_type; #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return G_PARAM_SPEC (spec); -#line 9916 "RajcePublishing.c" +#line 9880 "RajcePublishing.c" } @@ -9925,12 +9889,12 @@ gpointer publishing_rajce_value_get_live_api_request (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST), NULL); #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return value->data[0].v_pointer; -#line 9925 "RajcePublishing.c" +#line 9889 "RajcePublishing.c" } void publishing_rajce_value_set_live_api_request (GValue* value, gpointer v_object) { - PublishingRajceLiveApiRequest* old; + PublishingRajceLiveApiRequest * old; #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST)); #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -9945,23 +9909,23 @@ void publishing_rajce_value_set_live_api_request (GValue* value, gpointer v_obje value->data[0].v_pointer = v_object; #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_ref (value->data[0].v_pointer); -#line 9945 "RajcePublishing.c" +#line 9909 "RajcePublishing.c" } else { #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 9949 "RajcePublishing.c" +#line 9913 "RajcePublishing.c" } #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (old) { #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_unref (old); -#line 9955 "RajcePublishing.c" +#line 9919 "RajcePublishing.c" } } void publishing_rajce_value_take_live_api_request (GValue* value, gpointer v_object) { - PublishingRajceLiveApiRequest* old; + PublishingRajceLiveApiRequest * old; #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST)); #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -9974,17 +9938,17 @@ void publishing_rajce_value_take_live_api_request (GValue* value, gpointer v_obj g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = v_object; -#line 9974 "RajcePublishing.c" +#line 9938 "RajcePublishing.c" } else { #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 9978 "RajcePublishing.c" +#line 9942 "RajcePublishing.c" } #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (old) { #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_unref (old); -#line 9984 "RajcePublishing.c" +#line 9948 "RajcePublishing.c" } } @@ -9996,7 +9960,7 @@ static void publishing_rajce_live_api_request_class_init (PublishingRajceLiveApi ((PublishingRajceLiveApiRequestClass *) klass)->finalize = publishing_rajce_live_api_request_finalize; #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_type_class_add_private (klass, sizeof (PublishingRajceLiveApiRequestPrivate)); -#line 9996 "RajcePublishing.c" +#line 9960 "RajcePublishing.c" } @@ -10005,11 +9969,11 @@ static void publishing_rajce_live_api_request_instance_init (PublishingRajceLive self->priv = PUBLISHING_RAJCE_LIVE_API_REQUEST_GET_PRIVATE (self); #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->ref_count = 1; -#line 10005 "RajcePublishing.c" +#line 9969 "RajcePublishing.c" } -static void publishing_rajce_live_api_request_finalize (PublishingRajceLiveApiRequest* obj) { +static void publishing_rajce_live_api_request_finalize (PublishingRajceLiveApiRequest * obj) { PublishingRajceLiveApiRequest * self; #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST, PublishingRajceLiveApiRequest); @@ -10019,7 +9983,7 @@ static void publishing_rajce_live_api_request_finalize (PublishingRajceLiveApiRe self->priv->_params = (_vala_array_free (self->priv->_params, self->priv->_params_length1, (GDestroyNotify) publishing_rajce_arg_item_unref), NULL); #line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->priv->_cmd); -#line 10019 "RajcePublishing.c" +#line 9983 "RajcePublishing.c" } @@ -10038,18 +10002,18 @@ GType publishing_rajce_live_api_request_get_type (void) { gpointer publishing_rajce_live_api_request_ref (gpointer instance) { - PublishingRajceLiveApiRequest* self; + PublishingRajceLiveApiRequest * self; self = instance; #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_atomic_int_inc (&self->ref_count); #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return instance; -#line 10044 "RajcePublishing.c" +#line 10008 "RajcePublishing.c" } void publishing_rajce_live_api_request_unref (gpointer instance) { - PublishingRajceLiveApiRequest* self; + PublishingRajceLiveApiRequest * self; self = instance; #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -10057,14 +10021,14 @@ void publishing_rajce_live_api_request_unref (gpointer instance) { PUBLISHING_RAJCE_LIVE_API_REQUEST_GET_CLASS (self)->finalize (self); #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 10057 "RajcePublishing.c" +#line 10021 "RajcePublishing.c" } } PublishingRajceTransaction* publishing_rajce_transaction_construct (GType object_type, PublishingRajceSession* session) { PublishingRajceTransaction* self = NULL; - PublishingRajceSession* _tmp0_ = NULL; + PublishingRajceSession* _tmp0_; #line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL); #line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -10073,40 +10037,40 @@ PublishingRajceTransaction* publishing_rajce_transaction_construct (GType object self = (PublishingRajceTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); #line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 10073 "RajcePublishing.c" +#line 10037 "RajcePublishing.c" } PublishingRajceTransaction* publishing_rajce_transaction_new (PublishingRajceSession* session) { #line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_transaction_construct (PUBLISHING_RAJCE_TYPE_TRANSACTION, session); -#line 10080 "RajcePublishing.c" +#line 10044 "RajcePublishing.c" } gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc) { gchar* result = NULL; xmlNode* root = NULL; - PublishingRESTSupportXmlDocument* _tmp0_ = NULL; - xmlNode* _tmp1_ = NULL; - xmlNode* _tmp2_ = NULL; + PublishingRESTSupportXmlDocument* _tmp0_; + xmlNode* _tmp1_; + xmlNode* _tmp2_; gchar* name = NULL; - xmlNode* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + xmlNode* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; gboolean _tmp7_ = FALSE; - const gchar* _tmp8_ = NULL; + const gchar* _tmp8_; xmlNode* errcode = NULL; xmlNode* _result_ = NULL; - xmlNode* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gint _tmp22_ = 0; - xmlNode* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; + xmlNode* _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; + gint _tmp22_; + xmlNode* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; GError * _inner_error_ = NULL; #line 1361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL); @@ -10120,15 +10084,15 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume _tmp2_ = root; #line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp2_ == NULL) { -#line 10120 "RajcePublishing.c" - gchar* _tmp3_ = NULL; +#line 10084 "RajcePublishing.c" + gchar* _tmp3_; #line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = g_strdup ("No XML returned from server"); #line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result = _tmp3_; #line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 10128 "RajcePublishing.c" +#line 10092 "RajcePublishing.c" } #line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = root; @@ -10144,19 +10108,19 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume if (_tmp8_ == NULL) { #line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = TRUE; -#line 10144 "RajcePublishing.c" +#line 10108 "RajcePublishing.c" } else { - const gchar* _tmp9_ = NULL; + const gchar* _tmp9_; #line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp9_ = name; #line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = g_strcmp0 (_tmp9_, "response") != 0; -#line 10151 "RajcePublishing.c" +#line 10115 "RajcePublishing.c" } #line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp7_) { -#line 10155 "RajcePublishing.c" - gchar* _tmp10_ = NULL; +#line 10119 "RajcePublishing.c" + gchar* _tmp10_; #line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp10_ = g_strdup ("No response from Rajce in XML"); #line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -10165,17 +10129,17 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume _g_free0 (name); #line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 10165 "RajcePublishing.c" +#line 10129 "RajcePublishing.c" } { xmlNode* _tmp11_ = NULL; - PublishingRESTSupportXmlDocument* _tmp12_ = NULL; - xmlNode* _tmp13_ = NULL; - xmlNode* _tmp14_ = NULL; + PublishingRESTSupportXmlDocument* _tmp12_; + xmlNode* _tmp13_; + xmlNode* _tmp14_; xmlNode* _tmp15_ = NULL; - PublishingRESTSupportXmlDocument* _tmp16_ = NULL; - xmlNode* _tmp17_ = NULL; - xmlNode* _tmp18_ = NULL; + PublishingRESTSupportXmlDocument* _tmp16_; + xmlNode* _tmp17_; + xmlNode* _tmp18_; #line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp12_ = doc; #line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -10188,7 +10152,7 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 10188 "RajcePublishing.c" +#line 10152 "RajcePublishing.c" goto __catch31_spit_publishing_publishing_error; } #line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -10199,7 +10163,7 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume g_clear_error (&_inner_error_); #line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 10199 "RajcePublishing.c" +#line 10163 "RajcePublishing.c" } #line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" errcode = _tmp11_; @@ -10215,7 +10179,7 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 10215 "RajcePublishing.c" +#line 10179 "RajcePublishing.c" goto __catch31_spit_publishing_publishing_error; } #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -10226,11 +10190,11 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume g_clear_error (&_inner_error_); #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 10226 "RajcePublishing.c" +#line 10190 "RajcePublishing.c" } #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _result_ = _tmp15_; -#line 10230 "RajcePublishing.c" +#line 10194 "RajcePublishing.c" } goto __finally31; __catch31_spit_publishing_publishing_error: @@ -10248,7 +10212,7 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume _g_free0 (name); #line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 10248 "RajcePublishing.c" +#line 10212 "RajcePublishing.c" } __finally31: #line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -10261,7 +10225,7 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume g_clear_error (&_inner_error_); #line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 10261 "RajcePublishing.c" +#line 10225 "RajcePublishing.c" } #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp19_ = errcode; @@ -10291,14 +10255,14 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume _g_free0 (name); #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 10291 "RajcePublishing.c" +#line 10255 "RajcePublishing.c" } static void publishing_rajce_transaction_class_init (PublishingRajceTransactionClass * klass) { #line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_transaction_parent_class = g_type_class_peek_parent (klass); -#line 10298 "RajcePublishing.c" +#line 10262 "RajcePublishing.c" } @@ -10326,15 +10290,15 @@ GType publishing_rajce_transaction_get_type (void) { PublishingRajceSessionLoginTransaction* publishing_rajce_session_login_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url, const gchar* username, const gchar* token) { PublishingRajceSessionLoginTransaction* self = NULL; - const gchar* _tmp0_ = NULL; - PublishingRajceSession* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + const gchar* _tmp0_; + PublishingRajceSession* _tmp1_; + const gchar* _tmp2_; PublishingRajceLiveApiRequest* req = NULL; - PublishingRajceLiveApiRequest* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; + PublishingRajceLiveApiRequest* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp5_; gchar* xml = NULL; - gchar* _tmp6_ = NULL; + gchar* _tmp6_; #line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL); #line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -10381,21 +10345,21 @@ PublishingRajceSessionLoginTransaction* publishing_rajce_session_login_transacti _publishing_rajce_live_api_request_unref0 (req); #line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 10381 "RajcePublishing.c" +#line 10345 "RajcePublishing.c" } PublishingRajceSessionLoginTransaction* publishing_rajce_session_login_transaction_new (PublishingRajceSession* session, const gchar* url, const gchar* username, const gchar* token) { #line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_session_login_transaction_construct (PUBLISHING_RAJCE_TYPE_SESSION_LOGIN_TRANSACTION, session, url, username, token); -#line 10388 "RajcePublishing.c" +#line 10352 "RajcePublishing.c" } static void publishing_rajce_session_login_transaction_class_init (PublishingRajceSessionLoginTransactionClass * klass) { #line 1393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_session_login_transaction_parent_class = g_type_class_peek_parent (klass); -#line 10395 "RajcePublishing.c" +#line 10359 "RajcePublishing.c" } @@ -10418,123 +10382,123 @@ GType publishing_rajce_session_login_transaction_get_type (void) { } -static void _vala_array_add9 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) { +static void _vala_array_add9 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) { #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if ((*length) == (*size)) { #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1); -#line 10425 "RajcePublishing.c" +#line 10389 "RajcePublishing.c" } #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[(*length)++] = value; #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[*length] = NULL; -#line 10431 "RajcePublishing.c" +#line 10395 "RajcePublishing.c" } -static void _vala_array_add10 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) { +static void _vala_array_add10 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) { #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if ((*length) == (*size)) { #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1); -#line 10442 "RajcePublishing.c" +#line 10406 "RajcePublishing.c" } #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[(*length)++] = value; #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[*length] = NULL; -#line 10448 "RajcePublishing.c" +#line 10412 "RajcePublishing.c" } -static void _vala_array_add11 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) { +static void _vala_array_add11 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) { #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if ((*length) == (*size)) { #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1); -#line 10459 "RajcePublishing.c" +#line 10423 "RajcePublishing.c" } #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[(*length)++] = value; #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[*length] = NULL; -#line 10465 "RajcePublishing.c" +#line 10429 "RajcePublishing.c" } -static void _vala_array_add12 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) { +static void _vala_array_add12 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) { #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if ((*length) == (*size)) { #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1); -#line 10476 "RajcePublishing.c" +#line 10440 "RajcePublishing.c" } #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[(*length)++] = value; #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[*length] = NULL; -#line 10482 "RajcePublishing.c" +#line 10446 "RajcePublishing.c" } -static void _vala_array_add13 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) { +static void _vala_array_add13 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) { #line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if ((*length) == (*size)) { #line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1); -#line 10493 "RajcePublishing.c" +#line 10457 "RajcePublishing.c" } #line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[(*length)++] = value; #line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[*length] = NULL; -#line 10499 "RajcePublishing.c" +#line 10463 "RajcePublishing.c" } PublishingRajceGetAlbumsTransaction* publishing_rajce_get_albums_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url) { PublishingRajceGetAlbumsTransaction* self = NULL; - PublishingRajceSession* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + PublishingRajceSession* _tmp0_; + const gchar* _tmp1_; PublishingRajceLiveApiRequest* req = NULL; - PublishingRajceLiveApiRequest* _tmp2_ = NULL; - PublishingRajceSession* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + PublishingRajceLiveApiRequest* _tmp2_; + PublishingRajceSession* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; PublishingRajceArgItem** columns = NULL; - PublishingRajceArgItem** _tmp6_ = NULL; - gint columns_length1 = 0; - gint _columns_size_ = 0; - PublishingRajceArgItem** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - PublishingRajceArgItem* _tmp8_ = NULL; - PublishingRajceArgItem** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - PublishingRajceArgItem* _tmp10_ = NULL; - PublishingRajceArgItem** _tmp11_ = NULL; - gint _tmp11__length1 = 0; - PublishingRajceArgItem* _tmp12_ = NULL; - PublishingRajceArgItem** _tmp13_ = NULL; - gint _tmp13__length1 = 0; - PublishingRajceArgItem* _tmp14_ = NULL; - PublishingRajceArgItem** _tmp15_ = NULL; - gint _tmp15__length1 = 0; - PublishingRajceArgItem* _tmp16_ = NULL; - PublishingRajceArgItem** _tmp17_ = NULL; - gint _tmp17__length1 = 0; + PublishingRajceArgItem** _tmp6_; + gint columns_length1; + gint _columns_size_; + PublishingRajceArgItem** _tmp7_; + gint _tmp7__length1; + PublishingRajceArgItem* _tmp8_; + PublishingRajceArgItem** _tmp9_; + gint _tmp9__length1; + PublishingRajceArgItem* _tmp10_; + PublishingRajceArgItem** _tmp11_; + gint _tmp11__length1; + PublishingRajceArgItem* _tmp12_; + PublishingRajceArgItem** _tmp13_; + gint _tmp13__length1; + PublishingRajceArgItem* _tmp14_; + PublishingRajceArgItem** _tmp15_; + gint _tmp15__length1; + PublishingRajceArgItem* _tmp16_; + PublishingRajceArgItem** _tmp17_; + gint _tmp17__length1; gchar* xml = NULL; - gchar* _tmp18_ = NULL; + gchar* _tmp18_; #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL); #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -10627,21 +10591,21 @@ PublishingRajceGetAlbumsTransaction* publishing_rajce_get_albums_transaction_con _publishing_rajce_live_api_request_unref0 (req); #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 10627 "RajcePublishing.c" +#line 10591 "RajcePublishing.c" } PublishingRajceGetAlbumsTransaction* publishing_rajce_get_albums_transaction_new (PublishingRajceSession* session, const gchar* url) { #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_get_albums_transaction_construct (PUBLISHING_RAJCE_TYPE_GET_ALBUMS_TRANSACTION, session, url); -#line 10634 "RajcePublishing.c" +#line 10598 "RajcePublishing.c" } static void publishing_rajce_get_albums_transaction_class_init (PublishingRajceGetAlbumsTransactionClass * klass) { #line 1412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_get_albums_transaction_parent_class = g_type_class_peek_parent (klass); -#line 10641 "RajcePublishing.c" +#line 10605 "RajcePublishing.c" } @@ -10666,17 +10630,17 @@ GType publishing_rajce_get_albums_transaction_get_type (void) { PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url, const gchar* albumName, gboolean hidden) { PublishingRajceCreateAlbumTransaction* self = NULL; - PublishingRajceSession* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + PublishingRajceSession* _tmp0_; + const gchar* _tmp1_; PublishingRajceLiveApiRequest* req = NULL; - PublishingRajceLiveApiRequest* _tmp2_ = NULL; - PublishingRajceSession* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + PublishingRajceLiveApiRequest* _tmp2_; + PublishingRajceSession* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + const gchar* _tmp6_; + gboolean _tmp7_; gchar* xml = NULL; - gchar* _tmp8_ = NULL; + gchar* _tmp8_; #line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL); #line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -10725,21 +10689,21 @@ PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction _publishing_rajce_live_api_request_unref0 (req); #line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 10725 "RajcePublishing.c" +#line 10689 "RajcePublishing.c" } PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction_new (PublishingRajceSession* session, const gchar* url, const gchar* albumName, gboolean hidden) { #line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_create_album_transaction_construct (PUBLISHING_RAJCE_TYPE_CREATE_ALBUM_TRANSACTION, session, url, albumName, hidden); -#line 10732 "RajcePublishing.c" +#line 10696 "RajcePublishing.c" } static void publishing_rajce_create_album_transaction_class_init (PublishingRajceCreateAlbumTransactionClass * klass) { #line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_create_album_transaction_parent_class = g_type_class_peek_parent (klass); -#line 10739 "RajcePublishing.c" +#line 10703 "RajcePublishing.c" } @@ -10764,16 +10728,16 @@ GType publishing_rajce_create_album_transaction_get_type (void) { PublishingRajceOpenAlbumTransaction* publishing_rajce_open_album_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url, gint albumID) { PublishingRajceOpenAlbumTransaction* self = NULL; - PublishingRajceSession* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + PublishingRajceSession* _tmp0_; + const gchar* _tmp1_; PublishingRajceLiveApiRequest* req = NULL; - PublishingRajceLiveApiRequest* _tmp2_ = NULL; - PublishingRajceSession* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gint _tmp6_ = 0; + PublishingRajceLiveApiRequest* _tmp2_; + PublishingRajceSession* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gint _tmp6_; gchar* xml = NULL; - gchar* _tmp7_ = NULL; + gchar* _tmp7_; #line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL); #line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -10814,21 +10778,21 @@ PublishingRajceOpenAlbumTransaction* publishing_rajce_open_album_transaction_con _publishing_rajce_live_api_request_unref0 (req); #line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 10814 "RajcePublishing.c" +#line 10778 "RajcePublishing.c" } PublishingRajceOpenAlbumTransaction* publishing_rajce_open_album_transaction_new (PublishingRajceSession* session, const gchar* url, gint albumID) { #line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_open_album_transaction_construct (PUBLISHING_RAJCE_TYPE_OPEN_ALBUM_TRANSACTION, session, url, albumID); -#line 10821 "RajcePublishing.c" +#line 10785 "RajcePublishing.c" } static void publishing_rajce_open_album_transaction_class_init (PublishingRajceOpenAlbumTransactionClass * klass) { #line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_open_album_transaction_parent_class = g_type_class_peek_parent (klass); -#line 10828 "RajcePublishing.c" +#line 10792 "RajcePublishing.c" } @@ -10853,18 +10817,18 @@ GType publishing_rajce_open_album_transaction_get_type (void) { PublishingRajceGetAlbumUrlTransaction* publishing_rajce_get_album_url_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url) { PublishingRajceGetAlbumUrlTransaction* self = NULL; - PublishingRajceSession* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + PublishingRajceSession* _tmp0_; + const gchar* _tmp1_; PublishingRajceLiveApiRequest* req = NULL; - PublishingRajceLiveApiRequest* _tmp2_ = NULL; - PublishingRajceSession* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - PublishingRajceSession* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + PublishingRajceLiveApiRequest* _tmp2_; + PublishingRajceSession* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + PublishingRajceSession* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; gchar* xml = NULL; - gchar* _tmp9_ = NULL; + gchar* _tmp9_; #line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL); #line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -10911,21 +10875,21 @@ PublishingRajceGetAlbumUrlTransaction* publishing_rajce_get_album_url_transactio _publishing_rajce_live_api_request_unref0 (req); #line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 10911 "RajcePublishing.c" +#line 10875 "RajcePublishing.c" } PublishingRajceGetAlbumUrlTransaction* publishing_rajce_get_album_url_transaction_new (PublishingRajceSession* session, const gchar* url) { #line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_get_album_url_transaction_construct (PUBLISHING_RAJCE_TYPE_GET_ALBUM_URL_TRANSACTION, session, url); -#line 10918 "RajcePublishing.c" +#line 10882 "RajcePublishing.c" } static void publishing_rajce_get_album_url_transaction_class_init (PublishingRajceGetAlbumUrlTransactionClass * klass) { #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_get_album_url_transaction_parent_class = g_type_class_peek_parent (klass); -#line 10925 "RajcePublishing.c" +#line 10889 "RajcePublishing.c" } @@ -10950,18 +10914,18 @@ GType publishing_rajce_get_album_url_transaction_get_type (void) { PublishingRajceCloseAlbumTransaction* publishing_rajce_close_album_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url) { PublishingRajceCloseAlbumTransaction* self = NULL; - PublishingRajceSession* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + PublishingRajceSession* _tmp0_; + const gchar* _tmp1_; PublishingRajceLiveApiRequest* req = NULL; - PublishingRajceLiveApiRequest* _tmp2_ = NULL; - PublishingRajceSession* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - PublishingRajceSession* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + PublishingRajceLiveApiRequest* _tmp2_; + PublishingRajceSession* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + PublishingRajceSession* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; gchar* xml = NULL; - gchar* _tmp9_ = NULL; + gchar* _tmp9_; #line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL); #line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -11008,21 +10972,21 @@ PublishingRajceCloseAlbumTransaction* publishing_rajce_close_album_transaction_c _publishing_rajce_live_api_request_unref0 (req); #line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 11008 "RajcePublishing.c" +#line 10972 "RajcePublishing.c" } PublishingRajceCloseAlbumTransaction* publishing_rajce_close_album_transaction_new (PublishingRajceSession* session, const gchar* url) { #line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_close_album_transaction_construct (PUBLISHING_RAJCE_TYPE_CLOSE_ALBUM_TRANSACTION, session, url); -#line 11015 "RajcePublishing.c" +#line 10979 "RajcePublishing.c" } static void publishing_rajce_close_album_transaction_class_init (PublishingRajceCloseAlbumTransactionClass * klass) { #line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_close_album_transaction_parent_class = g_type_class_peek_parent (klass); -#line 11022 "RajcePublishing.c" +#line 10986 "RajcePublishing.c" } @@ -11047,15 +11011,15 @@ GType publishing_rajce_close_album_transaction_get_type (void) { PublishingRajceGetCategoriesTransaction* publishing_rajce_get_categories_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url) { PublishingRajceGetCategoriesTransaction* self = NULL; - PublishingRajceSession* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + PublishingRajceSession* _tmp0_; + const gchar* _tmp1_; PublishingRajceLiveApiRequest* req = NULL; - PublishingRajceLiveApiRequest* _tmp2_ = NULL; - PublishingRajceSession* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + PublishingRajceLiveApiRequest* _tmp2_; + PublishingRajceSession* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; gchar* xml = NULL; - gchar* _tmp6_ = NULL; + gchar* _tmp6_; #line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL); #line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -11092,21 +11056,21 @@ PublishingRajceGetCategoriesTransaction* publishing_rajce_get_categories_transac _publishing_rajce_live_api_request_unref0 (req); #line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 11092 "RajcePublishing.c" +#line 11056 "RajcePublishing.c" } PublishingRajceGetCategoriesTransaction* publishing_rajce_get_categories_transaction_new (PublishingRajceSession* session, const gchar* url) { #line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_get_categories_transaction_construct (PUBLISHING_RAJCE_TYPE_GET_CATEGORIES_TRANSACTION, session, url); -#line 11099 "RajcePublishing.c" +#line 11063 "RajcePublishing.c" } static void publishing_rajce_get_categories_transaction_class_init (PublishingRajceGetCategoriesTransactionClass * klass) { #line 1500 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_get_categories_transaction_parent_class = g_type_class_peek_parent (klass); -#line 11106 "RajcePublishing.c" +#line 11070 "RajcePublishing.c" } @@ -11132,75 +11096,75 @@ GType publishing_rajce_get_categories_transaction_get_type (void) { static void _g_free0_ (gpointer var) { #line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" var = (g_free (var), NULL); -#line 11132 "RajcePublishing.c" +#line 11096 "RajcePublishing.c" } PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url, PublishingRajcePublishingParameters* parameters, SpitPublishingPublishable* publishable) { PublishingRajceAddPhotoTransaction* self = NULL; - PublishingRajceSession* _tmp0_ = NULL; - SpitPublishingPublishable* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PublishingRajcePublishingParameters* _tmp3_ = NULL; - PublishingRajcePublishingParameters* _tmp4_ = NULL; + PublishingRajceSession* _tmp0_; + SpitPublishingPublishable* _tmp1_; + const gchar* _tmp2_; + PublishingRajcePublishingParameters* _tmp3_; + PublishingRajcePublishingParameters* _tmp4_; const gchar* _tmp5_ = NULL; - PublishingRajcePublishingParameters* _tmp6_ = NULL; - gint* _tmp7_ = NULL; - SpitPublishingPublishable* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - PublishingRajcePublishingParameters* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; + PublishingRajcePublishingParameters* _tmp6_; + gint* _tmp7_; + SpitPublishingPublishable* _tmp8_; + GFile* _tmp9_; + GFile* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + PublishingRajcePublishingParameters* _tmp13_; + const gchar* _tmp14_; gchar* basename = NULL; - SpitPublishingPublishable* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; + SpitPublishingPublishable* _tmp15_; + gchar* _tmp16_; gchar* comment = NULL; - SpitPublishingPublishable* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; + SpitPublishingPublishable* _tmp17_; + gchar* _tmp18_; gchar* pubname = NULL; - SpitPublishingPublishable* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; + SpitPublishingPublishable* _tmp19_; + gchar* _tmp20_; gint width = 0; - PublishingRajceSession* _tmp21_ = NULL; - gint _tmp22_ = 0; + PublishingRajceSession* _tmp21_; + gint _tmp22_; gint height = 0; - PublishingRajceSession* _tmp23_ = NULL; - gint _tmp24_ = 0; + PublishingRajceSession* _tmp23_; + gint _tmp24_; PublishingRajceLiveApiRequest* req = NULL; - PublishingRajceLiveApiRequest* _tmp25_ = NULL; - PublishingRajceLiveApiRequest* _tmp26_ = NULL; - PublishingRajceSession* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - PublishingRajceLiveApiRequest* _tmp30_ = NULL; - gint _tmp31_ = 0; - PublishingRajceLiveApiRequest* _tmp32_ = NULL; - gint _tmp33_ = 0; - PublishingRajceLiveApiRequest* _tmp34_ = NULL; - PublishingRajceSession* _tmp35_ = NULL; - gchar* _tmp36_ = NULL; - gchar* _tmp37_ = NULL; - PublishingRajceLiveApiRequest* _tmp38_ = NULL; - const gchar* _tmp39_ = NULL; - PublishingRajceLiveApiRequest* _tmp40_ = NULL; - const gchar* _tmp41_ = NULL; + PublishingRajceLiveApiRequest* _tmp25_; + PublishingRajceLiveApiRequest* _tmp26_; + PublishingRajceSession* _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; + PublishingRajceLiveApiRequest* _tmp30_; + gint _tmp31_; + PublishingRajceLiveApiRequest* _tmp32_; + gint _tmp33_; + PublishingRajceLiveApiRequest* _tmp34_; + PublishingRajceSession* _tmp35_; + gchar* _tmp36_; + gchar* _tmp37_; + PublishingRajceLiveApiRequest* _tmp38_; + const gchar* _tmp39_; + PublishingRajceLiveApiRequest* _tmp40_; + const gchar* _tmp41_; const gchar* _tmp42_ = NULL; - const gchar* _tmp43_ = NULL; - PublishingRajceLiveApiRequest* _tmp45_ = NULL; + const gchar* _tmp43_; + PublishingRajceLiveApiRequest* _tmp45_; gchar* xml = NULL; - PublishingRajceLiveApiRequest* _tmp46_ = NULL; - gchar* _tmp47_ = NULL; + PublishingRajceLiveApiRequest* _tmp46_; + gchar* _tmp47_; GHashTable* disposition_table = NULL; - GHashFunc _tmp48_ = NULL; - GEqualFunc _tmp49_ = NULL; - GHashTable* _tmp50_ = NULL; - gchar* _tmp51_ = NULL; - gchar* _tmp52_ = NULL; - gchar* _tmp53_ = NULL; - const gchar* _tmp54_ = NULL; - gchar* _tmp55_ = NULL; + GHashFunc _tmp48_; + GEqualFunc _tmp49_; + GHashTable* _tmp50_; + gchar* _tmp51_; + gchar* _tmp52_; + gchar* _tmp53_; + const gchar* _tmp54_; + gchar* _tmp55_; #line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL); #line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -11233,11 +11197,11 @@ PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_const if ((*_tmp7_) > 0) { #line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = ""; -#line 11233 "RajcePublishing.c" +#line 11197 "RajcePublishing.c" } else { #line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = " new"; -#line 11237 "RajcePublishing.c" +#line 11201 "RajcePublishing.c" } #line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp8_ = publishable; @@ -11346,17 +11310,17 @@ PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_const _tmp43_ = comment; #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp43_ != NULL) { -#line 11345 "RajcePublishing.c" - const gchar* _tmp44_ = NULL; +#line 11309 "RajcePublishing.c" + const gchar* _tmp44_; #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp44_ = comment; #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp42_ = _tmp44_; -#line 11351 "RajcePublishing.c" +#line 11315 "RajcePublishing.c" } else { #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp42_ = ""; -#line 11355 "RajcePublishing.c" +#line 11319 "RajcePublishing.c" } #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp45_ = req; @@ -11408,14 +11372,14 @@ PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_const _g_free0 (basename); #line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 11407 "RajcePublishing.c" +#line 11371 "RajcePublishing.c" } PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_new (PublishingRajceSession* session, const gchar* url, PublishingRajcePublishingParameters* parameters, SpitPublishingPublishable* publishable) { #line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_add_photo_transaction_construct (PUBLISHING_RAJCE_TYPE_ADD_PHOTO_TRANSACTION, session, url, parameters, publishable); -#line 11414 "RajcePublishing.c" +#line 11378 "RajcePublishing.c" } @@ -11426,7 +11390,7 @@ static void publishing_rajce_add_photo_transaction_class_init (PublishingRajceAd ((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_rajce_add_photo_transaction_finalize; #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_type_class_add_private (klass, sizeof (PublishingRajceAddPhotoTransactionPrivate)); -#line 11425 "RajcePublishing.c" +#line 11389 "RajcePublishing.c" } @@ -11435,11 +11399,11 @@ static void publishing_rajce_add_photo_transaction_instance_init (PublishingRajc self->priv = PUBLISHING_RAJCE_ADD_PHOTO_TRANSACTION_GET_PRIVATE (self); #line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->parameters = NULL; -#line 11434 "RajcePublishing.c" +#line 11398 "RajcePublishing.c" } -static void publishing_rajce_add_photo_transaction_finalize (PublishingRESTSupportTransaction* obj) { +static void publishing_rajce_add_photo_transaction_finalize (PublishingRESTSupportTransaction * obj) { PublishingRajceAddPhotoTransaction * self; #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_ADD_PHOTO_TRANSACTION, PublishingRajceAddPhotoTransaction); @@ -11447,7 +11411,7 @@ static void publishing_rajce_add_photo_transaction_finalize (PublishingRESTSuppo _publishing_rajce_publishing_parameters_unref0 (self->priv->parameters); #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_rajce_add_photo_transaction_parent_class)->finalize (obj); -#line 11446 "RajcePublishing.c" +#line 11410 "RajcePublishing.c" } diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.c b/plugins/shotwell-publishing-extras/TumblrPublishing.c index a04cec6..8749112 100644 --- a/plugins/shotwell-publishing-extras/TumblrPublishing.c +++ b/plugins/shotwell-publishing-extras/TumblrPublishing.c @@ -1,4 +1,4 @@ -/* TumblrPublishing.c generated by valac 0.34.7, the Vala compiler +/* TumblrPublishing.c generated by valac 0.36.6, the Vala compiler * generated from TumblrPublishing.vala, do not modify */ /* Copyright 2012 BJA Electronics @@ -155,9 +155,20 @@ typedef struct _PublishingTumblrTumblrPublisherUploader PublishingTumblrTumblrPu typedef struct _PublishingTumblrTumblrPublisherUploaderClass PublishingTumblrTumblrPublisherUploaderClass; #define _publishing_rest_support_batch_uploader_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_batch_uploader_unref (var), NULL))) typedef struct _PublishingTumblrTumblrPublisherAuthenticationPanePrivate PublishingTumblrTumblrPublisherAuthenticationPanePrivate; +enum { + PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_LOGIN_SIGNAL, + PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_LAST_SIGNAL +}; +static guint publishing_tumblr_tumblr_publisher_authentication_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_LAST_SIGNAL] = {0}; typedef struct _PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate; #define _publishing_tumblr_blog_entry_unref0(var) ((var == NULL) ? NULL : (var = (publishing_tumblr_blog_entry_unref (var), NULL))) #define _publishing_tumblr_size_entry_unref0(var) ((var == NULL) ? NULL : (var = (publishing_tumblr_size_entry_unref (var), NULL))) +enum { + PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL, + PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL, + PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL +}; +static guint publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0}; typedef struct _PublishingTumblrTumblrPublisherTransactionPrivate PublishingTumblrTumblrPublisherTransactionPrivate; typedef struct _PublishingTumblrTumblrPublisherAccessTokenFetchTransactionPrivate PublishingTumblrTumblrPublisherAccessTokenFetchTransactionPrivate; typedef struct _PublishingTumblrTumblrPublisherUserInfoFetchTransactionPrivate PublishingTumblrTumblrPublisherUserInfoFetchTransactionPrivate; @@ -381,8 +392,8 @@ static gint tumblr_service_icon_pixbuf_set_length1; static GdkPixbuf** tumblr_service_icon_pixbuf_set = NULL; static gint tumblr_service_icon_pixbuf_set_length1 = 0; static gint _tumblr_service_icon_pixbuf_set_size_ = 0; -static SpitPluggableIface* tumblr_service_spit_pluggable_parent_iface = NULL; -static SpitPublishingServiceIface* tumblr_service_spit_publishing_service_parent_iface = NULL; +static SpitPluggableIface * tumblr_service_spit_pluggable_parent_iface = NULL; +static SpitPublishingServiceIface * tumblr_service_spit_publishing_service_parent_iface = NULL; static gpointer publishing_tumblr_blog_entry_parent_class = NULL; static gpointer publishing_tumblr_size_entry_parent_class = NULL; static gpointer publishing_tumblr_tumblr_publisher_parent_class = NULL; @@ -391,16 +402,16 @@ static gchar* publishing_tumblr_tumblr_publisher_authentication_pane_INTRO_MESSA static gchar* publishing_tumblr_tumblr_publisher_authentication_pane_INTRO_MESSAGE = NULL; static gchar* publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE; static gchar* publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE = NULL; -static SpitPublishingDialogPaneIface* publishing_tumblr_tumblr_publisher_authentication_pane_spit_publishing_dialog_pane_parent_iface = NULL; +static SpitPublishingDialogPaneIface * publishing_tumblr_tumblr_publisher_authentication_pane_spit_publishing_dialog_pane_parent_iface = NULL; static gpointer publishing_tumblr_tumblr_publisher_publishing_options_pane_parent_class = NULL; -static SpitPublishingDialogPaneIface* publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL; +static SpitPublishingDialogPaneIface * publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL; static gpointer publishing_tumblr_tumblr_publisher_transaction_parent_class = NULL; static gpointer publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_parent_class = NULL; static gpointer publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_parent_class = NULL; static gpointer publishing_tumblr_tumblr_publisher_upload_transaction_parent_class = NULL; static gpointer publishing_tumblr_tumblr_publisher_uploader_parent_class = NULL; static gpointer publishing_tumblr_tumblr_publisher_session_parent_class = NULL; -static SpitPublishingPublisherIface* publishing_tumblr_tumblr_publisher_spit_publishing_publisher_parent_iface = NULL; +static SpitPublishingPublisherIface * publishing_tumblr_tumblr_publisher_spit_publishing_publisher_parent_iface = NULL; GType tumblr_service_get_type (void) G_GNUC_CONST; enum { @@ -420,7 +431,7 @@ PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_new (SpitPub PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host); GType publishing_tumblr_tumblr_publisher_get_type (void) G_GNUC_CONST; static SpitPublishingPublisherMediaType tumblr_service_real_get_supported_media (SpitPublishingService* base); -static void tumblr_service_finalize (GObject* obj); +static void tumblr_service_finalize (GObject * obj); #define PUBLISHING_TUMBLR_SERVICE_NAME "Tumblr" #define PUBLISHING_TUMBLR_ENDPOINT_URL "https://www.tumblr.com/" #define PUBLISHING_TUMBLR_API_KEY "NdXvXQuKVccOsCOj0H4k9HUJcbcjDBYSo2AkaHzXFECHGNuP9k" @@ -439,7 +450,7 @@ enum { }; PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_new (const gchar* creator_blog, const gchar* creator_url); PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_construct (GType object_type, const gchar* creator_blog, const gchar* creator_url); -static void publishing_tumblr_blog_entry_finalize (PublishingTumblrBlogEntry* obj); +static void publishing_tumblr_blog_entry_finalize (PublishingTumblrBlogEntry * obj); gpointer publishing_tumblr_size_entry_ref (gpointer instance); void publishing_tumblr_size_entry_unref (gpointer instance); GParamSpec* publishing_tumblr_param_spec_size_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -452,7 +463,7 @@ enum { }; PublishingTumblrSizeEntry* publishing_tumblr_size_entry_new (const gchar* creator_title, gint creator_size); PublishingTumblrSizeEntry* publishing_tumblr_size_entry_construct (GType object_type, const gchar* creator_title, gint creator_size); -static void publishing_tumblr_size_entry_finalize (PublishingTumblrSizeEntry* obj); +static void publishing_tumblr_size_entry_finalize (PublishingTumblrSizeEntry * obj); GType publishing_tumblr_tumblr_publisher_session_get_type (void) G_GNUC_CONST; GType publishing_tumblr_tumblr_publisher_publishing_options_pane_get_type (void) G_GNUC_CONST; #define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisherPrivate)) @@ -462,9 +473,9 @@ enum { static void publishing_tumblr_tumblr_publisher_on_session_authenticated (PublishingTumblrTumblrPublisher* self); static void _publishing_tumblr_tumblr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer self); static PublishingTumblrSizeEntry** publishing_tumblr_tumblr_publisher_create_sizes (PublishingTumblrTumblrPublisher* self, int* result_length1); -static void _vala_array_add18 (PublishingTumblrSizeEntry*** array, int* length, int* size, PublishingTumblrSizeEntry* value); -static void _vala_array_add19 (PublishingTumblrSizeEntry*** array, int* length, int* size, PublishingTumblrSizeEntry* value); -static void _vala_array_add20 (PublishingTumblrSizeEntry*** array, int* length, int* size, PublishingTumblrSizeEntry* value); +static void _vala_array_add18 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value); +static void _vala_array_add19 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value); +static void _vala_array_add20 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value); static PublishingTumblrBlogEntry** publishing_tumblr_tumblr_publisher_create_blogs (PublishingTumblrTumblrPublisher* self, int* result_length1); PublishingTumblrTumblrPublisherSession* publishing_tumblr_tumblr_publisher_session_new (void); PublishingTumblrTumblrPublisherSession* publishing_tumblr_tumblr_publisher_session_construct (GType object_type); @@ -512,7 +523,7 @@ static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (Publis static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self); static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_request (PublishingTumblrTumblrPublisher* self, const gchar* response); static void publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (PublishingTumblrTumblrPublisher* self); -static void _vala_array_add21 (PublishingTumblrBlogEntry*** array, int* length, int* size, PublishingTumblrBlogEntry* value); +static void _vala_array_add21 (PublishingTumblrBlogEntry** * array, int* length, int* size, PublishingTumblrBlogEntry* value); void publishing_tumblr_tumblr_publisher_session_deauthenticate (PublishingTumblrTumblrPublisherSession* self); PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_new (PublishingTumblrTumblrPublisher* publisher, SpitPublishingPublisherMediaType media_type, PublishingTumblrSizeEntry** sizes, int sizes_length1, PublishingTumblrBlogEntry** blogs, int blogs_length1, const gchar* username); PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_construct (GType object_type, PublishingTumblrTumblrPublisher* publisher, SpitPublishingPublisherMediaType media_type, PublishingTumblrSizeEntry** sizes, int sizes_length1, PublishingTumblrBlogEntry** blogs, int blogs_length1, const gchar* username); @@ -554,7 +565,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publishe static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base); static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base); static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void publishing_tumblr_tumblr_publisher_authentication_pane_finalize (GObject* obj); +static void publishing_tumblr_tumblr_publisher_authentication_pane_finalize (GObject * obj); #define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate)) enum { PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY @@ -579,7 +590,7 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_p static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self); static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self); static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base); -static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize (GObject* obj); +static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize (GObject * obj); enum { PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TRANSACTION_DUMMY_PROPERTY }; @@ -606,26 +617,26 @@ static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (Publ PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_new (PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable* publishable, const gchar* blog_url); PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable* publishable, const gchar* blog_url); void publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (PublishingTumblrTumblrPublisherUploadTransaction* self, const gchar* key, const gchar* value); -static void _vala_array_add22 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value); +static void _vala_array_add22 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value); PublishingRESTSupportArgument** publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_fields (PublishingTumblrTumblrPublisherUploadTransaction* self, int* result_length1); static PublishingRESTSupportArgument** _vala_array_dup9 (PublishingRESTSupportArgument** self, int length); gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_string (PublishingTumblrTumblrPublisherUploadTransaction* self); static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error); -static void publishing_tumblr_tumblr_publisher_upload_transaction_finalize (PublishingRESTSupportTransaction* obj); +static void publishing_tumblr_tumblr_publisher_upload_transaction_finalize (PublishingRESTSupportTransaction * obj); #define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploaderPrivate)) enum { PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_DUMMY_PROPERTY }; static PublishingRESTSupportTransaction* publishing_tumblr_tumblr_publisher_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable); -static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingRESTSupportBatchUploader* obj); +static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingRESTSupportBatchUploader * obj); #define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSessionPrivate)) enum { PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_SESSION_DUMMY_PROPERTY }; static gboolean publishing_tumblr_tumblr_publisher_session_real_is_authenticated (PublishingRESTSupportSession* base); -static void _vala_array_add23 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value); -static void publishing_tumblr_tumblr_publisher_session_finalize (PublishingRESTSupportSession* obj); -static void publishing_tumblr_tumblr_publisher_finalize (GObject* obj); +static void _vala_array_add23 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value); +static void publishing_tumblr_tumblr_publisher_session_finalize (PublishingRESTSupportSession * obj); +static void publishing_tumblr_tumblr_publisher_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); @@ -633,8 +644,8 @@ static gint _vala_array_length (gpointer array); TumblrService* tumblr_service_construct (GType object_type, GFile* resource_directory) { TumblrService * self = NULL; - GdkPixbuf** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + GdkPixbuf** _tmp0_; + gint _tmp0__length1; #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (G_IS_FILE (resource_directory), NULL); #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -645,9 +656,9 @@ TumblrService* tumblr_service_construct (GType object_type, GFile* resource_dire _tmp0__length1 = tumblr_service_icon_pixbuf_set_length1; #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp0_ == NULL) { -#line 649 "TumblrPublishing.c" - gint _tmp1_ = 0; - GdkPixbuf** _tmp2_ = NULL; +#line 660 "TumblrPublishing.c" + gint _tmp1_; + GdkPixbuf** _tmp2_; #line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" TUMBLR_SERVICE_ICON_FILENAME, &_tmp1_); #line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -658,27 +669,27 @@ TumblrService* tumblr_service_construct (GType object_type, GFile* resource_dire tumblr_service_icon_pixbuf_set_length1 = _tmp1_; #line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tumblr_service_icon_pixbuf_set_size_ = tumblr_service_icon_pixbuf_set_length1; -#line 662 "TumblrPublishing.c" +#line 673 "TumblrPublishing.c" } #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self; -#line 666 "TumblrPublishing.c" +#line 677 "TumblrPublishing.c" } TumblrService* tumblr_service_new (GFile* resource_directory) { #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return tumblr_service_construct (TYPE_TUMBLR_SERVICE, resource_directory); -#line 673 "TumblrPublishing.c" +#line 684 "TumblrPublishing.c" } static gint tumblr_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) { TumblrService * self; gint result = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService); #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -691,7 +702,7 @@ static gint tumblr_service_real_get_pluggable_interface (SpitPluggable* base, gi result = _tmp2_; #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 695 "TumblrPublishing.c" +#line 706 "TumblrPublishing.c" } @@ -704,7 +715,7 @@ static const gchar* tumblr_service_real_get_id (SpitPluggable* base) { result = "org.yorba.shotwell.publishing.tumblr"; #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 708 "TumblrPublishing.c" +#line 719 "TumblrPublishing.c" } @@ -717,14 +728,14 @@ static const gchar* tumblr_service_real_get_pluggable_name (SpitPluggable* base) result = "Tumblr"; #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 721 "TumblrPublishing.c" +#line 732 "TumblrPublishing.c" } static gpointer _g_object_ref0 (gpointer self) { #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self ? g_object_ref (self) : NULL; -#line 728 "TumblrPublishing.c" +#line 739 "TumblrPublishing.c" } @@ -735,34 +746,33 @@ static GdkPixbuf** _vala_array_dup6 (GdkPixbuf** self, int length) { result = g_new0 (GdkPixbuf*, length + 1); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" for (i = 0; i < length; i++) { -#line 739 "TumblrPublishing.c" - GdkPixbuf* _tmp0_ = NULL; +#line 750 "TumblrPublishing.c" + GdkPixbuf* _tmp0_; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result[i] = _tmp0_; -#line 745 "TumblrPublishing.c" +#line 756 "TumblrPublishing.c" } #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 749 "TumblrPublishing.c" +#line 760 "TumblrPublishing.c" } static void tumblr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) { TumblrService * self; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GdkPixbuf** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - GdkPixbuf** _tmp9_ = NULL; - gint _tmp9__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + GdkPixbuf** _tmp7_; + gint _tmp7__length1; + GdkPixbuf** _tmp8_; + gint _tmp8__length1; #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -774,60 +784,58 @@ static void tumblr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" (*info).authors = _tmp0_; #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp1_ = _ ("Copyright 2012 BJA Electronics"); -#line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp1_ = g_strdup (_ ("Copyright 2012 BJA Electronics")); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 ((*info).copyright); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - (*info).copyright = _tmp2_; + (*info).copyright = _tmp1_; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp3_ = g_strdup (RESOURCES_TRANSLATORS); + _tmp2_ = g_strdup (RESOURCES_TRANSLATORS); #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 ((*info).translators); #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - (*info).translators = _tmp3_; + (*info).translators = _tmp2_; #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp4_ = g_strdup (_VERSION); + _tmp3_ = g_strdup (_VERSION); #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 ((*info).version); #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - (*info).version = _tmp4_; + (*info).version = _tmp3_; #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp5_ = g_strdup (RESOURCES_WEBSITE_NAME); + _tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME); #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 ((*info).website_name); #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - (*info).website_name = _tmp5_; + (*info).website_name = _tmp4_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp6_ = g_strdup (RESOURCES_WEBSITE_URL); + _tmp5_ = g_strdup (RESOURCES_WEBSITE_URL); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 ((*info).website_url); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - (*info).website_url = _tmp6_; + (*info).website_url = _tmp5_; #line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" (*info).is_license_wordwrapped = FALSE; #line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp7_ = g_strdup (RESOURCES_LICENSE); + _tmp6_ = g_strdup (RESOURCES_LICENSE); #line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 ((*info).license); #line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - (*info).license = _tmp7_; + (*info).license = _tmp6_; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp8_ = tumblr_service_icon_pixbuf_set; + _tmp7_ = tumblr_service_icon_pixbuf_set; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp8__length1 = tumblr_service_icon_pixbuf_set_length1; + _tmp7__length1 = tumblr_service_icon_pixbuf_set_length1; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup6 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_); + _tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup6 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp9__length1 = _tmp8__length1; + _tmp8__length1 = _tmp7__length1; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" (*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - (*info).icons = _tmp9_; + (*info).icons = _tmp8_; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - (*info).icons_length1 = _tmp9__length1; -#line 831 "TumblrPublishing.c" + (*info).icons_length1 = _tmp8__length1; +#line 839 "TumblrPublishing.c" } @@ -835,15 +843,15 @@ static void tumblr_service_real_activation (SpitPluggable* base, gboolean enable TumblrService * self; #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService); -#line 839 "TumblrPublishing.c" +#line 847 "TumblrPublishing.c" } static SpitPublishingPublisher* tumblr_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) { TumblrService * self; SpitPublishingPublisher* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - PublishingTumblrTumblrPublisher* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + PublishingTumblrTumblrPublisher* _tmp1_; #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService); #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -856,7 +864,7 @@ static SpitPublishingPublisher* tumblr_service_real_create_publisher (SpitPublis result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher); #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 860 "TumblrPublishing.c" +#line 868 "TumblrPublishing.c" } @@ -869,7 +877,7 @@ static SpitPublishingPublisherMediaType tumblr_service_real_get_supported_media result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 873 "TumblrPublishing.c" +#line 881 "TumblrPublishing.c" } @@ -878,7 +886,7 @@ static void tumblr_service_class_init (TumblrServiceClass * klass) { tumblr_service_parent_class = g_type_class_peek_parent (klass); #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" G_OBJECT_CLASS (klass)->finalize = tumblr_service_finalize; -#line 882 "TumblrPublishing.c" +#line 890 "TumblrPublishing.c" } @@ -886,16 +894,16 @@ static void tumblr_service_spit_pluggable_interface_init (SpitPluggableIface * i #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" tumblr_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface); #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) tumblr_service_real_get_pluggable_interface; + iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) tumblr_service_real_get_pluggable_interface; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - iface->get_id = (const gchar* (*)(SpitPluggable*)) tumblr_service_real_get_id; + iface->get_id = (const gchar* (*) (SpitPluggable *)) tumblr_service_real_get_id; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) tumblr_service_real_get_pluggable_name; + iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) tumblr_service_real_get_pluggable_name; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) tumblr_service_real_get_info; + iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) tumblr_service_real_get_info; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - iface->activation = (void (*)(SpitPluggable*, gboolean)) tumblr_service_real_activation; -#line 899 "TumblrPublishing.c" + iface->activation = (void (*) (SpitPluggable *, gboolean)) tumblr_service_real_activation; +#line 907 "TumblrPublishing.c" } @@ -903,10 +911,10 @@ static void tumblr_service_spit_publishing_service_interface_init (SpitPublishin #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" tumblr_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface); #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) tumblr_service_real_create_publisher; + iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) tumblr_service_real_create_publisher; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) tumblr_service_real_get_supported_media; -#line 910 "TumblrPublishing.c" + iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) tumblr_service_real_get_supported_media; +#line 918 "TumblrPublishing.c" } @@ -914,13 +922,13 @@ static void tumblr_service_instance_init (TumblrService * self) { } -static void tumblr_service_finalize (GObject* obj) { +static void tumblr_service_finalize (GObject * obj) { TumblrService * self; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TUMBLR_SERVICE, TumblrService); #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" G_OBJECT_CLASS (tumblr_service_parent_class)->finalize (obj); -#line 924 "TumblrPublishing.c" +#line 932 "TumblrPublishing.c" } @@ -942,10 +950,10 @@ GType tumblr_service_get_type (void) { PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_construct (GType object_type, const gchar* creator_blog, const gchar* creator_url) { PublishingTumblrBlogEntry* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (creator_blog != NULL, NULL); #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -970,21 +978,21 @@ PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_construct (GType object_ self->url = _tmp3_; #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self; -#line 974 "TumblrPublishing.c" +#line 982 "TumblrPublishing.c" } PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_new (const gchar* creator_blog, const gchar* creator_url) { #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return publishing_tumblr_blog_entry_construct (PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY, creator_blog, creator_url); -#line 981 "TumblrPublishing.c" +#line 989 "TumblrPublishing.c" } static void publishing_tumblr_value_blog_entry_init (GValue* value) { #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" value->data[0].v_pointer = NULL; -#line 988 "TumblrPublishing.c" +#line 996 "TumblrPublishing.c" } @@ -993,7 +1001,7 @@ static void publishing_tumblr_value_blog_entry_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_blog_entry_unref (value->data[0].v_pointer); -#line 997 "TumblrPublishing.c" +#line 1005 "TumblrPublishing.c" } } @@ -1003,11 +1011,11 @@ static void publishing_tumblr_value_blog_entry_copy_value (const GValue* src_val if (src_value->data[0].v_pointer) { #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" dest_value->data[0].v_pointer = publishing_tumblr_blog_entry_ref (src_value->data[0].v_pointer); -#line 1007 "TumblrPublishing.c" +#line 1015 "TumblrPublishing.c" } else { #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 1011 "TumblrPublishing.c" +#line 1019 "TumblrPublishing.c" } } @@ -1015,66 +1023,66 @@ static void publishing_tumblr_value_blog_entry_copy_value (const GValue* src_val static gpointer publishing_tumblr_value_blog_entry_peek_pointer (const GValue* value) { #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return value->data[0].v_pointer; -#line 1019 "TumblrPublishing.c" +#line 1027 "TumblrPublishing.c" } static gchar* publishing_tumblr_value_blog_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (collect_values[0].v_pointer) { -#line 1026 "TumblrPublishing.c" - PublishingTumblrBlogEntry* object; +#line 1034 "TumblrPublishing.c" + PublishingTumblrBlogEntry * object; object = collect_values[0].v_pointer; #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1033 "TumblrPublishing.c" +#line 1041 "TumblrPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1037 "TumblrPublishing.c" +#line 1045 "TumblrPublishing.c" } #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" value->data[0].v_pointer = publishing_tumblr_blog_entry_ref (object); -#line 1041 "TumblrPublishing.c" +#line 1049 "TumblrPublishing.c" } else { #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1045 "TumblrPublishing.c" +#line 1053 "TumblrPublishing.c" } #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return NULL; -#line 1049 "TumblrPublishing.c" +#line 1057 "TumblrPublishing.c" } static gchar* publishing_tumblr_value_blog_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingTumblrBlogEntry** object_p; + PublishingTumblrBlogEntry ** object_p; object_p = collect_values[0].v_pointer; #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (!object_p) { #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1060 "TumblrPublishing.c" +#line 1068 "TumblrPublishing.c" } #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (!value->data[0].v_pointer) { #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *object_p = NULL; -#line 1066 "TumblrPublishing.c" +#line 1074 "TumblrPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *object_p = value->data[0].v_pointer; -#line 1070 "TumblrPublishing.c" +#line 1078 "TumblrPublishing.c" } else { #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *object_p = publishing_tumblr_blog_entry_ref (value->data[0].v_pointer); -#line 1074 "TumblrPublishing.c" +#line 1082 "TumblrPublishing.c" } #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return NULL; -#line 1078 "TumblrPublishing.c" +#line 1086 "TumblrPublishing.c" } @@ -1088,7 +1096,7 @@ GParamSpec* publishing_tumblr_param_spec_blog_entry (const gchar* name, const gc G_PARAM_SPEC (spec)->value_type = object_type; #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return G_PARAM_SPEC (spec); -#line 1092 "TumblrPublishing.c" +#line 1100 "TumblrPublishing.c" } @@ -1097,12 +1105,12 @@ gpointer publishing_tumblr_value_get_blog_entry (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY), NULL); #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return value->data[0].v_pointer; -#line 1101 "TumblrPublishing.c" +#line 1109 "TumblrPublishing.c" } void publishing_tumblr_value_set_blog_entry (GValue* value, gpointer v_object) { - PublishingTumblrBlogEntry* old; + PublishingTumblrBlogEntry * old; #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY)); #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -1117,23 +1125,23 @@ void publishing_tumblr_value_set_blog_entry (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_blog_entry_ref (value->data[0].v_pointer); -#line 1121 "TumblrPublishing.c" +#line 1129 "TumblrPublishing.c" } else { #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1125 "TumblrPublishing.c" +#line 1133 "TumblrPublishing.c" } #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (old) { #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_blog_entry_unref (old); -#line 1131 "TumblrPublishing.c" +#line 1139 "TumblrPublishing.c" } } void publishing_tumblr_value_take_blog_entry (GValue* value, gpointer v_object) { - PublishingTumblrBlogEntry* old; + PublishingTumblrBlogEntry * old; #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY)); #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -1146,17 +1154,17 @@ void publishing_tumblr_value_take_blog_entry (GValue* value, gpointer v_object) g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" value->data[0].v_pointer = v_object; -#line 1150 "TumblrPublishing.c" +#line 1158 "TumblrPublishing.c" } else { #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1154 "TumblrPublishing.c" +#line 1162 "TumblrPublishing.c" } #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (old) { #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_blog_entry_unref (old); -#line 1160 "TumblrPublishing.c" +#line 1168 "TumblrPublishing.c" } } @@ -1166,18 +1174,18 @@ static void publishing_tumblr_blog_entry_class_init (PublishingTumblrBlogEntryCl publishing_tumblr_blog_entry_parent_class = g_type_class_peek_parent (klass); #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" ((PublishingTumblrBlogEntryClass *) klass)->finalize = publishing_tumblr_blog_entry_finalize; -#line 1170 "TumblrPublishing.c" +#line 1178 "TumblrPublishing.c" } static void publishing_tumblr_blog_entry_instance_init (PublishingTumblrBlogEntry * self) { #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->ref_count = 1; -#line 1177 "TumblrPublishing.c" +#line 1185 "TumblrPublishing.c" } -static void publishing_tumblr_blog_entry_finalize (PublishingTumblrBlogEntry* obj) { +static void publishing_tumblr_blog_entry_finalize (PublishingTumblrBlogEntry * obj) { PublishingTumblrBlogEntry * self; #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY, PublishingTumblrBlogEntry); @@ -1187,7 +1195,7 @@ static void publishing_tumblr_blog_entry_finalize (PublishingTumblrBlogEntry* ob _g_free0 (self->blog); #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (self->url); -#line 1191 "TumblrPublishing.c" +#line 1199 "TumblrPublishing.c" } @@ -1206,18 +1214,18 @@ GType publishing_tumblr_blog_entry_get_type (void) { gpointer publishing_tumblr_blog_entry_ref (gpointer instance) { - PublishingTumblrBlogEntry* self; + PublishingTumblrBlogEntry * self; self = instance; #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_atomic_int_inc (&self->ref_count); #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return instance; -#line 1216 "TumblrPublishing.c" +#line 1224 "TumblrPublishing.c" } void publishing_tumblr_blog_entry_unref (gpointer instance) { - PublishingTumblrBlogEntry* self; + PublishingTumblrBlogEntry * self; self = instance; #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1225,16 +1233,16 @@ void publishing_tumblr_blog_entry_unref (gpointer instance) { PUBLISHING_TUMBLR_BLOG_ENTRY_GET_CLASS (self)->finalize (self); #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1229 "TumblrPublishing.c" +#line 1237 "TumblrPublishing.c" } } PublishingTumblrSizeEntry* publishing_tumblr_size_entry_construct (GType object_type, const gchar* creator_title, gint creator_size) { PublishingTumblrSizeEntry* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gint _tmp2_ = 0; + const gchar* _tmp0_; + gchar* _tmp1_; + gint _tmp2_; #line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (creator_title != NULL, NULL); #line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -1253,21 +1261,21 @@ PublishingTumblrSizeEntry* publishing_tumblr_size_entry_construct (GType object_ self->size = _tmp2_; #line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self; -#line 1257 "TumblrPublishing.c" +#line 1265 "TumblrPublishing.c" } PublishingTumblrSizeEntry* publishing_tumblr_size_entry_new (const gchar* creator_title, gint creator_size) { #line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return publishing_tumblr_size_entry_construct (PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY, creator_title, creator_size); -#line 1264 "TumblrPublishing.c" +#line 1272 "TumblrPublishing.c" } static void publishing_tumblr_value_size_entry_init (GValue* value) { #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1271 "TumblrPublishing.c" +#line 1279 "TumblrPublishing.c" } @@ -1276,7 +1284,7 @@ static void publishing_tumblr_value_size_entry_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_size_entry_unref (value->data[0].v_pointer); -#line 1280 "TumblrPublishing.c" +#line 1288 "TumblrPublishing.c" } } @@ -1286,11 +1294,11 @@ static void publishing_tumblr_value_size_entry_copy_value (const GValue* src_val if (src_value->data[0].v_pointer) { #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" dest_value->data[0].v_pointer = publishing_tumblr_size_entry_ref (src_value->data[0].v_pointer); -#line 1290 "TumblrPublishing.c" +#line 1298 "TumblrPublishing.c" } else { #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 1294 "TumblrPublishing.c" +#line 1302 "TumblrPublishing.c" } } @@ -1298,66 +1306,66 @@ static void publishing_tumblr_value_size_entry_copy_value (const GValue* src_val static gpointer publishing_tumblr_value_size_entry_peek_pointer (const GValue* value) { #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return value->data[0].v_pointer; -#line 1302 "TumblrPublishing.c" +#line 1310 "TumblrPublishing.c" } static gchar* publishing_tumblr_value_size_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (collect_values[0].v_pointer) { -#line 1309 "TumblrPublishing.c" - PublishingTumblrSizeEntry* object; +#line 1317 "TumblrPublishing.c" + PublishingTumblrSizeEntry * object; object = collect_values[0].v_pointer; #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1316 "TumblrPublishing.c" +#line 1324 "TumblrPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1320 "TumblrPublishing.c" +#line 1328 "TumblrPublishing.c" } #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" value->data[0].v_pointer = publishing_tumblr_size_entry_ref (object); -#line 1324 "TumblrPublishing.c" +#line 1332 "TumblrPublishing.c" } else { #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1328 "TumblrPublishing.c" +#line 1336 "TumblrPublishing.c" } #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return NULL; -#line 1332 "TumblrPublishing.c" +#line 1340 "TumblrPublishing.c" } static gchar* publishing_tumblr_value_size_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingTumblrSizeEntry** object_p; + PublishingTumblrSizeEntry ** object_p; object_p = collect_values[0].v_pointer; #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (!object_p) { #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1343 "TumblrPublishing.c" +#line 1351 "TumblrPublishing.c" } #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (!value->data[0].v_pointer) { #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *object_p = NULL; -#line 1349 "TumblrPublishing.c" +#line 1357 "TumblrPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *object_p = value->data[0].v_pointer; -#line 1353 "TumblrPublishing.c" +#line 1361 "TumblrPublishing.c" } else { #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *object_p = publishing_tumblr_size_entry_ref (value->data[0].v_pointer); -#line 1357 "TumblrPublishing.c" +#line 1365 "TumblrPublishing.c" } #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return NULL; -#line 1361 "TumblrPublishing.c" +#line 1369 "TumblrPublishing.c" } @@ -1371,7 +1379,7 @@ GParamSpec* publishing_tumblr_param_spec_size_entry (const gchar* name, const gc G_PARAM_SPEC (spec)->value_type = object_type; #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return G_PARAM_SPEC (spec); -#line 1375 "TumblrPublishing.c" +#line 1383 "TumblrPublishing.c" } @@ -1380,12 +1388,12 @@ gpointer publishing_tumblr_value_get_size_entry (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY), NULL); #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return value->data[0].v_pointer; -#line 1384 "TumblrPublishing.c" +#line 1392 "TumblrPublishing.c" } void publishing_tumblr_value_set_size_entry (GValue* value, gpointer v_object) { - PublishingTumblrSizeEntry* old; + PublishingTumblrSizeEntry * old; #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY)); #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -1400,23 +1408,23 @@ void publishing_tumblr_value_set_size_entry (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_size_entry_ref (value->data[0].v_pointer); -#line 1404 "TumblrPublishing.c" +#line 1412 "TumblrPublishing.c" } else { #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1408 "TumblrPublishing.c" +#line 1416 "TumblrPublishing.c" } #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (old) { #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_size_entry_unref (old); -#line 1414 "TumblrPublishing.c" +#line 1422 "TumblrPublishing.c" } } void publishing_tumblr_value_take_size_entry (GValue* value, gpointer v_object) { - PublishingTumblrSizeEntry* old; + PublishingTumblrSizeEntry * old; #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY)); #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -1429,17 +1437,17 @@ void publishing_tumblr_value_take_size_entry (GValue* value, gpointer v_object) g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" value->data[0].v_pointer = v_object; -#line 1433 "TumblrPublishing.c" +#line 1441 "TumblrPublishing.c" } else { #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1437 "TumblrPublishing.c" +#line 1445 "TumblrPublishing.c" } #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (old) { #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_size_entry_unref (old); -#line 1443 "TumblrPublishing.c" +#line 1451 "TumblrPublishing.c" } } @@ -1449,18 +1457,18 @@ static void publishing_tumblr_size_entry_class_init (PublishingTumblrSizeEntryCl publishing_tumblr_size_entry_parent_class = g_type_class_peek_parent (klass); #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" ((PublishingTumblrSizeEntryClass *) klass)->finalize = publishing_tumblr_size_entry_finalize; -#line 1453 "TumblrPublishing.c" +#line 1461 "TumblrPublishing.c" } static void publishing_tumblr_size_entry_instance_init (PublishingTumblrSizeEntry * self) { #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->ref_count = 1; -#line 1460 "TumblrPublishing.c" +#line 1468 "TumblrPublishing.c" } -static void publishing_tumblr_size_entry_finalize (PublishingTumblrSizeEntry* obj) { +static void publishing_tumblr_size_entry_finalize (PublishingTumblrSizeEntry * obj) { PublishingTumblrSizeEntry * self; #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY, PublishingTumblrSizeEntry); @@ -1468,7 +1476,7 @@ static void publishing_tumblr_size_entry_finalize (PublishingTumblrSizeEntry* ob g_signal_handlers_destroy (self); #line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (self->title); -#line 1472 "TumblrPublishing.c" +#line 1480 "TumblrPublishing.c" } @@ -1487,18 +1495,18 @@ GType publishing_tumblr_size_entry_get_type (void) { gpointer publishing_tumblr_size_entry_ref (gpointer instance) { - PublishingTumblrSizeEntry* self; + PublishingTumblrSizeEntry * self; self = instance; #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_atomic_int_inc (&self->ref_count); #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return instance; -#line 1497 "TumblrPublishing.c" +#line 1505 "TumblrPublishing.c" } void publishing_tumblr_size_entry_unref (gpointer instance) { - PublishingTumblrSizeEntry* self; + PublishingTumblrSizeEntry * self; self = instance; #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1506,7 +1514,7 @@ void publishing_tumblr_size_entry_unref (gpointer instance) { PUBLISHING_TUMBLR_SIZE_ENTRY_GET_CLASS (self)->finalize (self); #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1510 "TumblrPublishing.c" +#line 1518 "TumblrPublishing.c" } } @@ -1514,81 +1522,78 @@ void publishing_tumblr_size_entry_unref (gpointer instance) { static void _publishing_tumblr_tumblr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer self) { #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_on_session_authenticated ((PublishingTumblrTumblrPublisher*) self); -#line 1518 "TumblrPublishing.c" +#line 1526 "TumblrPublishing.c" } -static void _vala_array_add18 (PublishingTumblrSizeEntry*** array, int* length, int* size, PublishingTumblrSizeEntry* value) { +static void _vala_array_add18 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value) { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if ((*length) == (*size)) { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *array = g_renew (PublishingTumblrSizeEntry*, *array, (*size) + 1); -#line 1529 "TumblrPublishing.c" +#line 1537 "TumblrPublishing.c" } #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" (*array)[(*length)++] = value; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" (*array)[*length] = NULL; -#line 1535 "TumblrPublishing.c" +#line 1543 "TumblrPublishing.c" } -static void _vala_array_add19 (PublishingTumblrSizeEntry*** array, int* length, int* size, PublishingTumblrSizeEntry* value) { +static void _vala_array_add19 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value) { #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if ((*length) == (*size)) { #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *array = g_renew (PublishingTumblrSizeEntry*, *array, (*size) + 1); -#line 1546 "TumblrPublishing.c" +#line 1554 "TumblrPublishing.c" } #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" (*array)[(*length)++] = value; #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" (*array)[*length] = NULL; -#line 1552 "TumblrPublishing.c" +#line 1560 "TumblrPublishing.c" } -static void _vala_array_add20 (PublishingTumblrSizeEntry*** array, int* length, int* size, PublishingTumblrSizeEntry* value) { +static void _vala_array_add20 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value) { #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if ((*length) == (*size)) { #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *array = g_renew (PublishingTumblrSizeEntry*, *array, (*size) + 1); -#line 1563 "TumblrPublishing.c" +#line 1571 "TumblrPublishing.c" } #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" (*array)[(*length)++] = value; #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" (*array)[*length] = NULL; -#line 1569 "TumblrPublishing.c" +#line 1577 "TumblrPublishing.c" } static PublishingTumblrSizeEntry** publishing_tumblr_tumblr_publisher_create_sizes (PublishingTumblrTumblrPublisher* self, int* result_length1) { PublishingTumblrSizeEntry** result = NULL; PublishingTumblrSizeEntry** _result_ = NULL; - PublishingTumblrSizeEntry** _tmp0_ = NULL; - gint _result__length1 = 0; - gint __result__size_ = 0; - PublishingTumblrSizeEntry** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - const gchar* _tmp2_ = NULL; - PublishingTumblrSizeEntry* _tmp3_ = NULL; - PublishingTumblrSizeEntry** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - const gchar* _tmp5_ = NULL; - PublishingTumblrSizeEntry* _tmp6_ = NULL; - PublishingTumblrSizeEntry** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - const gchar* _tmp8_ = NULL; - PublishingTumblrSizeEntry* _tmp9_ = NULL; - PublishingTumblrSizeEntry** _tmp10_ = NULL; - gint _tmp10__length1 = 0; + PublishingTumblrSizeEntry** _tmp0_; + gint _result__length1; + gint __result__size_; + PublishingTumblrSizeEntry** _tmp1_; + gint _tmp1__length1; + PublishingTumblrSizeEntry* _tmp2_; + PublishingTumblrSizeEntry** _tmp3_; + gint _tmp3__length1; + PublishingTumblrSizeEntry* _tmp4_; + PublishingTumblrSizeEntry** _tmp5_; + gint _tmp5__length1; + PublishingTumblrSizeEntry* _tmp6_; + PublishingTumblrSizeEntry** _tmp7_; + gint _tmp7__length1; #line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL); #line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -1604,57 +1609,51 @@ static PublishingTumblrSizeEntry** publishing_tumblr_tumblr_publisher_create_siz #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1__length1 = _result__length1; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp2_ = _ ("500 × 375 pixels"); -#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp3_ = publishing_tumblr_size_entry_new (_tmp2_, 500); + _tmp2_ = publishing_tumblr_size_entry_new (_ ("500 × 375 pixels"), 500); #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp3_); + _vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp2_); #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp4_ = _result_; + _tmp3_ = _result_; #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp4__length1 = _result__length1; + _tmp3__length1 = _result__length1; #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp5_ = _ ("1024 × 768 pixels"); + _tmp4_ = publishing_tumblr_size_entry_new (_ ("1024 × 768 pixels"), 1024); #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp6_ = publishing_tumblr_size_entry_new (_tmp5_, 1024); -#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _vala_array_add19 (&_result_, &_result__length1, &__result__size_, _tmp6_); + _vala_array_add19 (&_result_, &_result__length1, &__result__size_, _tmp4_); #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp7_ = _result_; + _tmp5_ = _result_; #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp7__length1 = _result__length1; + _tmp5__length1 = _result__length1; #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp8_ = _ ("1280 × 853 pixels"); + _tmp6_ = publishing_tumblr_size_entry_new (_ ("1280 × 853 pixels"), 1280); #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp9_ = publishing_tumblr_size_entry_new (_tmp8_, 1280); -#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp9_); + _vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp6_); #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp10_ = _result_; + _tmp7_ = _result_; #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp10__length1 = _result__length1; + _tmp7__length1 = _result__length1; #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (result_length1) { #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - *result_length1 = _tmp10__length1; -#line 1641 "TumblrPublishing.c" + *result_length1 = _tmp7__length1; +#line 1640 "TumblrPublishing.c" } #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - result = _tmp10_; + result = _tmp7_; #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 1647 "TumblrPublishing.c" +#line 1646 "TumblrPublishing.c" } static PublishingTumblrBlogEntry** publishing_tumblr_tumblr_publisher_create_blogs (PublishingTumblrTumblrPublisher* self, int* result_length1) { PublishingTumblrBlogEntry** result = NULL; PublishingTumblrBlogEntry** _result_ = NULL; - PublishingTumblrBlogEntry** _tmp0_ = NULL; - gint _result__length1 = 0; - gint __result__size_ = 0; - PublishingTumblrBlogEntry** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + PublishingTumblrBlogEntry** _tmp0_; + gint _result__length1; + gint __result__size_; + PublishingTumblrBlogEntry** _tmp1_; + gint _tmp1__length1; #line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL); #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -1673,28 +1672,28 @@ static PublishingTumblrBlogEntry** publishing_tumblr_tumblr_publisher_create_blo if (result_length1) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *result_length1 = _tmp1__length1; -#line 1677 "TumblrPublishing.c" +#line 1676 "TumblrPublishing.c" } #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result = _tmp1_; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 1683 "TumblrPublishing.c" +#line 1682 "TumblrPublishing.c" } PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) { PublishingTumblrTumblrPublisher * self = NULL; - SpitPublishingService* _tmp0_ = NULL; - SpitPublishingService* _tmp1_ = NULL; - SpitPublishingPluginHost* _tmp2_ = NULL; - SpitPublishingPluginHost* _tmp3_ = NULL; - PublishingTumblrTumblrPublisherSession* _tmp4_ = NULL; - gint _tmp5_ = 0; - PublishingTumblrSizeEntry** _tmp6_ = NULL; - gint _tmp7_ = 0; - PublishingTumblrBlogEntry** _tmp8_ = NULL; - PublishingTumblrTumblrPublisherSession* _tmp9_ = NULL; + SpitPublishingService* _tmp0_; + SpitPublishingService* _tmp1_; + SpitPublishingPluginHost* _tmp2_; + SpitPublishingPluginHost* _tmp3_; + PublishingTumblrTumblrPublisherSession* _tmp4_; + gint _tmp5_; + PublishingTumblrSizeEntry** _tmp6_; + gint _tmp7_; + PublishingTumblrBlogEntry** _tmp8_; + PublishingTumblrTumblrPublisherSession* _tmp9_; #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL); #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -1751,14 +1750,14 @@ PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_construct (G g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated", (GCallback) _publishing_tumblr_tumblr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated, self, 0); #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self; -#line 1755 "TumblrPublishing.c" +#line 1754 "TumblrPublishing.c" } PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) { #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return publishing_tumblr_tumblr_publisher_construct (PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, service, host); -#line 1762 "TumblrPublishing.c" +#line 1761 "TumblrPublishing.c" } @@ -1769,15 +1768,15 @@ static void publishing_tumblr_tumblr_publisher_invalidate_persistent_session (Pu publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token (self, ""); #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token_secret (self, ""); -#line 1773 "TumblrPublishing.c" +#line 1772 "TumblrPublishing.c" } static SpitPublishingService* publishing_tumblr_tumblr_publisher_real_get_service (SpitPublishingPublisher* base) { PublishingTumblrTumblrPublisher * self; SpitPublishingService* result = NULL; - SpitPublishingService* _tmp0_ = NULL; - SpitPublishingService* _tmp1_ = NULL; + SpitPublishingService* _tmp0_; + SpitPublishingService* _tmp1_; #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher); #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -1788,14 +1787,14 @@ static SpitPublishingService* publishing_tumblr_tumblr_publisher_real_get_servic result = _tmp1_; #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 1792 "TumblrPublishing.c" +#line 1791 "TumblrPublishing.c" } SpitPublishingPluginHost* publishing_tumblr_tumblr_publisher_get_host (PublishingTumblrTumblrPublisher* self) { SpitPublishingPluginHost* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL); #line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -1806,14 +1805,14 @@ SpitPublishingPluginHost* publishing_tumblr_tumblr_publisher_get_host (Publishin result = _tmp1_; #line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 1810 "TumblrPublishing.c" +#line 1809 "TumblrPublishing.c" } static gboolean publishing_tumblr_tumblr_publisher_real_is_running (SpitPublishingPublisher* base) { PublishingTumblrTumblrPublisher * self; gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher); #line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -1822,20 +1821,20 @@ static gboolean publishing_tumblr_tumblr_publisher_real_is_running (SpitPublishi result = _tmp0_; #line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 1826 "TumblrPublishing.c" +#line 1825 "TumblrPublishing.c" } static gboolean publishing_tumblr_tumblr_publisher_is_persistent_session_valid (PublishingTumblrTumblrPublisher* self) { gboolean result = FALSE; gchar* access_phase_token = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; gchar* access_phase_token_secret = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp1_; gboolean _tmp2_ = FALSE; - const gchar* _tmp3_ = NULL; + const gchar* _tmp3_; gboolean valid = FALSE; - gboolean _tmp5_ = FALSE; + gboolean _tmp5_; #line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), FALSE); #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -1850,17 +1849,17 @@ static gboolean publishing_tumblr_tumblr_publisher_is_persistent_session_valid ( _tmp3_ = access_phase_token; #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp3_ != NULL) { -#line 1854 "TumblrPublishing.c" - const gchar* _tmp4_ = NULL; +#line 1853 "TumblrPublishing.c" + const gchar* _tmp4_; #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp4_ = access_phase_token_secret; #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = _tmp4_ != NULL; -#line 1860 "TumblrPublishing.c" +#line 1859 "TumblrPublishing.c" } else { #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = FALSE; -#line 1864 "TumblrPublishing.c" +#line 1863 "TumblrPublishing.c" } #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" valid = _tmp2_; @@ -1871,11 +1870,11 @@ static gboolean publishing_tumblr_tumblr_publisher_is_persistent_session_valid ( #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_debug ("TumblrPublishing.vala:163: existing Tumblr session found in configurat" \ "ion database; using it."); -#line 1874 "TumblrPublishing.c" +#line 1873 "TumblrPublishing.c" } else { #line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_debug ("TumblrPublishing.vala:165: no persisted Tumblr session exists."); -#line 1878 "TumblrPublishing.c" +#line 1877 "TumblrPublishing.c" } #line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result = valid; @@ -1885,14 +1884,14 @@ static gboolean publishing_tumblr_tumblr_publisher_is_persistent_session_valid ( _g_free0 (access_phase_token); #line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 1888 "TumblrPublishing.c" +#line 1887 "TumblrPublishing.c" } gchar* publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token (PublishingTumblrTumblrPublisher* self) { gchar* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gchar* _tmp1_; #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL); #line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -1903,13 +1902,13 @@ gchar* publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token (Pub result = _tmp1_; #line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 1906 "TumblrPublishing.c" +#line 1905 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token (PublishingTumblrTumblrPublisher* self, const gchar* token) { - SpitPublishingPluginHost* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + const gchar* _tmp1_; #line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); #line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -1918,14 +1917,14 @@ static void publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token _tmp1_ = token; #line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "token", _tmp1_); -#line 1921 "TumblrPublishing.c" +#line 1920 "TumblrPublishing.c" } gchar* publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token_secret (PublishingTumblrTumblrPublisher* self) { gchar* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gchar* _tmp1_; #line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL); #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -1936,13 +1935,13 @@ gchar* publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token_secr result = _tmp1_; #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 1939 "TumblrPublishing.c" +#line 1938 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token_secret (PublishingTumblrTumblrPublisher* self, const gchar* token_secret) { - SpitPublishingPluginHost* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + const gchar* _tmp1_; #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -1951,14 +1950,14 @@ static void publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token _tmp1_ = token_secret; #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "token_secret", _tmp1_); -#line 1954 "TumblrPublishing.c" +#line 1953 "TumblrPublishing.c" } gint publishing_tumblr_tumblr_publisher_get_persistent_default_size (PublishingTumblrTumblrPublisher* self) { gint result = 0; - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), 0); #line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -1969,13 +1968,13 @@ gint publishing_tumblr_tumblr_publisher_get_persistent_default_size (PublishingT result = _tmp1_; #line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 1972 "TumblrPublishing.c" +#line 1971 "TumblrPublishing.c" } void publishing_tumblr_tumblr_publisher_set_persistent_default_size (PublishingTumblrTumblrPublisher* self, gint size) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -1984,14 +1983,14 @@ void publishing_tumblr_tumblr_publisher_set_persistent_default_size (PublishingT _tmp1_ = size; #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", _tmp1_); -#line 1987 "TumblrPublishing.c" +#line 1986 "TumblrPublishing.c" } gint publishing_tumblr_tumblr_publisher_get_persistent_default_blog (PublishingTumblrTumblrPublisher* self) { gint result = 0; - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), 0); #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -2002,13 +2001,13 @@ gint publishing_tumblr_tumblr_publisher_get_persistent_default_blog (PublishingT result = _tmp1_; #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 2005 "TumblrPublishing.c" +#line 2004 "TumblrPublishing.c" } void publishing_tumblr_tumblr_publisher_set_persistent_default_blog (PublishingTumblrTumblrPublisher* self, gint blog) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); #line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -2017,7 +2016,7 @@ void publishing_tumblr_tumblr_publisher_set_persistent_default_blog (PublishingT _tmp1_ = blog; #line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_blog", _tmp1_); -#line 2020 "TumblrPublishing.c" +#line 2019 "TumblrPublishing.c" } @@ -2035,19 +2034,19 @@ void publishing_tumblr_tumblr_publisher_set_persistent_default_blog (PublishingT static void _publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clicked_publishing_tumblr_tumblr_publisher_authentication_pane_login (PublishingTumblrTumblrPublisherAuthenticationPane* _sender, const gchar* user, const gchar* password, gpointer self) { #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clicked ((PublishingTumblrTumblrPublisher*) self, user, password); -#line 2038 "TumblrPublishing.c" +#line 2037 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_do_show_authentication_pane (PublishingTumblrTumblrPublisher* self, PublishingTumblrTumblrPublisherAuthenticationPaneMode mode) { - SpitPublishingPluginHost* _tmp0_ = NULL; + SpitPublishingPluginHost* _tmp0_; PublishingTumblrTumblrPublisherAuthenticationPane* authentication_pane = NULL; - PublishingTumblrTumblrPublisherAuthenticationPaneMode _tmp1_ = 0; - PublishingTumblrTumblrPublisherAuthenticationPane* _tmp2_ = NULL; - SpitPublishingPluginHost* _tmp3_ = NULL; - SpitPublishingPluginHost* _tmp4_ = NULL; - GtkWidget* _tmp5_ = NULL; - GtkWidget* _tmp6_ = NULL; + PublishingTumblrTumblrPublisherAuthenticationPaneMode _tmp1_; + PublishingTumblrTumblrPublisherAuthenticationPane* _tmp2_; + SpitPublishingPluginHost* _tmp3_; + SpitPublishingPluginHost* _tmp4_; + GtkWidget* _tmp5_; + GtkWidget* _tmp6_; #line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -2080,7 +2079,7 @@ static void publishing_tumblr_tumblr_publisher_do_show_authentication_pane (Publ _g_object_unref0 (_tmp6_); #line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (authentication_pane); -#line 2083 "TumblrPublishing.c" +#line 2082 "TumblrPublishing.c" } @@ -2095,9 +2094,9 @@ static void publishing_tumblr_tumblr_publisher_do_show_authentication_pane (Publ * @param password the password of the Tumblr as entered in the dialog */ static void publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clicked (PublishingTumblrTumblrPublisher* self, const gchar* username, const gchar* password) { - gboolean _tmp0_ = FALSE; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + gboolean _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; #line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); #line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -2112,7 +2111,7 @@ static void publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clic if (!_tmp0_) { #line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 2115 "TumblrPublishing.c" +#line 2114 "TumblrPublishing.c" } #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = username; @@ -2120,7 +2119,7 @@ static void publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clic _tmp2_ = password; #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_do_network_login (self, _tmp1_, _tmp2_); -#line 2123 "TumblrPublishing.c" +#line 2122 "TumblrPublishing.c" } @@ -2135,25 +2134,25 @@ static void publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clic static void _publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed ((PublishingTumblrTumblrPublisher*) self, _sender); -#line 2138 "TumblrPublishing.c" +#line 2137 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_on_auth_request_txn_error ((PublishingTumblrTumblrPublisher*) self, _sender, err); -#line 2145 "TumblrPublishing.c" +#line 2144 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_do_network_login (PublishingTumblrTumblrPublisher* self, const gchar* username, const gchar* password) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* txn = NULL; - PublishingTumblrTumblrPublisherSession* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* _tmp5_ = NULL; + PublishingTumblrTumblrPublisherSession* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* _tmp5_; GError * _inner_error_ = NULL; #line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); @@ -2185,7 +2184,7 @@ static void publishing_tumblr_tumblr_publisher_do_network_login (PublishingTumbl g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self, 0); #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_tumblr_tumblr_publisher_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self, 0); -#line 2188 "TumblrPublishing.c" +#line 2187 "TumblrPublishing.c" { #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -2193,7 +2192,7 @@ static void publishing_tumblr_tumblr_publisher_do_network_login (PublishingTumbl if (G_UNLIKELY (_inner_error_ != NULL)) { #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2196 "TumblrPublishing.c" +#line 2195 "TumblrPublishing.c" goto __catch32_spit_publishing_publishing_error; } #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -2204,15 +2203,15 @@ static void publishing_tumblr_tumblr_publisher_do_network_login (PublishingTumbl g_clear_error (&_inner_error_); #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 2207 "TumblrPublishing.c" +#line 2206 "TumblrPublishing.c" } } goto __finally32; __catch32_spit_publishing_publishing_error: { GError* err = NULL; - SpitPublishingPluginHost* _tmp6_ = NULL; - GError* _tmp7_ = NULL; + SpitPublishingPluginHost* _tmp6_; + GError* _tmp7_; #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" err = _inner_error_; #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -2225,7 +2224,7 @@ static void publishing_tumblr_tumblr_publisher_do_network_login (PublishingTumbl spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_); #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_error_free0 (err); -#line 2228 "TumblrPublishing.c" +#line 2227 "TumblrPublishing.c" } __finally32: #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -2238,26 +2237,26 @@ static void publishing_tumblr_tumblr_publisher_do_network_login (PublishingTumbl g_clear_error (&_inner_error_); #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 2241 "TumblrPublishing.c" +#line 2240 "TumblrPublishing.c" } #line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _publishing_rest_support_transaction_unref0 (txn); -#line 2245 "TumblrPublishing.c" +#line 2244 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingRESTSupportTransaction* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - PublishingRESTSupportTransaction* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingRESTSupportTransaction* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + PublishingRESTSupportTransaction* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -2280,7 +2279,7 @@ static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed (Pu if (!_tmp4_) { #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 2283 "TumblrPublishing.c" +#line 2282 "TumblrPublishing.c" } #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = txn; @@ -2303,18 +2302,18 @@ static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed (Pu publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_request (self, _tmp10_); #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp10_); -#line 2305 "TumblrPublishing.c" +#line 2304 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - SpitPublishingPluginHost* _tmp5_ = NULL; - GError* _tmp6_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + SpitPublishingPluginHost* _tmp5_; + GError* _tmp6_; #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -2337,7 +2336,7 @@ static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_error (Publis if (!_tmp4_) { #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 2339 "TumblrPublishing.c" +#line 2338 "TumblrPublishing.c" } #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_debug ("TumblrPublishing.vala:294: EVENT: OAuth authentication request transac" \ @@ -2348,27 +2347,27 @@ static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_error (Publis _tmp6_ = err; #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_); -#line 2349 "TumblrPublishing.c" +#line 2348 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_request (PublishingTumblrTumblrPublisher* self, const gchar* response) { - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; gchar* oauth_token = NULL; gchar* oauth_token_secret = NULL; gchar** key_value_pairs = NULL; - const gchar* _tmp1_ = NULL; - gchar** _tmp2_ = NULL; - gchar** _tmp3_ = NULL; - gint key_value_pairs_length1 = 0; - gint _key_value_pairs_size_ = 0; - gchar** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - gboolean _tmp25_ = FALSE; - const gchar* _tmp26_ = NULL; - PublishingTumblrTumblrPublisherSession* _tmp33_ = NULL; - const gchar* _tmp34_ = NULL; - const gchar* _tmp35_ = NULL; + const gchar* _tmp1_; + gchar** _tmp2_; + gchar** _tmp3_; + gint key_value_pairs_length1; + gint _key_value_pairs_size_; + gchar** _tmp4_; + gint _tmp4__length1; + gboolean _tmp24_ = FALSE; + const gchar* _tmp25_; + PublishingTumblrTumblrPublisherSession* _tmp31_; + const gchar* _tmp32_; + const gchar* _tmp33_; #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -2396,7 +2395,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_req _tmp4_ = key_value_pairs; #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp4__length1 = key_value_pairs_length1; -#line 2396 "TumblrPublishing.c" +#line 2395 "TumblrPublishing.c" { gchar** pair_collection = NULL; gint pair_collection_length1 = 0; @@ -2408,26 +2407,26 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_req pair_collection_length1 = _tmp4__length1; #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" for (pair_it = 0; pair_it < _tmp4__length1; pair_it = pair_it + 1) { -#line 2408 "TumblrPublishing.c" - gchar* _tmp5_ = NULL; +#line 2407 "TumblrPublishing.c" + gchar* _tmp5_; gchar* pair = NULL; #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = g_strdup (pair_collection[pair_it]); #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" pair = _tmp5_; -#line 2415 "TumblrPublishing.c" +#line 2414 "TumblrPublishing.c" { gchar** split_pair = NULL; - const gchar* _tmp6_ = NULL; - gchar** _tmp7_ = NULL; - gchar** _tmp8_ = NULL; - gint split_pair_length1 = 0; - gint _split_pair_size_ = 0; - gchar** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - gchar** _tmp15_ = NULL; - gint _tmp15__length1 = 0; - const gchar* _tmp16_ = NULL; + const gchar* _tmp6_; + gchar** _tmp7_; + gchar** _tmp8_; + gint split_pair_length1; + gint _split_pair_size_; + gchar** _tmp9_; + gint _tmp9__length1; + gchar** _tmp14_; + gint _tmp14__length1; + const gchar* _tmp15_; #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp6_ = pair; #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -2444,159 +2443,153 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_req _tmp9__length1 = split_pair_length1; #line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp9__length1 != 2) { -#line 2444 "TumblrPublishing.c" - SpitPublishingPluginHost* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - GError* _tmp13_ = NULL; - GError* _tmp14_ = NULL; +#line 2443 "TumblrPublishing.c" + SpitPublishingPluginHost* _tmp10_; + const gchar* _tmp11_; + GError* _tmp12_; + GError* _tmp13_; #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp10_ = self->priv->host; #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp11_ = _ ("“%s” isn’t a valid response to an OAuth authentication request"); -#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp12_ = response; + _tmp11_ = response; #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp13_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp11_, _tmp12_); + _tmp12_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _ ("“%s” isn’t a valid response to an OAuth authentication request"), _tmp11_); #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - spit_publishing_plugin_host_post_error (_tmp10_, _tmp14_); + spit_publishing_plugin_host_post_error (_tmp10_, _tmp13_); #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_error_free0 (_tmp14_); -#line 2464 "TumblrPublishing.c" + _g_error_free0 (_tmp13_); +#line 2460 "TumblrPublishing.c" } #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp15_ = split_pair; + _tmp14_ = split_pair; #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp15__length1 = split_pair_length1; + _tmp14__length1 = split_pair_length1; #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp16_ = _tmp15_[0]; + _tmp15_ = _tmp14_[0]; #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - if (g_strcmp0 (_tmp16_, "oauth_token") == 0) { -#line 2474 "TumblrPublishing.c" - gchar** _tmp17_ = NULL; - gint _tmp17__length1 = 0; - const gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; + if (g_strcmp0 (_tmp15_, "oauth_token") == 0) { +#line 2470 "TumblrPublishing.c" + gchar** _tmp16_; + gint _tmp16__length1; + const gchar* _tmp17_; + gchar* _tmp18_; #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp17_ = split_pair; + _tmp16_ = split_pair; #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp17__length1 = split_pair_length1; + _tmp16__length1 = split_pair_length1; #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp18_ = _tmp17_[1]; + _tmp17_ = _tmp16_[1]; #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp19_ = g_strdup (_tmp18_); + _tmp18_ = g_strdup (_tmp17_); #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (oauth_token); #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - oauth_token = _tmp19_; -#line 2491 "TumblrPublishing.c" + oauth_token = _tmp18_; +#line 2487 "TumblrPublishing.c" } else { - gchar** _tmp20_ = NULL; - gint _tmp20__length1 = 0; - const gchar* _tmp21_ = NULL; + gchar** _tmp19_; + gint _tmp19__length1; + const gchar* _tmp20_; #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp20_ = split_pair; + _tmp19_ = split_pair; #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp20__length1 = split_pair_length1; + _tmp19__length1 = split_pair_length1; #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp21_ = _tmp20_[0]; + _tmp20_ = _tmp19_[0]; #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - if (g_strcmp0 (_tmp21_, "oauth_token_secret") == 0) { -#line 2504 "TumblrPublishing.c" - gchar** _tmp22_ = NULL; - gint _tmp22__length1 = 0; - const gchar* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; + if (g_strcmp0 (_tmp20_, "oauth_token_secret") == 0) { +#line 2500 "TumblrPublishing.c" + gchar** _tmp21_; + gint _tmp21__length1; + const gchar* _tmp22_; + gchar* _tmp23_; #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp22_ = split_pair; + _tmp21_ = split_pair; #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp22__length1 = split_pair_length1; + _tmp21__length1 = split_pair_length1; #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp23_ = _tmp22_[1]; + _tmp22_ = _tmp21_[1]; #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp24_ = g_strdup (_tmp23_); + _tmp23_ = g_strdup (_tmp22_); #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (oauth_token_secret); #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - oauth_token_secret = _tmp24_; -#line 2521 "TumblrPublishing.c" + oauth_token_secret = _tmp23_; +#line 2517 "TumblrPublishing.c" } } #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" split_pair = (_vala_array_free (split_pair, split_pair_length1, (GDestroyNotify) g_free), NULL); #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (pair); -#line 2528 "TumblrPublishing.c" +#line 2524 "TumblrPublishing.c" } } } #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp26_ = oauth_token; + _tmp25_ = oauth_token; #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - if (_tmp26_ == NULL) { + if (_tmp25_ == NULL) { #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp25_ = TRUE; -#line 2538 "TumblrPublishing.c" + _tmp24_ = TRUE; +#line 2534 "TumblrPublishing.c" } else { - const gchar* _tmp27_ = NULL; + const gchar* _tmp26_; #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp27_ = oauth_token_secret; + _tmp26_ = oauth_token_secret; #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp25_ = _tmp27_ == NULL; -#line 2545 "TumblrPublishing.c" + _tmp24_ = _tmp26_ == NULL; +#line 2541 "TumblrPublishing.c" } #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - if (_tmp25_) { -#line 2549 "TumblrPublishing.c" - SpitPublishingPluginHost* _tmp28_ = NULL; - const gchar* _tmp29_ = NULL; - const gchar* _tmp30_ = NULL; - GError* _tmp31_ = NULL; - GError* _tmp32_ = NULL; -#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp28_ = self->priv->host; + if (_tmp24_) { +#line 2545 "TumblrPublishing.c" + SpitPublishingPluginHost* _tmp27_; + const gchar* _tmp28_; + GError* _tmp29_; + GError* _tmp30_; #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp29_ = _ ("“%s” isn’t a valid response to an OAuth authentication request"); + _tmp27_ = self->priv->host; #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp30_ = response; + _tmp28_ = response; #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp31_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp29_, _tmp30_); + _tmp29_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _ ("“%s” isn’t a valid response to an OAuth authentication request"), _tmp28_); #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp32_ = _tmp31_; + _tmp30_ = _tmp29_; #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - spit_publishing_plugin_host_post_error (_tmp28_, _tmp32_); + spit_publishing_plugin_host_post_error (_tmp27_, _tmp30_); #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_error_free0 (_tmp32_); -#line 2569 "TumblrPublishing.c" + _g_error_free0 (_tmp30_); +#line 2562 "TumblrPublishing.c" } #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp33_ = self->priv->session; + _tmp31_ = self->priv->session; #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp34_ = oauth_token; + _tmp32_ = oauth_token; #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp35_ = oauth_token_secret; + _tmp33_ = oauth_token_secret; #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - publishing_tumblr_tumblr_publisher_session_set_access_phase_credentials (_tmp33_, _tmp34_, _tmp35_); + publishing_tumblr_tumblr_publisher_session_set_access_phase_credentials (_tmp31_, _tmp32_, _tmp33_); #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" key_value_pairs = (_vala_array_free (key_value_pairs, key_value_pairs_length1, (GDestroyNotify) g_free), NULL); #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (oauth_token_secret); #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (oauth_token); -#line 2585 "TumblrPublishing.c" +#line 2578 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_on_session_authenticated (PublishingTumblrTumblrPublisher* self) { - gboolean _tmp0_ = FALSE; - PublishingTumblrTumblrPublisherSession* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - PublishingTumblrTumblrPublisherSession* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + gboolean _tmp0_; + PublishingTumblrTumblrPublisherSession* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + PublishingTumblrTumblrPublisherSession* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; #line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); #line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -2605,7 +2598,7 @@ static void publishing_tumblr_tumblr_publisher_on_session_authenticated (Publish if (!_tmp0_) { #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 2605 "TumblrPublishing.c" +#line 2598 "TumblrPublishing.c" } #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_debug ("TumblrPublishing.vala:332: EVENT: a fully authenticated session has be" \ @@ -2632,28 +2625,28 @@ static void publishing_tumblr_tumblr_publisher_on_session_authenticated (Publish _g_free0 (_tmp6_); #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_do_get_blogs (self); -#line 2631 "TumblrPublishing.c" +#line 2624 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_on_info_request_txn_completed ((PublishingTumblrTumblrPublisher*) self, _sender); -#line 2638 "TumblrPublishing.c" +#line 2631 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_on_info_request_txn_error ((PublishingTumblrTumblrPublisher*) self, _sender, err); -#line 2645 "TumblrPublishing.c" +#line 2638 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTumblrPublisher* self) { PublishingTumblrTumblrPublisherUserInfoFetchTransaction* txn = NULL; - PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL; - PublishingTumblrTumblrPublisherUserInfoFetchTransaction* _tmp1_ = NULL; + PublishingTumblrTumblrPublisherSession* _tmp0_; + PublishingTumblrTumblrPublisherUserInfoFetchTransaction* _tmp1_; GError * _inner_error_ = NULL; #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); @@ -2669,7 +2662,7 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed, self, 0); #line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error, self, 0); -#line 2668 "TumblrPublishing.c" +#line 2661 "TumblrPublishing.c" { #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -2677,7 +2670,7 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum if (G_UNLIKELY (_inner_error_ != NULL)) { #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2676 "TumblrPublishing.c" +#line 2669 "TumblrPublishing.c" goto __catch33_spit_publishing_publishing_error; } #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -2688,15 +2681,15 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum g_clear_error (&_inner_error_); #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 2687 "TumblrPublishing.c" +#line 2680 "TumblrPublishing.c" } } goto __finally33; __catch33_spit_publishing_publishing_error: { GError* err = NULL; - SpitPublishingPluginHost* _tmp2_ = NULL; - GError* _tmp3_ = NULL; + SpitPublishingPluginHost* _tmp2_; + GError* _tmp3_; #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" err = _inner_error_; #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -2709,7 +2702,7 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum spit_publishing_plugin_host_post_error (_tmp2_, _tmp3_); #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_error_free0 (err); -#line 2708 "TumblrPublishing.c" +#line 2701 "TumblrPublishing.c" } __finally33: #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -2722,26 +2715,26 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum g_clear_error (&_inner_error_); #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 2721 "TumblrPublishing.c" +#line 2714 "TumblrPublishing.c" } #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _publishing_rest_support_transaction_unref0 (txn); -#line 2725 "TumblrPublishing.c" +#line 2718 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingRESTSupportTransaction* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - PublishingRESTSupportTransaction* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingRESTSupportTransaction* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + PublishingRESTSupportTransaction* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -2764,7 +2757,7 @@ static void publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (Pu if (!_tmp4_) { #line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 2763 "TumblrPublishing.c" +#line 2756 "TumblrPublishing.c" } #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = txn; @@ -2789,156 +2782,198 @@ static void publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (Pu _g_free0 (_tmp10_); #line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (self); -#line 2787 "TumblrPublishing.c" +#line 2780 "TumblrPublishing.c" } static gpointer _json_object_ref0 (gpointer self) { #line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self ? json_object_ref (self) : NULL; -#line 2794 "TumblrPublishing.c" +#line 2787 "TumblrPublishing.c" } static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 2807 "TumblrPublishing.c" +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if ((*((gchar*) self)) == '\0') { +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp1_ = TRUE; +#line 2806 "TumblrPublishing.c" + } else { + const gchar* _tmp2_; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp2_ = old; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; +#line 2813 "TumblrPublishing.c" + } +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if (_tmp1_) { +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp0_ = TRUE; +#line 2819 "TumblrPublishing.c" + } else { + const gchar* _tmp3_; + const gchar* _tmp4_; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp3_ = old; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp4_ = replacement; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; +#line 2829 "TumblrPublishing.c" + } +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if (_tmp0_) { +#line 2833 "TumblrPublishing.c" + gchar* _tmp5_; +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp5_ = g_strdup (self); +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp5_; +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + return result; +#line 2841 "TumblrPublishing.c" + } { GRegex* regex = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - GRegex* _tmp3_ = NULL; - GRegex* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - GRegex* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp0_ = old; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp2_ = _tmp1_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp4_ = _tmp3_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _g_free0 (_tmp2_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - regex = _tmp4_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + GRegex* _tmp9_; + GRegex* _tmp10_; + gchar* _tmp11_ = NULL; + GRegex* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp6_ = old; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp7_ = g_regex_escape_string (_tmp6_, -1); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp8_ = _tmp7_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp10_ = _tmp9_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp8_); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + regex = _tmp10_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 2838 "TumblrPublishing.c" +#line 2873 "TumblrPublishing.c" goto __catch35_g_regex_error; } -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 2847 "TumblrPublishing.c" +#line 2882 "TumblrPublishing.c" } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp6_ = regex; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp7_ = replacement; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp5_ = _tmp8_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp12_ = regex; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp13_ = replacement; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = _tmp14_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 2863 "TumblrPublishing.c" +#line 2898 "TumblrPublishing.c" goto __catch35_g_regex_error; } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 2874 "TumblrPublishing.c" +#line 2909 "TumblrPublishing.c" } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp9_ = _tmp5_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp5_ = NULL; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - result = _tmp9_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _g_free0 (_tmp5_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp15_ = _tmp11_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = NULL; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp15_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp11_); +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2888 "TumblrPublishing.c" +#line 2923 "TumblrPublishing.c" } goto __finally35; __catch35_g_regex_error: { GError* e = NULL; -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 2902 "TumblrPublishing.c" +#line 2937 "TumblrPublishing.c" } __finally35: -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 2913 "TumblrPublishing.c" +#line 2948 "TumblrPublishing.c" } } -static void _vala_array_add21 (PublishingTumblrBlogEntry*** array, int* length, int* size, PublishingTumblrBlogEntry* value) { +static void _vala_array_add21 (PublishingTumblrBlogEntry** * array, int* length, int* size, PublishingTumblrBlogEntry* value) { #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if ((*length) == (*size)) { #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *array = g_renew (PublishingTumblrBlogEntry*, *array, (*size) + 1); -#line 2925 "TumblrPublishing.c" +#line 2960 "TumblrPublishing.c" } #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" (*array)[(*length)++] = value; #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" (*array)[*length] = NULL; -#line 2931 "TumblrPublishing.c" +#line 2966 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_request (PublishingTumblrTumblrPublisher* self, const gchar* response) { - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; GError * _inner_error_ = NULL; #line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); @@ -2949,26 +2984,26 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_debug ("TumblrPublishing.vala:370: ACTION: parsing info request response '%s' " \ "into list of available blogs", _tmp0_); -#line 2946 "TumblrPublishing.c" +#line 2981 "TumblrPublishing.c" { JsonParser* parser = NULL; - JsonParser* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + JsonParser* _tmp1_; + const gchar* _tmp2_; JsonObject* root_object = NULL; - JsonNode* _tmp3_ = NULL; - JsonObject* _tmp4_ = NULL; - JsonObject* _tmp5_ = NULL; - JsonObject* _tmp6_ = NULL; - JsonObject* _tmp7_ = NULL; - JsonObject* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - JsonObject* _tmp12_ = NULL; - JsonObject* _tmp13_ = NULL; - JsonObject* _tmp14_ = NULL; - JsonArray* _tmp15_ = NULL; - GList* _tmp16_ = NULL; + JsonNode* _tmp3_; + JsonObject* _tmp4_; + JsonObject* _tmp5_; + JsonObject* _tmp6_; + JsonObject* _tmp7_; + JsonObject* _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; + const gchar* _tmp11_; + JsonObject* _tmp12_; + JsonObject* _tmp13_; + JsonObject* _tmp14_; + JsonArray* _tmp15_; + GList* _tmp16_; #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = json_parser_new (); #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -2981,7 +3016,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req if (G_UNLIKELY (_inner_error_ != NULL)) { #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (parser); -#line 2978 "TumblrPublishing.c" +#line 3013 "TumblrPublishing.c" goto __catch34_g_error; } #line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -3020,7 +3055,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req _tmp15_ = json_object_get_array_member (_tmp14_, "blogs"); #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp16_ = json_array_get_elements (_tmp15_); -#line 3017 "TumblrPublishing.c" +#line 3052 "TumblrPublishing.c" { GList* blognode_collection = NULL; GList* blognode_it = NULL; @@ -3028,34 +3063,34 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req blognode_collection = _tmp16_; #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" for (blognode_it = blognode_collection; blognode_it != NULL; blognode_it = blognode_it->next) { -#line 3025 "TumblrPublishing.c" +#line 3060 "TumblrPublishing.c" JsonNode* blognode = NULL; #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" blognode = (JsonNode*) blognode_it->data; -#line 3029 "TumblrPublishing.c" +#line 3064 "TumblrPublishing.c" { JsonObject* blog = NULL; - JsonNode* _tmp17_ = NULL; - JsonObject* _tmp18_ = NULL; - JsonObject* _tmp19_ = NULL; + JsonNode* _tmp17_; + JsonObject* _tmp18_; + JsonObject* _tmp19_; gchar* name = NULL; - JsonObject* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; + JsonObject* _tmp20_; + const gchar* _tmp21_; + gchar* _tmp22_; gchar* url = NULL; - JsonObject* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - const gchar* _tmp29_ = NULL; - const gchar* _tmp30_ = NULL; - PublishingTumblrBlogEntry** _tmp31_ = NULL; - gint _tmp31__length1 = 0; - const gchar* _tmp32_ = NULL; - const gchar* _tmp33_ = NULL; - PublishingTumblrBlogEntry* _tmp34_ = NULL; + JsonObject* _tmp23_; + const gchar* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + const gchar* _tmp29_; + const gchar* _tmp30_; + PublishingTumblrBlogEntry** _tmp31_; + gint _tmp31__length1; + const gchar* _tmp32_; + const gchar* _tmp33_; + PublishingTumblrBlogEntry* _tmp34_; #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp17_ = blognode; #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -3112,25 +3147,25 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req _g_free0 (name); #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _json_object_unref0 (blog); -#line 3109 "TumblrPublishing.c" +#line 3144 "TumblrPublishing.c" } } #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_list_free0 (blognode_collection); -#line 3114 "TumblrPublishing.c" +#line 3149 "TumblrPublishing.c" } #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _json_object_unref0 (root_object); #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (parser); -#line 3120 "TumblrPublishing.c" +#line 3155 "TumblrPublishing.c" } goto __finally34; __catch34_g_error: { GError* err = NULL; - SpitPublishingPluginHost* _tmp35_ = NULL; - GError* _tmp36_ = NULL; + SpitPublishingPluginHost* _tmp35_; + GError* _tmp36_; #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" err = _inner_error_; #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -3143,7 +3178,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req spit_publishing_plugin_host_post_error (_tmp35_, _tmp36_); #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_error_free0 (err); -#line 3140 "TumblrPublishing.c" +#line 3175 "TumblrPublishing.c" } __finally34: #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -3154,20 +3189,20 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req g_clear_error (&_inner_error_); #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 3151 "TumblrPublishing.c" +#line 3186 "TumblrPublishing.c" } } static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingTumblrTumblrPublisherSession* _tmp5_ = NULL; - SpitPublishingPluginHost* _tmp6_ = NULL; - GError* _tmp7_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingTumblrTumblrPublisherSession* _tmp5_; + SpitPublishingPluginHost* _tmp6_; + GError* _tmp7_; #line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); #line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -3190,7 +3225,7 @@ static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (Publis if (!_tmp4_) { #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 3187 "TumblrPublishing.c" +#line 3222 "TumblrPublishing.c" } #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = self->priv->session; @@ -3207,36 +3242,36 @@ static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (Publis _tmp7_ = err; #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_); -#line 3203 "TumblrPublishing.c" +#line 3238 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) { #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish ((PublishingTumblrTumblrPublisher*) self); -#line 3210 "TumblrPublishing.c" +#line 3245 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) { #line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout ((PublishingTumblrTumblrPublisher*) self); -#line 3217 "TumblrPublishing.c" +#line 3252 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (PublishingTumblrTumblrPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; + SpitPublishingPluginHost* _tmp0_; PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_options_pane = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; - SpitPublishingPublisherMediaType _tmp2_ = 0; - PublishingTumblrSizeEntry** _tmp3_ = NULL; - gint _tmp3__length1 = 0; - PublishingTumblrBlogEntry** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - const gchar* _tmp5_ = NULL; - PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp6_ = NULL; - SpitPublishingPluginHost* _tmp7_ = NULL; + SpitPublishingPluginHost* _tmp1_; + SpitPublishingPublisherMediaType _tmp2_; + PublishingTumblrSizeEntry** _tmp3_; + gint _tmp3__length1; + PublishingTumblrBlogEntry** _tmp4_; + gint _tmp4__length1; + const gchar* _tmp5_; + PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp6_; + SpitPublishingPluginHost* _tmp7_; #line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); #line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -3273,24 +3308,24 @@ static void publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane ( spit_publishing_plugin_host_install_dialog_pane (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (publishing_options_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); #line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (publishing_options_pane); -#line 3269 "TumblrPublishing.c" +#line 3304 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish (PublishingTumblrTumblrPublisher* self) { - PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp0_ = NULL; - gboolean _tmp5_ = FALSE; + PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp0_; + gboolean _tmp5_; #line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = self->priv->publishing_options_pane; #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp0_ != NULL) { -#line 3282 "TumblrPublishing.c" - PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_ = NULL; - guint _tmp2_ = 0U; - PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_ = NULL; - guint _tmp4_ = 0U; +#line 3317 "TumblrPublishing.c" + PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_; + guint _tmp2_; + PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_; + guint _tmp4_; #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = self->priv->publishing_options_pane; #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -3303,7 +3338,7 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publis g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp4_, NULL, FALSE); #line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self); -#line 3299 "TumblrPublishing.c" +#line 3334 "TumblrPublishing.c" } #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); @@ -3311,31 +3346,31 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publis if (!_tmp5_) { #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 3307 "TumblrPublishing.c" +#line 3342 "TumblrPublishing.c" } #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_debug ("TumblrPublishing.vala:424: EVENT: user clicked the 'Publish' button in" \ " the publishing options pane"); #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_do_publish (self); -#line 3313 "TumblrPublishing.c" +#line 3348 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout (PublishingTumblrTumblrPublisher* self) { - PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp0_ = NULL; - gboolean _tmp5_ = FALSE; + PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp0_; + gboolean _tmp5_; #line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); #line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = self->priv->publishing_options_pane; #line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp0_ != NULL) { -#line 3326 "TumblrPublishing.c" - PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_ = NULL; - guint _tmp2_ = 0U; - PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_ = NULL; - guint _tmp4_ = 0U; +#line 3361 "TumblrPublishing.c" + PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_; + guint _tmp2_; + PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_; + guint _tmp4_; #line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = self->priv->publishing_options_pane; #line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -3348,7 +3383,7 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp4_, NULL, FALSE); #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self); -#line 3343 "TumblrPublishing.c" +#line 3378 "TumblrPublishing.c" } #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); @@ -3356,27 +3391,27 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout if (!_tmp5_) { #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 3351 "TumblrPublishing.c" +#line 3386 "TumblrPublishing.c" } #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_debug ("TumblrPublishing.vala:437: EVENT: user clicked the 'Logout' button in " \ "the publishing options pane"); #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_do_logout (self); -#line 3357 "TumblrPublishing.c" +#line 3392 "TumblrPublishing.c" } gint publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func (SpitPublishingPublishable* a, SpitPublishingPublishable* b) { gint result = 0; - SpitPublishingPublishable* _tmp0_ = NULL; - GDateTime* _tmp1_ = NULL; - GDateTime* _tmp2_ = NULL; - SpitPublishingPublishable* _tmp3_ = NULL; - GDateTime* _tmp4_ = NULL; - GDateTime* _tmp5_ = NULL; - gint _tmp6_ = 0; - gint _tmp7_ = 0; + SpitPublishingPublishable* _tmp0_; + GDateTime* _tmp1_; + GDateTime* _tmp2_; + SpitPublishingPublishable* _tmp3_; + GDateTime* _tmp4_; + GDateTime* _tmp5_; + gint _tmp6_; + gint _tmp7_; #line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (a), 0); #line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -3405,7 +3440,7 @@ gint publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func (SpitPubli result = _tmp7_; #line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 3399 "TumblrPublishing.c" +#line 3434 "TumblrPublishing.c" } @@ -3414,74 +3449,74 @@ static gint _publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func_gc result = publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func ((SpitPublishingPublishable*) a, (SpitPublishingPublishable*) b); #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 3408 "TumblrPublishing.c" +#line 3443 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) { #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_on_upload_complete ((PublishingTumblrTumblrPublisher*) self, _sender, num_photos_published); -#line 3415 "TumblrPublishing.c" +#line 3450 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) { #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_on_upload_error ((PublishingTumblrTumblrPublisher*) self, _sender, err); -#line 3422 "TumblrPublishing.c" +#line 3457 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) { #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_on_upload_status_updated ((PublishingTumblrTumblrPublisher*) self, file_number, fraction_complete); -#line 3429 "TumblrPublishing.c" +#line 3464 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumblrPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; - PublishingTumblrSizeEntry** _tmp2_ = NULL; - gint _tmp2__length1 = 0; - gint _tmp3_ = 0; - PublishingTumblrSizeEntry* _tmp4_ = NULL; - gint _tmp5_ = 0; - void* _tmp6_ = NULL; - GDestroyNotify _tmp7_ = NULL; - SpitPublishingProgressCallback _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; + PublishingTumblrSizeEntry** _tmp2_; + gint _tmp2__length1; + gint _tmp3_; + PublishingTumblrSizeEntry* _tmp4_; + gint _tmp5_; + void* _tmp6_; + GDestroyNotify _tmp7_; + SpitPublishingProgressCallback _tmp8_; + gboolean _tmp9_; SpitPublishingPublishable** publishables = NULL; - SpitPublishingPluginHost* _tmp10_ = NULL; - gint _tmp11_ = 0; - SpitPublishingPublishable** _tmp12_ = NULL; - gint publishables_length1 = 0; - gint _publishables_size_ = 0; + SpitPublishingPluginHost* _tmp10_; + gint _tmp11_; + SpitPublishingPublishable** _tmp12_; + gint publishables_length1; + gint _publishables_size_; GeeArrayList* sorted_list = NULL; - GeeArrayList* _tmp13_ = NULL; - SpitPublishingPublishable** _tmp14_ = NULL; - gint _tmp14__length1 = 0; - GeeArrayList* _tmp18_ = NULL; + GeeArrayList* _tmp13_; + SpitPublishingPublishable** _tmp14_; + gint _tmp14__length1; + GeeArrayList* _tmp18_; gchar* blog_url = NULL; - PublishingTumblrBlogEntry** _tmp19_ = NULL; - gint _tmp19__length1 = 0; - gint _tmp20_ = 0; - PublishingTumblrBlogEntry* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; + PublishingTumblrBlogEntry** _tmp19_; + gint _tmp19__length1; + gint _tmp20_; + PublishingTumblrBlogEntry* _tmp21_; + const gchar* _tmp22_; + gchar* _tmp23_; PublishingTumblrTumblrPublisherUploader* uploader = NULL; - PublishingTumblrTumblrPublisherSession* _tmp24_ = NULL; - GeeArrayList* _tmp25_ = NULL; - gint _tmp26_ = 0; - gpointer* _tmp27_ = NULL; - SpitPublishingPublishable** _tmp28_ = NULL; - gint _tmp28__length1 = 0; - const gchar* _tmp29_ = NULL; - PublishingTumblrTumblrPublisherUploader* _tmp30_ = NULL; - PublishingTumblrTumblrPublisherUploader* _tmp31_ = NULL; - PublishingTumblrTumblrPublisherUploader* _tmp32_ = NULL; - PublishingTumblrTumblrPublisherUploader* _tmp33_ = NULL; - PublishingTumblrTumblrPublisherUploader* _tmp34_ = NULL; + PublishingTumblrTumblrPublisherSession* _tmp24_; + GeeArrayList* _tmp25_; + gint _tmp26_; + gpointer* _tmp27_; + SpitPublishingPublishable** _tmp28_; + gint _tmp28__length1; + const gchar* _tmp29_; + PublishingTumblrTumblrPublisherUploader* _tmp30_; + PublishingTumblrTumblrPublisherUploader* _tmp31_; + PublishingTumblrTumblrPublisherUploader* _tmp32_; + PublishingTumblrTumblrPublisherUploader* _tmp33_; + PublishingTumblrTumblrPublisherUploader* _tmp34_; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -3525,7 +3560,7 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl if (!_tmp9_) { #line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 3518 "TumblrPublishing.c" +#line 3553 "TumblrPublishing.c" } #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp10_ = self->priv->host; @@ -3545,7 +3580,7 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl _tmp14_ = publishables; #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp14__length1 = publishables_length1; -#line 3538 "TumblrPublishing.c" +#line 3573 "TumblrPublishing.c" { SpitPublishingPublishable** p_collection = NULL; gint p_collection_length1 = 0; @@ -3557,17 +3592,17 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl p_collection_length1 = _tmp14__length1; #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" for (p_it = 0; p_it < _tmp14__length1; p_it = p_it + 1) { -#line 3550 "TumblrPublishing.c" - SpitPublishingPublishable* _tmp15_ = NULL; +#line 3585 "TumblrPublishing.c" + SpitPublishingPublishable* _tmp15_; SpitPublishingPublishable* p = NULL; #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp15_ = _g_object_ref0 (p_collection[p_it]); #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" p = _tmp15_; -#line 3557 "TumblrPublishing.c" +#line 3592 "TumblrPublishing.c" { - GeeArrayList* _tmp16_ = NULL; - SpitPublishingPublishable* _tmp17_ = NULL; + GeeArrayList* _tmp16_; + SpitPublishingPublishable* _tmp17_; #line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_debug ("TumblrPublishing.vala:466: ACTION: add publishable"); #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -3578,7 +3613,7 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (p); -#line 3571 "TumblrPublishing.c" +#line 3606 "TumblrPublishing.c" } } } @@ -3640,13 +3675,13 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl _g_object_unref0 (sorted_list); #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL); -#line 3633 "TumblrPublishing.c" +#line 3668 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_do_show_success_pane (PublishingTumblrTumblrPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); #line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -3659,19 +3694,19 @@ static void publishing_tumblr_tumblr_publisher_do_show_success_pane (PublishingT _tmp1_ = self->priv->host; #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" spit_publishing_plugin_host_install_success_pane (_tmp1_); -#line 3652 "TumblrPublishing.c" +#line 3687 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_on_upload_status_updated (PublishingTumblrTumblrPublisher* self, gint file_number, gdouble completed_fraction) { - gboolean _tmp0_ = FALSE; - gdouble _tmp1_ = 0.0; - SpitPublishingProgressCallback _tmp2_ = NULL; - void* _tmp2__target = NULL; - SpitPublishingProgressCallback _tmp3_ = NULL; - void* _tmp3__target = NULL; - gint _tmp4_ = 0; - gdouble _tmp5_ = 0.0; + gboolean _tmp0_; + gdouble _tmp1_; + SpitPublishingProgressCallback _tmp2_; + void* _tmp2__target; + SpitPublishingProgressCallback _tmp3_; + void* _tmp3__target; + gint _tmp4_; + gdouble _tmp5_; #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -3680,7 +3715,7 @@ static void publishing_tumblr_tumblr_publisher_on_upload_status_updated (Publish if (!_tmp0_) { #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 3673 "TumblrPublishing.c" +#line 3708 "TumblrPublishing.c" } #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = completed_fraction; @@ -3703,17 +3738,17 @@ static void publishing_tumblr_tumblr_publisher_on_upload_status_updated (Publish _tmp5_ = completed_fraction; #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp3_ (_tmp4_, _tmp5_, _tmp3__target); -#line 3695 "TumblrPublishing.c" +#line 3730 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) { - gboolean _tmp0_ = FALSE; - gint _tmp1_ = 0; - PublishingRESTSupportBatchUploader* _tmp2_ = NULL; - guint _tmp3_ = 0U; - PublishingRESTSupportBatchUploader* _tmp4_ = NULL; - guint _tmp5_ = 0U; + gboolean _tmp0_; + gint _tmp1_; + PublishingRESTSupportBatchUploader* _tmp2_; + guint _tmp3_; + PublishingRESTSupportBatchUploader* _tmp4_; + guint _tmp5_; #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -3724,7 +3759,7 @@ static void publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTum if (!_tmp0_) { #line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 3716 "TumblrPublishing.c" +#line 3751 "TumblrPublishing.c" } #line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = num_published; @@ -3745,20 +3780,20 @@ static void publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTum g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self); #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_do_show_success_pane (self); -#line 3736 "TumblrPublishing.c" +#line 3771 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) { - gboolean _tmp0_ = FALSE; - GError* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PublishingRESTSupportBatchUploader* _tmp3_ = NULL; - guint _tmp4_ = 0U; - PublishingRESTSupportBatchUploader* _tmp5_ = NULL; - guint _tmp6_ = 0U; - SpitPublishingPluginHost* _tmp7_ = NULL; - GError* _tmp8_ = NULL; + gboolean _tmp0_; + GError* _tmp1_; + const gchar* _tmp2_; + PublishingRESTSupportBatchUploader* _tmp3_; + guint _tmp4_; + PublishingRESTSupportBatchUploader* _tmp5_; + guint _tmp6_; + SpitPublishingPluginHost* _tmp7_; + GError* _tmp8_; #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -3769,7 +3804,7 @@ static void publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblr if (!_tmp0_) { #line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 3760 "TumblrPublishing.c" +#line 3795 "TumblrPublishing.c" } #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = err; @@ -3796,12 +3831,12 @@ static void publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblr _tmp8_ = err; #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_); -#line 3786 "TumblrPublishing.c" +#line 3821 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_do_logout (PublishingTumblrTumblrPublisher* self) { - PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL; + PublishingTumblrTumblrPublisherSession* _tmp0_; #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); #line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -3817,13 +3852,13 @@ static void publishing_tumblr_tumblr_publisher_do_logout (PublishingTumblrTumblr self->priv->running = FALSE; #line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_attempt_start (self); -#line 3806 "TumblrPublishing.c" +#line 3841 "TumblrPublishing.c" } void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPublisher* self) { - gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; + gboolean _tmp0_; + gboolean _tmp1_; #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -3832,7 +3867,7 @@ void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPub if (_tmp0_) { #line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 3821 "TumblrPublishing.c" +#line 3856 "TumblrPublishing.c" } #line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_debug ("TumblrPublishing.vala:539: TumblrPublisher: starting interaction."); @@ -3842,12 +3877,12 @@ void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPub _tmp1_ = publishing_tumblr_tumblr_publisher_is_persistent_session_valid (self); #line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp1_) { -#line 3831 "TumblrPublishing.c" - PublishingTumblrTumblrPublisherSession* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; +#line 3866 "TumblrPublishing.c" + PublishingTumblrTumblrPublisherSession* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; #line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_debug ("TumblrPublishing.vala:543: attempt start: a persistent session is avai" \ "lable; using it"); @@ -3867,22 +3902,22 @@ void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPub _g_free0 (_tmp6_); #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp4_); -#line 3855 "TumblrPublishing.c" +#line 3890 "TumblrPublishing.c" } else { #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_debug ("TumblrPublishing.vala:548: attempt start: no persistent session availa" \ "ble; showing login welcome pane"); #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_do_show_authentication_pane (self, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_INTRO); -#line 3861 "TumblrPublishing.c" +#line 3896 "TumblrPublishing.c" } } static void publishing_tumblr_tumblr_publisher_real_start (SpitPublishingPublisher* base) { PublishingTumblrTumblrPublisher * self; - gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; + gboolean _tmp0_; + gboolean _tmp1_; #line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher); #line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -3891,26 +3926,22 @@ static void publishing_tumblr_tumblr_publisher_real_start (SpitPublishingPublish if (_tmp0_) { #line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 3878 "TumblrPublishing.c" +#line 3913 "TumblrPublishing.c" } #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = self->priv->was_started; #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp1_) { -#line 3884 "TumblrPublishing.c" - const gchar* _tmp2_ = NULL; -#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp2_ = _ ("TumblrPublisher: start( ): can’t start; this publisher is not restarta" \ -"ble."); #line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_error ("TumblrPublishing.vala:559: %s", _tmp2_); -#line 3890 "TumblrPublishing.c" + g_error ("TumblrPublishing.vala:559: %s", _ ("TumblrPublisher: start( ): can’t start; this publisher is not restarta" \ +"ble.")); +#line 3921 "TumblrPublishing.c" } #line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_debug ("TumblrPublishing.vala:561: TumblrPublisher: starting interaction."); #line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_attempt_start (self); -#line 3896 "TumblrPublishing.c" +#line 3927 "TumblrPublishing.c" } @@ -3922,7 +3953,7 @@ static void publishing_tumblr_tumblr_publisher_real_stop (SpitPublishingPublishe g_debug ("TumblrPublishing.vala:567: TumblrPublisher: stop( ) invoked."); #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->running = FALSE; -#line 3908 "TumblrPublishing.c" +#line 3939 "TumblrPublishing.c" } @@ -3941,27 +3972,27 @@ GType publishing_tumblr_tumblr_publisher_authentication_pane_mode_get_type (void static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed ((PublishingTumblrTumblrPublisherAuthenticationPane*) self); -#line 3927 "TumblrPublishing.c" +#line 3958 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed ((PublishingTumblrTumblrPublisherAuthenticationPane*) self); -#line 3934 "TumblrPublishing.c" +#line 3965 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked ((PublishingTumblrTumblrPublisherAuthenticationPane*) self); -#line 3941 "TumblrPublishing.c" +#line 3972 "TumblrPublishing.c" } PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publisher_authentication_pane_construct (GType object_type, PublishingTumblrTumblrPublisher* publisher, PublishingTumblrTumblrPublisherAuthenticationPaneMode mode) { PublishingTumblrTumblrPublisherAuthenticationPane * self = NULL; - GtkBox* _tmp0_ = NULL; + GtkBox* _tmp0_; GError * _inner_error_ = NULL; #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (publisher), NULL); @@ -3975,42 +4006,42 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ _g_object_unref0 (self->priv->pane_widget); #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->pane_widget = _tmp0_; -#line 3961 "TumblrPublishing.c" +#line 3992 "TumblrPublishing.c" { - GtkBuilder* _tmp1_ = NULL; - GtkBuilder* _tmp2_ = NULL; - GtkBuilder* _tmp3_ = NULL; + GtkBuilder* _tmp1_; + GtkBuilder* _tmp2_; + GtkBuilder* _tmp3_; GtkWidget* content = NULL; - GtkBuilder* _tmp4_ = NULL; - GObject* _tmp5_ = NULL; - GtkWidget* _tmp6_ = NULL; + GtkBuilder* _tmp4_; + GObject* _tmp5_; + GtkWidget* _tmp6_; GtkLabel* message_label = NULL; - GtkBuilder* _tmp7_ = NULL; - GObject* _tmp8_ = NULL; - GtkLabel* _tmp9_ = NULL; - PublishingTumblrTumblrPublisherAuthenticationPaneMode _tmp10_ = 0; - GtkBuilder* _tmp18_ = NULL; - GObject* _tmp19_ = NULL; - GtkEntry* _tmp20_ = NULL; - GtkBuilder* _tmp21_ = NULL; - GObject* _tmp22_ = NULL; - GtkEntry* _tmp23_ = NULL; - GtkBuilder* _tmp24_ = NULL; - GObject* _tmp25_ = NULL; - GtkButton* _tmp26_ = NULL; - GtkEntry* _tmp27_ = NULL; - GtkEntry* _tmp28_ = NULL; - GtkButton* _tmp29_ = NULL; - GtkWidget* _tmp30_ = NULL; - GtkContainer* _tmp31_ = NULL; - GtkContainer* _tmp32_ = NULL; - GtkWidget* _tmp33_ = NULL; - GtkBox* _tmp34_ = NULL; - GtkWidget* _tmp35_ = NULL; - PublishingTumblrTumblrPublisher* _tmp36_ = NULL; - SpitPublishingPluginHost* _tmp37_ = NULL; - SpitPublishingPluginHost* _tmp38_ = NULL; - GtkButton* _tmp39_ = NULL; + GtkBuilder* _tmp7_; + GObject* _tmp8_; + GtkLabel* _tmp9_; + PublishingTumblrTumblrPublisherAuthenticationPaneMode _tmp10_; + GtkBuilder* _tmp17_; + GObject* _tmp18_; + GtkEntry* _tmp19_; + GtkBuilder* _tmp20_; + GObject* _tmp21_; + GtkEntry* _tmp22_; + GtkBuilder* _tmp23_; + GObject* _tmp24_; + GtkButton* _tmp25_; + GtkEntry* _tmp26_; + GtkEntry* _tmp27_; + GtkButton* _tmp28_; + GtkWidget* _tmp29_; + GtkContainer* _tmp30_; + GtkContainer* _tmp31_; + GtkWidget* _tmp32_; + GtkBox* _tmp33_; + GtkWidget* _tmp34_; + PublishingTumblrTumblrPublisher* _tmp35_; + SpitPublishingPluginHost* _tmp36_; + SpitPublishingPluginHost* _tmp37_; + GtkButton* _tmp38_; #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = gtk_builder_new (); #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -4023,7 +4054,7 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/tumblr_authentication_pane.ui", &_inner_error_); #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4009 "TumblrPublishing.c" +#line 4040 "TumblrPublishing.c" goto __catch36_g_error; } #line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -4052,10 +4083,10 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ switch (_tmp10_) { #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" case PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_INTRO: -#line 4038 "TumblrPublishing.c" +#line 4069 "TumblrPublishing.c" { - GtkLabel* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; + GtkLabel* _tmp11_; + const gchar* _tmp12_; #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp11_ = message_label; #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -4064,138 +4095,132 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ gtk_label_set_text (_tmp11_, _tmp12_); #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" break; -#line 4050 "TumblrPublishing.c" +#line 4081 "TumblrPublishing.c" } #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" case PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER: -#line 4054 "TumblrPublishing.c" +#line 4085 "TumblrPublishing.c" { - GtkLabel* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; + GtkLabel* _tmp13_; + const gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp13_ = message_label; #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp14_ = _ ("Invalid User Name or Password"); + _tmp14_ = publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE; #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp15_ = publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE; + _tmp15_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Invalid User Name or Password"), _tmp14_); #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp16_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp14_, _tmp15_); + _tmp16_ = _tmp15_; #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp17_ = _tmp16_; + gtk_label_set_markup (_tmp13_, _tmp16_); #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - gtk_label_set_markup (_tmp13_, _tmp17_); -#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp16_); #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" break; -#line 4077 "TumblrPublishing.c" +#line 4105 "TumblrPublishing.c" } default: #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" break; -#line 4082 "TumblrPublishing.c" +#line 4110 "TumblrPublishing.c" } #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp18_ = self->priv->builder; + _tmp17_ = self->priv->builder; #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp19_ = gtk_builder_get_object (_tmp18_, "username_entry"); + _tmp18_ = gtk_builder_get_object (_tmp17_, "username_entry"); #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp19_) : NULL); + _tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp18_) : NULL); #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (self->priv->username_entry); #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->username_entry = _tmp20_; + self->priv->username_entry = _tmp19_; #line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp21_ = self->priv->builder; + _tmp20_ = self->priv->builder; #line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp22_ = gtk_builder_get_object (_tmp21_, "password_entry"); + _tmp21_ = gtk_builder_get_object (_tmp20_, "password_entry"); #line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp22_) : NULL); + _tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp21_) : NULL); #line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (self->priv->password_entry); #line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->password_entry = _tmp23_; + self->priv->password_entry = _tmp22_; #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp24_ = self->priv->builder; + _tmp23_ = self->priv->builder; #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp25_ = gtk_builder_get_object (_tmp24_, "login_button"); + _tmp24_ = gtk_builder_get_object (_tmp23_, "login_button"); #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, gtk_button_get_type ()) ? ((GtkButton*) _tmp25_) : NULL); + _tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_button_get_type ()) ? ((GtkButton*) _tmp24_) : NULL); #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (self->priv->login_button); #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->login_button = _tmp26_; + self->priv->login_button = _tmp25_; #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp27_ = self->priv->username_entry; + _tmp26_ = self->priv->username_entry; #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed_gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed_gtk_editable_changed, self, 0); #line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp28_ = self->priv->password_entry; + _tmp27_ = self->priv->password_entry; #line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed_gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed_gtk_editable_changed, self, 0); #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp29_ = self->priv->login_button; + _tmp28_ = self->priv->login_button; #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_signal_connect_object (_tmp29_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp28_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0); #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp30_ = content; + _tmp29_ = content; #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp31_ = gtk_widget_get_parent (_tmp30_); + _tmp30_ = gtk_widget_get_parent (_tmp29_); #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp32_ = _tmp31_; + _tmp31_ = _tmp30_; #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp33_ = content; + _tmp32_ = content; #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - gtk_container_remove (_tmp32_, _tmp33_); + gtk_container_remove (_tmp31_, _tmp32_); #line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp34_ = self->priv->pane_widget; + _tmp33_ = self->priv->pane_widget; #line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp35_ = content; + _tmp34_ = content; #line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_container_get_type (), GtkContainer), _tmp35_); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_container_get_type (), GtkContainer), _tmp34_); #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp36_ = publisher; + _tmp35_ = publisher; #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp37_ = publishing_tumblr_tumblr_publisher_get_host (_tmp36_); + _tmp36_ = publishing_tumblr_tumblr_publisher_get_host (_tmp35_); #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp38_ = _tmp37_; + _tmp37_ = _tmp36_; #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp39_ = self->priv->login_button; + _tmp38_ = self->priv->login_button; #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - spit_publishing_plugin_host_set_dialog_default_widget (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget)); + spit_publishing_plugin_host_set_dialog_default_widget (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget)); #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_object_unref0 (_tmp38_); + _g_object_unref0 (_tmp37_); #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (message_label); #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (content); -#line 4158 "TumblrPublishing.c" +#line 4186 "TumblrPublishing.c" } goto __finally36; __catch36_g_error: { GError* e = NULL; - const gchar* _tmp40_ = NULL; - GError* _tmp41_ = NULL; - const gchar* _tmp42_ = NULL; + GError* _tmp39_; + const gchar* _tmp40_; #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" e = _inner_error_; #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _inner_error_ = NULL; #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp40_ = _ ("Could not load UI: %s"); + _tmp39_ = e; #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp41_ = e; + _tmp40_ = _tmp39_->message; #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp42_ = _tmp41_->message; -#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_warning (_tmp40_, _tmp42_); + g_warning (_ ("Could not load UI: %s"), _tmp40_); #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_error_free0 (e); -#line 4181 "TumblrPublishing.c" +#line 4206 "TumblrPublishing.c" } __finally36: #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -4206,25 +4231,25 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ g_clear_error (&_inner_error_); #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return NULL; -#line 4192 "TumblrPublishing.c" +#line 4217 "TumblrPublishing.c" } #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self; -#line 4196 "TumblrPublishing.c" +#line 4221 "TumblrPublishing.c" } PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publisher_authentication_pane_new (PublishingTumblrTumblrPublisher* publisher, PublishingTumblrTumblrPublisherAuthenticationPaneMode mode) { #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return publishing_tumblr_tumblr_publisher_authentication_pane_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, publisher, mode); -#line 4203 "TumblrPublishing.c" +#line 4228 "TumblrPublishing.c" } GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_get_default_widget (PublishingTumblrTumblrPublisherAuthenticationPane* self) { GtkWidget* result = NULL; - GtkButton* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkButton* _tmp0_; + GtkWidget* _tmp1_; #line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self), NULL); #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -4235,15 +4260,15 @@ GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_get_default_wi result = _tmp1_; #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 4221 "TumblrPublishing.c" +#line 4246 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked (PublishingTumblrTumblrPublisherAuthenticationPane* self) { - GtkEntry* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - GtkEntry* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; + GtkEntry* _tmp0_; + const gchar* _tmp1_; + GtkEntry* _tmp2_; + const gchar* _tmp3_; #line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self)); #line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -4255,8 +4280,8 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_on_login_butt #line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp3_ = gtk_entry_get_text (_tmp2_); #line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_signal_emit_by_name (self, "login", _tmp1_, _tmp3_); -#line 4242 "TumblrPublishing.c" + g_signal_emit (self, publishing_tumblr_tumblr_publisher_authentication_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_LOGIN_SIGNAL], 0, _tmp1_, _tmp3_); +#line 4267 "TumblrPublishing.c" } @@ -4265,7 +4290,7 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_on_user_chang g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self)); #line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (self); -#line 4251 "TumblrPublishing.c" +#line 4276 "TumblrPublishing.c" } @@ -4274,16 +4299,16 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_on_password_c g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self)); #line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (self); -#line 4260 "TumblrPublishing.c" +#line 4285 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (PublishingTumblrTumblrPublisherAuthenticationPane* self) { gboolean _tmp0_ = FALSE; - GtkEntry* _tmp1_ = NULL; - guint _tmp2_ = 0U; - guint _tmp3_ = 0U; - GtkButton* _tmp7_ = NULL; + GtkEntry* _tmp1_; + guint _tmp2_; + guint _tmp3_; + GtkButton* _tmp7_; #line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self)); #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -4294,10 +4319,10 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_update_login_ _tmp3_ = _tmp2_; #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp3_ > ((guint) 0)) { -#line 4280 "TumblrPublishing.c" - GtkEntry* _tmp4_ = NULL; - guint _tmp5_ = 0U; - guint _tmp6_ = 0U; +#line 4305 "TumblrPublishing.c" + GtkEntry* _tmp4_; + guint _tmp5_; + guint _tmp6_; #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp4_ = self->priv->password_entry; #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -4306,25 +4331,25 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_update_login_ _tmp6_ = _tmp5_; #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = _tmp6_ > ((guint) 0); -#line 4292 "TumblrPublishing.c" +#line 4317 "TumblrPublishing.c" } else { #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = FALSE; -#line 4296 "TumblrPublishing.c" +#line 4321 "TumblrPublishing.c" } #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp7_ = self->priv->login_button; #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), _tmp0_); -#line 4302 "TumblrPublishing.c" +#line 4327 "TumblrPublishing.c" } static GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) { PublishingTumblrTumblrPublisherAuthenticationPane * self; GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane); #line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -4335,7 +4360,7 @@ static GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_real_ge result = _tmp1_; #line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 4321 "TumblrPublishing.c" +#line 4346 "TumblrPublishing.c" } @@ -4348,15 +4373,15 @@ static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publishe result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; #line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 4334 "TumblrPublishing.c" +#line 4359 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base) { PublishingTumblrTumblrPublisherAuthenticationPane * self; - GtkEntry* _tmp0_ = NULL; - GtkEntry* _tmp1_ = NULL; - GtkButton* _tmp2_ = NULL; + GtkEntry* _tmp0_; + GtkEntry* _tmp1_; + GtkButton* _tmp2_; #line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane); #line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -4373,7 +4398,7 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_ gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE); #line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (self); -#line 4359 "TumblrPublishing.c" +#line 4384 "TumblrPublishing.c" } @@ -4381,7 +4406,7 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_ PublishingTumblrTumblrPublisherAuthenticationPane * self; #line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane); -#line 4367 "TumblrPublishing.c" +#line 4392 "TumblrPublishing.c" } @@ -4400,27 +4425,25 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GVa data1 = closure->data; #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" data2 = param_values->data[0].v_pointer; -#line 4386 "TumblrPublishing.c" +#line 4411 "TumblrPublishing.c" } else { #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" data1 = param_values->data[0].v_pointer; #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" data2 = closure->data; -#line 4392 "TumblrPublishing.c" +#line 4417 "TumblrPublishing.c" } #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" callback = (GMarshalFunc_VOID__STRING_STRING) (marshal_data ? marshal_data : cc->callback); #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), data2); -#line 4398 "TumblrPublishing.c" +#line 4423 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_authentication_pane_class_init (PublishingTumblrTumblrPublisherAuthenticationPaneClass * klass) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_authentication_pane_parent_class = g_type_class_peek_parent (klass); #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -4428,20 +4451,16 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_class_init (P #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_tumblr_tumblr_publisher_authentication_pane_finalize; #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_signal_new ("login", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); + publishing_tumblr_tumblr_publisher_authentication_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_LOGIN_SIGNAL] = g_signal_new ("login", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); #line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp0_ = _ ("Enter the username and password associated with your Tumblr account."); + _tmp0_ = g_strdup (_ ("Enter the username and password associated with your Tumblr account.")); #line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - publishing_tumblr_tumblr_publisher_authentication_pane_INTRO_MESSAGE = _tmp1_; + publishing_tumblr_tumblr_publisher_authentication_pane_INTRO_MESSAGE = _tmp0_; #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp2_ = _ ("Username and/or password invalid. Please try again"); + _tmp1_ = g_strdup (_ ("Username and/or password invalid. Please try again")); #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp3_ = g_strdup (_tmp2_); -#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp3_; -#line 4427 "TumblrPublishing.c" + publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp1_; +#line 4446 "TumblrPublishing.c" } @@ -4449,14 +4468,14 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_spit_publishi #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_authentication_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface); #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_authentication_pane_real_get_widget; + iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_authentication_pane_real_get_widget; #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_authentication_pane_real_get_preferred_geometry; + iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_authentication_pane_real_get_preferred_geometry; #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_installed; + iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_installed; #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_uninstalled; -#line 4442 "TumblrPublishing.c" + iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_uninstalled; +#line 4461 "TumblrPublishing.c" } @@ -4465,11 +4484,11 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_instance_init self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_GET_PRIVATE (self); #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->pane_widget = NULL; -#line 4451 "TumblrPublishing.c" +#line 4470 "TumblrPublishing.c" } -static void publishing_tumblr_tumblr_publisher_authentication_pane_finalize (GObject* obj) { +static void publishing_tumblr_tumblr_publisher_authentication_pane_finalize (GObject * obj) { PublishingTumblrTumblrPublisherAuthenticationPane * self; #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane); @@ -4485,7 +4504,7 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_finalize (GOb _g_object_unref0 (self->priv->login_button); #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_authentication_pane_parent_class)->finalize (obj); -#line 4471 "TumblrPublishing.c" +#line 4490 "TumblrPublishing.c" } @@ -4510,7 +4529,7 @@ GType publishing_tumblr_tumblr_publisher_authentication_pane_get_type (void) { static gpointer _publishing_tumblr_size_entry_ref0 (gpointer self) { #line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self ? publishing_tumblr_size_entry_ref (self) : NULL; -#line 4496 "TumblrPublishing.c" +#line 4515 "TumblrPublishing.c" } @@ -4521,24 +4540,24 @@ static PublishingTumblrSizeEntry** _vala_array_dup7 (PublishingTumblrSizeEntry** result = g_new0 (PublishingTumblrSizeEntry*, length + 1); #line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" for (i = 0; i < length; i++) { -#line 4507 "TumblrPublishing.c" - PublishingTumblrSizeEntry* _tmp0_ = NULL; +#line 4526 "TumblrPublishing.c" + PublishingTumblrSizeEntry* _tmp0_; #line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = _publishing_tumblr_size_entry_ref0 (self[i]); #line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result[i] = _tmp0_; -#line 4513 "TumblrPublishing.c" +#line 4532 "TumblrPublishing.c" } #line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 4517 "TumblrPublishing.c" +#line 4536 "TumblrPublishing.c" } static gpointer _publishing_tumblr_blog_entry_ref0 (gpointer self) { #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self ? publishing_tumblr_blog_entry_ref (self) : NULL; -#line 4524 "TumblrPublishing.c" +#line 4543 "TumblrPublishing.c" } @@ -4549,64 +4568,64 @@ static PublishingTumblrBlogEntry** _vala_array_dup8 (PublishingTumblrBlogEntry** result = g_new0 (PublishingTumblrBlogEntry*, length + 1); #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" for (i = 0; i < length; i++) { -#line 4535 "TumblrPublishing.c" - PublishingTumblrBlogEntry* _tmp0_ = NULL; +#line 4554 "TumblrPublishing.c" + PublishingTumblrBlogEntry* _tmp0_; #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = _publishing_tumblr_blog_entry_ref0 (self[i]); #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result[i] = _tmp0_; -#line 4541 "TumblrPublishing.c" +#line 4560 "TumblrPublishing.c" } #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 4545 "TumblrPublishing.c" +#line 4564 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self); -#line 4552 "TumblrPublishing.c" +#line 4571 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self); -#line 4559 "TumblrPublishing.c" +#line 4578 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self); -#line 4566 "TumblrPublishing.c" +#line 4585 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self); -#line 4573 "TumblrPublishing.c" +#line 4592 "TumblrPublishing.c" } PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_construct (GType object_type, PublishingTumblrTumblrPublisher* publisher, SpitPublishingPublisherMediaType media_type, PublishingTumblrSizeEntry** sizes, int sizes_length1, PublishingTumblrBlogEntry** blogs, int blogs_length1, const gchar* username) { PublishingTumblrTumblrPublisherPublishingOptionsPane * self = NULL; - GtkBox* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - PublishingTumblrTumblrPublisher* _tmp3_ = NULL; - PublishingTumblrTumblrPublisher* _tmp4_ = NULL; - SpitPublishingPublisherMediaType _tmp5_ = 0; - PublishingTumblrSizeEntry** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - PublishingTumblrSizeEntry** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - PublishingTumblrBlogEntry** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - PublishingTumblrBlogEntry** _tmp9_ = NULL; - gint _tmp9__length1 = 0; + GtkBox* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + PublishingTumblrTumblrPublisher* _tmp3_; + PublishingTumblrTumblrPublisher* _tmp4_; + SpitPublishingPublisherMediaType _tmp5_; + PublishingTumblrSizeEntry** _tmp6_; + gint _tmp6__length1; + PublishingTumblrSizeEntry** _tmp7_; + gint _tmp7__length1; + PublishingTumblrBlogEntry** _tmp8_; + gint _tmp8__length1; + PublishingTumblrBlogEntry** _tmp9_; + gint _tmp9__length1; GError * _inner_error_ = NULL; #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (publisher), NULL); @@ -4674,45 +4693,44 @@ PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_p self->priv->blogs_length1 = _tmp9__length1; #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->_blogs_size_ = self->priv->blogs_length1; -#line 4660 "TumblrPublishing.c" +#line 4679 "TumblrPublishing.c" { - GtkBuilder* _tmp10_ = NULL; - GtkBuilder* _tmp11_ = NULL; - GtkBuilder* _tmp12_ = NULL; - GtkBuilder* _tmp13_ = NULL; - GObject* _tmp14_ = NULL; - GtkBox* _tmp15_ = NULL; - GtkBuilder* _tmp16_ = NULL; - GObject* _tmp17_ = NULL; - GtkLabel* _tmp18_ = NULL; - GtkBuilder* _tmp19_ = NULL; - GObject* _tmp20_ = NULL; - GtkButton* _tmp21_ = NULL; - GtkBuilder* _tmp22_ = NULL; - GObject* _tmp23_ = NULL; - GtkButton* _tmp24_ = NULL; - GtkBuilder* _tmp25_ = NULL; - GObject* _tmp26_ = NULL; - GtkComboBoxText* _tmp27_ = NULL; - GtkBuilder* _tmp28_ = NULL; - GObject* _tmp29_ = NULL; - GtkLabel* _tmp30_ = NULL; - GtkBuilder* _tmp31_ = NULL; - GObject* _tmp32_ = NULL; - GtkComboBoxText* _tmp33_ = NULL; - GtkBuilder* _tmp34_ = NULL; - GObject* _tmp35_ = NULL; - GtkLabel* _tmp36_ = NULL; + GtkBuilder* _tmp10_; + GtkBuilder* _tmp11_; + GtkBuilder* _tmp12_; + GtkBuilder* _tmp13_; + GObject* _tmp14_; + GtkBox* _tmp15_; + GtkBuilder* _tmp16_; + GObject* _tmp17_; + GtkLabel* _tmp18_; + GtkBuilder* _tmp19_; + GObject* _tmp20_; + GtkButton* _tmp21_; + GtkBuilder* _tmp22_; + GObject* _tmp23_; + GtkButton* _tmp24_; + GtkBuilder* _tmp25_; + GObject* _tmp26_; + GtkComboBoxText* _tmp27_; + GtkBuilder* _tmp28_; + GObject* _tmp29_; + GtkLabel* _tmp30_; + GtkBuilder* _tmp31_; + GObject* _tmp32_; + GtkComboBoxText* _tmp33_; + GtkBuilder* _tmp34_; + GObject* _tmp35_; + GtkLabel* _tmp36_; gchar* upload_label_text = NULL; - const gchar* _tmp37_ = NULL; - const gchar* _tmp38_ = NULL; - gchar* _tmp39_ = NULL; - GtkLabel* _tmp40_ = NULL; - const gchar* _tmp41_ = NULL; - GtkComboBoxText* _tmp42_ = NULL; - SpitPublishingPublisherMediaType _tmp43_ = 0; - GtkButton* _tmp47_ = NULL; - GtkButton* _tmp48_ = NULL; + const gchar* _tmp37_; + gchar* _tmp38_; + GtkLabel* _tmp39_; + const gchar* _tmp40_; + GtkComboBoxText* _tmp41_; + SpitPublishingPublisherMediaType _tmp42_; + GtkButton* _tmp46_; + GtkButton* _tmp47_; #line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp10_ = gtk_builder_new (); #line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -4725,7 +4743,7 @@ PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_p gtk_builder_add_from_resource (_tmp11_, PLUGIN_RESOURCE_PATH "/tumblr_publishing_options_pane.ui", &_inner_error_); #line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4711 "TumblrPublishing.c" +#line 4729 "TumblrPublishing.c" goto __catch37_g_error; } #line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -4813,85 +4831,80 @@ PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_p #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->blog_label = _tmp36_; #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp37_ = _ ("You are logged into Tumblr as %s.\n\n"); -#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp38_ = self->priv->username; + _tmp37_ = self->priv->username; #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp39_ = g_strdup_printf (_tmp37_, _tmp38_); + _tmp38_ = g_strdup_printf (_ ("You are logged into Tumblr as %s.\n\n"), _tmp37_); #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - upload_label_text = _tmp39_; + upload_label_text = _tmp38_; #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp40_ = self->priv->upload_info_label; + _tmp39_ = self->priv->upload_info_label; #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp41_ = upload_label_text; + _tmp40_ = upload_label_text; #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - gtk_label_set_label (_tmp40_, _tmp41_); + gtk_label_set_label (_tmp39_, _tmp40_); #line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (self); #line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp42_ = self->priv->blog_combo; + _tmp41_ = self->priv->blog_combo; #line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed, self, 0); #line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp43_ = media_type; + _tmp42_ = media_type; #line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - if (_tmp43_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { -#line 4822 "TumblrPublishing.c" - GtkComboBoxText* _tmp44_ = NULL; + if (_tmp42_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { +#line 4838 "TumblrPublishing.c" + GtkComboBoxText* _tmp43_; #line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (self); #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp44_ = self->priv->size_combo; + _tmp43_ = self->priv->size_combo; #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0); -#line 4830 "TumblrPublishing.c" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0); +#line 4846 "TumblrPublishing.c" } else { - GtkComboBoxText* _tmp45_ = NULL; - GtkLabel* _tmp46_ = NULL; + GtkComboBoxText* _tmp44_; + GtkLabel* _tmp45_; #line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp45_ = self->priv->size_combo; + _tmp44_ = self->priv->size_combo; #line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), FALSE); #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp46_ = self->priv->size_label; + _tmp45_ = self->priv->size_label; #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 4842 "TumblrPublishing.c" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE); +#line 4858 "TumblrPublishing.c" } #line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp47_ = self->priv->logout_button; + _tmp46_ = self->priv->logout_button; #line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_signal_connect_object (_tmp47_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp46_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0); #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp48_ = self->priv->publish_button; + _tmp47_ = self->priv->publish_button; #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_signal_connect_object (_tmp48_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp47_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0); #line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (upload_label_text); -#line 4854 "TumblrPublishing.c" +#line 4870 "TumblrPublishing.c" } goto __finally37; __catch37_g_error: { GError* e = NULL; - const gchar* _tmp49_ = NULL; - GError* _tmp50_ = NULL; - const gchar* _tmp51_ = NULL; + GError* _tmp48_; + const gchar* _tmp49_; #line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" e = _inner_error_; #line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _inner_error_ = NULL; #line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp49_ = _ ("Could not load UI: %s"); -#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp50_ = e; + _tmp48_ = e; #line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp51_ = _tmp50_->message; + _tmp49_ = _tmp48_->message; #line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_warning (_tmp49_, _tmp51_); + g_warning (_ ("Could not load UI: %s"), _tmp49_); #line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_error_free0 (e); -#line 4877 "TumblrPublishing.c" +#line 4890 "TumblrPublishing.c" } __finally37: #line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -4902,18 +4915,18 @@ PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_p g_clear_error (&_inner_error_); #line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return NULL; -#line 4888 "TumblrPublishing.c" +#line 4901 "TumblrPublishing.c" } #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self; -#line 4892 "TumblrPublishing.c" +#line 4905 "TumblrPublishing.c" } PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_new (PublishingTumblrTumblrPublisher* publisher, SpitPublishingPublisherMediaType media_type, PublishingTumblrSizeEntry** sizes, int sizes_length1, PublishingTumblrBlogEntry** blogs, int blogs_length1, const gchar* username) { #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return publishing_tumblr_tumblr_publisher_publishing_options_pane_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, publisher, media_type, sizes, sizes_length1, blogs, blogs_length1, username); -#line 4899 "TumblrPublishing.c" +#line 4912 "TumblrPublishing.c" } @@ -4921,8 +4934,8 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout #line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self)); #line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_signal_emit_by_name (self, "logout"); -#line 4908 "TumblrPublishing.c" + g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0); +#line 4921 "TumblrPublishing.c" } @@ -4930,14 +4943,14 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publis #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self)); #line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_signal_emit_by_name (self, "publish"); -#line 4917 "TumblrPublishing.c" + g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0); +#line 4930 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) { - PublishingTumblrBlogEntry** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + PublishingTumblrBlogEntry** _tmp0_; + gint _tmp0__length1; #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self)); #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -4946,17 +4959,17 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_ _tmp0__length1 = self->priv->blogs_length1; #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp0_ != NULL) { -#line 4932 "TumblrPublishing.c" - PublishingTumblrBlogEntry** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - GtkComboBoxText* _tmp6_ = NULL; - PublishingTumblrTumblrPublisher* _tmp7_ = NULL; - gint _tmp8_ = 0; +#line 4945 "TumblrPublishing.c" + PublishingTumblrBlogEntry** _tmp1_; + gint _tmp1__length1; + GtkComboBoxText* _tmp6_; + PublishingTumblrTumblrPublisher* _tmp7_; + gint _tmp8_; #line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = self->priv->blogs; #line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1__length1 = self->priv->blogs_length1; -#line 4942 "TumblrPublishing.c" +#line 4955 "TumblrPublishing.c" { PublishingTumblrBlogEntry** b_collection = NULL; gint b_collection_length1 = 0; @@ -4968,18 +4981,18 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_ b_collection_length1 = _tmp1__length1; #line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" for (b_it = 0; b_it < _tmp1__length1; b_it = b_it + 1) { -#line 4954 "TumblrPublishing.c" - PublishingTumblrBlogEntry* _tmp2_ = NULL; +#line 4967 "TumblrPublishing.c" + PublishingTumblrBlogEntry* _tmp2_; PublishingTumblrBlogEntry* b = NULL; #line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = _publishing_tumblr_blog_entry_ref0 (b_collection[b_it]); #line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" b = _tmp2_; -#line 4961 "TumblrPublishing.c" +#line 4974 "TumblrPublishing.c" { - GtkComboBoxText* _tmp3_ = NULL; - PublishingTumblrBlogEntry* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; + GtkComboBoxText* _tmp3_; + PublishingTumblrBlogEntry* _tmp4_; + const gchar* _tmp5_; #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp3_ = self->priv->blog_combo; #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -4990,7 +5003,7 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_ gtk_combo_box_text_append_text (_tmp3_, _tmp5_); #line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _publishing_tumblr_blog_entry_unref0 (b); -#line 4976 "TumblrPublishing.c" +#line 4989 "TumblrPublishing.c" } } } @@ -5002,15 +5015,15 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_ _tmp8_ = publishing_tumblr_tumblr_publisher_get_persistent_default_blog (_tmp7_); #line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), _tmp8_); -#line 4988 "TumblrPublishing.c" +#line 5001 "TumblrPublishing.c" } } static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) { - PublishingTumblrTumblrPublisher* _tmp0_ = NULL; - GtkComboBoxText* _tmp1_ = NULL; - gint _tmp2_ = 0; + PublishingTumblrTumblrPublisher* _tmp0_; + GtkComboBoxText* _tmp1_; + gint _tmp2_; #line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self)); #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -5021,13 +5034,13 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_c _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_set_persistent_default_blog (_tmp0_, _tmp2_); -#line 5007 "TumblrPublishing.c" +#line 5020 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) { - PublishingTumblrSizeEntry** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + PublishingTumblrSizeEntry** _tmp0_; + gint _tmp0__length1; #line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self)); #line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -5036,17 +5049,17 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_ _tmp0__length1 = self->priv->sizes_length1; #line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp0_ != NULL) { -#line 5022 "TumblrPublishing.c" - PublishingTumblrSizeEntry** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - GtkComboBoxText* _tmp6_ = NULL; - PublishingTumblrTumblrPublisher* _tmp7_ = NULL; - gint _tmp8_ = 0; +#line 5035 "TumblrPublishing.c" + PublishingTumblrSizeEntry** _tmp1_; + gint _tmp1__length1; + GtkComboBoxText* _tmp6_; + PublishingTumblrTumblrPublisher* _tmp7_; + gint _tmp8_; #line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = self->priv->sizes; #line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1__length1 = self->priv->sizes_length1; -#line 5032 "TumblrPublishing.c" +#line 5045 "TumblrPublishing.c" { PublishingTumblrSizeEntry** e_collection = NULL; gint e_collection_length1 = 0; @@ -5058,18 +5071,18 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_ e_collection_length1 = _tmp1__length1; #line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" for (e_it = 0; e_it < _tmp1__length1; e_it = e_it + 1) { -#line 5044 "TumblrPublishing.c" - PublishingTumblrSizeEntry* _tmp2_ = NULL; +#line 5057 "TumblrPublishing.c" + PublishingTumblrSizeEntry* _tmp2_; PublishingTumblrSizeEntry* e = NULL; #line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = _publishing_tumblr_size_entry_ref0 (e_collection[e_it]); #line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" e = _tmp2_; -#line 5051 "TumblrPublishing.c" +#line 5064 "TumblrPublishing.c" { - GtkComboBoxText* _tmp3_ = NULL; - PublishingTumblrSizeEntry* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; + GtkComboBoxText* _tmp3_; + PublishingTumblrSizeEntry* _tmp4_; + const gchar* _tmp5_; #line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp3_ = self->priv->size_combo; #line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -5080,7 +5093,7 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_ gtk_combo_box_text_append_text (_tmp3_, _tmp5_); #line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _publishing_tumblr_size_entry_unref0 (e); -#line 5066 "TumblrPublishing.c" +#line 5079 "TumblrPublishing.c" } } } @@ -5092,15 +5105,15 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_ _tmp8_ = publishing_tumblr_tumblr_publisher_get_persistent_default_size (_tmp7_); #line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), _tmp8_); -#line 5078 "TumblrPublishing.c" +#line 5091 "TumblrPublishing.c" } } static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) { - PublishingTumblrTumblrPublisher* _tmp0_ = NULL; - GtkComboBoxText* _tmp1_ = NULL; - gint _tmp2_ = 0; + PublishingTumblrTumblrPublisher* _tmp0_; + GtkComboBoxText* _tmp1_; + gint _tmp2_; #line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self)); #line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -5111,7 +5124,7 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_c _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); #line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_set_persistent_default_size (_tmp0_, _tmp2_); -#line 5097 "TumblrPublishing.c" +#line 5110 "TumblrPublishing.c" } @@ -5119,8 +5132,8 @@ void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish ( #line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self)); #line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_signal_emit_by_name (self, "publish"); -#line 5106 "TumblrPublishing.c" + g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0); +#line 5119 "TumblrPublishing.c" } @@ -5128,16 +5141,16 @@ void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout (P #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self)); #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_signal_emit_by_name (self, "logout"); -#line 5115 "TumblrPublishing.c" + g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0); +#line 5128 "TumblrPublishing.c" } static GtkWidget* publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) { PublishingTumblrTumblrPublisherPublishingOptionsPane * self; GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane); #line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -5148,7 +5161,7 @@ static GtkWidget* publishing_tumblr_tumblr_publisher_publishing_options_pane_rea result = _tmp1_; #line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 5134 "TumblrPublishing.c" +#line 5147 "TumblrPublishing.c" } @@ -5161,21 +5174,21 @@ static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publishe result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; #line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 5147 "TumblrPublishing.c" +#line 5160 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) { #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self); -#line 5154 "TumblrPublishing.c" +#line 5167 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) { #line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self); -#line 5161 "TumblrPublishing.c" +#line 5174 "TumblrPublishing.c" } @@ -5187,14 +5200,14 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_p g_signal_connect_object (self, "publish", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self, 0); #line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_connect_object (self, "logout", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self, 0); -#line 5173 "TumblrPublishing.c" +#line 5186 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) { PublishingTumblrTumblrPublisherPublishingOptionsPane * self; - guint _tmp0_ = 0U; - guint _tmp1_ = 0U; + guint _tmp0_; + guint _tmp1_; #line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane); #line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -5205,7 +5218,7 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_p g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE); #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self); -#line 5191 "TumblrPublishing.c" +#line 5204 "TumblrPublishing.c" } @@ -5217,10 +5230,10 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_class_ini #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize; #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_signal_new ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_signal_new ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 5206 "TumblrPublishing.c" + publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 5219 "TumblrPublishing.c" } @@ -5228,19 +5241,19 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publ #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface); #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_widget; + iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_widget; #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_preferred_geometry; + iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_preferred_geometry; #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_installed; + iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_installed; #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled; -#line 5221 "TumblrPublishing.c" + iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled; +#line 5234 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_publishing_options_pane_instance_init (PublishingTumblrTumblrPublisherPublishingOptionsPane * self) { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self); #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -5277,11 +5290,11 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_instance_ self->priv->username = _tmp0_; #line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->publisher = NULL; -#line 5263 "TumblrPublishing.c" +#line 5276 "TumblrPublishing.c" } -static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize (GObject* obj) { +static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize (GObject * obj) { PublishingTumblrTumblrPublisherPublishingOptionsPane * self; #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane); @@ -5313,7 +5326,7 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize _g_object_unref0 (self->priv->publisher); #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_publishing_options_pane_parent_class)->finalize (obj); -#line 5299 "TumblrPublishing.c" +#line 5312 "TumblrPublishing.c" } @@ -5336,8 +5349,8 @@ GType publishing_tumblr_tumblr_publisher_publishing_options_pane_get_type (void) PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, PublishingRESTSupportHttpMethod method) { PublishingTumblrTumblrPublisherTransaction* self = NULL; - PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL; - PublishingRESTSupportHttpMethod _tmp1_ = 0; + PublishingTumblrTumblrPublisherSession* _tmp0_; + PublishingRESTSupportHttpMethod _tmp1_; #line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL); #line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -5348,32 +5361,32 @@ PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_t self = (PublishingTumblrTumblrPublisherTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_); #line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self; -#line 5334 "TumblrPublishing.c" +#line 5347 "TumblrPublishing.c" } PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_new (PublishingTumblrTumblrPublisherSession* session, PublishingRESTSupportHttpMethod method) { #line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return publishing_tumblr_tumblr_publisher_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, session, method); -#line 5341 "TumblrPublishing.c" +#line 5354 "TumblrPublishing.c" } PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (GType object_type, PublishingTumblrTumblrPublisherSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) { PublishingTumblrTumblrPublisherTransaction* self = NULL; - PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - PublishingRESTSupportHttpMethod _tmp2_ = 0; - PublishingTumblrTumblrPublisherSession* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - PublishingTumblrTumblrPublisherSession* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - PublishingTumblrTumblrPublisherSession* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; + PublishingTumblrTumblrPublisherSession* _tmp0_; + const gchar* _tmp1_; + PublishingRESTSupportHttpMethod _tmp2_; + PublishingTumblrTumblrPublisherSession* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + PublishingTumblrTumblrPublisherSession* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + PublishingTumblrTumblrPublisherSession* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + gboolean _tmp12_; #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL); #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -5424,10 +5437,10 @@ PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_t _g_free0 (_tmp11_); #line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp12_) { -#line 5410 "TumblrPublishing.c" - PublishingTumblrTumblrPublisherSession* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; +#line 5423 "TumblrPublishing.c" + PublishingTumblrTumblrPublisherSession* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp13_ = session; #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -5438,25 +5451,25 @@ PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_t publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_token", _tmp15_); #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp15_); -#line 5424 "TumblrPublishing.c" +#line 5437 "TumblrPublishing.c" } #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self; -#line 5428 "TumblrPublishing.c" +#line 5441 "TumblrPublishing.c" } PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_new_with_uri (PublishingTumblrTumblrPublisherSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) { #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, session, uri, method); -#line 5435 "TumblrPublishing.c" +#line 5448 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) { PublishingTumblrTumblrPublisherTransaction * self; - PublishingRESTSupportSession* _tmp0_ = NULL; - PublishingTumblrTumblrPublisherSession* _tmp1_ = NULL; + PublishingRESTSupportSession* _tmp0_; + PublishingTumblrTumblrPublisherSession* _tmp1_; GError * _inner_error_ = NULL; #line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, PublishingTumblrTumblrPublisherTransaction); @@ -5478,7 +5491,7 @@ static void publishing_tumblr_tumblr_publisher_transaction_real_execute (Publish g_propagate_error (error, _inner_error_); #line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 5464 "TumblrPublishing.c" +#line 5477 "TumblrPublishing.c" } else { #line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -5486,7 +5499,7 @@ static void publishing_tumblr_tumblr_publisher_transaction_real_execute (Publish g_clear_error (&_inner_error_); #line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 5472 "TumblrPublishing.c" +#line 5485 "TumblrPublishing.c" } } } @@ -5496,8 +5509,8 @@ static void publishing_tumblr_tumblr_publisher_transaction_class_init (Publishin #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_transaction_parent_class = g_type_class_peek_parent (klass); #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_tumblr_tumblr_publisher_transaction_real_execute; -#line 5483 "TumblrPublishing.c" + ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_tumblr_tumblr_publisher_transaction_real_execute; +#line 5496 "TumblrPublishing.c" } @@ -5519,11 +5532,11 @@ GType publishing_tumblr_tumblr_publisher_transaction_get_type (void) { PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, const gchar* username, const gchar* password) { PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* self = NULL; - PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; + PublishingTumblrTumblrPublisherSession* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL); #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -5552,21 +5565,21 @@ PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* publishing_tumblr_tu publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_mode", "client_auth"); #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self; -#line 5538 "TumblrPublishing.c" +#line 5551 "TumblrPublishing.c" } PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_new (PublishingTumblrTumblrPublisherSession* session, const gchar* username, const gchar* password) { #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, session, username, password); -#line 5545 "TumblrPublishing.c" +#line 5558 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_class_init (PublishingTumblrTumblrPublisherAccessTokenFetchTransactionClass * klass) { #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_parent_class = g_type_class_peek_parent (klass); -#line 5552 "TumblrPublishing.c" +#line 5565 "TumblrPublishing.c" } @@ -5588,7 +5601,7 @@ GType publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_get_type PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session) { PublishingTumblrTumblrPublisherUserInfoFetchTransaction* self = NULL; - PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL; + PublishingTumblrTumblrPublisherSession* _tmp0_; #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL); #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -5597,21 +5610,21 @@ PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumbl self = (PublishingTumblrTumblrPublisherUserInfoFetchTransaction*) publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (object_type, _tmp0_, "https://api.tumblr.com/v2/user/info", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self; -#line 5583 "TumblrPublishing.c" +#line 5596 "TumblrPublishing.c" } PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_new (PublishingTumblrTumblrPublisherSession* session) { #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION, session); -#line 5590 "TumblrPublishing.c" +#line 5603 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_class_init (PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass * klass) { #line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_parent_class = g_type_class_peek_parent (klass); -#line 5597 "TumblrPublishing.c" +#line 5610 "TumblrPublishing.c" } @@ -5634,19 +5647,19 @@ GType publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_get_type (v static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (PublishingTumblrTumblrPublisherUploadTransaction* self, guint8* data, int data_length1) { gchar* result = NULL; GString* s = NULL; - GString* _tmp0_ = NULL; + GString* _tmp0_; gchar* bytes = NULL; - gchar* _tmp1_ = NULL; - gint bytes_length1 = 0; - gint _bytes_size_ = 0; - gchar* _tmp2_ = NULL; - gint _tmp2__length1 = 0; - gchar _tmp3_ = '\0'; - guint8* _tmp4_ = NULL; - gint _tmp4__length1 = 0; - GString* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; + gchar* _tmp1_; + gint bytes_length1; + gint _bytes_size_; + gchar* _tmp2_; + gint _tmp2__length1; + gchar _tmp3_; + guint8* _tmp4_; + gint _tmp4__length1; + GString* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL); #line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -5673,7 +5686,7 @@ static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (Publ _tmp4_ = data; #line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp4__length1 = data_length1; -#line 5659 "TumblrPublishing.c" +#line 5672 "TumblrPublishing.c" { guint8* byte_collection = NULL; gint byte_collection_length1 = 0; @@ -5685,34 +5698,34 @@ static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (Publ byte_collection_length1 = _tmp4__length1; #line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" for (byte_it = 0; byte_it < _tmp4__length1; byte_it = byte_it + 1) { -#line 5671 "TumblrPublishing.c" +#line 5684 "TumblrPublishing.c" guint8 byte = 0U; #line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" byte = byte_collection[byte_it]; -#line 5675 "TumblrPublishing.c" +#line 5688 "TumblrPublishing.c" { - guint8 _tmp5_ = 0U; + guint8 _tmp5_; #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = byte; #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (((gint) _tmp5_) == 0) { -#line 5682 "TumblrPublishing.c" - GString* _tmp6_ = NULL; +#line 5695 "TumblrPublishing.c" + GString* _tmp6_; #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp6_ = s; #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_string_append (_tmp6_, "%00"); -#line 5688 "TumblrPublishing.c" +#line 5701 "TumblrPublishing.c" } else { - gchar* _tmp7_ = NULL; - gint _tmp7__length1 = 0; - guint8 _tmp8_ = 0U; - gchar _tmp9_ = '\0'; - GString* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gint _tmp11__length1 = 0; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; + gchar* _tmp7_; + gint _tmp7__length1; + guint8 _tmp8_; + gchar _tmp9_; + GString* _tmp10_; + gchar* _tmp11_; + gint _tmp11__length1; + gchar* _tmp12_; + gchar* _tmp13_; #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp7_ = bytes; #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -5737,7 +5750,7 @@ static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (Publ g_string_append (_tmp10_, _tmp13_); #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp13_); -#line 5723 "TumblrPublishing.c" +#line 5736 "TumblrPublishing.c" } } } @@ -5756,26 +5769,26 @@ static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (Publ _g_string_free0 (s); #line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 5742 "TumblrPublishing.c" +#line 5755 "TumblrPublishing.c" } static gpointer _publishing_rest_support_session_ref0 (gpointer self) { #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self ? publishing_rest_support_session_ref (self) : NULL; -#line 5749 "TumblrPublishing.c" +#line 5762 "TumblrPublishing.c" } PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable* publishable, const gchar* blog_url) { PublishingTumblrTumblrPublisherUploadTransaction* self = NULL; - PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL; - SpitPublishingPublishable* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - PublishingTumblrTumblrPublisherSession* _tmp5_ = NULL; - PublishingTumblrTumblrPublisherSession* _tmp6_ = NULL; + PublishingTumblrTumblrPublisherSession* _tmp0_; + SpitPublishingPublishable* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + PublishingTumblrTumblrPublisherSession* _tmp5_; + PublishingTumblrTumblrPublisherSession* _tmp6_; #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL); #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -5808,40 +5821,40 @@ PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publi self->priv->session = _tmp6_; #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self; -#line 5794 "TumblrPublishing.c" +#line 5807 "TumblrPublishing.c" } PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_new (PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable* publishable, const gchar* blog_url) { #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return publishing_tumblr_tumblr_publisher_upload_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, session, publishable, blog_url); -#line 5801 "TumblrPublishing.c" +#line 5814 "TumblrPublishing.c" } -static void _vala_array_add22 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) { +static void _vala_array_add22 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) { #line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if ((*length) == (*size)) { #line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1); -#line 5812 "TumblrPublishing.c" +#line 5825 "TumblrPublishing.c" } #line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" (*array)[(*length)++] = value; #line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" (*array)[*length] = NULL; -#line 5818 "TumblrPublishing.c" +#line 5831 "TumblrPublishing.c" } void publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (PublishingTumblrTumblrPublisherUploadTransaction* self, const gchar* key, const gchar* value) { - PublishingRESTSupportArgument** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PublishingRESTSupportArgument* _tmp3_ = NULL; + PublishingRESTSupportArgument** _tmp0_; + gint _tmp0__length1; + const gchar* _tmp1_; + const gchar* _tmp2_; + PublishingRESTSupportArgument* _tmp3_; #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self)); #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -5860,14 +5873,14 @@ void publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_hea _tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_); #line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _vala_array_add22 (&self->priv->auth_header_fields, &self->priv->auth_header_fields_length1, &self->priv->_auth_header_fields_size_, _tmp3_); -#line 5846 "TumblrPublishing.c" +#line 5859 "TumblrPublishing.c" } static gpointer _publishing_rest_support_argument_ref0 (gpointer self) { #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self ? publishing_rest_support_argument_ref (self) : NULL; -#line 5853 "TumblrPublishing.c" +#line 5866 "TumblrPublishing.c" } @@ -5878,28 +5891,28 @@ static PublishingRESTSupportArgument** _vala_array_dup9 (PublishingRESTSupportAr result = g_new0 (PublishingRESTSupportArgument*, length + 1); #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" for (i = 0; i < length; i++) { -#line 5864 "TumblrPublishing.c" - PublishingRESTSupportArgument* _tmp0_ = NULL; +#line 5877 "TumblrPublishing.c" + PublishingRESTSupportArgument* _tmp0_; #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = _publishing_rest_support_argument_ref0 (self[i]); #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result[i] = _tmp0_; -#line 5870 "TumblrPublishing.c" +#line 5883 "TumblrPublishing.c" } #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 5874 "TumblrPublishing.c" +#line 5887 "TumblrPublishing.c" } PublishingRESTSupportArgument** publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_fields (PublishingTumblrTumblrPublisherUploadTransaction* self, int* result_length1) { PublishingRESTSupportArgument** result = NULL; - PublishingRESTSupportArgument** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - PublishingRESTSupportArgument** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - PublishingRESTSupportArgument** _tmp2_ = NULL; - gint _tmp2__length1 = 0; + PublishingRESTSupportArgument** _tmp0_; + gint _tmp0__length1; + PublishingRESTSupportArgument** _tmp1_; + gint _tmp1__length1; + PublishingRESTSupportArgument** _tmp2_; + gint _tmp2__length1; #line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL); #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -5918,74 +5931,74 @@ PublishingRESTSupportArgument** publishing_tumblr_tumblr_publisher_upload_transa if (result_length1) { #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *result_length1 = _tmp2__length1; -#line 5904 "TumblrPublishing.c" +#line 5917 "TumblrPublishing.c" } #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result = _tmp2_; #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 5910 "TumblrPublishing.c" +#line 5923 "TumblrPublishing.c" } gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_string (PublishingTumblrTumblrPublisherUploadTransaction* self) { gchar* result = NULL; gchar* _result_ = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL); #line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = g_strdup ("OAuth "); #line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _result_ = _tmp0_; -#line 5924 "TumblrPublishing.c" +#line 5937 "TumblrPublishing.c" { gint i = 0; #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" i = 0; -#line 5929 "TumblrPublishing.c" +#line 5942 "TumblrPublishing.c" { gboolean _tmp1_ = FALSE; #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = TRUE; #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" while (TRUE) { -#line 5936 "TumblrPublishing.c" - gint _tmp3_ = 0; - PublishingRESTSupportArgument** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - const gchar* _tmp5_ = NULL; - PublishingRESTSupportArgument** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - gint _tmp7_ = 0; - PublishingRESTSupportArgument* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - PublishingRESTSupportArgument** _tmp14_ = NULL; - gint _tmp14__length1 = 0; - gint _tmp15_ = 0; - PublishingRESTSupportArgument* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - gint _tmp23_ = 0; - PublishingRESTSupportArgument** _tmp24_ = NULL; - gint _tmp24__length1 = 0; +#line 5949 "TumblrPublishing.c" + gint _tmp3_; + PublishingRESTSupportArgument** _tmp4_; + gint _tmp4__length1; + const gchar* _tmp5_; + PublishingRESTSupportArgument** _tmp6_; + gint _tmp6__length1; + gint _tmp7_; + PublishingRESTSupportArgument* _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; + const gchar* _tmp13_; + PublishingRESTSupportArgument** _tmp14_; + gint _tmp14__length1; + gint _tmp15_; + PublishingRESTSupportArgument* _tmp16_; + const gchar* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; + gint _tmp23_; + PublishingRESTSupportArgument** _tmp24_; + gint _tmp24__length1; #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (!_tmp1_) { -#line 5965 "TumblrPublishing.c" - gint _tmp2_ = 0; +#line 5978 "TumblrPublishing.c" + gint _tmp2_; #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = i; #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" i = _tmp2_ + 1; -#line 5971 "TumblrPublishing.c" +#line 5984 "TumblrPublishing.c" } #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = FALSE; @@ -5999,7 +6012,7 @@ gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_h if (!(_tmp3_ < _tmp4__length1)) { #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" break; -#line 5985 "TumblrPublishing.c" +#line 5998 "TumblrPublishing.c" } #line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = _result_; @@ -6065,9 +6078,9 @@ gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_h _tmp24__length1 = self->priv->auth_header_fields_length1; #line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp23_ < (_tmp24__length1 - 1)) { -#line 6051 "TumblrPublishing.c" - const gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; +#line 6064 "TumblrPublishing.c" + const gchar* _tmp25_; + gchar* _tmp26_; #line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp25_ = _result_; #line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -6076,7 +6089,7 @@ gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_h _g_free0 (_result_); #line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _result_ = _tmp26_; -#line 6062 "TumblrPublishing.c" +#line 6075 "TumblrPublishing.c" } } } @@ -6085,515 +6098,515 @@ gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_h result = _result_; #line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 6071 "TumblrPublishing.c" +#line 6084 "TumblrPublishing.c" } static guint8* string_get_data (const gchar* self, int* result_length1) { guint8* result; guint8* res = NULL; - gint res_length1 = 0; - gint _res_size_ = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - guint8* _tmp3_ = NULL; - gint _tmp3__length1 = 0; - guint8* _tmp4_ = NULL; - gint _tmp4__length1 = 0; -#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint res_length1; + gint _res_size_; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; + guint8* _tmp3_; + gint _tmp3__length1; + guint8* _tmp4_; + gint _tmp4__length1; +#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = (guint8*) self; -#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res_length1 = -1; -#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _res_size_ = res_length1; -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res_length1 = (gint) _tmp1_; -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = res_length1; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = res; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = res_length1; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4__length1 = _tmp3__length1; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (result_length1) { -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" *result_length1 = _tmp4__length1; -#line 6115 "TumblrPublishing.c" +#line 6128 "TumblrPublishing.c" } -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 6121 "TumblrPublishing.c" +#line 6134 "TumblrPublishing.c" } static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; - gchar** _tmp3_ = NULL; - gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp3_; + gint _tmp3__length1; +#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" separator = ""; -#line 6138 "TumblrPublishing.c" +#line 6151 "TumblrPublishing.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = TRUE; -#line 6148 "TumblrPublishing.c" +#line 6161 "TumblrPublishing.c" } else { - gchar** _tmp4_ = NULL; - gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp4_; + gint _tmp4__length1; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; -#line 6158 "TumblrPublishing.c" +#line 6171 "TumblrPublishing.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 6164 "TumblrPublishing.c" +#line 6177 "TumblrPublishing.c" } else { gboolean _tmp5_ = FALSE; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp6_; + gint _tmp6__length1; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { -#line 6175 "TumblrPublishing.c" - gchar** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 6188 "TumblrPublishing.c" + gchar** _tmp7_; + gint _tmp7__length1; + const gchar* _tmp8_; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; -#line 6187 "TumblrPublishing.c" +#line 6200 "TumblrPublishing.c" } else { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = FALSE; -#line 6191 "TumblrPublishing.c" +#line 6204 "TumblrPublishing.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; -#line 6195 "TumblrPublishing.c" +#line 6208 "TumblrPublishing.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 6199 "TumblrPublishing.c" +#line 6212 "TumblrPublishing.c" gint i = 0; gsize len = 0UL; - gint _tmp31_ = 0; - gint _tmp33_ = 0; - gint _tmp34_ = 0; - gsize _tmp35_ = 0UL; - const gchar* _tmp36_ = NULL; - gint _tmp37_ = 0; - gint _tmp38_ = 0; - gint _tmp39_ = 0; + gint _tmp31_; + gint _tmp33_; + gint _tmp34_; + gsize _tmp35_; + const gchar* _tmp36_; + gint _tmp37_; + gint _tmp38_; + gint _tmp39_; const gchar* res = NULL; - gsize _tmp40_ = 0UL; - void* _tmp41_ = NULL; + gsize _tmp40_; + void* _tmp41_; void* ptr = NULL; - const gchar* _tmp42_ = NULL; - gchar** _tmp43_ = NULL; - gint _tmp43__length1 = 0; - const gchar* _tmp44_ = NULL; - void* _tmp45_ = NULL; - const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp42_; + gchar** _tmp43_; + gint _tmp43__length1; + const gchar* _tmp44_; + void* _tmp45_; + const gchar* _tmp62_; +#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = (gsize) 1; -#line 6222 "TumblrPublishing.c" +#line 6235 "TumblrPublishing.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { -#line 6231 "TumblrPublishing.c" +#line 6244 "TumblrPublishing.c" gboolean _tmp11_ = FALSE; gboolean _tmp12_ = FALSE; - gchar** _tmp13_ = NULL; - gint _tmp13__length1 = 0; + gchar** _tmp13_; + gint _tmp13__length1; gint _tmp21_ = 0; - gchar** _tmp22_ = NULL; - gint _tmp22__length1 = 0; - gint _tmp23_ = 0; - const gchar* _tmp24_ = NULL; - gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp22_; + gint _tmp22__length1; + gint _tmp23_; + const gchar* _tmp24_; + gsize _tmp30_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp9_) { -#line 6244 "TumblrPublishing.c" - gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 6257 "TumblrPublishing.c" + gint _tmp10_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp10_ + 1; -#line 6250 "TumblrPublishing.c" +#line 6263 "TumblrPublishing.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { -#line 6260 "TumblrPublishing.c" - gint _tmp14_ = 0; - gchar** _tmp15_ = NULL; - gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 6273 "TumblrPublishing.c" + gint _tmp14_; + gchar** _tmp15_; + gint _tmp15__length1; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; -#line 6272 "TumblrPublishing.c" +#line 6285 "TumblrPublishing.c" } else { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 6276 "TumblrPublishing.c" +#line 6289 "TumblrPublishing.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = TRUE; -#line 6282 "TumblrPublishing.c" +#line 6295 "TumblrPublishing.c" } else { gboolean _tmp16_ = FALSE; - gchar** _tmp17_ = NULL; - gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp17_; + gint _tmp17__length1; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { -#line 6293 "TumblrPublishing.c" - gchar** _tmp18_ = NULL; - gint _tmp18__length1 = 0; - gint _tmp19_ = 0; - const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 6306 "TumblrPublishing.c" + gchar** _tmp18_; + gint _tmp18__length1; + gint _tmp19_; + const gchar* _tmp20_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; -#line 6308 "TumblrPublishing.c" +#line 6321 "TumblrPublishing.c" } else { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = FALSE; -#line 6312 "TumblrPublishing.c" +#line 6325 "TumblrPublishing.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; -#line 6316 "TumblrPublishing.c" +#line 6329 "TumblrPublishing.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" break; -#line 6322 "TumblrPublishing.c" +#line 6335 "TumblrPublishing.c" } -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { -#line 6334 "TumblrPublishing.c" - gchar** _tmp25_ = NULL; - gint _tmp25__length1 = 0; - gint _tmp26_ = 0; - const gchar* _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 6347 "TumblrPublishing.c" + gchar** _tmp25_; + gint _tmp25__length1; + gint _tmp26_; + const gchar* _tmp27_; + gint _tmp28_; + gint _tmp29_; +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; -#line 6355 "TumblrPublishing.c" +#line 6368 "TumblrPublishing.c" } else { -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = 0; -#line 6359 "TumblrPublishing.c" +#line 6372 "TumblrPublishing.c" } -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; -#line 6365 "TumblrPublishing.c" +#line 6378 "TumblrPublishing.c" } } -#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { -#line 6372 "TumblrPublishing.c" - gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 6385 "TumblrPublishing.c" + gchar* _tmp32_; +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 6380 "TumblrPublishing.c" +#line 6393 "TumblrPublishing.c" } -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp45_; -#line 6418 "TumblrPublishing.c" +#line 6431 "TumblrPublishing.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { -#line 6427 "TumblrPublishing.c" - gint _tmp48_ = 0; - gchar** _tmp49_ = NULL; - gint _tmp49__length1 = 0; - void* _tmp50_ = NULL; - const gchar* _tmp51_ = NULL; - void* _tmp52_ = NULL; +#line 6440 "TumblrPublishing.c" + gint _tmp48_; + gchar** _tmp49_; + gint _tmp49__length1; + void* _tmp50_; + const gchar* _tmp51_; + void* _tmp52_; const gchar* _tmp53_ = NULL; - gchar** _tmp54_ = NULL; - gint _tmp54__length1 = 0; - gint _tmp55_ = 0; - const gchar* _tmp56_ = NULL; - void* _tmp60_ = NULL; - void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp54_; + gint _tmp54__length1; + gint _tmp55_; + const gchar* _tmp56_; + void* _tmp60_; + void* _tmp61_; +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp46_) { -#line 6443 "TumblrPublishing.c" - gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 6456 "TumblrPublishing.c" + gint _tmp47_; +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp47_ + 1; -#line 6449 "TumblrPublishing.c" +#line 6462 "TumblrPublishing.c" } -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" break; -#line 6463 "TumblrPublishing.c" +#line 6476 "TumblrPublishing.c" } -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { -#line 6483 "TumblrPublishing.c" - gchar** _tmp57_ = NULL; - gint _tmp57__length1 = 0; - gint _tmp58_ = 0; - const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 6496 "TumblrPublishing.c" + gchar** _tmp57_; + gint _tmp57__length1; + gint _tmp58_; + const gchar* _tmp59_; +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; -#line 6498 "TumblrPublishing.c" +#line 6511 "TumblrPublishing.c" } else { -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = ""; -#line 6502 "TumblrPublishing.c" +#line 6515 "TumblrPublishing.c" } -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp61_; -#line 6510 "TumblrPublishing.c" +#line 6523 "TumblrPublishing.c" } } -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 6521 "TumblrPublishing.c" +#line 6534 "TumblrPublishing.c" } else { - gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp63_; +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 6530 "TumblrPublishing.c" +#line 6543 "TumblrPublishing.c" } } static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) { PublishingTumblrTumblrPublisherUploadTransaction * self; - PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - PublishingTumblrTumblrPublisherSession* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - PublishingTumblrTumblrPublisherSession* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + PublishingTumblrTumblrPublisherSession* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + PublishingTumblrTumblrPublisherSession* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + PublishingTumblrTumblrPublisherSession* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; gchar* payload = NULL; gsize payload_length = 0UL; - PublishingTumblrTumblrPublisherSession* _tmp34_ = NULL; + PublishingTumblrTumblrPublisherSession* _tmp33_; gchar* authorization_header = NULL; - gchar* _tmp35_ = NULL; - const gchar* _tmp36_ = NULL; - const gchar* _tmp37_ = NULL; + gchar* _tmp34_; + const gchar* _tmp35_; + const gchar* _tmp36_; PublishingRESTSupportArgument** request_arguments = NULL; - gint _tmp38_ = 0; - PublishingRESTSupportArgument** _tmp39_ = NULL; - gint request_arguments_length1 = 0; - gint _request_arguments_size_ = 0; - PublishingRESTSupportArgument** _tmp40_ = NULL; - gint _tmp40__length1 = 0; + gint _tmp37_; + PublishingRESTSupportArgument** _tmp38_; + gint request_arguments_length1; + gint _request_arguments_size_; + PublishingRESTSupportArgument** _tmp39_; + gint _tmp39__length1; gchar* request_data = NULL; - gchar* _tmp41_ = NULL; + gchar* _tmp40_; SoupMessage* outbound_message = NULL; - gchar* _tmp64_ = NULL; - gchar* _tmp65_ = NULL; - SoupMessage* _tmp66_ = NULL; - SoupMessage* _tmp67_ = NULL; - SoupMessage* _tmp68_ = NULL; - const gchar* _tmp69_ = NULL; - guint8* _tmp70_ = NULL; - gint _tmp70__length1 = 0; - guint8* _tmp71_ = NULL; - gint _tmp71__length1 = 0; + gchar* _tmp63_; + gchar* _tmp64_; + SoupMessage* _tmp65_; + SoupMessage* _tmp66_; + SoupMessage* _tmp67_; + const gchar* _tmp68_; + guint8* _tmp69_; + gint _tmp69__length1; + guint8* _tmp70_; + gint _tmp70__length1; GeeMapIterator* i = NULL; - GeeHashMap* _tmp72_ = NULL; - GeeMapIterator* _tmp73_ = NULL; + GeeHashMap* _tmp71_; + GeeMapIterator* _tmp72_; gboolean cont = FALSE; - GeeMapIterator* _tmp74_ = NULL; - gboolean _tmp75_ = FALSE; - SoupMessage* _tmp87_ = NULL; + GeeMapIterator* _tmp73_; + gboolean _tmp74_; + SoupMessage* _tmp86_; GError * _inner_error_ = NULL; #line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransaction); @@ -6633,37 +6646,37 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute ( publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_token", _tmp8_); #line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp8_); -#line 6619 "TumblrPublishing.c" +#line 6632 "TumblrPublishing.c" { - SpitPublishingPublishable* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; + SpitPublishingPublishable* _tmp9_; + GFile* _tmp10_; + GFile* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; gchar* _tmp14_ = NULL; gsize _tmp15_ = 0UL; gchar* reqdata = NULL; - const gchar* _tmp16_ = NULL; - guint8* _tmp17_ = NULL; - gint _tmp17__length1 = 0; - guint8* _tmp18_ = NULL; - gint _tmp18__length1 = 0; - gsize _tmp19_ = 0UL; - gchar* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; + const gchar* _tmp16_; + guint8* _tmp17_; + gint _tmp17__length1; + guint8* _tmp18_; + gint _tmp18__length1; + gsize _tmp19_; + gchar* _tmp20_; + const gchar* _tmp21_; gchar** keywords = NULL; - SpitPublishingPublishable* _tmp22_ = NULL; - gint _tmp23_ = 0; - gchar** _tmp24_ = NULL; - gint keywords_length1 = 0; - gint _keywords_size_ = 0; + SpitPublishingPublishable* _tmp22_; + gint _tmp23_; + gchar** _tmp24_; + gint keywords_length1; + gint _keywords_size_; gchar* tags = NULL; - gchar* _tmp25_ = NULL; - gchar** _tmp26_ = NULL; - gint _tmp26__length1 = 0; - const gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; + gchar* _tmp25_; + gchar** _tmp26_; + gint _tmp26__length1; + const gchar* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->publishable; #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -6690,7 +6703,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute ( if (G_UNLIKELY (_inner_error_ != NULL)) { #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_inner_error_->domain == G_FILE_ERROR) { -#line 6676 "TumblrPublishing.c" +#line 6689 "TumblrPublishing.c" goto __catch38_g_file_error; } #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -6701,7 +6714,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute ( g_clear_error (&_inner_error_); #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 6687 "TumblrPublishing.c" +#line 6700 "TumblrPublishing.c" } #line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp16_ = payload; @@ -6743,10 +6756,10 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute ( _tmp26__length1 = keywords_length1; #line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp26_ != NULL) { -#line 6729 "TumblrPublishing.c" - gchar** _tmp27_ = NULL; - gint _tmp27__length1 = 0; - gchar* _tmp28_ = NULL; +#line 6742 "TumblrPublishing.c" + gchar** _tmp27_; + gint _tmp27__length1; + gchar* _tmp28_; #line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp27_ = keywords; #line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -6757,7 +6770,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute ( _g_free0 (tags); #line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" tags = _tmp28_; -#line 6743 "TumblrPublishing.c" +#line 6756 "TumblrPublishing.c" } #line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp29_ = tags; @@ -6775,27 +6788,24 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute ( keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL); #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (reqdata); -#line 6761 "TumblrPublishing.c" +#line 6774 "TumblrPublishing.c" } goto __finally38; __catch38_g_file_error: { GError* e = NULL; - const gchar* _tmp32_ = NULL; - GError* _tmp33_ = NULL; + GError* _tmp32_; #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" e = _inner_error_; #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _inner_error_ = NULL; #line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp32_ = _ ("A temporary file needed for publishing is unavailable"); -#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp33_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp32_); + _tmp32_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _ ("A temporary file needed for publishing is unavailable")); #line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _inner_error_ = _tmp33_; + _inner_error_ = _tmp32_; #line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_error_free0 (e); -#line 6781 "TumblrPublishing.c" +#line 6791 "TumblrPublishing.c" goto __finally38; } __finally38: @@ -6809,7 +6819,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute ( _g_free0 (payload); #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 6795 "TumblrPublishing.c" +#line 6805 "TumblrPublishing.c" } else { #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (payload); @@ -6819,259 +6829,259 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute ( g_clear_error (&_inner_error_); #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 6805 "TumblrPublishing.c" +#line 6815 "TumblrPublishing.c" } } #line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp34_ = self->priv->session; + _tmp33_ = self->priv->session; #line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - publishing_tumblr_tumblr_publisher_session_sign_transaction (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); + publishing_tumblr_tumblr_publisher_session_sign_transaction (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); #line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp35_ = publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_string (self); + _tmp34_ = publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_string (self); #line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - authorization_header = _tmp35_; + authorization_header = _tmp34_; #line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp36_ = authorization_header; + _tmp35_ = authorization_header; #line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_debug ("TumblrPublishing.vala:968: executing upload transaction: authorization" \ -" header string = '%s'", _tmp36_); +" header string = '%s'", _tmp35_); #line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp37_ = authorization_header; + _tmp36_ = authorization_header; #line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp37_); + publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp36_); #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp39_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp38_); + _tmp38_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp37_); #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - request_arguments = _tmp39_; + request_arguments = _tmp38_; #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - request_arguments_length1 = _tmp38_; + request_arguments_length1 = _tmp37_; #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _request_arguments_size_ = request_arguments_length1; #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp40_ = request_arguments; + _tmp39_ = request_arguments; #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp40__length1 = request_arguments_length1; + _tmp39__length1 = request_arguments_length1; #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _vala_assert (_tmp40__length1 > 0, "request_arguments.length > 0"); + _vala_assert (_tmp39__length1 > 0, "request_arguments.length > 0"); #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp41_ = g_strdup (""); + _tmp40_ = g_strdup (""); #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - request_data = _tmp41_; -#line 6842 "TumblrPublishing.c" + request_data = _tmp40_; +#line 6852 "TumblrPublishing.c" { gint i = 0; #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" i = 0; -#line 6847 "TumblrPublishing.c" +#line 6857 "TumblrPublishing.c" { - gboolean _tmp42_ = FALSE; + gboolean _tmp41_ = FALSE; #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp42_ = TRUE; + _tmp41_ = TRUE; #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" while (TRUE) { -#line 6854 "TumblrPublishing.c" - gint _tmp44_ = 0; - PublishingRESTSupportArgument** _tmp45_ = NULL; - gint _tmp45__length1 = 0; - const gchar* _tmp46_ = NULL; - PublishingRESTSupportArgument** _tmp47_ = NULL; - gint _tmp47__length1 = 0; - gint _tmp48_ = 0; - PublishingRESTSupportArgument* _tmp49_ = NULL; - const gchar* _tmp50_ = NULL; - gchar* _tmp51_ = NULL; - gchar* _tmp52_ = NULL; - PublishingRESTSupportArgument** _tmp53_ = NULL; - gint _tmp53__length1 = 0; - gint _tmp54_ = 0; - PublishingRESTSupportArgument* _tmp55_ = NULL; - const gchar* _tmp56_ = NULL; - gchar* _tmp57_ = NULL; - gchar* _tmp58_ = NULL; - gchar* _tmp59_ = NULL; - gint _tmp60_ = 0; - PublishingRESTSupportArgument** _tmp61_ = NULL; - gint _tmp61__length1 = 0; +#line 6864 "TumblrPublishing.c" + gint _tmp43_; + PublishingRESTSupportArgument** _tmp44_; + gint _tmp44__length1; + const gchar* _tmp45_; + PublishingRESTSupportArgument** _tmp46_; + gint _tmp46__length1; + gint _tmp47_; + PublishingRESTSupportArgument* _tmp48_; + const gchar* _tmp49_; + gchar* _tmp50_; + gchar* _tmp51_; + PublishingRESTSupportArgument** _tmp52_; + gint _tmp52__length1; + gint _tmp53_; + PublishingRESTSupportArgument* _tmp54_; + const gchar* _tmp55_; + gchar* _tmp56_; + gchar* _tmp57_; + gchar* _tmp58_; + gint _tmp59_; + PublishingRESTSupportArgument** _tmp60_; + gint _tmp60__length1; #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - if (!_tmp42_) { -#line 6879 "TumblrPublishing.c" - gint _tmp43_ = 0; + if (!_tmp41_) { +#line 6889 "TumblrPublishing.c" + gint _tmp42_; #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp43_ = i; + _tmp42_ = i; #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - i = _tmp43_ + 1; -#line 6885 "TumblrPublishing.c" + i = _tmp42_ + 1; +#line 6895 "TumblrPublishing.c" } #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp42_ = FALSE; + _tmp41_ = FALSE; #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp44_ = i; + _tmp43_ = i; #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp45_ = request_arguments; + _tmp44_ = request_arguments; #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp45__length1 = request_arguments_length1; + _tmp44__length1 = request_arguments_length1; #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - if (!(_tmp44_ < _tmp45__length1)) { + if (!(_tmp43_ < _tmp44__length1)) { #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" break; -#line 6899 "TumblrPublishing.c" +#line 6909 "TumblrPublishing.c" } #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp46_ = request_data; + _tmp45_ = request_data; #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp47_ = request_arguments; + _tmp46_ = request_arguments; #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp47__length1 = request_arguments_length1; + _tmp46__length1 = request_arguments_length1; #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp48_ = i; + _tmp47_ = i; #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp49_ = _tmp47_[_tmp48_]; + _tmp48_ = _tmp46_[_tmp47_]; #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp50_ = _tmp49_->key; + _tmp49_ = _tmp48_->key; #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp51_ = g_strconcat (_tmp50_, "=", NULL); + _tmp50_ = g_strconcat (_tmp49_, "=", NULL); #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp52_ = _tmp51_; + _tmp51_ = _tmp50_; #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp53_ = request_arguments; + _tmp52_ = request_arguments; #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp53__length1 = request_arguments_length1; + _tmp52__length1 = request_arguments_length1; #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp54_ = i; + _tmp53_ = i; #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp55_ = _tmp53_[_tmp54_]; + _tmp54_ = _tmp52_[_tmp53_]; #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp56_ = _tmp55_->value; + _tmp55_ = _tmp54_->value; #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp57_ = g_strconcat (_tmp52_, _tmp56_, NULL); + _tmp56_ = g_strconcat (_tmp51_, _tmp55_, NULL); #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp58_ = _tmp57_; + _tmp57_ = _tmp56_; #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp59_ = g_strconcat (_tmp46_, _tmp58_, NULL); + _tmp58_ = g_strconcat (_tmp45_, _tmp57_, NULL); #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (request_data); #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - request_data = _tmp59_; + request_data = _tmp58_; #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_free0 (_tmp58_); + _g_free0 (_tmp57_); #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_free0 (_tmp52_); + _g_free0 (_tmp51_); #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp60_ = i; + _tmp59_ = i; #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp61_ = request_arguments; + _tmp60_ = request_arguments; #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp61__length1 = request_arguments_length1; + _tmp60__length1 = request_arguments_length1; #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - if (_tmp60_ < (_tmp61__length1 - 1)) { -#line 6949 "TumblrPublishing.c" - const gchar* _tmp62_ = NULL; - gchar* _tmp63_ = NULL; + if (_tmp59_ < (_tmp60__length1 - 1)) { +#line 6959 "TumblrPublishing.c" + const gchar* _tmp61_; + gchar* _tmp62_; #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp62_ = request_data; + _tmp61_ = request_data; #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp63_ = g_strconcat (_tmp62_, "&", NULL); + _tmp62_ = g_strconcat (_tmp61_, "&", NULL); #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (request_data); #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - request_data = _tmp63_; -#line 6960 "TumblrPublishing.c" + request_data = _tmp62_; +#line 6970 "TumblrPublishing.c" } } } } #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp64_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); + _tmp63_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp65_ = _tmp64_; + _tmp64_ = _tmp63_; #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp66_ = soup_message_new ("POST", _tmp65_); + _tmp65_ = soup_message_new ("POST", _tmp64_); #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp67_ = _tmp66_; + _tmp66_ = _tmp65_; #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_free0 (_tmp65_); + _g_free0 (_tmp64_); #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - outbound_message = _tmp67_; + outbound_message = _tmp66_; #line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp68_ = outbound_message; + _tmp67_ = outbound_message; #line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp69_ = request_data; + _tmp68_ = request_data; #line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp70_ = string_get_data (_tmp69_, &_tmp70__length1); + _tmp69_ = string_get_data (_tmp68_, &_tmp69__length1); #line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp71_ = _tmp70_; + _tmp70_ = _tmp69_; #line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp71__length1 = _tmp70__length1; + _tmp70__length1 = _tmp69__length1; #line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - soup_message_set_request (_tmp68_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp71_, (gsize) _tmp71__length1); + soup_message_set_request (_tmp67_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp70_, (gsize) _tmp70__length1); #line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp72_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->message_headers; + _tmp71_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->message_headers; #line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp73_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp72_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - i = _tmp73_; + i = _tmp72_; #line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp74_ = i; + _tmp73_ = i; #line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp75_ = gee_map_iterator_next (_tmp74_); + _tmp74_ = gee_map_iterator_next (_tmp73_); #line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - cont = _tmp75_; + cont = _tmp74_; #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" while (TRUE) { -#line 7003 "TumblrPublishing.c" - gboolean _tmp76_ = FALSE; - SoupMessage* _tmp77_ = NULL; - SoupMessageHeaders* _tmp78_ = NULL; - GeeMapIterator* _tmp79_ = NULL; - gpointer _tmp80_ = NULL; - gchar* _tmp81_ = NULL; - GeeMapIterator* _tmp82_ = NULL; - gpointer _tmp83_ = NULL; - gchar* _tmp84_ = NULL; - GeeMapIterator* _tmp85_ = NULL; - gboolean _tmp86_ = FALSE; +#line 7013 "TumblrPublishing.c" + gboolean _tmp75_; + SoupMessage* _tmp76_; + SoupMessageHeaders* _tmp77_; + GeeMapIterator* _tmp78_; + gpointer _tmp79_; + gchar* _tmp80_; + GeeMapIterator* _tmp81_; + gpointer _tmp82_; + gchar* _tmp83_; + GeeMapIterator* _tmp84_; + gboolean _tmp85_; #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp76_ = cont; + _tmp75_ = cont; #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - if (!_tmp76_) { + if (!_tmp75_) { #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" break; -#line 7021 "TumblrPublishing.c" +#line 7031 "TumblrPublishing.c" } #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp77_ = outbound_message; + _tmp76_ = outbound_message; #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp78_ = _tmp77_->request_headers; + _tmp77_ = _tmp76_->request_headers; #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp79_ = i; + _tmp78_ = i; #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp80_ = gee_map_iterator_get_key (_tmp79_); + _tmp79_ = gee_map_iterator_get_key (_tmp78_); #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp81_ = (gchar*) _tmp80_; + _tmp80_ = (gchar*) _tmp79_; #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp82_ = i; + _tmp81_ = i; #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp83_ = gee_map_iterator_get_value (_tmp82_); + _tmp82_ = gee_map_iterator_get_value (_tmp81_); #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp84_ = (gchar*) _tmp83_; + _tmp83_ = (gchar*) _tmp82_; #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - soup_message_headers_append (_tmp78_, _tmp81_, _tmp84_); + soup_message_headers_append (_tmp77_, _tmp80_, _tmp83_); #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_free0 (_tmp84_); + _g_free0 (_tmp83_); #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_free0 (_tmp81_); + _g_free0 (_tmp80_); #line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp85_ = i; + _tmp84_ = i; #line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp86_ = gee_map_iterator_next (_tmp85_); + _tmp85_ = gee_map_iterator_next (_tmp84_); #line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - cont = _tmp86_; -#line 7051 "TumblrPublishing.c" + cont = _tmp85_; +#line 7061 "TumblrPublishing.c" } #line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp87_ = outbound_message; + _tmp86_ = outbound_message; #line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp87_); + publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp86_); #line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE); #line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -7096,7 +7106,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute ( _g_free0 (payload); #line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 7081 "TumblrPublishing.c" +#line 7091 "TumblrPublishing.c" } else { #line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (i); @@ -7116,7 +7126,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute ( g_clear_error (&_inner_error_); #line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 7101 "TumblrPublishing.c" +#line 7111 "TumblrPublishing.c" } } #line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -7131,7 +7141,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute ( _g_free0 (authorization_header); #line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (payload); -#line 7116 "TumblrPublishing.c" +#line 7126 "TumblrPublishing.c" } @@ -7143,19 +7153,19 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_class_init (Pu #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherUploadTransactionPrivate)); #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_tumblr_tumblr_publisher_upload_transaction_real_execute; -#line 7129 "TumblrPublishing.c" + ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_tumblr_tumblr_publisher_upload_transaction_real_execute; +#line 7139 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_upload_transaction_instance_init (PublishingTumblrTumblrPublisherUploadTransaction * self) { #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOAD_TRANSACTION_GET_PRIVATE (self); -#line 7136 "TumblrPublishing.c" +#line 7146 "TumblrPublishing.c" } -static void publishing_tumblr_tumblr_publisher_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) { +static void publishing_tumblr_tumblr_publisher_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) { PublishingTumblrTumblrPublisherUploadTransaction * self; #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransaction); @@ -7165,7 +7175,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_finalize (Publ self->priv->auth_header_fields = (_vala_array_free (self->priv->auth_header_fields, self->priv->auth_header_fields_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_tumblr_tumblr_publisher_upload_transaction_parent_class)->finalize (obj); -#line 7150 "TumblrPublishing.c" +#line 7160 "TumblrPublishing.c" } @@ -7183,11 +7193,11 @@ GType publishing_tumblr_tumblr_publisher_upload_transaction_get_type (void) { PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable** publishables, int publishables_length1, const gchar* blog_url) { PublishingTumblrTumblrPublisherUploader* self = NULL; - PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL; - SpitPublishingPublishable** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + PublishingTumblrTumblrPublisherSession* _tmp0_; + SpitPublishingPublishable** _tmp1_; + gint _tmp1__length1; + const gchar* _tmp2_; + gchar* _tmp3_; #line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL); #line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -7210,27 +7220,27 @@ PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uplo self->priv->blog_url = _tmp3_; #line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self; -#line 7195 "TumblrPublishing.c" +#line 7205 "TumblrPublishing.c" } PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_new (PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable** publishables, int publishables_length1, const gchar* blog_url) { #line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return publishing_tumblr_tumblr_publisher_uploader_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, session, publishables, publishables_length1, blog_url); -#line 7202 "TumblrPublishing.c" +#line 7212 "TumblrPublishing.c" } static PublishingRESTSupportTransaction* publishing_tumblr_tumblr_publisher_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) { PublishingTumblrTumblrPublisherUploader * self; PublishingRESTSupportTransaction* result = NULL; - PublishingRESTSupportSession* _tmp0_ = NULL; - PublishingTumblrTumblrPublisherSession* _tmp1_ = NULL; - SpitPublishingPublishable* _tmp2_ = NULL; - SpitPublishingPublishable* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - PublishingTumblrTumblrPublisherUploadTransaction* _tmp5_ = NULL; - PublishingRESTSupportTransaction* _tmp6_ = NULL; + PublishingRESTSupportSession* _tmp0_; + PublishingTumblrTumblrPublisherSession* _tmp1_; + SpitPublishingPublishable* _tmp2_; + SpitPublishingPublishable* _tmp3_; + const gchar* _tmp4_; + PublishingTumblrTumblrPublisherUploadTransaction* _tmp5_; + PublishingRESTSupportTransaction* _tmp6_; #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploader); #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -7259,7 +7269,7 @@ static PublishingRESTSupportTransaction* publishing_tumblr_tumblr_publisher_uplo result = _tmp6_; #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 7244 "TumblrPublishing.c" +#line 7254 "TumblrPublishing.c" } @@ -7271,24 +7281,24 @@ static void publishing_tumblr_tumblr_publisher_uploader_class_init (PublishingTu #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherUploaderPrivate)); #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_tumblr_tumblr_publisher_uploader_real_create_transaction; -#line 7257 "TumblrPublishing.c" + ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_tumblr_tumblr_publisher_uploader_real_create_transaction; +#line 7267 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_uploader_instance_init (PublishingTumblrTumblrPublisherUploader * self) { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_GET_PRIVATE (self); #line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = g_strdup (""); #line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->blog_url = _tmp0_; -#line 7269 "TumblrPublishing.c" +#line 7279 "TumblrPublishing.c" } -static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingRESTSupportBatchUploader* obj) { +static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingRESTSupportBatchUploader * obj) { PublishingTumblrTumblrPublisherUploader * self; #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploader); @@ -7296,7 +7306,7 @@ static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingREST _g_free0 (self->priv->blog_url); #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_tumblr_tumblr_publisher_uploader_parent_class)->finalize (obj); -#line 7281 "TumblrPublishing.c" +#line 7291 "TumblrPublishing.c" } @@ -7318,14 +7328,14 @@ PublishingTumblrTumblrPublisherSession* publishing_tumblr_tumblr_publisher_sessi self = (PublishingTumblrTumblrPublisherSession*) publishing_rest_support_session_construct (object_type, PUBLISHING_TUMBLR_ENDPOINT_URL); #line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self; -#line 7303 "TumblrPublishing.c" +#line 7313 "TumblrPublishing.c" } PublishingTumblrTumblrPublisherSession* publishing_tumblr_tumblr_publisher_session_new (void) { #line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return publishing_tumblr_tumblr_publisher_session_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION); -#line 7310 "TumblrPublishing.c" +#line 7320 "TumblrPublishing.c" } @@ -7333,38 +7343,38 @@ static gboolean publishing_tumblr_tumblr_publisher_session_real_is_authenticated PublishingTumblrTumblrPublisherSession * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; - const gchar* _tmp1_ = NULL; + const gchar* _tmp1_; #line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession); #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = self->priv->access_phase_token; #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp1_ != NULL) { -#line 7325 "TumblrPublishing.c" - const gchar* _tmp2_ = NULL; +#line 7335 "TumblrPublishing.c" + const gchar* _tmp2_; #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = self->priv->access_phase_token_secret; #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = _tmp2_ != NULL; -#line 7331 "TumblrPublishing.c" +#line 7341 "TumblrPublishing.c" } else { #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = FALSE; -#line 7335 "TumblrPublishing.c" +#line 7345 "TumblrPublishing.c" } #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result = _tmp0_; #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 7341 "TumblrPublishing.c" +#line 7351 "TumblrPublishing.c" } void publishing_tumblr_tumblr_publisher_session_authenticate_from_persistent_credentials (PublishingTumblrTumblrPublisherSession* self, const gchar* token, const gchar* secret) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; #line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self)); #line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -7389,7 +7399,7 @@ void publishing_tumblr_tumblr_publisher_session_authenticate_from_persistent_cre self->priv->access_phase_token_secret = _tmp3_; #line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated"); -#line 7374 "TumblrPublishing.c" +#line 7384 "TumblrPublishing.c" } @@ -7404,92 +7414,92 @@ void publishing_tumblr_tumblr_publisher_session_deauthenticate (PublishingTumblr _g_free0 (self->priv->access_phase_token_secret); #line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->access_phase_token_secret = NULL; -#line 7389 "TumblrPublishing.c" +#line 7399 "TumblrPublishing.c" } static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) { #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self ? publishing_rest_support_transaction_ref (self) : NULL; -#line 7396 "TumblrPublishing.c" +#line 7406 "TumblrPublishing.c" } -static void _vala_array_add23 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) { +static void _vala_array_add23 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) { #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if ((*length) == (*size)) { #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1); -#line 7407 "TumblrPublishing.c" +#line 7417 "TumblrPublishing.c" } #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" (*array)[(*length)++] = value; #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" (*array)[*length] = NULL; -#line 7413 "TumblrPublishing.c" +#line 7423 "TumblrPublishing.c" } void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumblrTumblrPublisherSession* self, PublishingRESTSupportTransaction* txn) { gchar* http_method = NULL; - PublishingRESTSupportTransaction* _tmp0_ = NULL; - PublishingRESTSupportHttpMethod _tmp1_ = 0; - gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + PublishingRESTSupportHttpMethod _tmp1_; + gchar* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; gchar* signing_key = NULL; - const gchar* _tmp6_ = NULL; + const gchar* _tmp6_; PublishingRESTSupportArgument** base_string_arguments = NULL; - PublishingRESTSupportTransaction* _tmp11_ = NULL; - gint _tmp12_ = 0; - PublishingRESTSupportArgument** _tmp13_ = NULL; - gint base_string_arguments_length1 = 0; - gint _base_string_arguments_size_ = 0; + PublishingRESTSupportTransaction* _tmp11_; + gint _tmp12_; + PublishingRESTSupportArgument** _tmp13_; + gint base_string_arguments_length1; + gint _base_string_arguments_size_; PublishingTumblrTumblrPublisherUploadTransaction* upload_txn = NULL; - PublishingRESTSupportTransaction* _tmp14_ = NULL; - PublishingTumblrTumblrPublisherUploadTransaction* _tmp15_ = NULL; - PublishingTumblrTumblrPublisherUploadTransaction* _tmp16_ = NULL; + PublishingRESTSupportTransaction* _tmp14_; + PublishingTumblrTumblrPublisherUploadTransaction* _tmp15_; + PublishingTumblrTumblrPublisherUploadTransaction* _tmp16_; PublishingRESTSupportArgument** sorted_args = NULL; - PublishingRESTSupportArgument** _tmp25_ = NULL; - gint _tmp25__length1 = 0; - gint _tmp26_ = 0; - PublishingRESTSupportArgument** _tmp27_ = NULL; - gint sorted_args_length1 = 0; - gint _sorted_args_size_ = 0; + PublishingRESTSupportArgument** _tmp25_; + gint _tmp25__length1; + gint _tmp26_; + PublishingRESTSupportArgument** _tmp27_; + gint sorted_args_length1; + gint _sorted_args_size_; gchar* arguments_string = NULL; - gchar* _tmp28_ = NULL; + gchar* _tmp28_; gchar* signature_base_string = NULL; - const gchar* _tmp51_ = NULL; - gchar* _tmp52_ = NULL; - gchar* _tmp53_ = NULL; - PublishingRESTSupportTransaction* _tmp54_ = NULL; - gchar* _tmp55_ = NULL; - gchar* _tmp56_ = NULL; - gchar* _tmp57_ = NULL; - gchar* _tmp58_ = NULL; - gchar* _tmp59_ = NULL; - gchar* _tmp60_ = NULL; - gchar* _tmp61_ = NULL; - gchar* _tmp62_ = NULL; - const gchar* _tmp63_ = NULL; - gchar* _tmp64_ = NULL; - gchar* _tmp65_ = NULL; - gchar* _tmp66_ = NULL; - gchar* _tmp67_ = NULL; - const gchar* _tmp68_ = NULL; - const gchar* _tmp69_ = NULL; + const gchar* _tmp51_; + gchar* _tmp52_; + gchar* _tmp53_; + PublishingRESTSupportTransaction* _tmp54_; + gchar* _tmp55_; + gchar* _tmp56_; + gchar* _tmp57_; + gchar* _tmp58_; + gchar* _tmp59_; + gchar* _tmp60_; + gchar* _tmp61_; + gchar* _tmp62_; + const gchar* _tmp63_; + gchar* _tmp64_; + gchar* _tmp65_; + gchar* _tmp66_; + gchar* _tmp67_; + const gchar* _tmp68_; + const gchar* _tmp69_; gchar* signature = NULL; - const gchar* _tmp70_ = NULL; - const gchar* _tmp71_ = NULL; - gchar* _tmp72_ = NULL; - const gchar* _tmp73_ = NULL; - const gchar* _tmp74_ = NULL; - gchar* _tmp75_ = NULL; - const gchar* _tmp76_ = NULL; - PublishingTumblrTumblrPublisherUploadTransaction* _tmp77_ = NULL; + const gchar* _tmp70_; + const gchar* _tmp71_; + gchar* _tmp72_; + const gchar* _tmp73_; + const gchar* _tmp74_; + gchar* _tmp75_; + const gchar* _tmp76_; + PublishingTumblrTumblrPublisherUploadTransaction* _tmp77_; #line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self)); #line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -7520,10 +7530,10 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb _tmp6_ = self->priv->access_phase_token_secret; #line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp6_ != NULL) { -#line 7505 "TumblrPublishing.c" - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; +#line 7515 "TumblrPublishing.c" + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_debug ("TumblrPublishing.vala:1055: access phase token secret available; using" \ " it as signing key"); @@ -7539,9 +7549,9 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb signing_key = _tmp9_; #line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp8_); -#line 7523 "TumblrPublishing.c" +#line 7533 "TumblrPublishing.c" } else { - gchar* _tmp10_ = NULL; + gchar* _tmp10_; #line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_debug ("TumblrPublishing.vala:1059: %s", "Access phase token secret not available; using API " "key as signing key"); #line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -7550,7 +7560,7 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb _g_free0 (signing_key); #line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" signing_key = _tmp10_; -#line 7534 "TumblrPublishing.c" +#line 7544 "TumblrPublishing.c" } #line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp11_ = txn; @@ -7572,15 +7582,15 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb _tmp16_ = upload_txn; #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp16_ != NULL) { -#line 7556 "TumblrPublishing.c" +#line 7566 "TumblrPublishing.c" PublishingRESTSupportArgument** auth_header_args = NULL; - PublishingTumblrTumblrPublisherUploadTransaction* _tmp17_ = NULL; - gint _tmp18_ = 0; - PublishingRESTSupportArgument** _tmp19_ = NULL; - gint auth_header_args_length1 = 0; - gint _auth_header_args_size_ = 0; - PublishingRESTSupportArgument** _tmp20_ = NULL; - gint _tmp20__length1 = 0; + PublishingTumblrTumblrPublisherUploadTransaction* _tmp17_; + gint _tmp18_; + PublishingRESTSupportArgument** _tmp19_; + gint auth_header_args_length1; + gint _auth_header_args_size_; + PublishingRESTSupportArgument** _tmp20_; + gint _tmp20__length1; #line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_debug ("TumblrPublishing.vala:1070: %s", "this transaction is an UploadTransaction; including Authorization head" \ "er " "fields in signature base string"); @@ -7598,7 +7608,7 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb _tmp20_ = auth_header_args; #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp20__length1 = auth_header_args_length1; -#line 7581 "TumblrPublishing.c" +#line 7591 "TumblrPublishing.c" { PublishingRESTSupportArgument** arg_collection = NULL; gint arg_collection_length1 = 0; @@ -7610,19 +7620,19 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb arg_collection_length1 = _tmp20__length1; #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" for (arg_it = 0; arg_it < _tmp20__length1; arg_it = arg_it + 1) { -#line 7593 "TumblrPublishing.c" - PublishingRESTSupportArgument* _tmp21_ = NULL; +#line 7603 "TumblrPublishing.c" + PublishingRESTSupportArgument* _tmp21_; PublishingRESTSupportArgument* arg = NULL; #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp21_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]); #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" arg = _tmp21_; -#line 7600 "TumblrPublishing.c" +#line 7610 "TumblrPublishing.c" { - PublishingRESTSupportArgument** _tmp22_ = NULL; - gint _tmp22__length1 = 0; - PublishingRESTSupportArgument* _tmp23_ = NULL; - PublishingRESTSupportArgument* _tmp24_ = NULL; + PublishingRESTSupportArgument** _tmp22_; + gint _tmp22__length1; + PublishingRESTSupportArgument* _tmp23_; + PublishingRESTSupportArgument* _tmp24_; #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp22_ = base_string_arguments; #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -7635,13 +7645,13 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb _vala_array_add23 (&base_string_arguments, &base_string_arguments_length1, &_base_string_arguments_size_, _tmp24_); #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _publishing_rest_support_argument_unref0 (arg); -#line 7618 "TumblrPublishing.c" +#line 7628 "TumblrPublishing.c" } } } #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" auth_header_args = (_vala_array_free (auth_header_args, auth_header_args_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); -#line 7624 "TumblrPublishing.c" +#line 7634 "TumblrPublishing.c" } #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp25_ = base_string_arguments; @@ -7659,50 +7669,50 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb _tmp28_ = g_strdup (""); #line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" arguments_string = _tmp28_; -#line 7642 "TumblrPublishing.c" +#line 7652 "TumblrPublishing.c" { gint i = 0; #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" i = 0; -#line 7647 "TumblrPublishing.c" +#line 7657 "TumblrPublishing.c" { gboolean _tmp29_ = FALSE; #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp29_ = TRUE; #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" while (TRUE) { -#line 7654 "TumblrPublishing.c" - gint _tmp31_ = 0; - PublishingRESTSupportArgument** _tmp32_ = NULL; - gint _tmp32__length1 = 0; - const gchar* _tmp33_ = NULL; - PublishingRESTSupportArgument** _tmp34_ = NULL; - gint _tmp34__length1 = 0; - gint _tmp35_ = 0; - PublishingRESTSupportArgument* _tmp36_ = NULL; - const gchar* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; - gchar* _tmp39_ = NULL; - PublishingRESTSupportArgument** _tmp40_ = NULL; - gint _tmp40__length1 = 0; - gint _tmp41_ = 0; - PublishingRESTSupportArgument* _tmp42_ = NULL; - const gchar* _tmp43_ = NULL; - gchar* _tmp44_ = NULL; - gchar* _tmp45_ = NULL; - gchar* _tmp46_ = NULL; - gint _tmp47_ = 0; - PublishingRESTSupportArgument** _tmp48_ = NULL; - gint _tmp48__length1 = 0; +#line 7664 "TumblrPublishing.c" + gint _tmp31_; + PublishingRESTSupportArgument** _tmp32_; + gint _tmp32__length1; + const gchar* _tmp33_; + PublishingRESTSupportArgument** _tmp34_; + gint _tmp34__length1; + gint _tmp35_; + PublishingRESTSupportArgument* _tmp36_; + const gchar* _tmp37_; + gchar* _tmp38_; + gchar* _tmp39_; + PublishingRESTSupportArgument** _tmp40_; + gint _tmp40__length1; + gint _tmp41_; + PublishingRESTSupportArgument* _tmp42_; + const gchar* _tmp43_; + gchar* _tmp44_; + gchar* _tmp45_; + gchar* _tmp46_; + gint _tmp47_; + PublishingRESTSupportArgument** _tmp48_; + gint _tmp48__length1; #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (!_tmp29_) { -#line 7679 "TumblrPublishing.c" - gint _tmp30_ = 0; +#line 7689 "TumblrPublishing.c" + gint _tmp30_; #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp30_ = i; #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" i = _tmp30_ + 1; -#line 7685 "TumblrPublishing.c" +#line 7695 "TumblrPublishing.c" } #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp29_ = FALSE; @@ -7716,7 +7726,7 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb if (!(_tmp31_ < _tmp32__length1)) { #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" break; -#line 7699 "TumblrPublishing.c" +#line 7709 "TumblrPublishing.c" } #line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp33_ = arguments_string; @@ -7766,9 +7776,9 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb _tmp48__length1 = sorted_args_length1; #line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp47_ < (_tmp48__length1 - 1)) { -#line 7749 "TumblrPublishing.c" - const gchar* _tmp49_ = NULL; - gchar* _tmp50_ = NULL; +#line 7759 "TumblrPublishing.c" + const gchar* _tmp49_; + gchar* _tmp50_; #line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp49_ = arguments_string; #line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -7777,7 +7787,7 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb _g_free0 (arguments_string); #line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" arguments_string = _tmp50_; -#line 7760 "TumblrPublishing.c" +#line 7770 "TumblrPublishing.c" } } } @@ -7866,26 +7876,26 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb _tmp77_ = upload_txn; #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp77_ != NULL) { -#line 7849 "TumblrPublishing.c" - PublishingTumblrTumblrPublisherUploadTransaction* _tmp78_ = NULL; - const gchar* _tmp79_ = NULL; +#line 7859 "TumblrPublishing.c" + PublishingTumblrTumblrPublisherUploadTransaction* _tmp78_; + const gchar* _tmp79_; #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp78_ = upload_txn; #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp79_ = signature; #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (_tmp78_, "oauth_signature", _tmp79_); -#line 7858 "TumblrPublishing.c" +#line 7868 "TumblrPublishing.c" } else { - PublishingRESTSupportTransaction* _tmp80_ = NULL; - const gchar* _tmp81_ = NULL; + PublishingRESTSupportTransaction* _tmp80_; + const gchar* _tmp81_; #line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp80_ = txn; #line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp81_ = signature; #line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_rest_support_transaction_add_argument (_tmp80_, "oauth_signature", _tmp81_); -#line 7868 "TumblrPublishing.c" +#line 7878 "TumblrPublishing.c" } #line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (signature); @@ -7903,15 +7913,15 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb _g_free0 (signing_key); #line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (http_method); -#line 7886 "TumblrPublishing.c" +#line 7896 "TumblrPublishing.c" } void publishing_tumblr_tumblr_publisher_session_set_access_phase_credentials (PublishingTumblrTumblrPublisherSession* self, const gchar* token, const gchar* secret) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; #line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self)); #line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -7936,14 +7946,14 @@ void publishing_tumblr_tumblr_publisher_session_set_access_phase_credentials (Pu self->priv->access_phase_token_secret = _tmp3_; #line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated"); -#line 7919 "TumblrPublishing.c" +#line 7929 "TumblrPublishing.c" } gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token (PublishingTumblrTumblrPublisherSession* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL); #line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -7954,14 +7964,14 @@ gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token (Publis result = _tmp1_; #line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 7937 "TumblrPublishing.c" +#line 7947 "TumblrPublishing.c" } gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token_secret (PublishingTumblrTumblrPublisherSession* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL); #line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -7972,25 +7982,25 @@ gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token_secret result = _tmp1_; #line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 7955 "TumblrPublishing.c" +#line 7965 "TumblrPublishing.c" } gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_nonce (PublishingTumblrTumblrPublisherSession* self) { gchar* result = NULL; GTimeVal currtime = {0}; - GTimeVal _tmp0_ = {0}; - glong _tmp1_ = 0L; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - GTimeVal _tmp4_ = {0}; - glong _tmp5_ = 0L; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; + GTimeVal _tmp0_; + glong _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + GTimeVal _tmp4_; + glong _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; #line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL); #line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -8031,50 +8041,50 @@ gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_nonce (PublishingTum result = _tmp11_; #line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 8014 "TumblrPublishing.c" +#line 8024 "TumblrPublishing.c" } static glong string_strnlen (gchar* str, glong maxlen) { glong result = 0L; gchar* end = NULL; - gchar* _tmp0_ = NULL; - glong _tmp1_ = 0L; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + glong _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = maxlen; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp2_; -#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = end; -#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { -#line 8037 "TumblrPublishing.c" - glong _tmp4_ = 0L; -#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 8047 "TumblrPublishing.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 8045 "TumblrPublishing.c" +#line 8055 "TumblrPublishing.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 8057 "TumblrPublishing.c" +#line 8067 "TumblrPublishing.c" } } @@ -8083,133 +8093,133 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_ = 0L; - glong _tmp8_ = 0L; - glong _tmp14_ = 0L; - glong _tmp17_ = 0L; - glong _tmp18_ = 0L; - glong _tmp19_ = 0L; - glong _tmp20_ = 0L; - glong _tmp21_ = 0L; - gchar* _tmp22_ = NULL; -#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp1_; + glong _tmp8_; + glong _tmp14_; + glong _tmp17_; + glong _tmp18_; + glong _tmp19_; + glong _tmp20_; + glong _tmp21_; + gchar* _tmp22_; +#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = offset; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { -#line 8081 "TumblrPublishing.c" - glong _tmp2_ = 0L; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 8091 "TumblrPublishing.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 8087 "TumblrPublishing.c" +#line 8097 "TumblrPublishing.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 8091 "TumblrPublishing.c" +#line 8101 "TumblrPublishing.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 8095 "TumblrPublishing.c" - glong _tmp3_ = 0L; - glong _tmp4_ = 0L; - glong _tmp5_ = 0L; -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 8105 "TumblrPublishing.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 8107 "TumblrPublishing.c" +#line 8117 "TumblrPublishing.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 8117 "TumblrPublishing.c" +#line 8127 "TumblrPublishing.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 8123 "TumblrPublishing.c" - glong _tmp9_ = 0L; - glong _tmp10_ = 0L; - glong _tmp11_ = 0L; -#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 8133 "TumblrPublishing.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 8137 "TumblrPublishing.c" +#line 8147 "TumblrPublishing.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 8147 "TumblrPublishing.c" +#line 8157 "TumblrPublishing.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 8153 "TumblrPublishing.c" - glong _tmp15_ = 0L; - glong _tmp16_ = 0L; -#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 8163 "TumblrPublishing.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 8162 "TumblrPublishing.c" +#line 8172 "TumblrPublishing.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 8182 "TumblrPublishing.c" +#line 8192 "TumblrPublishing.c" } gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_timestamp (PublishingTumblrTumblrPublisherSession* self) { gchar* result = NULL; - gint64 _tmp0_ = 0LL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + gint64 _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL); #line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -8228,7 +8238,7 @@ gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_timestamp (Publishin result = _tmp4_; #line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 8211 "TumblrPublishing.c" +#line 8221 "TumblrPublishing.c" } @@ -8240,8 +8250,8 @@ static void publishing_tumblr_tumblr_publisher_session_class_init (PublishingTum #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherSessionPrivate)); #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_tumblr_tumblr_publisher_session_real_is_authenticated; -#line 8224 "TumblrPublishing.c" + ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_tumblr_tumblr_publisher_session_real_is_authenticated; +#line 8234 "TumblrPublishing.c" } @@ -8252,11 +8262,11 @@ static void publishing_tumblr_tumblr_publisher_session_instance_init (Publishing self->priv->access_phase_token = NULL; #line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->access_phase_token_secret = NULL; -#line 8235 "TumblrPublishing.c" +#line 8245 "TumblrPublishing.c" } -static void publishing_tumblr_tumblr_publisher_session_finalize (PublishingRESTSupportSession* obj) { +static void publishing_tumblr_tumblr_publisher_session_finalize (PublishingRESTSupportSession * obj) { PublishingTumblrTumblrPublisherSession * self; #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession); @@ -8266,7 +8276,7 @@ static void publishing_tumblr_tumblr_publisher_session_finalize (PublishingRESTS _g_free0 (self->priv->access_phase_token_secret); #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_tumblr_tumblr_publisher_session_parent_class)->finalize (obj); -#line 8249 "TumblrPublishing.c" +#line 8259 "TumblrPublishing.c" } @@ -8293,7 +8303,7 @@ static void publishing_tumblr_tumblr_publisher_class_init (PublishingTumblrTumbl g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherPrivate)); #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_tumblr_tumblr_publisher_finalize; -#line 8276 "TumblrPublishing.c" +#line 8286 "TumblrPublishing.c" } @@ -8301,23 +8311,27 @@ static void publishing_tumblr_tumblr_publisher_spit_publishing_publisher_interfa #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface); #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_tumblr_tumblr_publisher_real_get_service; + iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_get_service; #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_tumblr_tumblr_publisher_real_is_running; + iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_is_running; #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - iface->start = (void (*)(SpitPublishingPublisher*)) publishing_tumblr_tumblr_publisher_real_start; + iface->start = (void (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_start; #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_tumblr_tumblr_publisher_real_stop; -#line 8291 "TumblrPublishing.c" + iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_stop; +#line 8301 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_instance_init (PublishingTumblrTumblrPublisher * self) { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_GET_PRIVATE (self); #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->progress_reporter = NULL; +#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv->progress_reporter_target = self; +#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv->progress_reporter_target_destroy_notify = NULL; #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->running = FALSE; #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -8342,14 +8356,14 @@ static void publishing_tumblr_tumblr_publisher_instance_init (PublishingTumblrTu _tmp0_ = g_strdup (""); #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->username = _tmp0_; -#line 8325 "TumblrPublishing.c" +#line 8339 "TumblrPublishing.c" } -static void publishing_tumblr_tumblr_publisher_finalize (GObject* obj) { +static void publishing_tumblr_tumblr_publisher_finalize (GObject * obj) { PublishingTumblrTumblrPublisher * self; - PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL; - guint _tmp1_ = 0U; + PublishingTumblrTumblrPublisherSession* _tmp0_; + guint _tmp1_; #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher); #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -8382,7 +8396,7 @@ static void publishing_tumblr_tumblr_publisher_finalize (GObject* obj) { _g_free0 (self->priv->username); #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_parent_class)->finalize (obj); -#line 8365 "TumblrPublishing.c" +#line 8379 "TumblrPublishing.c" } diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.c b/plugins/shotwell-publishing-extras/YandexPublishing.c index 54894d6..492f100 100644 --- a/plugins/shotwell-publishing-extras/YandexPublishing.c +++ b/plugins/shotwell-publishing-extras/YandexPublishing.c @@ -1,4 +1,4 @@ -/* YandexPublishing.c generated by valac 0.34.7, the Vala compiler +/* YandexPublishing.c generated by valac 0.36.6, the Vala compiler * generated from YandexPublishing.vala, do not modify */ /* Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net> @@ -87,6 +87,12 @@ typedef struct _PublishingYandexWebAuthPanePrivate PublishingYandexWebAuthPanePr #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _g_match_info_unref0(var) ((var == NULL) ? NULL : (var = (g_match_info_unref (var), NULL))) #define __vala_WebKitNavigationAction_free0(var) ((var == NULL) ? NULL : (var = (_vala_WebKitNavigationAction_free (var), NULL))) +enum { + PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_SUCCEEDED_SIGNAL, + PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_FAILED_SIGNAL, + PUBLISHING_YANDEX_WEB_AUTH_PANE_LAST_SIGNAL +}; +static guint publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LAST_SIGNAL] = {0}; #define PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS (publishing_yandex_publish_options_get_type ()) #define PUBLISHING_YANDEX_PUBLISH_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS, PublishingYandexPublishOptions)) @@ -110,6 +116,12 @@ typedef struct _PublishingYandexParamSpecPublishOptions PublishingYandexParamSpe typedef struct _PublishingYandexPublishingOptionsPane PublishingYandexPublishingOptionsPane; typedef struct _PublishingYandexPublishingOptionsPaneClass PublishingYandexPublishingOptionsPaneClass; typedef struct _PublishingYandexPublishingOptionsPanePrivate PublishingYandexPublishingOptionsPanePrivate; +enum { + PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL, + PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL, + PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL +}; +static guint publishing_yandex_publishing_options_pane_signals[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0}; #define PUBLISHING_YANDEX_TYPE_UPLOADER (publishing_yandex_uploader_get_type ()) #define PUBLISHING_YANDEX_UPLOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_YANDEX_TYPE_UPLOADER, PublishingYandexUploader)) @@ -274,18 +286,18 @@ struct _PublishingYandexYandexPublisherPrivate { static gpointer yandex_service_parent_class = NULL; -static SpitPluggableIface* yandex_service_spit_pluggable_parent_iface = NULL; -static SpitPublishingServiceIface* yandex_service_spit_publishing_service_parent_iface = NULL; +static SpitPluggableIface * yandex_service_spit_pluggable_parent_iface = NULL; +static SpitPublishingServiceIface * yandex_service_spit_publishing_service_parent_iface = NULL; static gpointer publishing_yandex_transaction_parent_class = NULL; static gpointer publishing_yandex_session_parent_class = NULL; static gpointer publishing_yandex_web_auth_pane_parent_class = NULL; static gpointer publishing_yandex_publish_options_parent_class = NULL; static gpointer publishing_yandex_publishing_options_pane_parent_class = NULL; -static SpitPublishingDialogPaneIface* publishing_yandex_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL; +static SpitPublishingDialogPaneIface * publishing_yandex_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL; static gpointer publishing_yandex_uploader_parent_class = NULL; static gpointer publishing_yandex_upload_transaction_parent_class = NULL; static gpointer publishing_yandex_yandex_publisher_parent_class = NULL; -static SpitPublishingPublisherIface* publishing_yandex_yandex_publisher_spit_publishing_publisher_parent_iface = NULL; +static SpitPublishingPublisherIface * publishing_yandex_yandex_publisher_spit_publishing_publisher_parent_iface = NULL; GType yandex_service_get_type (void) G_GNUC_CONST; enum { @@ -326,7 +338,7 @@ PublishingYandexSession* publishing_yandex_session_construct (GType object_type) static gboolean publishing_yandex_session_real_is_authenticated (PublishingRESTSupportSession* base); void publishing_yandex_session_deauthenticate (PublishingYandexSession* self); void publishing_yandex_session_set_auth_token (PublishingYandexSession* self, const gchar* token); -static void publishing_yandex_session_finalize (PublishingRESTSupportSession* obj); +static void publishing_yandex_session_finalize (PublishingRESTSupportSession * obj); GType publishing_yandex_web_auth_pane_get_type (void) G_GNUC_CONST; #define PUBLISHING_YANDEX_WEB_AUTH_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPanePrivate)) enum { @@ -340,7 +352,7 @@ static gboolean _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_vie static void publishing_yandex_web_auth_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base); static WebKitNavigationAction* _vala_WebKitNavigationAction_copy (WebKitNavigationAction* self); static void _vala_WebKitNavigationAction_free (WebKitNavigationAction* self); -static void publishing_yandex_web_auth_pane_finalize (GObject* obj); +static void publishing_yandex_web_auth_pane_finalize (GObject * obj); gpointer publishing_yandex_publish_options_ref (gpointer instance); void publishing_yandex_publish_options_unref (gpointer instance); GParamSpec* publishing_yandex_param_spec_publish_options (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -353,7 +365,7 @@ enum { }; PublishingYandexPublishOptions* publishing_yandex_publish_options_new (void); PublishingYandexPublishOptions* publishing_yandex_publish_options_construct (GType object_type); -static void publishing_yandex_publish_options_finalize (PublishingYandexPublishOptions* obj); +static void publishing_yandex_publish_options_finalize (PublishingYandexPublishOptions * obj); GType publishing_yandex_publishing_options_pane_get_type (void) G_GNUC_CONST; #define PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPanePrivate)) enum { @@ -369,7 +381,7 @@ static void publishing_yandex_publishing_options_pane_on_publish_clicked (Publis static void _publishing_yandex_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); static void publishing_yandex_publishing_options_pane_on_logout_clicked (PublishingYandexPublishingOptionsPane* self); static void _publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); -static void publishing_yandex_publishing_options_pane_finalize (GObject* obj); +static void publishing_yandex_publishing_options_pane_finalize (GObject * obj); GType publishing_yandex_uploader_get_type (void) G_GNUC_CONST; #define PUBLISHING_YANDEX_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YANDEX_TYPE_UPLOADER, PublishingYandexUploaderPrivate)) enum { @@ -381,7 +393,7 @@ static PublishingRESTSupportTransaction* publishing_yandex_uploader_real_create_ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable* photo); PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construct (GType object_type, PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable* photo); GType publishing_yandex_upload_transaction_get_type (void) G_GNUC_CONST; -static void publishing_yandex_uploader_finalize (PublishingRESTSupportBatchUploader* obj); +static void publishing_yandex_uploader_finalize (PublishingRESTSupportBatchUploader * obj); enum { PUBLISHING_YANDEX_UPLOAD_TRANSACTION_DUMMY_PROPERTY }; @@ -438,7 +450,7 @@ static void publishing_yandex_yandex_publisher_show_welcome_page (PublishingYand static void _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback (gpointer self); static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublisher* base); static void publishing_yandex_yandex_publisher_real_stop (SpitPublishingPublisher* base); -static void publishing_yandex_yandex_publisher_finalize (GObject* obj); +static void publishing_yandex_yandex_publisher_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); @@ -447,9 +459,9 @@ static gint _vala_array_length (gpointer array); static gint yandex_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) { YandexService * self; gint result = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YANDEX_SERVICE, YandexService); #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -462,7 +474,7 @@ static gint yandex_service_real_get_pluggable_interface (SpitPluggable* base, gi result = _tmp2_; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 466 "YandexPublishing.c" +#line 478 "YandexPublishing.c" } @@ -475,7 +487,7 @@ static const gchar* yandex_service_real_get_id (SpitPluggable* base) { result = "org.yorba.shotwell.publishing.yandex-fotki"; #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 479 "YandexPublishing.c" +#line 491 "YandexPublishing.c" } @@ -488,21 +500,19 @@ static const gchar* yandex_service_real_get_pluggable_name (SpitPluggable* base) result = "Yandex.Fotki"; #line 17 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 492 "YandexPublishing.c" +#line 504 "YandexPublishing.c" } static void yandex_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) { YandexService * self; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; #line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YANDEX_SERVICE, YandexService); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -514,56 +524,52 @@ static void yandex_service_real_get_info (SpitPluggable* base, SpitPluggableInfo #line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" (*info).authors = _tmp0_; #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp1_ = _ ("Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"); -#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp1_ = g_strdup (_ ("Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>")); #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 ((*info).copyright); #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - (*info).copyright = _tmp2_; + (*info).copyright = _tmp1_; #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp3_ = g_strdup (RESOURCES_TRANSLATORS); + _tmp2_ = g_strdup (RESOURCES_TRANSLATORS); #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 ((*info).translators); #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - (*info).translators = _tmp3_; + (*info).translators = _tmp2_; #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp4_ = g_strdup (_VERSION); + _tmp3_ = g_strdup (_VERSION); #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 ((*info).version); #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - (*info).version = _tmp4_; -#line 25 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp5_ = _ ("Visit the Yandex.Fotki web site"); + (*info).version = _tmp3_; #line 25 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp6_ = g_strdup (_tmp5_); + _tmp4_ = g_strdup (_ ("Visit the Yandex.Fotki web site")); #line 25 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 ((*info).website_name); #line 25 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - (*info).website_name = _tmp6_; + (*info).website_name = _tmp4_; #line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp7_ = g_strdup ("https://fotki.yandex.ru/"); + _tmp5_ = g_strdup ("https://fotki.yandex.ru/"); #line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 ((*info).website_url); #line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - (*info).website_url = _tmp7_; + (*info).website_url = _tmp5_; #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" (*info).is_license_wordwrapped = FALSE; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp8_ = g_strdup (RESOURCES_LICENSE); + _tmp6_ = g_strdup (RESOURCES_LICENSE); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 ((*info).license); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - (*info).license = _tmp8_; -#line 559 "YandexPublishing.c" + (*info).license = _tmp6_; +#line 565 "YandexPublishing.c" } static SpitPublishingPublisher* yandex_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) { YandexService * self; SpitPublishingPublisher* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - PublishingYandexYandexPublisher* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + PublishingYandexYandexPublisher* _tmp1_; #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YANDEX_SERVICE, YandexService); #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -576,7 +582,7 @@ static SpitPublishingPublisher* yandex_service_real_create_publisher (SpitPublis result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher); #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 580 "YandexPublishing.c" +#line 586 "YandexPublishing.c" } @@ -589,7 +595,7 @@ static SpitPublishingPublisherMediaType yandex_service_real_get_supported_media result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO; #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 593 "YandexPublishing.c" +#line 599 "YandexPublishing.c" } @@ -597,7 +603,7 @@ static void yandex_service_real_activation (SpitPluggable* base, gboolean enable YandexService * self; #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YANDEX_SERVICE, YandexService); -#line 601 "YandexPublishing.c" +#line 607 "YandexPublishing.c" } @@ -607,21 +613,21 @@ YandexService* yandex_service_construct (GType object_type) { self = (YandexService*) g_object_new (object_type, NULL); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self; -#line 611 "YandexPublishing.c" +#line 617 "YandexPublishing.c" } YandexService* yandex_service_new (void) { #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return yandex_service_construct (TYPE_YANDEX_SERVICE); -#line 618 "YandexPublishing.c" +#line 624 "YandexPublishing.c" } static void yandex_service_class_init (YandexServiceClass * klass) { #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" yandex_service_parent_class = g_type_class_peek_parent (klass); -#line 625 "YandexPublishing.c" +#line 631 "YandexPublishing.c" } @@ -629,16 +635,16 @@ static void yandex_service_spit_pluggable_interface_init (SpitPluggableIface * i #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" yandex_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) yandex_service_real_get_pluggable_interface; + iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) yandex_service_real_get_pluggable_interface; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - iface->get_id = (const gchar* (*)(SpitPluggable*)) yandex_service_real_get_id; + iface->get_id = (const gchar* (*) (SpitPluggable *)) yandex_service_real_get_id; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) yandex_service_real_get_pluggable_name; + iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) yandex_service_real_get_pluggable_name; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) yandex_service_real_get_info; + iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) yandex_service_real_get_info; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - iface->activation = (void (*)(SpitPluggable*, gboolean)) yandex_service_real_activation; -#line 642 "YandexPublishing.c" + iface->activation = (void (*) (SpitPluggable *, gboolean)) yandex_service_real_activation; +#line 648 "YandexPublishing.c" } @@ -646,10 +652,10 @@ static void yandex_service_spit_publishing_service_interface_init (SpitPublishin #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" yandex_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) yandex_service_real_create_publisher; + iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) yandex_service_real_create_publisher; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) yandex_service_real_get_supported_media; -#line 653 "YandexPublishing.c" + iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) yandex_service_real_get_supported_media; +#line 659 "YandexPublishing.c" } @@ -675,9 +681,9 @@ GType yandex_service_get_type (void) { PublishingYandexTransaction* publishing_yandex_transaction_construct_with_url (GType object_type, PublishingYandexSession* session, const gchar* url, PublishingRESTSupportHttpMethod method) { PublishingYandexTransaction* self = NULL; - PublishingYandexSession* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - PublishingRESTSupportHttpMethod _tmp2_ = 0; + PublishingYandexSession* _tmp0_; + const gchar* _tmp1_; + PublishingRESTSupportHttpMethod _tmp2_; #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (session), NULL); #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -694,22 +700,22 @@ PublishingYandexTransaction* publishing_yandex_transaction_construct_with_url (G publishing_yandex_transaction_add_headers (self); #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self; -#line 698 "YandexPublishing.c" +#line 704 "YandexPublishing.c" } PublishingYandexTransaction* publishing_yandex_transaction_new_with_url (PublishingYandexSession* session, const gchar* url, PublishingRESTSupportHttpMethod method) { #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return publishing_yandex_transaction_construct_with_url (PUBLISHING_YANDEX_TYPE_TRANSACTION, session, url, method); -#line 705 "YandexPublishing.c" +#line 711 "YandexPublishing.c" } static void publishing_yandex_transaction_add_headers (PublishingYandexTransaction* self) { - PublishingRESTSupportSession* _tmp0_ = NULL; - PublishingYandexSession* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; + PublishingRESTSupportSession* _tmp0_; + PublishingYandexSession* _tmp1_; + gboolean _tmp2_; + gboolean _tmp3_; #line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_TRANSACTION (self)); #line 56 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -724,13 +730,13 @@ static void publishing_yandex_transaction_add_headers (PublishingYandexTransacti _publishing_rest_support_session_unref0 (_tmp1_); #line 56 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_tmp3_) { -#line 728 "YandexPublishing.c" - PublishingRESTSupportSession* _tmp4_ = NULL; - PublishingYandexSession* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; +#line 734 "YandexPublishing.c" + PublishingRESTSupportSession* _tmp4_; + PublishingYandexSession* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp4_ = publishing_rest_support_transaction_get_parent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); #line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -753,15 +759,15 @@ static void publishing_yandex_transaction_add_headers (PublishingYandexTransacti _publishing_rest_support_session_unref0 (_tmp5_); #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Connection", "close"); -#line 757 "YandexPublishing.c" +#line 763 "YandexPublishing.c" } } PublishingYandexTransaction* publishing_yandex_transaction_construct (GType object_type, PublishingYandexSession* session, PublishingRESTSupportHttpMethod method) { PublishingYandexTransaction* self = NULL; - PublishingYandexSession* _tmp0_ = NULL; - PublishingRESTSupportHttpMethod _tmp1_ = 0; + PublishingYandexSession* _tmp0_; + PublishingRESTSupportHttpMethod _tmp1_; #line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (session), NULL); #line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -774,20 +780,20 @@ PublishingYandexTransaction* publishing_yandex_transaction_construct (GType obje publishing_yandex_transaction_add_headers (self); #line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self; -#line 778 "YandexPublishing.c" +#line 784 "YandexPublishing.c" } PublishingYandexTransaction* publishing_yandex_transaction_new (PublishingYandexSession* session, PublishingRESTSupportHttpMethod method) { #line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return publishing_yandex_transaction_construct (PUBLISHING_YANDEX_TYPE_TRANSACTION, session, method); -#line 785 "YandexPublishing.c" +#line 791 "YandexPublishing.c" } void publishing_yandex_transaction_add_data (PublishingYandexTransaction* self, const gchar* type, const gchar* data) { - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_TRANSACTION (self)); #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -800,14 +806,14 @@ void publishing_yandex_transaction_add_data (PublishingYandexTransaction* self, _tmp1_ = type; #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_rest_support_transaction_set_custom_payload (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp0_, _tmp1_, (gulong) 0); -#line 804 "YandexPublishing.c" +#line 810 "YandexPublishing.c" } static void publishing_yandex_transaction_class_init (PublishingYandexTransactionClass * klass) { #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_transaction_parent_class = g_type_class_peek_parent (klass); -#line 811 "YandexPublishing.c" +#line 817 "YandexPublishing.c" } @@ -833,21 +839,21 @@ PublishingYandexSession* publishing_yandex_session_construct (GType object_type) self = (PublishingYandexSession*) publishing_rest_support_session_construct (object_type, NULL); #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self; -#line 837 "YandexPublishing.c" +#line 843 "YandexPublishing.c" } PublishingYandexSession* publishing_yandex_session_new (void) { #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return publishing_yandex_session_construct (PUBLISHING_YANDEX_TYPE_SESSION); -#line 844 "YandexPublishing.c" +#line 850 "YandexPublishing.c" } static gboolean publishing_yandex_session_real_is_authenticated (PublishingRESTSupportSession* base) { PublishingYandexSession * self; gboolean result = FALSE; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_SESSION, PublishingYandexSession); #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -856,7 +862,7 @@ static gboolean publishing_yandex_session_real_is_authenticated (PublishingRESTS result = _tmp0_ != NULL; #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 860 "YandexPublishing.c" +#line 866 "YandexPublishing.c" } @@ -867,13 +873,13 @@ void publishing_yandex_session_deauthenticate (PublishingYandexSession* self) { _g_free0 (self->priv->auth_token); #line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->priv->auth_token = NULL; -#line 871 "YandexPublishing.c" +#line 877 "YandexPublishing.c" } void publishing_yandex_session_set_auth_token (PublishingYandexSession* self, const gchar* token) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_SESSION (self)); #line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -886,14 +892,14 @@ void publishing_yandex_session_set_auth_token (PublishingYandexSession* self, co _g_free0 (self->priv->auth_token); #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->priv->auth_token = _tmp1_; -#line 890 "YandexPublishing.c" +#line 896 "YandexPublishing.c" } gchar* publishing_yandex_session_get_auth_token (PublishingYandexSession* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (self), NULL); #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -904,7 +910,7 @@ gchar* publishing_yandex_session_get_auth_token (PublishingYandexSession* self) result = _tmp1_; #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 908 "YandexPublishing.c" +#line 914 "YandexPublishing.c" } @@ -916,8 +922,8 @@ static void publishing_yandex_session_class_init (PublishingYandexSessionClass * #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingYandexSessionPrivate)); #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_yandex_session_real_is_authenticated; -#line 921 "YandexPublishing.c" + ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_yandex_session_real_is_authenticated; +#line 927 "YandexPublishing.c" } @@ -926,11 +932,11 @@ static void publishing_yandex_session_instance_init (PublishingYandexSession * s self->priv = PUBLISHING_YANDEX_SESSION_GET_PRIVATE (self); #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->priv->auth_token = NULL; -#line 930 "YandexPublishing.c" +#line 936 "YandexPublishing.c" } -static void publishing_yandex_session_finalize (PublishingRESTSupportSession* obj) { +static void publishing_yandex_session_finalize (PublishingRESTSupportSession * obj) { PublishingYandexSession * self; #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_SESSION, PublishingYandexSession); @@ -938,7 +944,7 @@ static void publishing_yandex_session_finalize (PublishingRESTSupportSession* ob _g_free0 (self->priv->auth_token); #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_yandex_session_parent_class)->finalize (obj); -#line 942 "YandexPublishing.c" +#line 948 "YandexPublishing.c" } @@ -956,7 +962,7 @@ GType publishing_yandex_session_get_type (void) { PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_construct (GType object_type, const gchar* login_url) { PublishingYandexWebAuthPane * self = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_val_if_fail (login_url != NULL, NULL); #line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -965,14 +971,14 @@ PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_construct (GType ob self = (PublishingYandexWebAuthPane*) g_object_new (object_type, "login-uri", _tmp0_, "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE, NULL); #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self; -#line 969 "YandexPublishing.c" +#line 975 "YandexPublishing.c" } PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_new (const gchar* login_url) { #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return publishing_yandex_web_auth_pane_construct (PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, login_url); -#line 976 "YandexPublishing.c" +#line 982 "YandexPublishing.c" } @@ -981,22 +987,22 @@ static gboolean _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_vie result = publishing_yandex_web_auth_pane_on_decide_policy ((PublishingYandexWebAuthPane*) self, decision, type); #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 985 "YandexPublishing.c" +#line 991 "YandexPublishing.c" } static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) { PublishingYandexWebAuthPane * self; - WebKitWebView* _tmp3_ = NULL; - WebKitWebView* _tmp4_ = NULL; + WebKitWebView* _tmp3_; + WebKitWebView* _tmp4_; GError * _inner_error_ = NULL; #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane); -#line 996 "YandexPublishing.c" +#line 1002 "YandexPublishing.c" { GRegex* _tmp0_ = NULL; - GRegex* _tmp1_ = NULL; - GRegex* _tmp2_ = NULL; + GRegex* _tmp1_; + GRegex* _tmp2_; #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp1_ = g_regex_new ("(.*)#access_token=([a-zA-Z0-9]*)&", 0, 0, &_inner_error_); #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1005,7 +1011,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 1009 "YandexPublishing.c" +#line 1015 "YandexPublishing.c" goto __catch39_g_regex_error; } #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1014,7 +1020,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) { g_clear_error (&_inner_error_); #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 1018 "YandexPublishing.c" +#line 1024 "YandexPublishing.c" } #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp2_ = _tmp0_; @@ -1026,7 +1032,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) { self->priv->re = _tmp2_; #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_regex_unref0 (_tmp0_); -#line 1030 "YandexPublishing.c" +#line 1036 "YandexPublishing.c" } goto __finally39; __catch39_g_regex_error: @@ -1040,7 +1046,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) { g_assert_not_reached (); #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_error_free0 (e); -#line 1044 "YandexPublishing.c" +#line 1050 "YandexPublishing.c" } __finally39: #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1051,7 +1057,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) { g_clear_error (&_inner_error_); #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 1055 "YandexPublishing.c" +#line 1061 "YandexPublishing.c" } #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp3_ = shotwell_plugins_common_web_authentication_pane_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane)); @@ -1061,7 +1067,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) { g_signal_connect_object (_tmp4_, "decide-policy", (GCallback) _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy, self, 0); #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_object_unref0 (_tmp4_); -#line 1065 "YandexPublishing.c" +#line 1071 "YandexPublishing.c" } @@ -1069,41 +1075,41 @@ static void publishing_yandex_web_auth_pane_real_on_page_load (ShotwellPluginsCo PublishingYandexWebAuthPane * self; #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane); -#line 1073 "YandexPublishing.c" +#line 1079 "YandexPublishing.c" } static gpointer _g_object_ref0 (gpointer self) { #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self ? g_object_ref (self) : NULL; -#line 1080 "YandexPublishing.c" +#line 1086 "YandexPublishing.c" } static WebKitNavigationAction* _vala_WebKitNavigationAction_copy (WebKitNavigationAction* self) { #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return g_boxed_copy (webkit_navigation_action_get_type (), self); -#line 1087 "YandexPublishing.c" +#line 1093 "YandexPublishing.c" } static gpointer __vala_WebKitNavigationAction_copy0 (gpointer self) { #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self ? _vala_WebKitNavigationAction_copy (self) : NULL; -#line 1094 "YandexPublishing.c" +#line 1100 "YandexPublishing.c" } static void _vala_WebKitNavigationAction_free (WebKitNavigationAction* self) { #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_boxed_free (webkit_navigation_action_get_type (), self); -#line 1101 "YandexPublishing.c" +#line 1107 "YandexPublishing.c" } static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYandexWebAuthPane* self, WebKitPolicyDecision* decision, WebKitPolicyDecisionType type) { gboolean result = FALSE; - WebKitPolicyDecisionType _tmp0_ = 0; + WebKitPolicyDecisionType _tmp0_; #line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_val_if_fail (PUBLISHING_YANDEX_IS_WEB_AUTH_PANE (self), FALSE); #line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1114,29 +1120,29 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand switch (_tmp0_) { #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" case WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION: -#line 1118 "YandexPublishing.c" +#line 1124 "YandexPublishing.c" { WebKitNavigationPolicyDecision* n_decision = NULL; - WebKitPolicyDecision* _tmp1_ = NULL; - WebKitNavigationPolicyDecision* _tmp2_ = NULL; + WebKitPolicyDecision* _tmp1_; + WebKitNavigationPolicyDecision* _tmp2_; WebKitNavigationAction* action = NULL; - WebKitNavigationPolicyDecision* _tmp3_ = NULL; - WebKitNavigationAction* _tmp4_ = NULL; - WebKitNavigationAction* _tmp5_ = NULL; - WebKitNavigationAction* _tmp6_ = NULL; + WebKitNavigationPolicyDecision* _tmp3_; + WebKitNavigationAction* _tmp4_; + WebKitNavigationAction* _tmp5_; + WebKitNavigationAction* _tmp6_; gchar* uri = NULL; - WebKitNavigationAction* _tmp7_ = NULL; - WebKitURIRequest* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; + WebKitNavigationAction* _tmp7_; + WebKitURIRequest* _tmp8_; + const gchar* _tmp9_; + const gchar* _tmp10_; + gchar* _tmp11_; + const gchar* _tmp12_; GMatchInfo* info = NULL; - GRegex* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; + GRegex* _tmp13_; + const gchar* _tmp14_; GMatchInfo* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; - WebKitPolicyDecision* _tmp28_ = NULL; + gboolean _tmp16_; + WebKitPolicyDecision* _tmp28_; #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp1_ = decision; #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1183,18 +1189,18 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand info = _tmp15_; #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_tmp16_) { -#line 1187 "YandexPublishing.c" +#line 1193 "YandexPublishing.c" gchar* access_token = NULL; - GMatchInfo* _tmp17_ = NULL; - gchar** _tmp18_ = NULL; - gchar** _tmp19_ = NULL; - gchar** _tmp20_ = NULL; - gint _tmp20__length1 = 0; - const gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; + GMatchInfo* _tmp17_; + gchar** _tmp18_; + gchar** _tmp19_; + gchar** _tmp20_; + gint _tmp20__length1; + const gchar* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + const gchar* _tmp24_; + const gchar* _tmp25_; #line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp17_ = info; #line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1223,13 +1229,13 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand _tmp25_ = access_token; #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_tmp25_ != NULL) { -#line 1227 "YandexPublishing.c" - const gchar* _tmp26_ = NULL; - WebKitPolicyDecision* _tmp27_ = NULL; +#line 1233 "YandexPublishing.c" + const gchar* _tmp26_; + WebKitPolicyDecision* _tmp27_; #line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp26_ = access_token; #line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - g_signal_emit_by_name (self, "login-succeeded", _tmp26_); + g_signal_emit (self, publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_SUCCEEDED_SIGNAL], 0, _tmp26_); #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp27_ = decision; #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1246,15 +1252,15 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand _g_object_unref0 (n_decision); #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" break; -#line 1250 "YandexPublishing.c" +#line 1256 "YandexPublishing.c" } else { #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - g_signal_emit_by_name (self, "login-failed"); -#line 1254 "YandexPublishing.c" + g_signal_emit (self, publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_FAILED_SIGNAL], 0); +#line 1260 "YandexPublishing.c" } #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 (access_token); -#line 1258 "YandexPublishing.c" +#line 1264 "YandexPublishing.c" } #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp28_ = decision; @@ -1270,20 +1276,20 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand _g_object_unref0 (n_decision); #line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" break; -#line 1274 "YandexPublishing.c" +#line 1280 "YandexPublishing.c" } #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" case WEBKIT_POLICY_DECISION_TYPE_RESPONSE: -#line 1278 "YandexPublishing.c" +#line 1284 "YandexPublishing.c" { - WebKitPolicyDecision* _tmp29_ = NULL; + WebKitPolicyDecision* _tmp29_; #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp29_ = decision; #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" webkit_policy_decision_use (_tmp29_); #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" break; -#line 1287 "YandexPublishing.c" +#line 1293 "YandexPublishing.c" } default: { @@ -1291,14 +1297,14 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand result = FALSE; #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 1295 "YandexPublishing.c" +#line 1301 "YandexPublishing.c" } } #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" result = TRUE; #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 1302 "YandexPublishing.c" +#line 1308 "YandexPublishing.c" } @@ -1308,27 +1314,27 @@ static void publishing_yandex_web_auth_pane_class_init (PublishingYandexWebAuthP #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingYandexWebAuthPanePrivate)); #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - ((GObjectClass *) klass)->constructed = (void (*)(GObject*)) publishing_yandex_web_auth_pane_real_constructed; + ((GObjectClass *) klass)->constructed = (void (*) (GObject *)) publishing_yandex_web_auth_pane_real_constructed; #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - ((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*)(ShotwellPluginsCommonWebAuthenticationPane*)) publishing_yandex_web_auth_pane_real_on_page_load; + ((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*) (ShotwellPluginsCommonWebAuthenticationPane *)) publishing_yandex_web_auth_pane_real_on_page_load; #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_yandex_web_auth_pane_finalize; #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - g_signal_new ("login_succeeded", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); + publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_SUCCEEDED_SIGNAL] = g_signal_new ("login-succeeded", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - g_signal_new ("login_failed", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 1321 "YandexPublishing.c" + publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_FAILED_SIGNAL] = g_signal_new ("login-failed", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 1327 "YandexPublishing.c" } static void publishing_yandex_web_auth_pane_instance_init (PublishingYandexWebAuthPane * self) { #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->priv = PUBLISHING_YANDEX_WEB_AUTH_PANE_GET_PRIVATE (self); -#line 1328 "YandexPublishing.c" +#line 1334 "YandexPublishing.c" } -static void publishing_yandex_web_auth_pane_finalize (GObject* obj) { +static void publishing_yandex_web_auth_pane_finalize (GObject * obj) { PublishingYandexWebAuthPane * self; #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane); @@ -1336,7 +1342,7 @@ static void publishing_yandex_web_auth_pane_finalize (GObject* obj) { _g_regex_unref0 (self->priv->re); #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" G_OBJECT_CLASS (publishing_yandex_web_auth_pane_parent_class)->finalize (obj); -#line 1340 "YandexPublishing.c" +#line 1346 "YandexPublishing.c" } @@ -1358,21 +1364,21 @@ PublishingYandexPublishOptions* publishing_yandex_publish_options_construct (GTy self = (PublishingYandexPublishOptions*) g_type_create_instance (object_type); #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self; -#line 1362 "YandexPublishing.c" +#line 1368 "YandexPublishing.c" } PublishingYandexPublishOptions* publishing_yandex_publish_options_new (void) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return publishing_yandex_publish_options_construct (PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS); -#line 1369 "YandexPublishing.c" +#line 1375 "YandexPublishing.c" } static void publishing_yandex_value_publish_options_init (GValue* value) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" value->data[0].v_pointer = NULL; -#line 1376 "YandexPublishing.c" +#line 1382 "YandexPublishing.c" } @@ -1381,7 +1387,7 @@ static void publishing_yandex_value_publish_options_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_publish_options_unref (value->data[0].v_pointer); -#line 1385 "YandexPublishing.c" +#line 1391 "YandexPublishing.c" } } @@ -1391,11 +1397,11 @@ static void publishing_yandex_value_publish_options_copy_value (const GValue* sr if (src_value->data[0].v_pointer) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" dest_value->data[0].v_pointer = publishing_yandex_publish_options_ref (src_value->data[0].v_pointer); -#line 1395 "YandexPublishing.c" +#line 1401 "YandexPublishing.c" } else { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 1399 "YandexPublishing.c" +#line 1405 "YandexPublishing.c" } } @@ -1403,66 +1409,66 @@ static void publishing_yandex_value_publish_options_copy_value (const GValue* sr static gpointer publishing_yandex_value_publish_options_peek_pointer (const GValue* value) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return value->data[0].v_pointer; -#line 1407 "YandexPublishing.c" +#line 1413 "YandexPublishing.c" } static gchar* publishing_yandex_value_publish_options_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (collect_values[0].v_pointer) { -#line 1414 "YandexPublishing.c" - PublishingYandexPublishOptions* object; +#line 1420 "YandexPublishing.c" + PublishingYandexPublishOptions * object; object = collect_values[0].v_pointer; #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1421 "YandexPublishing.c" +#line 1427 "YandexPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1425 "YandexPublishing.c" +#line 1431 "YandexPublishing.c" } #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" value->data[0].v_pointer = publishing_yandex_publish_options_ref (object); -#line 1429 "YandexPublishing.c" +#line 1435 "YandexPublishing.c" } else { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" value->data[0].v_pointer = NULL; -#line 1433 "YandexPublishing.c" +#line 1439 "YandexPublishing.c" } #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return NULL; -#line 1437 "YandexPublishing.c" +#line 1443 "YandexPublishing.c" } static gchar* publishing_yandex_value_publish_options_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingYandexPublishOptions** object_p; + PublishingYandexPublishOptions ** object_p; object_p = collect_values[0].v_pointer; #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (!object_p) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1448 "YandexPublishing.c" +#line 1454 "YandexPublishing.c" } #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (!value->data[0].v_pointer) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" *object_p = NULL; -#line 1454 "YandexPublishing.c" +#line 1460 "YandexPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" *object_p = value->data[0].v_pointer; -#line 1458 "YandexPublishing.c" +#line 1464 "YandexPublishing.c" } else { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" *object_p = publishing_yandex_publish_options_ref (value->data[0].v_pointer); -#line 1462 "YandexPublishing.c" +#line 1468 "YandexPublishing.c" } #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return NULL; -#line 1466 "YandexPublishing.c" +#line 1472 "YandexPublishing.c" } @@ -1476,7 +1482,7 @@ GParamSpec* publishing_yandex_param_spec_publish_options (const gchar* name, con G_PARAM_SPEC (spec)->value_type = object_type; #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return G_PARAM_SPEC (spec); -#line 1480 "YandexPublishing.c" +#line 1486 "YandexPublishing.c" } @@ -1485,12 +1491,12 @@ gpointer publishing_yandex_value_get_publish_options (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS), NULL); #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return value->data[0].v_pointer; -#line 1489 "YandexPublishing.c" +#line 1495 "YandexPublishing.c" } void publishing_yandex_value_set_publish_options (GValue* value, gpointer v_object) { - PublishingYandexPublishOptions* old; + PublishingYandexPublishOptions * old; #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS)); #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1505,23 +1511,23 @@ void publishing_yandex_value_set_publish_options (GValue* value, gpointer v_obje value->data[0].v_pointer = v_object; #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_publish_options_ref (value->data[0].v_pointer); -#line 1509 "YandexPublishing.c" +#line 1515 "YandexPublishing.c" } else { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" value->data[0].v_pointer = NULL; -#line 1513 "YandexPublishing.c" +#line 1519 "YandexPublishing.c" } #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (old) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_publish_options_unref (old); -#line 1519 "YandexPublishing.c" +#line 1525 "YandexPublishing.c" } } void publishing_yandex_value_take_publish_options (GValue* value, gpointer v_object) { - PublishingYandexPublishOptions* old; + PublishingYandexPublishOptions * old; #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS)); #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1534,17 +1540,17 @@ void publishing_yandex_value_take_publish_options (GValue* value, gpointer v_obj g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" value->data[0].v_pointer = v_object; -#line 1538 "YandexPublishing.c" +#line 1544 "YandexPublishing.c" } else { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" value->data[0].v_pointer = NULL; -#line 1542 "YandexPublishing.c" +#line 1548 "YandexPublishing.c" } #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (old) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_publish_options_unref (old); -#line 1548 "YandexPublishing.c" +#line 1554 "YandexPublishing.c" } } @@ -1554,7 +1560,7 @@ static void publishing_yandex_publish_options_class_init (PublishingYandexPublis publishing_yandex_publish_options_parent_class = g_type_class_peek_parent (klass); #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" ((PublishingYandexPublishOptionsClass *) klass)->finalize = publishing_yandex_publish_options_finalize; -#line 1558 "YandexPublishing.c" +#line 1564 "YandexPublishing.c" } @@ -1569,11 +1575,11 @@ static void publishing_yandex_publish_options_instance_init (PublishingYandexPub self->destination_album_url = NULL; #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->ref_count = 1; -#line 1573 "YandexPublishing.c" +#line 1579 "YandexPublishing.c" } -static void publishing_yandex_publish_options_finalize (PublishingYandexPublishOptions* obj) { +static void publishing_yandex_publish_options_finalize (PublishingYandexPublishOptions * obj) { PublishingYandexPublishOptions * self; #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS, PublishingYandexPublishOptions); @@ -1585,7 +1591,7 @@ static void publishing_yandex_publish_options_finalize (PublishingYandexPublishO _g_free0 (self->destination_album); #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 (self->destination_album_url); -#line 1589 "YandexPublishing.c" +#line 1595 "YandexPublishing.c" } @@ -1604,18 +1610,18 @@ GType publishing_yandex_publish_options_get_type (void) { gpointer publishing_yandex_publish_options_ref (gpointer instance) { - PublishingYandexPublishOptions* self; + PublishingYandexPublishOptions * self; self = instance; #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_atomic_int_inc (&self->ref_count); #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return instance; -#line 1614 "YandexPublishing.c" +#line 1620 "YandexPublishing.c" } void publishing_yandex_publish_options_unref (gpointer instance) { - PublishingYandexPublishOptions* self; + PublishingYandexPublishOptions * self; self = instance; #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1623,7 +1629,7 @@ void publishing_yandex_publish_options_unref (gpointer instance) { PUBLISHING_YANDEX_PUBLISH_OPTIONS_GET_CLASS (self)->finalize (self); #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1627 "YandexPublishing.c" +#line 1633 "YandexPublishing.c" } } @@ -1637,7 +1643,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_yandex_publishing_opti result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; #line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 1641 "YandexPublishing.c" +#line 1647 "YandexPublishing.c" } @@ -1645,7 +1651,7 @@ static void publishing_yandex_publishing_options_pane_real_on_pane_installed (Sp PublishingYandexPublishingOptionsPane * self; #line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane); -#line 1649 "YandexPublishing.c" +#line 1655 "YandexPublishing.c" } @@ -1653,15 +1659,15 @@ static void publishing_yandex_publishing_options_pane_real_on_pane_uninstalled ( PublishingYandexPublishingOptionsPane * self; #line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane); -#line 1657 "YandexPublishing.c" +#line 1663 "YandexPublishing.c" } static GtkWidget* publishing_yandex_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) { PublishingYandexPublishingOptionsPane * self; GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane); #line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1672,28 +1678,28 @@ static GtkWidget* publishing_yandex_publishing_options_pane_real_get_widget (Spi result = _tmp1_; #line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 1676 "YandexPublishing.c" +#line 1682 "YandexPublishing.c" } static void _publishing_yandex_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_publishing_options_pane_on_publish_clicked ((PublishingYandexPublishingOptionsPane*) self); -#line 1683 "YandexPublishing.c" +#line 1689 "YandexPublishing.c" } static void _publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_publishing_options_pane_on_logout_clicked ((PublishingYandexPublishingOptionsPane*) self); -#line 1690 "YandexPublishing.c" +#line 1696 "YandexPublishing.c" } PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane_construct (GType object_type, PublishingYandexPublishOptions* options, GeeHashMap* list, SpitPublishingPluginHost* host) { PublishingYandexPublishingOptionsPane * self = NULL; - PublishingYandexPublishOptions* _tmp0_ = NULL; - GtkBox* _tmp1_ = NULL; + PublishingYandexPublishOptions* _tmp0_; + GtkBox* _tmp1_; GError * _inner_error_ = NULL; #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_val_if_fail (PUBLISHING_YANDEX_IS_PUBLISH_OPTIONS (options), NULL); @@ -1715,33 +1721,33 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane _g_object_unref0 (self->priv->box); #line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->priv->box = _tmp1_; -#line 1719 "YandexPublishing.c" +#line 1725 "YandexPublishing.c" { - GtkBuilder* _tmp2_ = NULL; - GtkBuilder* _tmp3_ = NULL; - GtkBuilder* _tmp4_ = NULL; + GtkBuilder* _tmp2_; + GtkBuilder* _tmp3_; + GtkBuilder* _tmp4_; GtkWidget* content = NULL; - GtkBuilder* _tmp5_ = NULL; - GObject* _tmp6_ = NULL; - GtkWidget* _tmp7_ = NULL; - GtkBuilder* _tmp8_ = NULL; - GObject* _tmp9_ = NULL; - GtkComboBoxText* _tmp10_ = NULL; - GtkComboBoxText* _tmp23_ = NULL; - GtkBuilder* _tmp24_ = NULL; - GObject* _tmp25_ = NULL; - GtkButton* _tmp26_ = NULL; - GtkBuilder* _tmp27_ = NULL; - GObject* _tmp28_ = NULL; - GtkButton* _tmp29_ = NULL; - GtkButton* _tmp30_ = NULL; - GtkButton* _tmp31_ = NULL; - GtkWidget* _tmp32_ = NULL; - GtkContainer* _tmp33_ = NULL; - GtkContainer* _tmp34_ = NULL; - GtkWidget* _tmp35_ = NULL; - GtkBox* _tmp36_ = NULL; - GtkWidget* _tmp37_ = NULL; + GtkBuilder* _tmp5_; + GObject* _tmp6_; + GtkWidget* _tmp7_; + GtkBuilder* _tmp8_; + GObject* _tmp9_; + GtkComboBoxText* _tmp10_; + GtkComboBoxText* _tmp23_; + GtkBuilder* _tmp24_; + GObject* _tmp25_; + GtkButton* _tmp26_; + GtkBuilder* _tmp27_; + GObject* _tmp28_; + GtkButton* _tmp29_; + GtkButton* _tmp30_; + GtkButton* _tmp31_; + GtkWidget* _tmp32_; + GtkContainer* _tmp33_; + GtkContainer* _tmp34_; + GtkWidget* _tmp35_; + GtkBox* _tmp36_; + GtkWidget* _tmp37_; #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp2_ = gtk_builder_new (); #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1754,7 +1760,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane gtk_builder_add_from_resource (_tmp3_, PLUGIN_RESOURCE_PATH "/yandex_publish_model.ui", &_inner_error_); #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1758 "YandexPublishing.c" +#line 1764 "YandexPublishing.c" goto __catch40_g_error; } #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1779,15 +1785,15 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane _g_object_unref0 (self->priv->album_list); #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->priv->album_list = _tmp10_; -#line 1783 "YandexPublishing.c" +#line 1789 "YandexPublishing.c" { GeeIterator* _key_it = NULL; - GeeHashMap* _tmp11_ = NULL; - GeeSet* _tmp12_ = NULL; - GeeSet* _tmp13_ = NULL; - GeeSet* _tmp14_ = NULL; - GeeIterator* _tmp15_ = NULL; - GeeIterator* _tmp16_ = NULL; + GeeHashMap* _tmp11_; + GeeSet* _tmp12_; + GeeSet* _tmp13_; + GeeSet* _tmp14_; + GeeIterator* _tmp15_; + GeeIterator* _tmp16_; #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp11_ = list; #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1806,14 +1812,14 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane _key_it = _tmp16_; #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" while (TRUE) { -#line 1810 "YandexPublishing.c" - GeeIterator* _tmp17_ = NULL; - gboolean _tmp18_ = FALSE; +#line 1816 "YandexPublishing.c" + GeeIterator* _tmp17_; + gboolean _tmp18_; gchar* key = NULL; - GeeIterator* _tmp19_ = NULL; - gpointer _tmp20_ = NULL; - GtkComboBoxText* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; + GeeIterator* _tmp19_; + gpointer _tmp20_; + GtkComboBoxText* _tmp21_; + const gchar* _tmp22_; #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp17_ = _key_it; #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1822,7 +1828,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane if (!_tmp18_) { #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" break; -#line 1826 "YandexPublishing.c" +#line 1832 "YandexPublishing.c" } #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp19_ = _key_it; @@ -1838,11 +1844,11 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane gtk_combo_box_text_append_text (_tmp21_, _tmp22_); #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 (key); -#line 1842 "YandexPublishing.c" +#line 1848 "YandexPublishing.c" } #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_object_unref0 (_key_it); -#line 1846 "YandexPublishing.c" +#line 1852 "YandexPublishing.c" } #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp23_ = self->priv->album_list; @@ -1894,14 +1900,14 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane gtk_box_pack_start (_tmp36_, _tmp37_, TRUE, TRUE, (guint) 0); #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_object_unref0 (content); -#line 1898 "YandexPublishing.c" +#line 1904 "YandexPublishing.c" } goto __finally40; __catch40_g_error: { GError* e = NULL; - GError* _tmp38_ = NULL; - const gchar* _tmp39_ = NULL; + GError* _tmp38_; + const gchar* _tmp39_; #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" e = _inner_error_; #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1914,7 +1920,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane g_warning ("YandexPublishing.vala:214: Could not load UI: %s", _tmp39_); #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_error_free0 (e); -#line 1918 "YandexPublishing.c" +#line 1924 "YandexPublishing.c" } __finally40: #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1925,18 +1931,18 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane g_clear_error (&_inner_error_); #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return NULL; -#line 1929 "YandexPublishing.c" +#line 1935 "YandexPublishing.c" } #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self; -#line 1933 "YandexPublishing.c" +#line 1939 "YandexPublishing.c" } PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane_new (PublishingYandexPublishOptions* options, GeeHashMap* list, SpitPublishingPluginHost* host) { #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return publishing_yandex_publishing_options_pane_construct (PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, options, list, host); -#line 1940 "YandexPublishing.c" +#line 1946 "YandexPublishing.c" } @@ -1944,36 +1950,36 @@ static void publishing_yandex_publishing_options_pane_on_logout_clicked (Publish #line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_PUBLISHING_OPTIONS_PANE (self)); #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - g_signal_emit_by_name (self, "logout"); -#line 1949 "YandexPublishing.c" + g_signal_emit (self, publishing_yandex_publishing_options_pane_signals[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0); +#line 1955 "YandexPublishing.c" } static void publishing_yandex_publishing_options_pane_on_publish_clicked (PublishingYandexPublishingOptionsPane* self) { - PublishingYandexPublishOptions* _tmp0_ = NULL; - GtkComboBoxText* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + PublishingYandexPublishOptions* _tmp0_; + GtkComboBoxText* _tmp1_; + gchar* _tmp2_; GtkCheckButton* tmp = NULL; - GtkBuilder* _tmp3_ = NULL; - GObject* _tmp4_ = NULL; - GtkCheckButton* _tmp5_ = NULL; - PublishingYandexPublishOptions* _tmp6_ = NULL; - GtkCheckButton* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; - gboolean _tmp9_ = FALSE; - GtkBuilder* _tmp10_ = NULL; - GObject* _tmp11_ = NULL; - GtkCheckButton* _tmp12_ = NULL; - PublishingYandexPublishOptions* _tmp13_ = NULL; - GtkCheckButton* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; - gboolean _tmp16_ = FALSE; + GtkBuilder* _tmp3_; + GObject* _tmp4_; + GtkCheckButton* _tmp5_; + PublishingYandexPublishOptions* _tmp6_; + GtkCheckButton* _tmp7_; + gboolean _tmp8_; + gboolean _tmp9_; + GtkBuilder* _tmp10_; + GObject* _tmp11_; + GtkCheckButton* _tmp12_; + PublishingYandexPublishOptions* _tmp13_; + GtkCheckButton* _tmp14_; + gboolean _tmp15_; + gboolean _tmp16_; GtkComboBoxText* access_type = NULL; - GtkBuilder* _tmp17_ = NULL; - GObject* _tmp18_ = NULL; - GtkComboBoxText* _tmp19_ = NULL; - PublishingYandexPublishOptions* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; + GtkBuilder* _tmp17_; + GObject* _tmp18_; + GtkComboBoxText* _tmp19_; + PublishingYandexPublishOptions* _tmp20_; + gchar* _tmp21_; #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_PUBLISHING_OPTIONS_PANE (self)); #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2041,12 +2047,12 @@ static void publishing_yandex_publishing_options_pane_on_publish_clicked (Publis #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp20_->access_type = _tmp21_; #line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - g_signal_emit_by_name (self, "publish"); + g_signal_emit (self, publishing_yandex_publishing_options_pane_signals[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0); #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_object_unref0 (access_type); #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_object_unref0 (tmp); -#line 2050 "YandexPublishing.c" +#line 2056 "YandexPublishing.c" } @@ -2058,10 +2064,10 @@ static void publishing_yandex_publishing_options_pane_class_init (PublishingYand #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_yandex_publishing_options_pane_finalize; #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - g_signal_new ("publish", PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + publishing_yandex_publishing_options_pane_signals[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - g_signal_new ("logout", PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 2065 "YandexPublishing.c" + publishing_yandex_publishing_options_pane_signals[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 2071 "YandexPublishing.c" } @@ -2069,25 +2075,25 @@ static void publishing_yandex_publishing_options_pane_spit_publishing_dialog_pan #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface); #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_get_preferred_geometry; + iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_yandex_publishing_options_pane_real_get_preferred_geometry; #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_on_pane_installed; + iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_yandex_publishing_options_pane_real_on_pane_installed; #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_on_pane_uninstalled; + iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_yandex_publishing_options_pane_real_on_pane_uninstalled; #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_get_widget; -#line 2080 "YandexPublishing.c" + iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_yandex_publishing_options_pane_real_get_widget; +#line 2086 "YandexPublishing.c" } static void publishing_yandex_publishing_options_pane_instance_init (PublishingYandexPublishingOptionsPane * self) { #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->priv = PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self); -#line 2087 "YandexPublishing.c" +#line 2093 "YandexPublishing.c" } -static void publishing_yandex_publishing_options_pane_finalize (GObject* obj) { +static void publishing_yandex_publishing_options_pane_finalize (GObject * obj) { PublishingYandexPublishingOptionsPane * self; #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane); @@ -2103,7 +2109,7 @@ static void publishing_yandex_publishing_options_pane_finalize (GObject* obj) { _g_object_unref0 (self->priv->album_list); #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" G_OBJECT_CLASS (publishing_yandex_publishing_options_pane_parent_class)->finalize (obj); -#line 2107 "YandexPublishing.c" +#line 2113 "YandexPublishing.c" } @@ -2123,10 +2129,10 @@ GType publishing_yandex_publishing_options_pane_get_type (void) { PublishingYandexUploader* publishing_yandex_uploader_construct (GType object_type, PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable** photos, int photos_length1) { PublishingYandexUploader* self = NULL; - PublishingYandexSession* _tmp0_ = NULL; - SpitPublishingPublishable** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - PublishingYandexPublishOptions* _tmp2_ = NULL; + PublishingYandexSession* _tmp0_; + SpitPublishingPublishable** _tmp1_; + gint _tmp1__length1; + PublishingYandexPublishOptions* _tmp2_; #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (session), NULL); #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2145,27 +2151,27 @@ PublishingYandexUploader* publishing_yandex_uploader_construct (GType object_typ self->priv->options = _tmp2_; #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self; -#line 2149 "YandexPublishing.c" +#line 2155 "YandexPublishing.c" } PublishingYandexUploader* publishing_yandex_uploader_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable** photos, int photos_length1) { #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return publishing_yandex_uploader_construct (PUBLISHING_YANDEX_TYPE_UPLOADER, session, options, photos, photos_length1); -#line 2156 "YandexPublishing.c" +#line 2162 "YandexPublishing.c" } static PublishingRESTSupportTransaction* publishing_yandex_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) { PublishingYandexUploader * self; PublishingRESTSupportTransaction* result = NULL; - PublishingRESTSupportSession* _tmp0_ = NULL; - PublishingYandexSession* _tmp1_ = NULL; - PublishingYandexPublishOptions* _tmp2_ = NULL; - SpitPublishingPublishable* _tmp3_ = NULL; - SpitPublishingPublishable* _tmp4_ = NULL; - PublishingYandexUploadTransaction* _tmp5_ = NULL; - PublishingRESTSupportTransaction* _tmp6_ = NULL; + PublishingRESTSupportSession* _tmp0_; + PublishingYandexSession* _tmp1_; + PublishingYandexPublishOptions* _tmp2_; + SpitPublishingPublishable* _tmp3_; + SpitPublishingPublishable* _tmp4_; + PublishingYandexUploadTransaction* _tmp5_; + PublishingRESTSupportTransaction* _tmp6_; #line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_UPLOADER, PublishingYandexUploader); #line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2194,7 +2200,7 @@ static PublishingRESTSupportTransaction* publishing_yandex_uploader_real_create_ result = _tmp6_; #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 2198 "YandexPublishing.c" +#line 2204 "YandexPublishing.c" } @@ -2206,25 +2212,25 @@ static void publishing_yandex_uploader_class_init (PublishingYandexUploaderClass #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingYandexUploaderPrivate)); #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_yandex_uploader_real_create_transaction; -#line 2211 "YandexPublishing.c" + ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_yandex_uploader_real_create_transaction; +#line 2217 "YandexPublishing.c" } static void publishing_yandex_uploader_instance_init (PublishingYandexUploader * self) { #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->priv = PUBLISHING_YANDEX_UPLOADER_GET_PRIVATE (self); -#line 2218 "YandexPublishing.c" +#line 2224 "YandexPublishing.c" } -static void publishing_yandex_uploader_finalize (PublishingRESTSupportBatchUploader* obj) { +static void publishing_yandex_uploader_finalize (PublishingRESTSupportBatchUploader * obj) { PublishingYandexUploader * self; #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_UPLOADER, PublishingYandexUploader); #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_yandex_uploader_parent_class)->finalize (obj); -#line 2228 "YandexPublishing.c" +#line 2234 "YandexPublishing.c" } @@ -2242,26 +2248,26 @@ GType publishing_yandex_uploader_get_type (void) { static gchar* bool_to_string (gboolean self) { gchar* result = NULL; -#line 37 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 37 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (self) { -#line 2248 "YandexPublishing.c" - gchar* _tmp0_ = NULL; -#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2254 "YandexPublishing.c" + gchar* _tmp0_; +#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup ("true"); -#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp0_; -#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2256 "YandexPublishing.c" +#line 2262 "YandexPublishing.c" } else { - gchar* _tmp1_ = NULL; -#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp1_; +#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = g_strdup ("false"); -#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_; -#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2265 "YandexPublishing.c" +#line 2271 "YandexPublishing.c" } } @@ -2269,142 +2275,142 @@ static gchar* bool_to_string (gboolean self) { static void _vala_SoupMultipart_free (SoupMultipart* self) { #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_boxed_free (soup_multipart_get_type (), self); -#line 2273 "YandexPublishing.c" +#line 2279 "YandexPublishing.c" } static guint8* string_get_data (const gchar* self, int* result_length1) { guint8* result; guint8* res = NULL; - gint res_length1 = 0; - gint _res_size_ = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - guint8* _tmp3_ = NULL; - gint _tmp3__length1 = 0; - guint8* _tmp4_ = NULL; - gint _tmp4__length1 = 0; -#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint res_length1; + gint _res_size_; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; + guint8* _tmp3_; + gint _tmp3__length1; + guint8* _tmp4_; + gint _tmp4__length1; +#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = (guint8*) self; -#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res_length1 = -1; -#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _res_size_ = res_length1; -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res_length1 = (gint) _tmp1_; -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = res_length1; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = res; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = res_length1; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4__length1 = _tmp3__length1; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (result_length1) { -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" *result_length1 = _tmp4__length1; -#line 2317 "YandexPublishing.c" +#line 2323 "YandexPublishing.c" } -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2323 "YandexPublishing.c" +#line 2329 "YandexPublishing.c" } static void _g_free0_ (gpointer var) { #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" var = (g_free (var), NULL); -#line 2330 "YandexPublishing.c" +#line 2336 "YandexPublishing.c" } static void _vala_SoupBuffer_free (SoupBuffer* self) { #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_boxed_free (soup_buffer_get_type (), self); -#line 2337 "YandexPublishing.c" +#line 2343 "YandexPublishing.c" } PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construct (GType object_type, PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable* photo) { PublishingYandexUploadTransaction* self = NULL; - PublishingYandexSession* _tmp0_ = NULL; - PublishingYandexPublishOptions* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - SpitPublishingPublishable* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - PublishingYandexPublishOptions* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - PublishingYandexPublishOptions* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; + PublishingYandexSession* _tmp0_; + PublishingYandexPublishOptions* _tmp1_; + const gchar* _tmp2_; + SpitPublishingPublishable* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + PublishingYandexPublishOptions* _tmp6_; + const gchar* _tmp7_; + PublishingYandexPublishOptions* _tmp8_; + const gchar* _tmp9_; SoupMultipart* message_parts = NULL; - SoupMultipart* _tmp10_ = NULL; - SpitPublishingPublishable* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - PublishingYandexPublishOptions* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - PublishingYandexPublishOptions* _tmp18_ = NULL; - gboolean _tmp19_ = FALSE; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - PublishingYandexPublishOptions* _tmp22_ = NULL; - const gchar* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; + SoupMultipart* _tmp10_; + SpitPublishingPublishable* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + PublishingYandexPublishOptions* _tmp14_; + gboolean _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + PublishingYandexPublishOptions* _tmp18_; + gboolean _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; + PublishingYandexPublishOptions* _tmp22_; + const gchar* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; gchar* photo_data = NULL; gsize data_length = 0UL; gint image_part_num = 0; - gint _tmp40_ = 0; + gint _tmp40_; SoupBuffer* bindable_data = NULL; - guint8* _tmp41_ = NULL; - gint _tmp41__length1 = 0; - guint8* _tmp42_ = NULL; - gint _tmp42__length1 = 0; - SoupBuffer* _tmp43_ = NULL; - SpitPublishingPublishable* _tmp44_ = NULL; - GFile* _tmp45_ = NULL; - GFile* _tmp46_ = NULL; - gchar* _tmp47_ = NULL; - gchar* _tmp48_ = NULL; + guint8* _tmp41_; + gint _tmp41__length1; + guint8* _tmp42_; + gint _tmp42__length1; + SoupBuffer* _tmp43_; + SpitPublishingPublishable* _tmp44_; + GFile* _tmp45_; + GFile* _tmp46_; + gchar* _tmp47_; + gchar* _tmp48_; SoupMessageHeaders* image_part_header = NULL; SoupBuffer* image_part_body = NULL; SoupMessageHeaders* _tmp49_ = NULL; SoupBuffer* _tmp50_ = NULL; GHashTable* _result_ = NULL; - GHashFunc _tmp51_ = NULL; - GEqualFunc _tmp52_ = NULL; - GHashTable* _tmp53_ = NULL; - gchar* _tmp54_ = NULL; - gchar* _tmp55_ = NULL; - gchar* _tmp56_ = NULL; - gchar* _tmp57_ = NULL; + GHashFunc _tmp51_; + GEqualFunc _tmp52_; + GHashTable* _tmp53_; + gchar* _tmp54_; + gchar* _tmp55_; + gchar* _tmp56_; + gchar* _tmp57_; SoupMessage* outbound_message = NULL; - gchar* _tmp58_ = NULL; - gchar* _tmp59_ = NULL; - SoupMessage* _tmp60_ = NULL; - SoupMessage* _tmp61_ = NULL; - SoupMessageHeaders* _tmp62_ = NULL; - PublishingYandexSession* _tmp63_ = NULL; - gchar* _tmp64_ = NULL; - gchar* _tmp65_ = NULL; - gchar* _tmp66_ = NULL; - gchar* _tmp67_ = NULL; - SoupMessageHeaders* _tmp68_ = NULL; + gchar* _tmp58_; + gchar* _tmp59_; + SoupMessage* _tmp60_; + SoupMessage* _tmp61_; + SoupMessageHeaders* _tmp62_; + PublishingYandexSession* _tmp63_; + gchar* _tmp64_; + gchar* _tmp65_; + gchar* _tmp66_; + gchar* _tmp67_; + SoupMessageHeaders* _tmp68_; GError * _inner_error_ = NULL; #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (session), NULL); @@ -2490,13 +2496,13 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc soup_multipart_append_form_string (message_parts, "access", _tmp25_); #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 (_tmp25_); -#line 2494 "YandexPublishing.c" +#line 2500 "YandexPublishing.c" { - SpitPublishingPublishable* _tmp26_ = NULL; - GFile* _tmp27_ = NULL; - GFile* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; + SpitPublishingPublishable* _tmp26_; + GFile* _tmp27_; + GFile* _tmp28_; + gchar* _tmp29_; + gchar* _tmp30_; gchar* _tmp31_ = NULL; gsize _tmp32_ = 0UL; #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2525,7 +2531,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc if (G_UNLIKELY (_inner_error_ != NULL)) { #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_inner_error_->domain == G_FILE_ERROR) { -#line 2529 "YandexPublishing.c" +#line 2535 "YandexPublishing.c" goto __catch41_g_file_error; } #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2538,20 +2544,20 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc g_clear_error (&_inner_error_); #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return NULL; -#line 2542 "YandexPublishing.c" +#line 2548 "YandexPublishing.c" } } goto __finally41; __catch41_g_file_error: { GError* e = NULL; - SpitPublishingPublishable* _tmp33_ = NULL; - GFile* _tmp34_ = NULL; - GFile* _tmp35_ = NULL; - gchar* _tmp36_ = NULL; - gchar* _tmp37_ = NULL; - GError* _tmp38_ = NULL; - const gchar* _tmp39_ = NULL; + SpitPublishingPublishable* _tmp33_; + GFile* _tmp34_; + GFile* _tmp35_; + gchar* _tmp36_; + gchar* _tmp37_; + GError* _tmp38_; + const gchar* _tmp39_; #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" e = _inner_error_; #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2578,7 +2584,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc _g_object_unref0 (_tmp35_); #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_error_free0 (e); -#line 2582 "YandexPublishing.c" +#line 2588 "YandexPublishing.c" } __finally41: #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2593,7 +2599,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc g_clear_error (&_inner_error_); #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return NULL; -#line 2597 "YandexPublishing.c" +#line 2603 "YandexPublishing.c" } #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp40_ = soup_multipart_get_length (message_parts); @@ -2701,21 +2707,21 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc __vala_SoupMultipart_free0 (message_parts); #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self; -#line 2705 "YandexPublishing.c" +#line 2711 "YandexPublishing.c" } PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable* photo) { #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return publishing_yandex_upload_transaction_construct (PUBLISHING_YANDEX_TYPE_UPLOAD_TRANSACTION, session, options, photo); -#line 2712 "YandexPublishing.c" +#line 2718 "YandexPublishing.c" } static void publishing_yandex_upload_transaction_class_init (PublishingYandexUploadTransactionClass * klass) { #line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_upload_transaction_parent_class = g_type_class_peek_parent (klass); -#line 2719 "YandexPublishing.c" +#line 2725 "YandexPublishing.c" } @@ -2737,11 +2743,11 @@ GType publishing_yandex_upload_transaction_get_type (void) { PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) { PublishingYandexYandexPublisher * self = NULL; - SpitPublishingService* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; - PublishingYandexSession* _tmp2_ = NULL; - GeeHashMap* _tmp3_ = NULL; - PublishingYandexPublishOptions* _tmp4_ = NULL; + SpitPublishingService* _tmp0_; + SpitPublishingPluginHost* _tmp1_; + PublishingYandexSession* _tmp2_; + GeeHashMap* _tmp3_; + PublishingYandexPublishOptions* _tmp4_; #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL); #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2776,21 +2782,21 @@ PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_construct (G self->priv->options = _tmp4_; #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self; -#line 2780 "YandexPublishing.c" +#line 2786 "YandexPublishing.c" } PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) { #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return publishing_yandex_yandex_publisher_construct (PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, service, host); -#line 2787 "YandexPublishing.c" +#line 2793 "YandexPublishing.c" } gchar* publishing_yandex_yandex_publisher_get_persistent_auth_token (PublishingYandexYandexPublisher* self) { gchar* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gchar* _tmp1_; #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_val_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self), NULL); #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2801,13 +2807,13 @@ gchar* publishing_yandex_yandex_publisher_get_persistent_auth_token (PublishingY result = _tmp1_; #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 2805 "YandexPublishing.c" +#line 2811 "YandexPublishing.c" } void publishing_yandex_yandex_publisher_set_persistent_auth_token (PublishingYandexYandexPublisher* self, const gchar* auth_token) { - SpitPublishingPluginHost* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + const gchar* _tmp1_; #line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); #line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2818,27 +2824,27 @@ void publishing_yandex_yandex_publisher_set_persistent_auth_token (PublishingYan _tmp1_ = auth_token; #line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "auth_token", _tmp1_); -#line 2822 "YandexPublishing.c" +#line 2828 "YandexPublishing.c" } void publishing_yandex_yandex_publisher_invalidate_persistent_session (PublishingYandexYandexPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; + SpitPublishingPluginHost* _tmp0_; #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp0_ = self->priv->host; #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" spit_host_interface_unset_config_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "auth_token"); -#line 2834 "YandexPublishing.c" +#line 2840 "YandexPublishing.c" } gboolean publishing_yandex_yandex_publisher_is_persistent_session_available (PublishingYandexYandexPublisher* self) { gboolean result = FALSE; - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + gchar* _tmp0_; + gchar* _tmp1_; + gboolean _tmp2_; #line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_val_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self), FALSE); #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2853,14 +2859,14 @@ gboolean publishing_yandex_yandex_publisher_is_persistent_session_available (Pub result = _tmp2_; #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 2857 "YandexPublishing.c" +#line 2863 "YandexPublishing.c" } static gboolean publishing_yandex_yandex_publisher_real_is_running (SpitPublishingPublisher* base) { PublishingYandexYandexPublisher * self; gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher); #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2869,15 +2875,15 @@ static gboolean publishing_yandex_yandex_publisher_real_is_running (SpitPublishi result = _tmp0_; #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 2873 "YandexPublishing.c" +#line 2879 "YandexPublishing.c" } static SpitPublishingService* publishing_yandex_yandex_publisher_real_get_service (SpitPublishingPublisher* base) { PublishingYandexYandexPublisher * self; SpitPublishingService* result = NULL; - SpitPublishingService* _tmp0_ = NULL; - SpitPublishingService* _tmp1_ = NULL; + SpitPublishingService* _tmp0_; + SpitPublishingService* _tmp1_; #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher); #line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2888,7 +2894,7 @@ static SpitPublishingService* publishing_yandex_yandex_publisher_real_get_servic result = _tmp1_; #line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 2892 "YandexPublishing.c" +#line 2898 "YandexPublishing.c" } @@ -2902,7 +2908,7 @@ static gchar* publishing_yandex_yandex_publisher_check_response (PublishingYande result = NULL; #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 2906 "YandexPublishing.c" +#line 2912 "YandexPublishing.c" } @@ -2915,45 +2921,45 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand title = NULL; #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" link = NULL; -#line 2919 "YandexPublishing.c" +#line 2925 "YandexPublishing.c" { xmlNode* c = NULL; - xmlNode* _tmp0_ = NULL; - xmlNode* _tmp1_ = NULL; + xmlNode* _tmp0_; + xmlNode* _tmp1_; #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp0_ = e; #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp1_ = _tmp0_->children; #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" c = _tmp1_; -#line 2930 "YandexPublishing.c" +#line 2936 "YandexPublishing.c" { gboolean _tmp2_ = FALSE; #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp2_ = TRUE; #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" while (TRUE) { -#line 2937 "YandexPublishing.c" - xmlNode* _tmp5_ = NULL; - xmlNode* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; +#line 2943 "YandexPublishing.c" + xmlNode* _tmp5_; + xmlNode* _tmp6_; + const gchar* _tmp7_; gboolean _tmp10_ = FALSE; - xmlNode* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; + xmlNode* _tmp11_; + const gchar* _tmp12_; gboolean _tmp18_ = FALSE; - const gchar* _tmp19_ = NULL; + const gchar* _tmp19_; #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (!_tmp2_) { -#line 2948 "YandexPublishing.c" - xmlNode* _tmp3_ = NULL; - xmlNode* _tmp4_ = NULL; +#line 2954 "YandexPublishing.c" + xmlNode* _tmp3_; + xmlNode* _tmp4_; #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp3_ = c; #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp4_ = _tmp3_->next; #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" c = _tmp4_; -#line 2957 "YandexPublishing.c" +#line 2963 "YandexPublishing.c" } #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp2_ = FALSE; @@ -2963,7 +2969,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand if (!(_tmp5_ != NULL)) { #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" break; -#line 2967 "YandexPublishing.c" +#line 2973 "YandexPublishing.c" } #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp6_ = c; @@ -2971,9 +2977,9 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand _tmp7_ = _tmp6_->name; #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (g_strcmp0 (_tmp7_, "title") == 0) { -#line 2975 "YandexPublishing.c" - xmlNode* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; +#line 2981 "YandexPublishing.c" + xmlNode* _tmp8_; + gchar* _tmp9_; #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp8_ = c; #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2982,7 +2988,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand _g_free0 (title); #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" title = _tmp9_; -#line 2986 "YandexPublishing.c" +#line 2992 "YandexPublishing.c" } #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp11_ = c; @@ -2990,10 +2996,10 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand _tmp12_ = _tmp11_->name; #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (g_strcmp0 (_tmp12_, "link") == 0) { -#line 2994 "YandexPublishing.c" - xmlNode* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; +#line 3000 "YandexPublishing.c" + xmlNode* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp13_ = c; #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3004,17 +3010,17 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand _tmp10_ = g_strcmp0 (_tmp15_, "photos") == 0; #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 (_tmp15_); -#line 3008 "YandexPublishing.c" +#line 3014 "YandexPublishing.c" } else { #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp10_ = FALSE; -#line 3012 "YandexPublishing.c" +#line 3018 "YandexPublishing.c" } #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_tmp10_) { -#line 3016 "YandexPublishing.c" - xmlNode* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; +#line 3022 "YandexPublishing.c" + xmlNode* _tmp16_; + gchar* _tmp17_; #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp16_ = c; #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3023,32 +3029,32 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand _g_free0 (link); #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" link = _tmp17_; -#line 3027 "YandexPublishing.c" +#line 3033 "YandexPublishing.c" } #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp19_ = title; #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_tmp19_ != NULL) { -#line 3033 "YandexPublishing.c" - const gchar* _tmp20_ = NULL; +#line 3039 "YandexPublishing.c" + const gchar* _tmp20_; #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp20_ = link; #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp18_ = _tmp20_ != NULL; -#line 3039 "YandexPublishing.c" +#line 3045 "YandexPublishing.c" } else { #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp18_ = FALSE; -#line 3043 "YandexPublishing.c" +#line 3049 "YandexPublishing.c" } #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_tmp18_) { -#line 3047 "YandexPublishing.c" - const gchar* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; - GeeHashMap* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; +#line 3053 "YandexPublishing.c" + const gchar* _tmp21_; + const gchar* _tmp22_; + GeeHashMap* _tmp23_; + const gchar* _tmp24_; + const gchar* _tmp25_; #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp21_ = title; #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3073,7 +3079,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand link = NULL; #line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" break; -#line 3077 "YandexPublishing.c" +#line 3083 "YandexPublishing.c" } } } @@ -3082,7 +3088,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand _g_free0 (link); #line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 (title); -#line 3086 "YandexPublishing.c" +#line 3092 "YandexPublishing.c" } @@ -3091,18 +3097,18 @@ static gchar* _publishing_yandex_yandex_publisher_check_response_publishing_rest result = publishing_yandex_yandex_publisher_check_response ((PublishingYandexYandexPublisher*) self, doc); #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 3095 "YandexPublishing.c" +#line 3101 "YandexPublishing.c" } void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYandexPublisher* self, const gchar* data, GError** error) { PublishingRESTSupportXmlDocument* doc = NULL; - const gchar* _tmp0_ = NULL; - PublishingRESTSupportXmlDocument* _tmp1_ = NULL; + const gchar* _tmp0_; + PublishingRESTSupportXmlDocument* _tmp1_; xmlNode* root = NULL; - PublishingRESTSupportXmlDocument* _tmp2_ = NULL; - xmlNode* _tmp3_ = NULL; - xmlNode* _tmp4_ = NULL; + PublishingRESTSupportXmlDocument* _tmp2_; + xmlNode* _tmp3_; + xmlNode* _tmp4_; GError * _inner_error_ = NULL; #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); @@ -3122,7 +3128,7 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa g_propagate_error (error, _inner_error_); #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3126 "YandexPublishing.c" +#line 3132 "YandexPublishing.c" } else { #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3130,7 +3136,7 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa g_clear_error (&_inner_error_); #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3134 "YandexPublishing.c" +#line 3140 "YandexPublishing.c" } } #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3153,7 +3159,7 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa _publishing_rest_support_xml_document_unref0 (doc); #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3157 "YandexPublishing.c" +#line 3163 "YandexPublishing.c" } else { #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _publishing_rest_support_xml_document_unref0 (doc); @@ -3163,22 +3169,22 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa g_clear_error (&_inner_error_); #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3167 "YandexPublishing.c" +#line 3173 "YandexPublishing.c" } } #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _publishing_rest_support_xml_document_unref0 (doc); -#line 3172 "YandexPublishing.c" +#line 3178 "YandexPublishing.c" } void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandexPublisher* self, const gchar* data, GError** error) { PublishingRESTSupportXmlDocument* doc = NULL; - const gchar* _tmp0_ = NULL; - PublishingRESTSupportXmlDocument* _tmp1_ = NULL; + const gchar* _tmp0_; + PublishingRESTSupportXmlDocument* _tmp1_; xmlNode* root = NULL; - PublishingRESTSupportXmlDocument* _tmp2_ = NULL; - xmlNode* _tmp3_ = NULL; + PublishingRESTSupportXmlDocument* _tmp2_; + xmlNode* _tmp3_; GError * _inner_error_ = NULL; #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); @@ -3198,7 +3204,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex g_propagate_error (error, _inner_error_); #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3202 "YandexPublishing.c" +#line 3208 "YandexPublishing.c" } else { #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3206,7 +3212,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex g_clear_error (&_inner_error_); #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3210 "YandexPublishing.c" +#line 3216 "YandexPublishing.c" } } #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3215,41 +3221,41 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex _tmp3_ = publishing_rest_support_xml_document_get_root_node (_tmp2_); #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" root = _tmp3_; -#line 3219 "YandexPublishing.c" +#line 3225 "YandexPublishing.c" { xmlNode* e = NULL; - xmlNode* _tmp4_ = NULL; - xmlNode* _tmp5_ = NULL; + xmlNode* _tmp4_; + xmlNode* _tmp5_; #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp4_ = root; #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp5_ = _tmp4_->children; #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" e = _tmp5_; -#line 3230 "YandexPublishing.c" +#line 3236 "YandexPublishing.c" { gboolean _tmp6_ = FALSE; #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp6_ = TRUE; #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" while (TRUE) { -#line 3237 "YandexPublishing.c" - xmlNode* _tmp9_ = NULL; - xmlNode* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - xmlNode* _tmp12_ = NULL; +#line 3243 "YandexPublishing.c" + xmlNode* _tmp9_; + xmlNode* _tmp10_; + const gchar* _tmp11_; + xmlNode* _tmp12_; #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (!_tmp6_) { -#line 3244 "YandexPublishing.c" - xmlNode* _tmp7_ = NULL; - xmlNode* _tmp8_ = NULL; +#line 3250 "YandexPublishing.c" + xmlNode* _tmp7_; + xmlNode* _tmp8_; #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp7_ = e; #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp8_ = _tmp7_->next; #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" e = _tmp8_; -#line 3253 "YandexPublishing.c" +#line 3259 "YandexPublishing.c" } #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp6_ = FALSE; @@ -3259,7 +3265,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex if (!(_tmp9_ != NULL)) { #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" break; -#line 3263 "YandexPublishing.c" +#line 3269 "YandexPublishing.c" } #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp10_ = e; @@ -3269,7 +3275,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex if (g_strcmp0 (_tmp11_, "entry") != 0) { #line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" continue; -#line 3273 "YandexPublishing.c" +#line 3279 "YandexPublishing.c" } #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp12_ = e; @@ -3285,7 +3291,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex _publishing_rest_support_xml_document_unref0 (doc); #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3289 "YandexPublishing.c" +#line 3295 "YandexPublishing.c" } else { #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _publishing_rest_support_xml_document_unref0 (doc); @@ -3295,7 +3301,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex g_clear_error (&_inner_error_); #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3299 "YandexPublishing.c" +#line 3305 "YandexPublishing.c" } } } @@ -3303,31 +3309,31 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex } #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _publishing_rest_support_xml_document_unref0 (doc); -#line 3307 "YandexPublishing.c" +#line 3313 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_album_creation_complete ((PublishingYandexYandexPublisher*) self, _sender); -#line 3314 "YandexPublishing.c" +#line 3320 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_album_creation_error ((PublishingYandexYandexPublisher*) self, _sender, err); -#line 3321 "YandexPublishing.c" +#line 3327 "YandexPublishing.c" } static void publishing_yandex_yandex_publisher_album_creation_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - GError* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + GError* _tmp4_; + const gchar* _tmp5_; #line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); #line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3350,21 +3356,21 @@ static void publishing_yandex_yandex_publisher_album_creation_error (PublishingY _tmp5_ = _tmp4_->message; #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_warning ("YandexPublishing.vala:394: Album creation error: %s", _tmp5_); -#line 3354 "YandexPublishing.c" +#line 3360 "YandexPublishing.c" } static void publishing_yandex_yandex_publisher_album_creation_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - GeeHashMap* _tmp9_ = NULL; - PublishingYandexPublishOptions* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - gpointer _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + GeeHashMap* _tmp9_; + PublishingYandexPublishOptions* _tmp10_; + const gchar* _tmp11_; + gpointer _tmp12_; + gchar* _tmp13_; + gboolean _tmp14_; GError * _inner_error_ = NULL; #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); @@ -3382,11 +3388,11 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE); #line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self); -#line 3386 "YandexPublishing.c" +#line 3392 "YandexPublishing.c" { - PublishingRESTSupportTransaction* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + PublishingRESTSupportTransaction* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp4_ = t; #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3401,7 +3407,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi if (G_UNLIKELY (_inner_error_ != NULL)) { #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3405 "YandexPublishing.c" +#line 3411 "YandexPublishing.c" goto __catch42_spit_publishing_publishing_error; } #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3410,15 +3416,15 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi g_clear_error (&_inner_error_); #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3414 "YandexPublishing.c" +#line 3420 "YandexPublishing.c" } } goto __finally42; __catch42_spit_publishing_publishing_error: { GError* err = NULL; - SpitPublishingPluginHost* _tmp7_ = NULL; - GError* _tmp8_ = NULL; + SpitPublishingPluginHost* _tmp7_; + GError* _tmp8_; #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" err = _inner_error_; #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3433,7 +3439,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi _g_error_free0 (err); #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3437 "YandexPublishing.c" +#line 3443 "YandexPublishing.c" } __finally42: #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3444,7 +3450,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi g_clear_error (&_inner_error_); #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3448 "YandexPublishing.c" +#line 3454 "YandexPublishing.c" } #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp9_ = self->priv->album_list; @@ -3464,11 +3470,11 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi if (_tmp14_) { #line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_start_upload (self); -#line 3468 "YandexPublishing.c" +#line 3474 "YandexPublishing.c" } else { - SpitPublishingPluginHost* _tmp15_ = NULL; - GError* _tmp16_ = NULL; - GError* _tmp17_ = NULL; + SpitPublishingPluginHost* _tmp15_; + GError* _tmp16_; + GError* _tmp17_; #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp15_ = self->priv->host; #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3479,22 +3485,22 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi spit_publishing_plugin_host_post_error (_tmp15_, _tmp17_); #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_error_free0 (_tmp17_); -#line 3483 "YandexPublishing.c" +#line 3489 "YandexPublishing.c" } } static void publishing_yandex_yandex_publisher_create_destination_album (PublishingYandexYandexPublisher* self) { gchar* album = NULL; - PublishingYandexPublishOptions* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + PublishingYandexPublishOptions* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; gchar* data = NULL; - gchar* _tmp3_ = NULL; + gchar* _tmp3_; PublishingYandexTransaction* t = NULL; - PublishingYandexSession* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - PublishingYandexTransaction* _tmp6_ = NULL; + PublishingYandexSession* _tmp4_; + const gchar* _tmp5_; + PublishingYandexTransaction* _tmp6_; GError * _inner_error_ = NULL; #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); @@ -3525,7 +3531,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed, self, 0); #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self, 0); -#line 3528 "YandexPublishing.c" +#line 3534 "YandexPublishing.c" { #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -3533,7 +3539,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish if (G_UNLIKELY (_inner_error_ != NULL)) { #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3536 "YandexPublishing.c" +#line 3542 "YandexPublishing.c" goto __catch43_spit_publishing_publishing_error; } #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3548,15 +3554,15 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish g_clear_error (&_inner_error_); #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3551 "YandexPublishing.c" +#line 3557 "YandexPublishing.c" } } goto __finally43; __catch43_spit_publishing_publishing_error: { GError* err = NULL; - SpitPublishingPluginHost* _tmp7_ = NULL; - GError* _tmp8_ = NULL; + SpitPublishingPluginHost* _tmp7_; + GError* _tmp8_; #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" err = _inner_error_; #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3569,7 +3575,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_); #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_error_free0 (err); -#line 3572 "YandexPublishing.c" +#line 3578 "YandexPublishing.c" } __finally43: #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3586,7 +3592,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish g_clear_error (&_inner_error_); #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3589 "YandexPublishing.c" +#line 3595 "YandexPublishing.c" } #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _publishing_rest_support_transaction_unref0 (t); @@ -3594,32 +3600,32 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish _g_free0 (data); #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 (album); -#line 3597 "YandexPublishing.c" +#line 3603 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) { #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_on_upload_complete ((PublishingYandexYandexPublisher*) self, _sender, num_photos_published); -#line 3604 "YandexPublishing.c" +#line 3610 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) { #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_on_upload_error ((PublishingYandexYandexPublisher*) self, _sender, err); -#line 3611 "YandexPublishing.c" +#line 3617 "YandexPublishing.c" } static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) { - PublishingRESTSupportBatchUploader* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportBatchUploader* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gint _tmp4_ = 0; - SpitPublishingPluginHost* _tmp8_ = NULL; - SpitPublishingPluginHost* _tmp9_ = NULL; + PublishingRESTSupportBatchUploader* _tmp0_; + guint _tmp1_; + PublishingRESTSupportBatchUploader* _tmp2_; + guint _tmp3_; + gint _tmp4_; + SpitPublishingPluginHost* _tmp8_; + SpitPublishingPluginHost* _tmp9_; #line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); #line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3640,10 +3646,10 @@ static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYan _tmp4_ = num_published; #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_tmp4_ == 0) { -#line 3643 "YandexPublishing.c" - SpitPublishingPluginHost* _tmp5_ = NULL; - GError* _tmp6_ = NULL; - GError* _tmp7_ = NULL; +#line 3649 "YandexPublishing.c" + SpitPublishingPluginHost* _tmp5_; + GError* _tmp6_; + GError* _tmp7_; #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp5_ = self->priv->host; #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3654,7 +3660,7 @@ static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYan spit_publishing_plugin_host_post_error (_tmp5_, _tmp7_); #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_error_free0 (_tmp7_); -#line 3657 "YandexPublishing.c" +#line 3663 "YandexPublishing.c" } #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp8_ = self->priv->host; @@ -3664,17 +3670,17 @@ static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYan _tmp9_ = self->priv->host; #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" spit_publishing_plugin_host_install_success_pane (_tmp9_); -#line 3667 "YandexPublishing.c" +#line 3673 "YandexPublishing.c" } static void publishing_yandex_yandex_publisher_on_upload_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) { - PublishingRESTSupportBatchUploader* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportBatchUploader* _tmp2_ = NULL; - guint _tmp3_ = 0U; - GError* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; + PublishingRESTSupportBatchUploader* _tmp0_; + guint _tmp1_; + PublishingRESTSupportBatchUploader* _tmp2_; + guint _tmp3_; + GError* _tmp4_; + const gchar* _tmp5_; #line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); #line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3697,18 +3703,18 @@ static void publishing_yandex_yandex_publisher_on_upload_error (PublishingYandex _tmp5_ = _tmp4_->message; #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_warning ("YandexPublishing.vala:448: Photo upload error: %s", _tmp5_); -#line 3700 "YandexPublishing.c" +#line 3706 "YandexPublishing.c" } static void publishing_yandex_yandex_publisher_on_upload_status_updated (PublishingYandexYandexPublisher* self, gint file_number, gdouble completed_fraction) { - gdouble _tmp0_ = 0.0; - SpitPublishingProgressCallback _tmp1_ = NULL; - void* _tmp1__target = NULL; - SpitPublishingProgressCallback _tmp2_ = NULL; - void* _tmp2__target = NULL; - gint _tmp3_ = 0; - gdouble _tmp4_ = 0.0; + gdouble _tmp0_; + SpitPublishingProgressCallback _tmp1_; + void* _tmp1__target; + SpitPublishingProgressCallback _tmp2_; + void* _tmp2__target; + gint _tmp3_; + gdouble _tmp4_; #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); #line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3732,38 +3738,38 @@ static void publishing_yandex_yandex_publisher_on_upload_status_updated (Publish _tmp4_ = completed_fraction; #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp2_ (_tmp3_, _tmp4_, _tmp2__target); -#line 3734 "YandexPublishing.c" +#line 3740 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) { #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_on_upload_status_updated ((PublishingYandexYandexPublisher*) self, file_number, fraction_complete); -#line 3741 "YandexPublishing.c" +#line 3747 "YandexPublishing.c" } static void publishing_yandex_yandex_publisher_start_upload (PublishingYandexYandexPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; - void* _tmp2_ = NULL; - GDestroyNotify _tmp3_ = NULL; - SpitPublishingProgressCallback _tmp4_ = NULL; - PublishingYandexPublishOptions* _tmp5_ = NULL; - GeeHashMap* _tmp6_ = NULL; - PublishingYandexPublishOptions* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; + void* _tmp2_; + GDestroyNotify _tmp3_; + SpitPublishingProgressCallback _tmp4_; + PublishingYandexPublishOptions* _tmp5_; + GeeHashMap* _tmp6_; + PublishingYandexPublishOptions* _tmp7_; + const gchar* _tmp8_; + gpointer _tmp9_; SpitPublishingPublishable** publishables = NULL; - SpitPublishingPluginHost* _tmp10_ = NULL; - gint _tmp11_ = 0; - SpitPublishingPublishable** _tmp12_ = NULL; - gint publishables_length1 = 0; - gint _publishables_size_ = 0; + SpitPublishingPluginHost* _tmp10_; + gint _tmp11_; + SpitPublishingPublishable** _tmp12_; + gint publishables_length1; + gint _publishables_size_; PublishingYandexUploader* uploader = NULL; - PublishingYandexSession* _tmp13_ = NULL; - PublishingYandexPublishOptions* _tmp14_ = NULL; - PublishingYandexUploader* _tmp15_ = NULL; + PublishingYandexSession* _tmp13_; + PublishingYandexPublishOptions* _tmp14_; + PublishingYandexUploader* _tmp15_; #line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); #line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3830,13 +3836,13 @@ static void publishing_yandex_yandex_publisher_start_upload (PublishingYandexYan _publishing_rest_support_batch_uploader_unref0 (uploader); #line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL); -#line 3832 "YandexPublishing.c" +#line 3838 "YandexPublishing.c" } static void publishing_yandex_yandex_publisher_on_logout (PublishingYandexYandexPublisher* self) { - gboolean _tmp0_ = FALSE; - PublishingYandexSession* _tmp1_ = NULL; + gboolean _tmp0_; + PublishingYandexSession* _tmp1_; #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3845,7 +3851,7 @@ static void publishing_yandex_yandex_publisher_on_logout (PublishingYandexYandex if (!_tmp0_) { #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3847 "YandexPublishing.c" +#line 3853 "YandexPublishing.c" } #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp1_ = self->priv->session; @@ -3857,24 +3863,24 @@ static void publishing_yandex_yandex_publisher_on_logout (PublishingYandexYandex self->priv->running = FALSE; #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" spit_publishing_publisher_start (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); -#line 3859 "YandexPublishing.c" +#line 3865 "YandexPublishing.c" } static void publishing_yandex_yandex_publisher_on_publish (PublishingYandexYandexPublisher* self) { - PublishingYandexPublishOptions* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - GeeHashMap* _tmp2_ = NULL; - PublishingYandexPublishOptions* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - GeeHashMap* _tmp7_ = NULL; - PublishingYandexPublishOptions* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gpointer _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; + PublishingYandexPublishOptions* _tmp0_; + const gchar* _tmp1_; + GeeHashMap* _tmp2_; + PublishingYandexPublishOptions* _tmp3_; + const gchar* _tmp4_; + gpointer _tmp5_; + gchar* _tmp6_; + GeeHashMap* _tmp7_; + PublishingYandexPublishOptions* _tmp8_; + const gchar* _tmp9_; + gpointer _tmp10_; + gchar* _tmp11_; + gboolean _tmp12_; #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3913,11 +3919,11 @@ static void publishing_yandex_yandex_publisher_on_publish (PublishingYandexYande if (_tmp12_) { #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_create_destination_album (self); -#line 3915 "YandexPublishing.c" +#line 3921 "YandexPublishing.c" } else { #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_start_upload (self); -#line 3919 "YandexPublishing.c" +#line 3925 "YandexPublishing.c" } } @@ -3925,24 +3931,24 @@ static void publishing_yandex_yandex_publisher_on_publish (PublishingYandexYande static void _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_service_get_album_list_complete ((PublishingYandexYandexPublisher*) self, _sender); -#line 3927 "YandexPublishing.c" +#line 3933 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_service_get_album_list_error ((PublishingYandexYandexPublisher*) self, _sender, err); -#line 3934 "YandexPublishing.c" +#line 3940 "YandexPublishing.c" } void publishing_yandex_yandex_publisher_service_get_album_list_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - GError* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + GError* _tmp4_; + const gchar* _tmp5_; #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3967,38 +3973,38 @@ void publishing_yandex_yandex_publisher_service_get_album_list_error (Publishing _tmp5_ = _tmp4_->message; #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_warning ("YandexPublishing.vala:498: Failed to get album list: %s", _tmp5_); -#line 3969 "YandexPublishing.c" +#line 3975 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_on_publish_publishing_yandex_publishing_options_pane_publish (PublishingYandexPublishingOptionsPane* _sender, gpointer self) { #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_on_publish ((PublishingYandexYandexPublisher*) self); -#line 3976 "YandexPublishing.c" +#line 3982 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_on_logout_publishing_yandex_publishing_options_pane_logout (PublishingYandexPublishingOptionsPane* _sender, gpointer self) { #line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_on_logout ((PublishingYandexYandexPublisher*) self); -#line 3983 "YandexPublishing.c" +#line 3989 "YandexPublishing.c" } void publishing_yandex_yandex_publisher_service_get_album_list_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t) { - 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_; PublishingYandexPublishingOptionsPane* publishing_options_pane = NULL; - PublishingYandexPublishOptions* _tmp12_ = NULL; - GeeHashMap* _tmp13_ = NULL; - SpitPublishingPluginHost* _tmp14_ = NULL; - PublishingYandexPublishingOptionsPane* _tmp15_ = NULL; - SpitPublishingPluginHost* _tmp16_ = NULL; + PublishingYandexPublishOptions* _tmp12_; + GeeHashMap* _tmp13_; + SpitPublishingPluginHost* _tmp14_; + PublishingYandexPublishingOptionsPane* _tmp15_; + SpitPublishingPluginHost* _tmp16_; GError * _inner_error_ = NULL; #line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); @@ -4026,11 +4032,11 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish g_debug ("YandexPublishing.vala:505: service_get_album_list_complete: %s", _tmp6_); #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 (_tmp6_); -#line 4028 "YandexPublishing.c" +#line 4034 "YandexPublishing.c" { - PublishingRESTSupportTransaction* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; + PublishingRESTSupportTransaction* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp7_ = t; #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4045,7 +4051,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish if (G_UNLIKELY (_inner_error_ != NULL)) { #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4047 "YandexPublishing.c" +#line 4053 "YandexPublishing.c" goto __catch44_spit_publishing_publishing_error; } #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4054,15 +4060,15 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish g_clear_error (&_inner_error_); #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 4056 "YandexPublishing.c" +#line 4062 "YandexPublishing.c" } } goto __finally44; __catch44_spit_publishing_publishing_error: { GError* err = NULL; - SpitPublishingPluginHost* _tmp10_ = NULL; - GError* _tmp11_ = NULL; + SpitPublishingPluginHost* _tmp10_; + GError* _tmp11_; #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" err = _inner_error_; #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4075,7 +4081,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish spit_publishing_plugin_host_post_error (_tmp10_, _tmp11_); #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_error_free0 (err); -#line 4077 "YandexPublishing.c" +#line 4083 "YandexPublishing.c" } __finally44: #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4086,7 +4092,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish g_clear_error (&_inner_error_); #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 4088 "YandexPublishing.c" +#line 4094 "YandexPublishing.c" } #line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp12_ = self->priv->options; @@ -4108,17 +4114,17 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish spit_publishing_plugin_host_install_dialog_pane (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (publishing_options_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); #line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_object_unref0 (publishing_options_pane); -#line 4110 "YandexPublishing.c" +#line 4116 "YandexPublishing.c" } void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandexYandexPublisher* self, const gchar* url) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; PublishingYandexTransaction* t = NULL; - PublishingYandexSession* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - PublishingYandexTransaction* _tmp4_ = NULL; + PublishingYandexSession* _tmp2_; + const gchar* _tmp3_; + PublishingYandexTransaction* _tmp4_; GError * _inner_error_ = NULL; #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); @@ -4144,7 +4150,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed, self, 0); #line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error, self, 0); -#line 4146 "YandexPublishing.c" +#line 4152 "YandexPublishing.c" { #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -4152,7 +4158,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex if (G_UNLIKELY (_inner_error_ != NULL)) { #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4154 "YandexPublishing.c" +#line 4160 "YandexPublishing.c" goto __catch45_spit_publishing_publishing_error; } #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4163,15 +4169,15 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex g_clear_error (&_inner_error_); #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 4165 "YandexPublishing.c" +#line 4171 "YandexPublishing.c" } } goto __finally45; __catch45_spit_publishing_publishing_error: { GError* err = NULL; - SpitPublishingPluginHost* _tmp5_ = NULL; - GError* _tmp6_ = NULL; + SpitPublishingPluginHost* _tmp5_; + GError* _tmp6_; #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" err = _inner_error_; #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4184,7 +4190,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_); #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_error_free0 (err); -#line 4186 "YandexPublishing.c" +#line 4192 "YandexPublishing.c" } __finally45: #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4197,35 +4203,35 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex g_clear_error (&_inner_error_); #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 4199 "YandexPublishing.c" +#line 4205 "YandexPublishing.c" } #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _publishing_rest_support_transaction_unref0 (t); -#line 4203 "YandexPublishing.c" +#line 4209 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_fetch_account_complete ((PublishingYandexYandexPublisher*) self, _sender); -#line 4210 "YandexPublishing.c" +#line 4216 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_fetch_account_error ((PublishingYandexYandexPublisher*) self, _sender, err); -#line 4217 "YandexPublishing.c" +#line 4223 "YandexPublishing.c" } void publishing_yandex_yandex_publisher_fetch_account_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - GError* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + GError* _tmp4_; + const gchar* _tmp5_; #line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); #line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4248,18 +4254,18 @@ void publishing_yandex_yandex_publisher_fetch_account_error (PublishingYandexYan _tmp5_ = _tmp4_->message; #line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_warning ("YandexPublishing.vala:538: Failed to fetch account info: %s", _tmp5_); -#line 4250 "YandexPublishing.c" +#line 4256 "YandexPublishing.c" } void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t) { - 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_; GError * _inner_error_ = NULL; #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); @@ -4287,17 +4293,17 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex g_debug ("YandexPublishing.vala:545: account info: %s", _tmp6_); #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 (_tmp6_); -#line 4289 "YandexPublishing.c" +#line 4295 "YandexPublishing.c" { PublishingRESTSupportXmlDocument* doc = NULL; - PublishingRESTSupportTransaction* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - PublishingRESTSupportXmlDocument* _tmp10_ = NULL; - PublishingRESTSupportXmlDocument* _tmp11_ = NULL; + PublishingRESTSupportTransaction* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + PublishingRESTSupportXmlDocument* _tmp10_; + PublishingRESTSupportXmlDocument* _tmp11_; xmlNode* root = NULL; - PublishingRESTSupportXmlDocument* _tmp12_ = NULL; - xmlNode* _tmp13_ = NULL; + PublishingRESTSupportXmlDocument* _tmp12_; + xmlNode* _tmp13_; #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp7_ = t; #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4316,7 +4322,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex if (G_UNLIKELY (_inner_error_ != NULL)) { #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4318 "YandexPublishing.c" +#line 4324 "YandexPublishing.c" goto __catch46_spit_publishing_publishing_error; } #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4325,7 +4331,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex g_clear_error (&_inner_error_); #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 4327 "YandexPublishing.c" +#line 4333 "YandexPublishing.c" } #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp12_ = doc; @@ -4333,40 +4339,40 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex _tmp13_ = publishing_rest_support_xml_document_get_root_node (_tmp12_); #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" root = _tmp13_; -#line 4335 "YandexPublishing.c" +#line 4341 "YandexPublishing.c" { xmlNode* work = NULL; - xmlNode* _tmp14_ = NULL; - xmlNode* _tmp15_ = NULL; + xmlNode* _tmp14_; + xmlNode* _tmp15_; #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp14_ = root; #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp15_ = _tmp14_->children; #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" work = _tmp15_; -#line 4346 "YandexPublishing.c" +#line 4352 "YandexPublishing.c" { gboolean _tmp16_ = FALSE; #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp16_ = TRUE; #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" while (TRUE) { -#line 4353 "YandexPublishing.c" - xmlNode* _tmp19_ = NULL; - xmlNode* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; +#line 4359 "YandexPublishing.c" + xmlNode* _tmp19_; + xmlNode* _tmp20_; + const gchar* _tmp21_; #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (!_tmp16_) { -#line 4359 "YandexPublishing.c" - xmlNode* _tmp17_ = NULL; - xmlNode* _tmp18_ = NULL; +#line 4365 "YandexPublishing.c" + xmlNode* _tmp17_; + xmlNode* _tmp18_; #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp17_ = work; #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp18_ = _tmp17_->next; #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" work = _tmp18_; -#line 4368 "YandexPublishing.c" +#line 4374 "YandexPublishing.c" } #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp16_ = FALSE; @@ -4376,7 +4382,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex if (!(_tmp19_ != NULL)) { #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" break; -#line 4378 "YandexPublishing.c" +#line 4384 "YandexPublishing.c" } #line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp20_ = work; @@ -4386,45 +4392,45 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex if (g_strcmp0 (_tmp21_, "workspace") != 0) { #line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" continue; -#line 4388 "YandexPublishing.c" +#line 4394 "YandexPublishing.c" } { xmlNode* c = NULL; - xmlNode* _tmp22_ = NULL; - xmlNode* _tmp23_ = NULL; + xmlNode* _tmp22_; + xmlNode* _tmp23_; #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp22_ = work; #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp23_ = _tmp22_->children; #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" c = _tmp23_; -#line 4400 "YandexPublishing.c" +#line 4406 "YandexPublishing.c" { gboolean _tmp24_ = FALSE; #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp24_ = TRUE; #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" while (TRUE) { -#line 4407 "YandexPublishing.c" - xmlNode* _tmp27_ = NULL; - xmlNode* _tmp28_ = NULL; - const gchar* _tmp29_ = NULL; - xmlNode* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; - gboolean _tmp33_ = FALSE; +#line 4413 "YandexPublishing.c" + xmlNode* _tmp27_; + xmlNode* _tmp28_; + const gchar* _tmp29_; + xmlNode* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; + gboolean _tmp33_; #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (!_tmp24_) { -#line 4417 "YandexPublishing.c" - xmlNode* _tmp25_ = NULL; - xmlNode* _tmp26_ = NULL; +#line 4423 "YandexPublishing.c" + xmlNode* _tmp25_; + xmlNode* _tmp26_; #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp25_ = c; #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp26_ = _tmp25_->next; #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" c = _tmp26_; -#line 4426 "YandexPublishing.c" +#line 4432 "YandexPublishing.c" } #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp24_ = FALSE; @@ -4434,7 +4440,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex if (!(_tmp27_ != NULL)) { #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" break; -#line 4436 "YandexPublishing.c" +#line 4442 "YandexPublishing.c" } #line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp28_ = c; @@ -4444,7 +4450,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex if (g_strcmp0 (_tmp29_, "collection") != 0) { #line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" continue; -#line 4446 "YandexPublishing.c" +#line 4452 "YandexPublishing.c" } #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp30_ = c; @@ -4458,14 +4464,14 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex _g_free0 (_tmp32_); #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_tmp33_) { -#line 4460 "YandexPublishing.c" +#line 4466 "YandexPublishing.c" gchar* url = NULL; - xmlNode* _tmp34_ = NULL; - gchar* _tmp35_ = NULL; - PublishingYandexSession* _tmp36_ = NULL; - gchar* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; - const gchar* _tmp39_ = NULL; + xmlNode* _tmp34_; + gchar* _tmp35_; + PublishingYandexSession* _tmp36_; + gchar* _tmp37_; + gchar* _tmp38_; + const gchar* _tmp39_; #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp34_ = c; #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4490,7 +4496,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex _g_free0 (url); #line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" break; -#line 4492 "YandexPublishing.c" +#line 4498 "YandexPublishing.c" } } } @@ -4500,14 +4506,14 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex } #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _publishing_rest_support_xml_document_unref0 (doc); -#line 4502 "YandexPublishing.c" +#line 4508 "YandexPublishing.c" } goto __finally46; __catch46_spit_publishing_publishing_error: { GError* err = NULL; - SpitPublishingPluginHost* _tmp40_ = NULL; - GError* _tmp41_ = NULL; + SpitPublishingPluginHost* _tmp40_; + GError* _tmp41_; #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" err = _inner_error_; #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4520,7 +4526,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex spit_publishing_plugin_host_post_error (_tmp40_, _tmp41_); #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_error_free0 (err); -#line 4522 "YandexPublishing.c" +#line 4528 "YandexPublishing.c" } __finally46: #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4531,17 +4537,17 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex g_clear_error (&_inner_error_); #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 4533 "YandexPublishing.c" +#line 4539 "YandexPublishing.c" } } void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYandexYandexPublisher* self, const gchar* auth_token) { - PublishingYandexSession* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + PublishingYandexSession* _tmp0_; + const gchar* _tmp1_; PublishingYandexTransaction* t = NULL; - PublishingYandexSession* _tmp2_ = NULL; - PublishingYandexTransaction* _tmp3_ = NULL; + PublishingYandexSession* _tmp2_; + PublishingYandexTransaction* _tmp3_; GError * _inner_error_ = NULL; #line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); @@ -4563,7 +4569,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed, self, 0); #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error, self, 0); -#line 4565 "YandexPublishing.c" +#line 4571 "YandexPublishing.c" { #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -4571,7 +4577,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan if (G_UNLIKELY (_inner_error_ != NULL)) { #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4573 "YandexPublishing.c" +#line 4579 "YandexPublishing.c" goto __catch47_spit_publishing_publishing_error; } #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4582,15 +4588,15 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan g_clear_error (&_inner_error_); #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 4584 "YandexPublishing.c" +#line 4590 "YandexPublishing.c" } } goto __finally47; __catch47_spit_publishing_publishing_error: { GError* err = NULL; - SpitPublishingPluginHost* _tmp4_ = NULL; - GError* _tmp5_ = NULL; + SpitPublishingPluginHost* _tmp4_; + GError* _tmp5_; #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" err = _inner_error_; #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4603,7 +4609,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_); #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_error_free0 (err); -#line 4605 "YandexPublishing.c" +#line 4611 "YandexPublishing.c" } __finally47: #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4616,19 +4622,19 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan g_clear_error (&_inner_error_); #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 4618 "YandexPublishing.c" +#line 4624 "YandexPublishing.c" } #line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _publishing_rest_support_transaction_unref0 (t); -#line 4622 "YandexPublishing.c" +#line 4628 "YandexPublishing.c" } static void publishing_yandex_yandex_publisher_web_auth_login_succeeded (PublishingYandexYandexPublisher* self, const gchar* access_token) { - const gchar* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; - SpitPublishingPluginHost* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + SpitPublishingPluginHost* _tmp1_; + SpitPublishingPluginHost* _tmp2_; + const gchar* _tmp3_; #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4649,7 +4655,7 @@ static void publishing_yandex_yandex_publisher_web_auth_login_succeeded (Publish _tmp3_ = access_token; #line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_fetch_account_information (self, _tmp3_); -#line 4651 "YandexPublishing.c" +#line 4657 "YandexPublishing.c" } @@ -4658,33 +4664,33 @@ static void publishing_yandex_yandex_publisher_web_auth_login_failed (Publishing g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_debug ("YandexPublishing.vala:595: login failed"); -#line 4660 "YandexPublishing.c" +#line 4666 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_web_auth_login_succeeded_publishing_yandex_web_auth_pane_login_succeeded (PublishingYandexWebAuthPane* _sender, const gchar* success_url, gpointer self) { #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_web_auth_login_succeeded ((PublishingYandexYandexPublisher*) self, success_url); -#line 4667 "YandexPublishing.c" +#line 4673 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_web_auth_login_failed_publishing_yandex_web_auth_pane_login_failed (PublishingYandexWebAuthPane* _sender, gpointer self) { #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_web_auth_login_failed ((PublishingYandexYandexPublisher*) self); -#line 4674 "YandexPublishing.c" +#line 4680 "YandexPublishing.c" } static void publishing_yandex_yandex_publisher_start_web_auth (PublishingYandexYandexPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - PublishingYandexWebAuthPane* _tmp3_ = NULL; - PublishingYandexWebAuthPane* _tmp4_ = NULL; - PublishingYandexWebAuthPane* _tmp5_ = NULL; - SpitPublishingPluginHost* _tmp6_ = NULL; - PublishingYandexWebAuthPane* _tmp7_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + PublishingYandexWebAuthPane* _tmp3_; + PublishingYandexWebAuthPane* _tmp4_; + PublishingYandexWebAuthPane* _tmp5_; + SpitPublishingPluginHost* _tmp6_; + PublishingYandexWebAuthPane* _tmp7_; #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4717,37 +4723,34 @@ static void publishing_yandex_yandex_publisher_start_web_auth (PublishingYandexY _tmp7_ = self->priv->web_auth_pane; #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" spit_publishing_plugin_host_install_dialog_pane (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); -#line 4719 "YandexPublishing.c" +#line 4725 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback (gpointer self) { #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_start_web_auth ((PublishingYandexYandexPublisher*) self); -#line 4726 "YandexPublishing.c" +#line 4732 "YandexPublishing.c" } static void publishing_yandex_yandex_publisher_show_welcome_page (PublishingYandexYandexPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp0_ = self->priv->host; #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp1_ = _ ("You are not currently logged into Yandex.Fotki."); -#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - spit_publishing_plugin_host_install_welcome_pane (_tmp0_, _tmp1_, _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback, self); -#line 4741 "YandexPublishing.c" + spit_publishing_plugin_host_install_welcome_pane (_tmp0_, _ ("You are not currently logged into Yandex.Fotki."), _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback, self); +#line 4744 "YandexPublishing.c" } static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublisher* base) { PublishingYandexYandexPublisher * self; - gboolean _tmp0_ = FALSE; - SpitPublishingPluginHost* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + gboolean _tmp0_; + SpitPublishingPluginHost* _tmp1_; + gboolean _tmp2_; #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher); #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4756,7 +4759,7 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish if (_tmp0_) { #line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 4758 "YandexPublishing.c" +#line 4761 "YandexPublishing.c" } #line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp1_ = self->priv->host; @@ -4765,7 +4768,7 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish #line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_error ("YandexPublishing.vala:618: YandexPublisher: start( ): can't start; thi" \ "s publisher is not restartable."); -#line 4766 "YandexPublishing.c" +#line 4769 "YandexPublishing.c" } #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_debug ("YandexPublishing.vala:620: YandexPublisher: starting interaction."); @@ -4775,12 +4778,12 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish _tmp2_ = publishing_yandex_yandex_publisher_is_persistent_session_available (self); #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_tmp2_) { -#line 4776 "YandexPublishing.c" - PublishingYandexSession* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; +#line 4779 "YandexPublishing.c" + PublishingYandexSession* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp3_ = self->priv->session; #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4799,11 +4802,11 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish publishing_yandex_yandex_publisher_fetch_account_information (self, _tmp7_); #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 (_tmp7_); -#line 4800 "YandexPublishing.c" +#line 4803 "YandexPublishing.c" } else { #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_show_welcome_page (self); -#line 4804 "YandexPublishing.c" +#line 4807 "YandexPublishing.c" } } @@ -4818,7 +4821,7 @@ static void publishing_yandex_yandex_publisher_real_stop (SpitPublishingPublishe self->priv->host = NULL; #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->priv->running = FALSE; -#line 4819 "YandexPublishing.c" +#line 4822 "YandexPublishing.c" } @@ -4829,7 +4832,7 @@ static void publishing_yandex_yandex_publisher_class_init (PublishingYandexYande g_type_class_add_private (klass, sizeof (PublishingYandexYandexPublisherPrivate)); #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_yandex_yandex_publisher_finalize; -#line 4830 "YandexPublishing.c" +#line 4833 "YandexPublishing.c" } @@ -4837,14 +4840,14 @@ static void publishing_yandex_yandex_publisher_spit_publishing_publisher_interfa #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface); #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_is_running; + iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_yandex_yandex_publisher_real_is_running; #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_get_service; + iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_yandex_yandex_publisher_real_get_service; #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - iface->start = (void (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_start; + iface->start = (void (*) (SpitPublishingPublisher *)) publishing_yandex_yandex_publisher_real_start; #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_stop; -#line 4845 "YandexPublishing.c" + iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_yandex_yandex_publisher_real_stop; +#line 4848 "YandexPublishing.c" } @@ -4855,6 +4858,10 @@ static void publishing_yandex_yandex_publisher_instance_init (PublishingYandexYa self->priv->host = NULL; #line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->priv->progress_reporter = NULL; +#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" + self->priv->progress_reporter_target = self; +#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" + self->priv->progress_reporter_target_destroy_notify = NULL; #line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->priv->service = NULL; #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4865,11 +4872,11 @@ static void publishing_yandex_yandex_publisher_instance_init (PublishingYandexYa self->priv->running = FALSE; #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->priv->web_auth_pane = NULL; -#line 4866 "YandexPublishing.c" +#line 4873 "YandexPublishing.c" } -static void publishing_yandex_yandex_publisher_finalize (GObject* obj) { +static void publishing_yandex_yandex_publisher_finalize (GObject * obj) { PublishingYandexYandexPublisher * self; #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher); @@ -4893,7 +4900,7 @@ static void publishing_yandex_yandex_publisher_finalize (GObject* obj) { _publishing_rest_support_session_unref0 (self->priv->session); #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" G_OBJECT_CLASS (publishing_yandex_yandex_publisher_parent_class)->finalize (obj); -#line 4894 "YandexPublishing.c" +#line 4901 "YandexPublishing.c" } diff --git a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c index eb4ec9e..04cf9d3 100644 --- a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c +++ b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c @@ -1,4 +1,4 @@ -/* shotwell-publishing-extras.c generated by valac 0.34.7, the Vala compiler +/* shotwell-publishing-extras.c generated by valac 0.36.6, the Vala compiler * generated from shotwell-publishing-extras.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -85,7 +85,7 @@ struct _ShotwellPublishingExtraServicesPrivate { static gpointer shotwell_publishing_extra_services_parent_class = NULL; -static SpitModuleIface* shotwell_publishing_extra_services_spit_module_parent_iface = NULL; +static SpitModuleIface * shotwell_publishing_extra_services_spit_module_parent_iface = NULL; GType shotwell_publishing_extra_services_get_type (void) G_GNUC_CONST; #define SHOTWELL_PUBLISHING_EXTRA_SERVICES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, ShotwellPublishingExtraServicesPrivate)) @@ -97,30 +97,30 @@ ShotwellPublishingExtraServices* shotwell_publishing_extra_services_construct (G YandexService* yandex_service_new (void); YandexService* yandex_service_construct (GType object_type); GType yandex_service_get_type (void) G_GNUC_CONST; -static void _vala_array_add14 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add14 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); TumblrService* tumblr_service_new (GFile* resource_directory); TumblrService* tumblr_service_construct (GType object_type, GFile* resource_directory); GType tumblr_service_get_type (void) G_GNUC_CONST; -static void _vala_array_add15 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add15 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); RajceService* rajce_service_new (GFile* resource_directory); RajceService* rajce_service_construct (GType object_type, GFile* resource_directory); GType rajce_service_get_type (void) G_GNUC_CONST; -static void _vala_array_add16 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add16 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); Gallery3Service* gallery3_service_new (GFile* resource_directory); Gallery3Service* gallery3_service_construct (GType object_type, GFile* resource_directory); GType gallery3_service_get_type (void) G_GNUC_CONST; -static void _vala_array_add17 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add17 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); static const gchar* shotwell_publishing_extra_services_real_get_module_name (SpitModule* base); static const gchar* shotwell_publishing_extra_services_real_get_version (SpitModule* base); static const gchar* shotwell_publishing_extra_services_real_get_id (SpitModule* base); static SpitPluggable** shotwell_publishing_extra_services_real_get_pluggables (SpitModule* base, int* result_length1); -static void shotwell_publishing_extra_services_finalize (GObject* obj); +static void shotwell_publishing_extra_services_finalize (GObject * obj); SpitModule* spit_entry_point (SpitEntryPointParams* params); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_add14 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add14 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" if ((*length) == (*size)) { #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" @@ -137,7 +137,7 @@ static void _vala_array_add14 (SpitPluggable*** array, int* length, int* size, S } -static void _vala_array_add15 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add15 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" if ((*length) == (*size)) { #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" @@ -154,7 +154,7 @@ static void _vala_array_add15 (SpitPluggable*** array, int* length, int* size, S } -static void _vala_array_add16 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add16 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" if ((*length) == (*size)) { #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" @@ -171,7 +171,7 @@ static void _vala_array_add16 (SpitPluggable*** array, int* length, int* size, S } -static void _vala_array_add17 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add17 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" if ((*length) == (*size)) { #line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" @@ -190,27 +190,27 @@ static void _vala_array_add17 (SpitPluggable*** array, int* length, int* size, S ShotwellPublishingExtraServices* shotwell_publishing_extra_services_construct (GType object_type, GFile* module_file) { ShotwellPublishingExtraServices * self = NULL; - SpitPluggable** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - YandexService* _tmp1_ = NULL; - SpitPluggable** _tmp2_ = NULL; - gint _tmp2__length1 = 0; - GFile* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - TumblrService* _tmp6_ = NULL; - SpitPluggable** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - GFile* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; - RajceService* _tmp11_ = NULL; - SpitPluggable** _tmp12_ = NULL; - gint _tmp12__length1 = 0; - GFile* _tmp13_ = NULL; - GFile* _tmp14_ = NULL; - GFile* _tmp15_ = NULL; - Gallery3Service* _tmp16_ = NULL; + SpitPluggable** _tmp0_; + gint _tmp0__length1; + YandexService* _tmp1_; + SpitPluggable** _tmp2_; + gint _tmp2__length1; + GFile* _tmp3_; + GFile* _tmp4_; + GFile* _tmp5_; + TumblrService* _tmp6_; + SpitPluggable** _tmp7_; + gint _tmp7__length1; + GFile* _tmp8_; + GFile* _tmp9_; + GFile* _tmp10_; + RajceService* _tmp11_; + SpitPluggable** _tmp12_; + gint _tmp12__length1; + GFile* _tmp13_; + GFile* _tmp14_; + GFile* _tmp15_; + Gallery3Service* _tmp16_; #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" g_return_val_if_fail (G_IS_FILE (module_file), NULL); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" @@ -287,16 +287,13 @@ ShotwellPublishingExtraServices* shotwell_publishing_extra_services_new (GFile* static const gchar* shotwell_publishing_extra_services_real_get_module_name (SpitModule* base) { ShotwellPublishingExtraServices * self; const gchar* result = NULL; - const gchar* _tmp0_ = NULL; #line 30 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, ShotwellPublishingExtraServices); #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _tmp0_ = _ ("Shotwell Extra Publishing Services"); -#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - result = _tmp0_; + result = _ ("Shotwell Extra Publishing Services"); #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" return result; -#line 300 "shotwell-publishing-extras.c" +#line 297 "shotwell-publishing-extras.c" } @@ -309,7 +306,7 @@ static const gchar* shotwell_publishing_extra_services_real_get_version (SpitMod result = _VERSION; #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" return result; -#line 313 "shotwell-publishing-extras.c" +#line 310 "shotwell-publishing-extras.c" } @@ -322,17 +319,17 @@ static const gchar* shotwell_publishing_extra_services_real_get_id (SpitModule* result = "org.yorba.shotwell.publishing.extras"; #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" return result; -#line 326 "shotwell-publishing-extras.c" +#line 323 "shotwell-publishing-extras.c" } static SpitPluggable** shotwell_publishing_extra_services_real_get_pluggables (SpitModule* base, int* result_length1) { ShotwellPublishingExtraServices * self; SpitPluggable** result = NULL; - SpitPluggable** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - SpitPluggable** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + SpitPluggable** _tmp0_; + gint _tmp0__length1; + SpitPluggable** _tmp1_; + gint _tmp1__length1; #line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, ShotwellPublishingExtraServices); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" @@ -347,13 +344,13 @@ static SpitPluggable** shotwell_publishing_extra_services_real_get_pluggables (S if (result_length1) { #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" *result_length1 = _tmp1__length1; -#line 351 "shotwell-publishing-extras.c" +#line 348 "shotwell-publishing-extras.c" } #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" result = _tmp1_; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" return result; -#line 357 "shotwell-publishing-extras.c" +#line 354 "shotwell-publishing-extras.c" } @@ -364,7 +361,7 @@ static void shotwell_publishing_extra_services_class_init (ShotwellPublishingExt g_type_class_add_private (klass, sizeof (ShotwellPublishingExtraServicesPrivate)); #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" G_OBJECT_CLASS (klass)->finalize = shotwell_publishing_extra_services_finalize; -#line 368 "shotwell-publishing-extras.c" +#line 365 "shotwell-publishing-extras.c" } @@ -372,19 +369,19 @@ static void shotwell_publishing_extra_services_spit_module_interface_init (SpitM #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" shotwell_publishing_extra_services_spit_module_parent_iface = g_type_interface_peek_parent (iface); #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - iface->get_module_name = (const gchar* (*)(SpitModule*)) shotwell_publishing_extra_services_real_get_module_name; + iface->get_module_name = (const gchar* (*) (SpitModule *)) shotwell_publishing_extra_services_real_get_module_name; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - iface->get_version = (const gchar* (*)(SpitModule*)) shotwell_publishing_extra_services_real_get_version; + iface->get_version = (const gchar* (*) (SpitModule *)) shotwell_publishing_extra_services_real_get_version; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - iface->get_id = (const gchar* (*)(SpitModule*)) shotwell_publishing_extra_services_real_get_id; + iface->get_id = (const gchar* (*) (SpitModule *)) shotwell_publishing_extra_services_real_get_id; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - iface->get_pluggables = (SpitPluggable** (*)(SpitModule*, int*)) shotwell_publishing_extra_services_real_get_pluggables; -#line 383 "shotwell-publishing-extras.c" + iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_publishing_extra_services_real_get_pluggables; +#line 380 "shotwell-publishing-extras.c" } static void shotwell_publishing_extra_services_instance_init (ShotwellPublishingExtraServices * self) { - SpitPluggable** _tmp0_ = NULL; + SpitPluggable** _tmp0_; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" self->priv = SHOTWELL_PUBLISHING_EXTRA_SERVICES_GET_PRIVATE (self); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" @@ -395,11 +392,11 @@ static void shotwell_publishing_extra_services_instance_init (ShotwellPublishing self->priv->pluggables_length1 = 0; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" self->priv->_pluggables_size_ = self->priv->pluggables_length1; -#line 399 "shotwell-publishing-extras.c" +#line 396 "shotwell-publishing-extras.c" } -static void shotwell_publishing_extra_services_finalize (GObject* obj) { +static void shotwell_publishing_extra_services_finalize (GObject * obj) { ShotwellPublishingExtraServices * self; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, ShotwellPublishingExtraServices); @@ -407,7 +404,7 @@ static void shotwell_publishing_extra_services_finalize (GObject* obj) { self->priv->pluggables = (_vala_array_free (self->priv->pluggables, self->priv->pluggables_length1, (GDestroyNotify) g_object_unref), NULL); #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" G_OBJECT_CLASS (shotwell_publishing_extra_services_parent_class)->finalize (obj); -#line 411 "shotwell-publishing-extras.c" +#line 408 "shotwell-publishing-extras.c" } @@ -427,14 +424,14 @@ GType shotwell_publishing_extra_services_get_type (void) { SpitModule* spit_entry_point (SpitEntryPointParams* params) { SpitModule* result = NULL; - SpitEntryPointParams* _tmp0_ = NULL; - gint _tmp1_ = 0; - SpitEntryPointParams* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + SpitEntryPointParams* _tmp0_; + gint _tmp1_; + SpitEntryPointParams* _tmp2_; + gint _tmp3_; + gint _tmp4_; ShotwellPublishingExtraServices* _tmp5_ = NULL; - SpitEntryPointParams* _tmp6_ = NULL; - gint _tmp7_ = 0; + SpitEntryPointParams* _tmp6_; + gint _tmp7_; #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _tmp0_ = params; #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" @@ -453,10 +450,10 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) { _tmp7_ = (*_tmp6_).module_spit_interface; #line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) { -#line 457 "shotwell-publishing-extras.c" - SpitEntryPointParams* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - ShotwellPublishingExtraServices* _tmp10_ = NULL; +#line 454 "shotwell-publishing-extras.c" + SpitEntryPointParams* _tmp8_; + GFile* _tmp9_; + ShotwellPublishingExtraServices* _tmp10_; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _tmp8_ = params; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" @@ -467,19 +464,19 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) { _g_object_unref0 (_tmp5_); #line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _tmp5_ = _tmp10_; -#line 471 "shotwell-publishing-extras.c" +#line 468 "shotwell-publishing-extras.c" } else { #line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _g_object_unref0 (_tmp5_); #line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _tmp5_ = NULL; -#line 477 "shotwell-publishing-extras.c" +#line 474 "shotwell-publishing-extras.c" } #line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_MODULE, SpitModule); #line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" return result; -#line 483 "shotwell-publishing-extras.c" +#line 480 "shotwell-publishing-extras.c" } diff --git a/plugins/shotwell-publishing/FacebookPublishing.c b/plugins/shotwell-publishing/FacebookPublishing.c index a16729e..a1d00b4 100644 --- a/plugins/shotwell-publishing/FacebookPublishing.c +++ b/plugins/shotwell-publishing/FacebookPublishing.c @@ -1,4 +1,4 @@ -/* FacebookPublishing.c generated by valac 0.34.7, the Vala compiler +/* FacebookPublishing.c generated by valac 0.36.6, the Vala compiler * generated from FacebookPublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -140,10 +140,23 @@ typedef struct _PublishingFacebookPublishingOptionsPanePrivacyDescriptionClass P typedef struct _PublishingFacebookPublishingOptionsPanePrivacyDescriptionPrivate PublishingFacebookPublishingOptionsPanePrivacyDescriptionPrivate; #define _publishing_facebook_publishing_options_pane_privacy_description_unref0(var) ((var == NULL) ? NULL : (var = (publishing_facebook_publishing_options_pane_privacy_description_unref (var), NULL))) typedef struct _PublishingFacebookPublishingOptionsPaneParamSpecPrivacyDescription PublishingFacebookPublishingOptionsPaneParamSpecPrivacyDescription; +enum { + PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL, + PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL, + PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL +}; +static guint publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0}; #define PUBLISHING_FACEBOOK_TYPE_ENDPOINT (publishing_facebook_endpoint_get_type ()) typedef struct _PublishingFacebookGraphMessagePrivate PublishingFacebookGraphMessagePrivate; typedef struct _PublishingFacebookParamSpecGraphMessage PublishingFacebookParamSpecGraphMessage; +enum { + PUBLISHING_FACEBOOK_GRAPH_MESSAGE_COMPLETED_SIGNAL, + PUBLISHING_FACEBOOK_GRAPH_MESSAGE_FAILED_SIGNAL, + PUBLISHING_FACEBOOK_GRAPH_MESSAGE_DATA_TRANSMITTED_SIGNAL, + PUBLISHING_FACEBOOK_GRAPH_MESSAGE_LAST_SIGNAL +}; +static guint publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_LAST_SIGNAL] = {0}; typedef struct _PublishingFacebookGraphSessionPrivate PublishingFacebookGraphSessionPrivate; #define PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL (publishing_facebook_graph_session_graph_message_impl_get_type ()) @@ -207,8 +220,19 @@ typedef struct _PublishingFacebookGraphSessionGraphUploadMessagePrivate Publishi #define __vala_SoupBuffer_free0(var) ((var == NULL) ? NULL : (var = (_vala_SoupBuffer_free (var), NULL))) typedef struct _PublishingFacebookGraphSessionGraphCreateAlbumMessagePrivate PublishingFacebookGraphSessionGraphCreateAlbumMessagePrivate; typedef struct _PublishingFacebookParamSpecGraphSession PublishingFacebookParamSpecGraphSession; +enum { + PUBLISHING_FACEBOOK_GRAPH_SESSION_AUTHENTICATED_SIGNAL, + PUBLISHING_FACEBOOK_GRAPH_SESSION_LAST_SIGNAL +}; +static guint publishing_facebook_graph_session_signals[PUBLISHING_FACEBOOK_GRAPH_SESSION_LAST_SIGNAL] = {0}; typedef struct _PublishingFacebookUploaderPrivate PublishingFacebookUploaderPrivate; typedef struct _PublishingFacebookParamSpecUploader PublishingFacebookParamSpecUploader; +enum { + PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_COMPLETE_SIGNAL, + PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_ERROR_SIGNAL, + PUBLISHING_FACEBOOK_UPLOADER_LAST_SIGNAL +}; +static guint publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_LAST_SIGNAL] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -479,15 +503,15 @@ static gint facebook_service_icon_pixbuf_set_length1; static GdkPixbuf** facebook_service_icon_pixbuf_set = NULL; static gint facebook_service_icon_pixbuf_set_length1 = 0; static gint _facebook_service_icon_pixbuf_set_size_ = 0; -static SpitPluggableIface* facebook_service_spit_pluggable_parent_iface = NULL; -static SpitPublishingServiceIface* facebook_service_spit_publishing_service_parent_iface = NULL; +static SpitPluggableIface * facebook_service_spit_pluggable_parent_iface = NULL; +static SpitPublishingServiceIface * facebook_service_spit_publishing_service_parent_iface = NULL; static gpointer publishing_facebook_album_parent_class = NULL; static gpointer publishing_facebook_publishing_parameters_parent_class = NULL; static gpointer publishing_facebook_facebook_publisher_parent_class = NULL; -static SpitPublishingPublisherIface* publishing_facebook_facebook_publisher_spit_publishing_publisher_parent_iface = NULL; +static SpitPublishingPublisherIface * publishing_facebook_facebook_publisher_spit_publishing_publisher_parent_iface = NULL; static gpointer publishing_facebook_publishing_options_pane_parent_class = NULL; static gpointer publishing_facebook_publishing_options_pane_privacy_description_parent_class = NULL; -static SpitPublishingDialogPaneIface* publishing_facebook_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL; +static SpitPublishingDialogPaneIface * publishing_facebook_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL; static gpointer publishing_facebook_graph_message_parent_class = NULL; static gpointer publishing_facebook_graph_session_parent_class = NULL; static gpointer publishing_facebook_graph_session_graph_message_impl_parent_class = NULL; @@ -515,7 +539,7 @@ PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_new PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host); GType publishing_facebook_facebook_publisher_get_type (void) G_GNUC_CONST; static SpitPublishingPublisherMediaType facebook_service_real_get_supported_media (SpitPublishingService* base); -static void facebook_service_finalize (GObject* obj); +static void facebook_service_finalize (GObject * obj); #define PUBLISHING_FACEBOOK_SERVICE_NAME "facebook" #define PUBLISHING_FACEBOOK_USER_VISIBLE_NAME "Facebook" #define PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME _ ("Shotwell Connect") @@ -532,7 +556,7 @@ enum { }; PublishingFacebookAlbum* publishing_facebook_album_new (const gchar* name, const gchar* id); PublishingFacebookAlbum* publishing_facebook_album_construct (GType object_type, const gchar* name, const gchar* id); -static void publishing_facebook_album_finalize (PublishingFacebookAlbum* obj); +static void publishing_facebook_album_finalize (PublishingFacebookAlbum * obj); GType publishing_facebook_resolution_get_type (void) G_GNUC_CONST; gchar* publishing_facebook_resolution_get_name (PublishingFacebookResolution self); const gchar* publishing_facebook_resolution_to_string (PublishingFacebookResolution self); @@ -551,11 +575,11 @@ enum { PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameters_new (void); PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameters_construct (GType object_type); void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPublishingParameters* self, const gchar* name, const gchar* id); -static void _vala_array_add6 (PublishingFacebookAlbum*** array, int* length, int* size, PublishingFacebookAlbum* value); +static void _vala_array_add6 (PublishingFacebookAlbum** * array, int* length, int* size, PublishingFacebookAlbum* value); void publishing_facebook_publishing_parameters_set_target_album_by_name (PublishingFacebookPublishingParameters* self, const gchar* name); gchar* publishing_facebook_publishing_parameters_get_target_album_name (PublishingFacebookPublishingParameters* self); gchar* publishing_facebook_publishing_parameters_get_target_album_id (PublishingFacebookPublishingParameters* self); -static void publishing_facebook_publishing_parameters_finalize (PublishingFacebookPublishingParameters* obj); +static void publishing_facebook_publishing_parameters_finalize (PublishingFacebookPublishingParameters * obj); gpointer publishing_facebook_graph_session_ref (gpointer instance); void publishing_facebook_graph_session_unref (gpointer instance); GParamSpec* publishing_facebook_param_spec_graph_session (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -650,7 +674,7 @@ static void _publishing_facebook_facebook_publisher_on_authenticator_failed_spit static void publishing_facebook_facebook_publisher_real_stop (SpitPublishingPublisher* base); void publishing_facebook_graph_session_stop_transactions (PublishingFacebookGraphSession* self); static gboolean publishing_facebook_facebook_publisher_real_is_running (SpitPublishingPublisher* base); -static void publishing_facebook_facebook_publisher_finalize (GObject* obj); +static void publishing_facebook_facebook_publisher_finalize (GObject * obj); static gpointer publishing_facebook_publishing_options_pane_privacy_description_ref (gpointer instance); static void publishing_facebook_publishing_options_pane_privacy_description_unref (gpointer instance); static GParamSpec* publishing_facebook_publishing_options_pane_param_spec_privacy_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; @@ -685,11 +709,11 @@ static void _publishing_facebook_publishing_options_pane_on_size_changed_gtk_com static gboolean publishing_facebook_publishing_options_pane_publishing_photos (PublishingFacebookPublishingOptionsPane* self); static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_new (const gchar* description, const gchar* privacy_setting); static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_construct (GType object_type, const gchar* description, const gchar* privacy_setting); -static void _vala_array_add7 (PublishingFacebookPublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value); -static void _vala_array_add8 (PublishingFacebookPublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value); -static void _vala_array_add9 (PublishingFacebookPublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value); -static void _vala_array_add10 (PublishingFacebookResolution** array, int* length, int* size, PublishingFacebookResolution value); -static void _vala_array_add11 (PublishingFacebookResolution** array, int* length, int* size, PublishingFacebookResolution value); +static void _vala_array_add7 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value); +static void _vala_array_add8 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value); +static void _vala_array_add9 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value); +static void _vala_array_add10 (PublishingFacebookResolution* * array, int* length, int* size, PublishingFacebookResolution value); +static void _vala_array_add11 (PublishingFacebookResolution* * array, int* length, int* size, PublishingFacebookResolution value); void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPublishingOptionsPane* self); static void publishing_facebook_publishing_options_pane_notify_logout (PublishingFacebookPublishingOptionsPane* self); static void publishing_facebook_publishing_options_pane_notify_publish (PublishingFacebookPublishingOptionsPane* self, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution target_resolution); @@ -703,8 +727,8 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN (GClosure * enum { PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_DUMMY_PROPERTY }; -static void publishing_facebook_publishing_options_pane_privacy_description_finalize (PublishingFacebookPublishingOptionsPanePrivacyDescription* obj); -static void publishing_facebook_publishing_options_pane_finalize (GObject* obj); +static void publishing_facebook_publishing_options_pane_privacy_description_finalize (PublishingFacebookPublishingOptionsPanePrivacyDescription * obj); +static void publishing_facebook_publishing_options_pane_finalize (GObject * obj); GType publishing_facebook_endpoint_get_type (void) G_GNUC_CONST; gchar* publishing_facebook_endpoint_to_uri (PublishingFacebookEndpoint self); enum { @@ -715,7 +739,7 @@ static gchar* publishing_facebook_graph_message_real_get_uri (PublishingFacebook static gchar* publishing_facebook_graph_message_real_get_response_body (PublishingFacebookGraphMessage* self); PublishingFacebookGraphMessage* publishing_facebook_graph_message_construct (GType object_type); static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void publishing_facebook_graph_message_finalize (PublishingFacebookGraphMessage* obj); +static void publishing_facebook_graph_message_finalize (PublishingFacebookGraphMessage * obj); #define PUBLISHING_FACEBOOK_GRAPH_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION, PublishingFacebookGraphSessionPrivate)) enum { PUBLISHING_FACEBOOK_GRAPH_SESSION_DUMMY_PROPERTY @@ -745,7 +769,7 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph static gboolean publishing_facebook_graph_session_graph_message_impl_real_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* self); static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_uri (PublishingFacebookGraphMessage* base); static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_response_body (PublishingFacebookGraphMessage* base); -static void publishing_facebook_graph_session_graph_message_impl_finalize (PublishingFacebookGraphMessage* obj); +static void publishing_facebook_graph_session_graph_message_impl_finalize (PublishingFacebookGraphMessage * obj); enum { PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_QUERY_MESSAGE_DUMMY_PROPERTY }; @@ -763,11 +787,11 @@ enum { static void _vala_SoupMultipart_free (SoupMultipart* self); static void _vala_SoupBuffer_free (SoupBuffer* self); static gboolean publishing_facebook_graph_session_graph_upload_message_real_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* base); -static void publishing_facebook_graph_session_graph_upload_message_finalize (PublishingFacebookGraphMessage* obj); +static void publishing_facebook_graph_session_graph_upload_message_finalize (PublishingFacebookGraphMessage * obj); enum { PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_CREATE_ALBUM_MESSAGE_DUMMY_PROPERTY }; -static void publishing_facebook_graph_session_finalize (PublishingFacebookGraphSession* obj); +static void publishing_facebook_graph_session_finalize (PublishingFacebookGraphSession * obj); #define PUBLISHING_FACEBOOK_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FACEBOOK_TYPE_UPLOADER, PublishingFacebookUploaderPrivate)) enum { PUBLISHING_FACEBOOK_UPLOADER_DUMMY_PROPERTY @@ -781,15 +805,15 @@ static void _publishing_facebook_uploader_on_message_completed_publishing_facebo static void publishing_facebook_uploader_on_message_failed (PublishingFacebookUploader* self, PublishingFacebookGraphMessage* message, GError* _error_); static void _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self); static void publishing_facebook_uploader_send_files (PublishingFacebookUploader* self); -static void publishing_facebook_uploader_finalize (PublishingFacebookUploader* obj); +static void publishing_facebook_uploader_finalize (PublishingFacebookUploader * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); FacebookService* facebook_service_construct (GType object_type, GFile* resource_directory) { FacebookService * self = NULL; - GdkPixbuf** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + GdkPixbuf** _tmp0_; + gint _tmp0__length1; #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (G_IS_FILE (resource_directory), NULL); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -800,9 +824,9 @@ FacebookService* facebook_service_construct (GType object_type, GFile* resource_ _tmp0__length1 = facebook_service_icon_pixbuf_set_length1; #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp0_ == NULL) { -#line 804 "FacebookPublishing.c" - gint _tmp1_ = 0; - GdkPixbuf** _tmp2_ = NULL; +#line 828 "FacebookPublishing.c" + gint _tmp1_; + GdkPixbuf** _tmp2_; #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" FACEBOOK_SERVICE_ICON_FILENAME, &_tmp1_); #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -813,27 +837,27 @@ FacebookService* facebook_service_construct (GType object_type, GFile* resource_ facebook_service_icon_pixbuf_set_length1 = _tmp1_; #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _facebook_service_icon_pixbuf_set_size_ = facebook_service_icon_pixbuf_set_length1; -#line 817 "FacebookPublishing.c" +#line 841 "FacebookPublishing.c" } #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self; -#line 821 "FacebookPublishing.c" +#line 845 "FacebookPublishing.c" } FacebookService* facebook_service_new (GFile* resource_directory) { #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return facebook_service_construct (TYPE_FACEBOOK_SERVICE, resource_directory); -#line 828 "FacebookPublishing.c" +#line 852 "FacebookPublishing.c" } static gint facebook_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) { FacebookService * self; gint result = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FACEBOOK_SERVICE, FacebookService); #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -846,7 +870,7 @@ static gint facebook_service_real_get_pluggable_interface (SpitPluggable* base, result = _tmp2_; #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 850 "FacebookPublishing.c" +#line 874 "FacebookPublishing.c" } @@ -859,7 +883,7 @@ static const gchar* facebook_service_real_get_id (SpitPluggable* base) { result = "org.yorba.shotwell.publishing.facebook"; #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 863 "FacebookPublishing.c" +#line 887 "FacebookPublishing.c" } @@ -872,14 +896,14 @@ static const gchar* facebook_service_real_get_pluggable_name (SpitPluggable* bas result = "Facebook"; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 876 "FacebookPublishing.c" +#line 900 "FacebookPublishing.c" } static gpointer _g_object_ref0 (gpointer self) { #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self ? g_object_ref (self) : NULL; -#line 883 "FacebookPublishing.c" +#line 907 "FacebookPublishing.c" } @@ -890,34 +914,33 @@ static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) { result = g_new0 (GdkPixbuf*, length + 1); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" for (i = 0; i < length; i++) { -#line 894 "FacebookPublishing.c" - GdkPixbuf* _tmp0_ = NULL; +#line 918 "FacebookPublishing.c" + GdkPixbuf* _tmp0_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" result[i] = _tmp0_; -#line 900 "FacebookPublishing.c" +#line 924 "FacebookPublishing.c" } #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 904 "FacebookPublishing.c" +#line 928 "FacebookPublishing.c" } static void facebook_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) { FacebookService * self; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GdkPixbuf** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - GdkPixbuf** _tmp9_ = NULL; - gint _tmp9__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + GdkPixbuf** _tmp7_; + gint _tmp7__length1; + GdkPixbuf** _tmp8_; + gint _tmp8__length1; #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FACEBOOK_SERVICE, FacebookService); #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -929,60 +952,58 @@ static void facebook_service_real_get_info (SpitPluggable* base, SpitPluggableIn #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" (*info).authors = _tmp0_; #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp1_ = _ ("Copyright 2016 Software Freedom Conservancy Inc."); -#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp1_ = g_strdup (_ ("Copyright 2016 Software Freedom Conservancy Inc.")); #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 ((*info).copyright); #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - (*info).copyright = _tmp2_; + (*info).copyright = _tmp1_; #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp3_ = g_strdup (RESOURCES_TRANSLATORS); + _tmp2_ = g_strdup (RESOURCES_TRANSLATORS); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 ((*info).translators); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - (*info).translators = _tmp3_; + (*info).translators = _tmp2_; #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp4_ = g_strdup (_VERSION); + _tmp3_ = g_strdup (_VERSION); #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 ((*info).version); #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - (*info).version = _tmp4_; + (*info).version = _tmp3_; #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp5_ = g_strdup (RESOURCES_WEBSITE_NAME); + _tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 ((*info).website_name); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - (*info).website_name = _tmp5_; + (*info).website_name = _tmp4_; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp6_ = g_strdup (RESOURCES_WEBSITE_URL); + _tmp5_ = g_strdup (RESOURCES_WEBSITE_URL); #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 ((*info).website_url); #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - (*info).website_url = _tmp6_; + (*info).website_url = _tmp5_; #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" (*info).is_license_wordwrapped = FALSE; #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp7_ = g_strdup (RESOURCES_LICENSE); + _tmp6_ = g_strdup (RESOURCES_LICENSE); #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 ((*info).license); #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - (*info).license = _tmp7_; + (*info).license = _tmp6_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp8_ = facebook_service_icon_pixbuf_set; + _tmp7_ = facebook_service_icon_pixbuf_set; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp8__length1 = facebook_service_icon_pixbuf_set_length1; + _tmp7__length1 = facebook_service_icon_pixbuf_set_length1; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup1 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_); + _tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup1 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp9__length1 = _tmp8__length1; + _tmp8__length1 = _tmp7__length1; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" (*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - (*info).icons = _tmp9_; + (*info).icons = _tmp8_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - (*info).icons_length1 = _tmp9__length1; -#line 986 "FacebookPublishing.c" + (*info).icons_length1 = _tmp8__length1; +#line 1007 "FacebookPublishing.c" } @@ -990,15 +1011,15 @@ static void facebook_service_real_activation (SpitPluggable* base, gboolean enab FacebookService * self; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FACEBOOK_SERVICE, FacebookService); -#line 994 "FacebookPublishing.c" +#line 1015 "FacebookPublishing.c" } static SpitPublishingPublisher* facebook_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) { FacebookService * self; SpitPublishingPublisher* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - PublishingFacebookFacebookPublisher* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + PublishingFacebookFacebookPublisher* _tmp1_; #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FACEBOOK_SERVICE, FacebookService); #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -1011,7 +1032,7 @@ static SpitPublishingPublisher* facebook_service_real_create_publisher (SpitPubl result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 1015 "FacebookPublishing.c" +#line 1036 "FacebookPublishing.c" } @@ -1024,7 +1045,7 @@ static SpitPublishingPublisherMediaType facebook_service_real_get_supported_medi result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO; #line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 1028 "FacebookPublishing.c" +#line 1049 "FacebookPublishing.c" } @@ -1033,7 +1054,7 @@ static void facebook_service_class_init (FacebookServiceClass * klass) { facebook_service_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" G_OBJECT_CLASS (klass)->finalize = facebook_service_finalize; -#line 1037 "FacebookPublishing.c" +#line 1058 "FacebookPublishing.c" } @@ -1041,16 +1062,16 @@ static void facebook_service_spit_pluggable_interface_init (SpitPluggableIface * #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" facebook_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) facebook_service_real_get_pluggable_interface; + iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) facebook_service_real_get_pluggable_interface; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - iface->get_id = (const gchar* (*)(SpitPluggable*)) facebook_service_real_get_id; + iface->get_id = (const gchar* (*) (SpitPluggable *)) facebook_service_real_get_id; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) facebook_service_real_get_pluggable_name; + iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) facebook_service_real_get_pluggable_name; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) facebook_service_real_get_info; + iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) facebook_service_real_get_info; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - iface->activation = (void (*)(SpitPluggable*, gboolean)) facebook_service_real_activation; -#line 1054 "FacebookPublishing.c" + iface->activation = (void (*) (SpitPluggable *, gboolean)) facebook_service_real_activation; +#line 1075 "FacebookPublishing.c" } @@ -1058,10 +1079,10 @@ static void facebook_service_spit_publishing_service_interface_init (SpitPublish #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" facebook_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) facebook_service_real_create_publisher; + iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) facebook_service_real_create_publisher; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) facebook_service_real_get_supported_media; -#line 1065 "FacebookPublishing.c" + iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) facebook_service_real_get_supported_media; +#line 1086 "FacebookPublishing.c" } @@ -1069,13 +1090,13 @@ static void facebook_service_instance_init (FacebookService * self) { } -static void facebook_service_finalize (GObject* obj) { +static void facebook_service_finalize (GObject * obj) { FacebookService * self; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FACEBOOK_SERVICE, FacebookService); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" G_OBJECT_CLASS (facebook_service_parent_class)->finalize (obj); -#line 1079 "FacebookPublishing.c" +#line 1100 "FacebookPublishing.c" } @@ -1097,10 +1118,10 @@ GType facebook_service_get_type (void) { PublishingFacebookAlbum* publishing_facebook_album_construct (GType object_type, const gchar* name, const gchar* id) { PublishingFacebookAlbum* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (name != NULL, NULL); #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -1125,21 +1146,21 @@ PublishingFacebookAlbum* publishing_facebook_album_construct (GType object_type, self->id = _tmp3_; #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self; -#line 1129 "FacebookPublishing.c" +#line 1150 "FacebookPublishing.c" } PublishingFacebookAlbum* publishing_facebook_album_new (const gchar* name, const gchar* id) { #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return publishing_facebook_album_construct (PUBLISHING_FACEBOOK_TYPE_ALBUM, name, id); -#line 1136 "FacebookPublishing.c" +#line 1157 "FacebookPublishing.c" } static void publishing_facebook_value_album_init (GValue* value) { #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 1143 "FacebookPublishing.c" +#line 1164 "FacebookPublishing.c" } @@ -1148,7 +1169,7 @@ static void publishing_facebook_value_album_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_album_unref (value->data[0].v_pointer); -#line 1152 "FacebookPublishing.c" +#line 1173 "FacebookPublishing.c" } } @@ -1158,11 +1179,11 @@ static void publishing_facebook_value_album_copy_value (const GValue* src_value, if (src_value->data[0].v_pointer) { #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" dest_value->data[0].v_pointer = publishing_facebook_album_ref (src_value->data[0].v_pointer); -#line 1162 "FacebookPublishing.c" +#line 1183 "FacebookPublishing.c" } else { #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 1166 "FacebookPublishing.c" +#line 1187 "FacebookPublishing.c" } } @@ -1170,66 +1191,66 @@ static void publishing_facebook_value_album_copy_value (const GValue* src_value, static gpointer publishing_facebook_value_album_peek_pointer (const GValue* value) { #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return value->data[0].v_pointer; -#line 1174 "FacebookPublishing.c" +#line 1195 "FacebookPublishing.c" } static gchar* publishing_facebook_value_album_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (collect_values[0].v_pointer) { -#line 1181 "FacebookPublishing.c" - PublishingFacebookAlbum* object; +#line 1202 "FacebookPublishing.c" + PublishingFacebookAlbum * object; object = collect_values[0].v_pointer; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1188 "FacebookPublishing.c" +#line 1209 "FacebookPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1192 "FacebookPublishing.c" +#line 1213 "FacebookPublishing.c" } #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = publishing_facebook_album_ref (object); -#line 1196 "FacebookPublishing.c" +#line 1217 "FacebookPublishing.c" } else { #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 1200 "FacebookPublishing.c" +#line 1221 "FacebookPublishing.c" } #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return NULL; -#line 1204 "FacebookPublishing.c" +#line 1225 "FacebookPublishing.c" } static gchar* publishing_facebook_value_album_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingFacebookAlbum** object_p; + PublishingFacebookAlbum ** object_p; object_p = collect_values[0].v_pointer; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (!object_p) { #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1215 "FacebookPublishing.c" +#line 1236 "FacebookPublishing.c" } #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (!value->data[0].v_pointer) { #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *object_p = NULL; -#line 1221 "FacebookPublishing.c" +#line 1242 "FacebookPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *object_p = value->data[0].v_pointer; -#line 1225 "FacebookPublishing.c" +#line 1246 "FacebookPublishing.c" } else { #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *object_p = publishing_facebook_album_ref (value->data[0].v_pointer); -#line 1229 "FacebookPublishing.c" +#line 1250 "FacebookPublishing.c" } #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return NULL; -#line 1233 "FacebookPublishing.c" +#line 1254 "FacebookPublishing.c" } @@ -1243,7 +1264,7 @@ GParamSpec* publishing_facebook_param_spec_album (const gchar* name, const gchar G_PARAM_SPEC (spec)->value_type = object_type; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return G_PARAM_SPEC (spec); -#line 1247 "FacebookPublishing.c" +#line 1268 "FacebookPublishing.c" } @@ -1252,12 +1273,12 @@ gpointer publishing_facebook_value_get_album (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_ALBUM), NULL); #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return value->data[0].v_pointer; -#line 1256 "FacebookPublishing.c" +#line 1277 "FacebookPublishing.c" } void publishing_facebook_value_set_album (GValue* value, gpointer v_object) { - PublishingFacebookAlbum* old; + PublishingFacebookAlbum * old; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_ALBUM)); #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -1272,23 +1293,23 @@ void publishing_facebook_value_set_album (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_album_ref (value->data[0].v_pointer); -#line 1276 "FacebookPublishing.c" +#line 1297 "FacebookPublishing.c" } else { #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 1280 "FacebookPublishing.c" +#line 1301 "FacebookPublishing.c" } #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (old) { #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_album_unref (old); -#line 1286 "FacebookPublishing.c" +#line 1307 "FacebookPublishing.c" } } void publishing_facebook_value_take_album (GValue* value, gpointer v_object) { - PublishingFacebookAlbum* old; + PublishingFacebookAlbum * old; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_ALBUM)); #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -1301,17 +1322,17 @@ void publishing_facebook_value_take_album (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = v_object; -#line 1305 "FacebookPublishing.c" +#line 1326 "FacebookPublishing.c" } else { #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 1309 "FacebookPublishing.c" +#line 1330 "FacebookPublishing.c" } #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (old) { #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_album_unref (old); -#line 1315 "FacebookPublishing.c" +#line 1336 "FacebookPublishing.c" } } @@ -1321,18 +1342,18 @@ static void publishing_facebook_album_class_init (PublishingFacebookAlbumClass * publishing_facebook_album_parent_class = g_type_class_peek_parent (klass); #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" ((PublishingFacebookAlbumClass *) klass)->finalize = publishing_facebook_album_finalize; -#line 1325 "FacebookPublishing.c" +#line 1346 "FacebookPublishing.c" } static void publishing_facebook_album_instance_init (PublishingFacebookAlbum * self) { #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self->ref_count = 1; -#line 1332 "FacebookPublishing.c" +#line 1353 "FacebookPublishing.c" } -static void publishing_facebook_album_finalize (PublishingFacebookAlbum* obj) { +static void publishing_facebook_album_finalize (PublishingFacebookAlbum * obj) { PublishingFacebookAlbum * self; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_ALBUM, PublishingFacebookAlbum); @@ -1342,7 +1363,7 @@ static void publishing_facebook_album_finalize (PublishingFacebookAlbum* obj) { _g_free0 (self->name); #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 (self->id); -#line 1346 "FacebookPublishing.c" +#line 1367 "FacebookPublishing.c" } @@ -1361,18 +1382,18 @@ GType publishing_facebook_album_get_type (void) { gpointer publishing_facebook_album_ref (gpointer instance) { - PublishingFacebookAlbum* self; + PublishingFacebookAlbum * self; self = instance; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_atomic_int_inc (&self->ref_count); #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return instance; -#line 1371 "FacebookPublishing.c" +#line 1392 "FacebookPublishing.c" } void publishing_facebook_album_unref (gpointer instance) { - PublishingFacebookAlbum* self; + PublishingFacebookAlbum * self; self = instance; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1380,7 +1401,7 @@ void publishing_facebook_album_unref (gpointer instance) { PUBLISHING_FACEBOOK_ALBUM_GET_CLASS (self)->finalize (self); #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1384 "FacebookPublishing.c" +#line 1405 "FacebookPublishing.c" } } @@ -1391,44 +1412,38 @@ gchar* publishing_facebook_resolution_get_name (PublishingFacebookResolution sel switch (self) { #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" case PUBLISHING_FACEBOOK_RESOLUTION_STANDARD: -#line 1395 "FacebookPublishing.c" +#line 1416 "FacebookPublishing.c" { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_; #line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp0_ = _ ("Standard (720 pixels)"); + _tmp0_ = g_strdup (_ ("Standard (720 pixels)")); #line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - result = _tmp1_; + result = _tmp0_; #line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 1407 "FacebookPublishing.c" +#line 1425 "FacebookPublishing.c" } #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" case PUBLISHING_FACEBOOK_RESOLUTION_HIGH: -#line 1411 "FacebookPublishing.c" +#line 1429 "FacebookPublishing.c" { - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; -#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp2_ = _ ("Large (2048 pixels)"); + gchar* _tmp1_; #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp1_ = g_strdup (_ ("Large (2048 pixels)")); #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - result = _tmp3_; + result = _tmp1_; #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 1423 "FacebookPublishing.c" +#line 1438 "FacebookPublishing.c" } default: { - GEnumValue* _tmp4_; + GEnumValue* _tmp2_; #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp4_ = g_enum_get_value (g_type_class_ref (PUBLISHING_FACEBOOK_TYPE_RESOLUTION), self); + _tmp2_ = g_enum_get_value (g_type_class_ref (PUBLISHING_FACEBOOK_TYPE_RESOLUTION), self); #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - g_error ("FacebookPublishing.vala:87: Unknown resolution %s", (_tmp4_ != NULL) ? _tmp4_->value_name : NULL); -#line 1432 "FacebookPublishing.c" + g_error ("FacebookPublishing.vala:87: Unknown resolution %s", (_tmp2_ != NULL) ? _tmp2_->value_name : NULL); +#line 1447 "FacebookPublishing.c" } } } @@ -1440,23 +1455,23 @@ gint publishing_facebook_resolution_get_pixels (PublishingFacebookResolution sel switch (self) { #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" case PUBLISHING_FACEBOOK_RESOLUTION_STANDARD: -#line 1444 "FacebookPublishing.c" +#line 1459 "FacebookPublishing.c" { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" result = 720; #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 1450 "FacebookPublishing.c" +#line 1465 "FacebookPublishing.c" } #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" case PUBLISHING_FACEBOOK_RESOLUTION_HIGH: -#line 1454 "FacebookPublishing.c" +#line 1469 "FacebookPublishing.c" { #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" result = 2048; #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 1460 "FacebookPublishing.c" +#line 1475 "FacebookPublishing.c" } default: { @@ -1465,7 +1480,7 @@ gint publishing_facebook_resolution_get_pixels (PublishingFacebookResolution sel _tmp0_ = g_enum_get_value (g_type_class_ref (PUBLISHING_FACEBOOK_TYPE_RESOLUTION), self); #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_error ("FacebookPublishing.vala:100: Unknown resolution %s", (_tmp0_ != NULL) ? _tmp0_->value_name : NULL); -#line 1469 "FacebookPublishing.c" +#line 1484 "FacebookPublishing.c" } } } @@ -1511,51 +1526,51 @@ PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameter self->resolution = PUBLISHING_FACEBOOK_RESOLUTION_HIGH; #line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self; -#line 1515 "FacebookPublishing.c" +#line 1530 "FacebookPublishing.c" } PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameters_new (void) { #line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return publishing_facebook_publishing_parameters_construct (PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS); -#line 1522 "FacebookPublishing.c" +#line 1537 "FacebookPublishing.c" } static gpointer _publishing_facebook_album_ref0 (gpointer self) { #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self ? publishing_facebook_album_ref (self) : NULL; -#line 1529 "FacebookPublishing.c" +#line 1544 "FacebookPublishing.c" } -static void _vala_array_add6 (PublishingFacebookAlbum*** array, int* length, int* size, PublishingFacebookAlbum* value) { +static void _vala_array_add6 (PublishingFacebookAlbum** * array, int* length, int* size, PublishingFacebookAlbum* value) { #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if ((*length) == (*size)) { #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *array = g_renew (PublishingFacebookAlbum*, *array, (*size) + 1); -#line 1540 "FacebookPublishing.c" +#line 1555 "FacebookPublishing.c" } #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" (*array)[(*length)++] = value; #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" (*array)[*length] = NULL; -#line 1546 "FacebookPublishing.c" +#line 1561 "FacebookPublishing.c" } void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPublishingParameters* self, const gchar* name, const gchar* id) { - PublishingFacebookAlbum** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + PublishingFacebookAlbum** _tmp0_; + gint _tmp0__length1; PublishingFacebookAlbum* new_album = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - PublishingFacebookAlbum* _tmp4_ = NULL; - PublishingFacebookAlbum** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - PublishingFacebookAlbum* _tmp6_ = NULL; + const gchar* _tmp2_; + const gchar* _tmp3_; + PublishingFacebookAlbum* _tmp4_; + PublishingFacebookAlbum** _tmp5_; + gint _tmp5__length1; + PublishingFacebookAlbum* _tmp6_; #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_PARAMETERS (self)); #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -1568,8 +1583,8 @@ void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPubl _tmp0__length1 = self->albums_length1; #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp0_ == NULL) { -#line 1572 "FacebookPublishing.c" - PublishingFacebookAlbum** _tmp1_ = NULL; +#line 1587 "FacebookPublishing.c" + PublishingFacebookAlbum** _tmp1_; #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp1_ = g_new0 (PublishingFacebookAlbum*, 0 + 1); #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -1580,7 +1595,7 @@ void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPubl self->albums_length1 = 0; #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self->_albums_size_ = self->albums_length1; -#line 1584 "FacebookPublishing.c" +#line 1599 "FacebookPublishing.c" } #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp2_ = name; @@ -1600,12 +1615,12 @@ void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPubl _vala_array_add6 (&self->albums, &self->albums_length1, &self->_albums_size_, _tmp6_); #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _publishing_facebook_album_unref0 (new_album); -#line 1604 "FacebookPublishing.c" +#line 1619 "FacebookPublishing.c" } void publishing_facebook_publishing_parameters_set_target_album_by_name (PublishingFacebookPublishingParameters* self, const gchar* name) { - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_PARAMETERS (self)); #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -1616,38 +1631,38 @@ void publishing_facebook_publishing_parameters_set_target_album_by_name (Publish self->target_album = PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM; #line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 1620 "FacebookPublishing.c" +#line 1635 "FacebookPublishing.c" } { gint i = 0; #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" i = 0; -#line 1626 "FacebookPublishing.c" +#line 1641 "FacebookPublishing.c" { gboolean _tmp1_ = FALSE; #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp1_ = TRUE; #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" while (TRUE) { -#line 1633 "FacebookPublishing.c" - gint _tmp3_ = 0; - PublishingFacebookAlbum** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - PublishingFacebookAlbum** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - gint _tmp6_ = 0; - PublishingFacebookAlbum* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; +#line 1648 "FacebookPublishing.c" + gint _tmp3_; + PublishingFacebookAlbum** _tmp4_; + gint _tmp4__length1; + PublishingFacebookAlbum** _tmp5_; + gint _tmp5__length1; + gint _tmp6_; + PublishingFacebookAlbum* _tmp7_; + const gchar* _tmp8_; + const gchar* _tmp9_; #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (!_tmp1_) { -#line 1645 "FacebookPublishing.c" - gint _tmp2_ = 0; +#line 1660 "FacebookPublishing.c" + gint _tmp2_; #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp2_ = i; #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" i = _tmp2_ + 1; -#line 1651 "FacebookPublishing.c" +#line 1666 "FacebookPublishing.c" } #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp1_ = FALSE; @@ -1661,7 +1676,7 @@ void publishing_facebook_publishing_parameters_set_target_album_by_name (Publish if (!(_tmp3_ < _tmp4__length1)) { #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" break; -#line 1665 "FacebookPublishing.c" +#line 1680 "FacebookPublishing.c" } #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp5_ = self->albums; @@ -1677,36 +1692,36 @@ void publishing_facebook_publishing_parameters_set_target_album_by_name (Publish _tmp9_ = name; #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (g_strcmp0 (_tmp8_, _tmp9_) == 0) { -#line 1681 "FacebookPublishing.c" - gint _tmp10_ = 0; +#line 1696 "FacebookPublishing.c" + gint _tmp10_; #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp10_ = i; #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self->target_album = _tmp10_; #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 1689 "FacebookPublishing.c" +#line 1704 "FacebookPublishing.c" } } } } #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self->target_album = PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM; -#line 1696 "FacebookPublishing.c" +#line 1711 "FacebookPublishing.c" } gchar* publishing_facebook_publishing_parameters_get_target_album_name (PublishingFacebookPublishingParameters* self) { gchar* result = NULL; gboolean _tmp0_ = FALSE; - PublishingFacebookAlbum** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - PublishingFacebookAlbum** _tmp3_ = NULL; - gint _tmp3__length1 = 0; - gint _tmp4_ = 0; - PublishingFacebookAlbum* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; + PublishingFacebookAlbum** _tmp1_; + gint _tmp1__length1; + PublishingFacebookAlbum** _tmp3_; + gint _tmp3__length1; + gint _tmp4_; + PublishingFacebookAlbum* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; #line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_PARAMETERS (self), NULL); #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -1717,14 +1732,14 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_name (Publishi if (_tmp1_ == NULL) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp0_ = TRUE; -#line 1721 "FacebookPublishing.c" +#line 1736 "FacebookPublishing.c" } else { - gint _tmp2_ = 0; + gint _tmp2_; #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp2_ = self->target_album; #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp0_ = _tmp2_ == PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM; -#line 1728 "FacebookPublishing.c" +#line 1743 "FacebookPublishing.c" } #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp0_) { @@ -1732,7 +1747,7 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_name (Publishi result = NULL; #line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 1736 "FacebookPublishing.c" +#line 1751 "FacebookPublishing.c" } #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp3_ = self->albums; @@ -1750,21 +1765,21 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_name (Publishi result = _tmp7_; #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 1754 "FacebookPublishing.c" +#line 1769 "FacebookPublishing.c" } gchar* publishing_facebook_publishing_parameters_get_target_album_id (PublishingFacebookPublishingParameters* self) { gchar* result = NULL; gboolean _tmp0_ = FALSE; - PublishingFacebookAlbum** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - PublishingFacebookAlbum** _tmp3_ = NULL; - gint _tmp3__length1 = 0; - gint _tmp4_ = 0; - PublishingFacebookAlbum* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; + PublishingFacebookAlbum** _tmp1_; + gint _tmp1__length1; + PublishingFacebookAlbum** _tmp3_; + gint _tmp3__length1; + gint _tmp4_; + PublishingFacebookAlbum* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_PARAMETERS (self), NULL); #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -1775,14 +1790,14 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_id (Publishing if (_tmp1_ == NULL) { #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp0_ = TRUE; -#line 1779 "FacebookPublishing.c" +#line 1794 "FacebookPublishing.c" } else { - gint _tmp2_ = 0; + gint _tmp2_; #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp2_ = self->target_album; #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp0_ = _tmp2_ == PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM; -#line 1786 "FacebookPublishing.c" +#line 1801 "FacebookPublishing.c" } #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp0_) { @@ -1790,7 +1805,7 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_id (Publishing result = NULL; #line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 1794 "FacebookPublishing.c" +#line 1809 "FacebookPublishing.c" } #line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp3_ = self->albums; @@ -1808,14 +1823,14 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_id (Publishing result = _tmp7_; #line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 1812 "FacebookPublishing.c" +#line 1827 "FacebookPublishing.c" } static void publishing_facebook_value_publishing_parameters_init (GValue* value) { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 1819 "FacebookPublishing.c" +#line 1834 "FacebookPublishing.c" } @@ -1824,7 +1839,7 @@ static void publishing_facebook_value_publishing_parameters_free_value (GValue* if (value->data[0].v_pointer) { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_publishing_parameters_unref (value->data[0].v_pointer); -#line 1828 "FacebookPublishing.c" +#line 1843 "FacebookPublishing.c" } } @@ -1834,11 +1849,11 @@ static void publishing_facebook_value_publishing_parameters_copy_value (const GV if (src_value->data[0].v_pointer) { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" dest_value->data[0].v_pointer = publishing_facebook_publishing_parameters_ref (src_value->data[0].v_pointer); -#line 1838 "FacebookPublishing.c" +#line 1853 "FacebookPublishing.c" } else { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 1842 "FacebookPublishing.c" +#line 1857 "FacebookPublishing.c" } } @@ -1846,66 +1861,66 @@ static void publishing_facebook_value_publishing_parameters_copy_value (const GV static gpointer publishing_facebook_value_publishing_parameters_peek_pointer (const GValue* value) { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return value->data[0].v_pointer; -#line 1850 "FacebookPublishing.c" +#line 1865 "FacebookPublishing.c" } static gchar* publishing_facebook_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (collect_values[0].v_pointer) { -#line 1857 "FacebookPublishing.c" - PublishingFacebookPublishingParameters* object; +#line 1872 "FacebookPublishing.c" + PublishingFacebookPublishingParameters * object; object = collect_values[0].v_pointer; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1864 "FacebookPublishing.c" +#line 1879 "FacebookPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1868 "FacebookPublishing.c" +#line 1883 "FacebookPublishing.c" } #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = publishing_facebook_publishing_parameters_ref (object); -#line 1872 "FacebookPublishing.c" +#line 1887 "FacebookPublishing.c" } else { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 1876 "FacebookPublishing.c" +#line 1891 "FacebookPublishing.c" } #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return NULL; -#line 1880 "FacebookPublishing.c" +#line 1895 "FacebookPublishing.c" } static gchar* publishing_facebook_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingFacebookPublishingParameters** object_p; + PublishingFacebookPublishingParameters ** object_p; object_p = collect_values[0].v_pointer; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (!object_p) { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1891 "FacebookPublishing.c" +#line 1906 "FacebookPublishing.c" } #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (!value->data[0].v_pointer) { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *object_p = NULL; -#line 1897 "FacebookPublishing.c" +#line 1912 "FacebookPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *object_p = value->data[0].v_pointer; -#line 1901 "FacebookPublishing.c" +#line 1916 "FacebookPublishing.c" } else { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *object_p = publishing_facebook_publishing_parameters_ref (value->data[0].v_pointer); -#line 1905 "FacebookPublishing.c" +#line 1920 "FacebookPublishing.c" } #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return NULL; -#line 1909 "FacebookPublishing.c" +#line 1924 "FacebookPublishing.c" } @@ -1919,7 +1934,7 @@ GParamSpec* publishing_facebook_param_spec_publishing_parameters (const gchar* n G_PARAM_SPEC (spec)->value_type = object_type; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return G_PARAM_SPEC (spec); -#line 1923 "FacebookPublishing.c" +#line 1938 "FacebookPublishing.c" } @@ -1928,12 +1943,12 @@ gpointer publishing_facebook_value_get_publishing_parameters (const GValue* valu g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS), NULL); #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return value->data[0].v_pointer; -#line 1932 "FacebookPublishing.c" +#line 1947 "FacebookPublishing.c" } void publishing_facebook_value_set_publishing_parameters (GValue* value, gpointer v_object) { - PublishingFacebookPublishingParameters* old; + PublishingFacebookPublishingParameters * old; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS)); #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -1948,23 +1963,23 @@ void publishing_facebook_value_set_publishing_parameters (GValue* value, gpointe value->data[0].v_pointer = v_object; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_publishing_parameters_ref (value->data[0].v_pointer); -#line 1952 "FacebookPublishing.c" +#line 1967 "FacebookPublishing.c" } else { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 1956 "FacebookPublishing.c" +#line 1971 "FacebookPublishing.c" } #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (old) { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_publishing_parameters_unref (old); -#line 1962 "FacebookPublishing.c" +#line 1977 "FacebookPublishing.c" } } void publishing_facebook_value_take_publishing_parameters (GValue* value, gpointer v_object) { - PublishingFacebookPublishingParameters* old; + PublishingFacebookPublishingParameters * old; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS)); #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -1977,17 +1992,17 @@ void publishing_facebook_value_take_publishing_parameters (GValue* value, gpoint g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = v_object; -#line 1981 "FacebookPublishing.c" +#line 1996 "FacebookPublishing.c" } else { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 1985 "FacebookPublishing.c" +#line 2000 "FacebookPublishing.c" } #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (old) { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_publishing_parameters_unref (old); -#line 1991 "FacebookPublishing.c" +#line 2006 "FacebookPublishing.c" } } @@ -1997,18 +2012,18 @@ static void publishing_facebook_publishing_parameters_class_init (PublishingFace publishing_facebook_publishing_parameters_parent_class = g_type_class_peek_parent (klass); #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" ((PublishingFacebookPublishingParametersClass *) klass)->finalize = publishing_facebook_publishing_parameters_finalize; -#line 2001 "FacebookPublishing.c" +#line 2016 "FacebookPublishing.c" } static void publishing_facebook_publishing_parameters_instance_init (PublishingFacebookPublishingParameters * self) { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self->ref_count = 1; -#line 2008 "FacebookPublishing.c" +#line 2023 "FacebookPublishing.c" } -static void publishing_facebook_publishing_parameters_finalize (PublishingFacebookPublishingParameters* obj) { +static void publishing_facebook_publishing_parameters_finalize (PublishingFacebookPublishingParameters * obj) { PublishingFacebookPublishingParameters * self; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS, PublishingFacebookPublishingParameters); @@ -2020,7 +2035,7 @@ static void publishing_facebook_publishing_parameters_finalize (PublishingFacebo _g_free0 (self->new_album_name); #line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 (self->privacy_object); -#line 2024 "FacebookPublishing.c" +#line 2039 "FacebookPublishing.c" } @@ -2039,18 +2054,18 @@ GType publishing_facebook_publishing_parameters_get_type (void) { gpointer publishing_facebook_publishing_parameters_ref (gpointer instance) { - PublishingFacebookPublishingParameters* self; + PublishingFacebookPublishingParameters * self; self = instance; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_atomic_int_inc (&self->ref_count); #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return instance; -#line 2049 "FacebookPublishing.c" +#line 2064 "FacebookPublishing.c" } void publishing_facebook_publishing_parameters_unref (gpointer instance) { - PublishingFacebookPublishingParameters* self; + PublishingFacebookPublishingParameters * self; self = instance; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -2058,7 +2073,7 @@ void publishing_facebook_publishing_parameters_unref (gpointer instance) { PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self); #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2062 "FacebookPublishing.c" +#line 2077 "FacebookPublishing.c" } } @@ -2066,21 +2081,21 @@ void publishing_facebook_publishing_parameters_unref (gpointer instance) { static void _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated (PublishingFacebookGraphSession* _sender, gpointer self) { #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_on_session_authenticated ((PublishingFacebookFacebookPublisher*) self); -#line 2070 "FacebookPublishing.c" +#line 2085 "FacebookPublishing.c" } PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) { PublishingFacebookFacebookPublisher * self = NULL; - SpitPublishingService* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; - PublishingFacebookPublishingParameters* _tmp2_ = NULL; - PublishingAuthenticatorFactory* _tmp3_ = NULL; - PublishingAuthenticatorFactory* _tmp4_ = NULL; - SpitPublishingPluginHost* _tmp5_ = NULL; - SpitPublishingAuthenticator* _tmp6_ = NULL; - PublishingFacebookGraphSession* _tmp7_ = NULL; - PublishingFacebookGraphSession* _tmp8_ = NULL; + SpitPublishingService* _tmp0_; + SpitPublishingPluginHost* _tmp1_; + PublishingFacebookPublishingParameters* _tmp2_; + PublishingAuthenticatorFactory* _tmp3_; + PublishingAuthenticatorFactory* _tmp4_; + SpitPublishingPluginHost* _tmp5_; + SpitPublishingAuthenticator* _tmp6_; + PublishingFacebookGraphSession* _tmp7_; + PublishingFacebookGraphSession* _tmp8_; #line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL); #line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -2129,21 +2144,21 @@ PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_cons g_signal_connect_object (_tmp8_, "authenticated", (GCallback) _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated, self, 0); #line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self; -#line 2133 "FacebookPublishing.c" +#line 2148 "FacebookPublishing.c" } PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) { #line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return publishing_facebook_facebook_publisher_construct (PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, service, host); -#line 2140 "FacebookPublishing.c" +#line 2155 "FacebookPublishing.c" } static gboolean publishing_facebook_facebook_publisher_get_persistent_strip_metadata (PublishingFacebookFacebookPublisher* self) { gboolean result = FALSE; - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), FALSE); #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -2154,13 +2169,13 @@ static gboolean publishing_facebook_facebook_publisher_get_persistent_strip_meta result = _tmp1_; #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 2158 "FacebookPublishing.c" +#line 2173 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_set_persistent_strip_metadata (PublishingFacebookFacebookPublisher* self, gboolean strip_metadata) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; #line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -2169,14 +2184,14 @@ static void publishing_facebook_facebook_publisher_set_persistent_strip_metadata _tmp1_ = strip_metadata; #line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", _tmp1_); -#line 2173 "FacebookPublishing.c" +#line 2188 "FacebookPublishing.c" } gint publishing_facebook_facebook_publisher_get_persistent_default_size (PublishingFacebookFacebookPublisher* self) { gint result = 0; - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), 0); #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -2187,13 +2202,13 @@ gint publishing_facebook_facebook_publisher_get_persistent_default_size (Publish result = _tmp1_; #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 2191 "FacebookPublishing.c" +#line 2206 "FacebookPublishing.c" } void publishing_facebook_facebook_publisher_set_persistent_default_size (PublishingFacebookFacebookPublisher* self, gint size) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -2202,31 +2217,31 @@ void publishing_facebook_facebook_publisher_set_persistent_default_size (Publish _tmp1_ = size; #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", _tmp1_); -#line 2206 "FacebookPublishing.c" +#line 2221 "FacebookPublishing.c" } static void _publishing_facebook_facebook_publisher_on_fetch_user_info_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) { #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_on_fetch_user_info_completed ((PublishingFacebookFacebookPublisher*) self, _sender); -#line 2213 "FacebookPublishing.c" +#line 2228 "FacebookPublishing.c" } static void _publishing_facebook_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) { #line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_on_fetch_user_info_error ((PublishingFacebookFacebookPublisher*) self, _sender, err); -#line 2220 "FacebookPublishing.c" +#line 2235 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_do_fetch_user_info (PublishingFacebookFacebookPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; PublishingFacebookGraphMessage* user_info_message = NULL; - PublishingFacebookGraphSession* _tmp2_ = NULL; - PublishingFacebookGraphMessage* _tmp3_ = NULL; - PublishingFacebookGraphSession* _tmp4_ = NULL; + PublishingFacebookGraphSession* _tmp2_; + PublishingFacebookGraphMessage* _tmp3_; + PublishingFacebookGraphSession* _tmp4_; #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -2255,35 +2270,35 @@ static void publishing_facebook_facebook_publisher_do_fetch_user_info (Publishin publishing_facebook_graph_session_send_message (_tmp4_, user_info_message); #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _publishing_facebook_graph_message_unref0 (user_info_message); -#line 2259 "FacebookPublishing.c" +#line 2274 "FacebookPublishing.c" } static void _publishing_facebook_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) { #line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_on_fetch_albums_completed ((PublishingFacebookFacebookPublisher*) self, _sender); -#line 2266 "FacebookPublishing.c" +#line 2281 "FacebookPublishing.c" } static void _publishing_facebook_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) { #line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_on_fetch_albums_error ((PublishingFacebookFacebookPublisher*) self, _sender, err); -#line 2273 "FacebookPublishing.c" +#line 2288 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_do_fetch_album_descriptions (PublishingFacebookFacebookPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; PublishingFacebookGraphMessage* albums_message = NULL; - PublishingFacebookGraphSession* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - PublishingFacebookGraphMessage* _tmp6_ = NULL; - PublishingFacebookGraphMessage* _tmp7_ = NULL; - PublishingFacebookGraphSession* _tmp8_ = NULL; + PublishingFacebookGraphSession* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + PublishingFacebookGraphMessage* _tmp6_; + PublishingFacebookGraphMessage* _tmp7_; + PublishingFacebookGraphSession* _tmp8_; #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -2322,35 +2337,35 @@ static void publishing_facebook_facebook_publisher_do_fetch_album_descriptions ( publishing_facebook_graph_session_send_message (_tmp8_, albums_message); #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _publishing_facebook_graph_message_unref0 (albums_message); -#line 2326 "FacebookPublishing.c" +#line 2341 "FacebookPublishing.c" } static JsonNode* _vala_JsonNode_copy (JsonNode* self) { #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return g_boxed_copy (json_node_get_type (), self); -#line 2333 "FacebookPublishing.c" +#line 2348 "FacebookPublishing.c" } static gpointer __vala_JsonNode_copy0 (gpointer self) { #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self ? _vala_JsonNode_copy (self) : NULL; -#line 2340 "FacebookPublishing.c" +#line 2355 "FacebookPublishing.c" } static gpointer _json_object_ref0 (gpointer self) { #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self ? json_object_ref (self) : NULL; -#line 2347 "FacebookPublishing.c" +#line 2362 "FacebookPublishing.c" } static void _vala_JsonNode_free (JsonNode* self) { #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_boxed_free (json_node_get_type (), self); -#line 2354 "FacebookPublishing.c" +#line 2369 "FacebookPublishing.c" } @@ -2363,26 +2378,26 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso #line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_debug ("FacebookPublishing.vala:259: ACTION: extracting user info from JSON re" \ "sponse."); -#line 2366 "FacebookPublishing.c" +#line 2381 "FacebookPublishing.c" { JsonParser* parser = NULL; - JsonParser* _tmp0_ = NULL; - JsonParser* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + JsonParser* _tmp0_; + JsonParser* _tmp1_; + const gchar* _tmp2_; JsonNode* root = NULL; - JsonParser* _tmp3_ = NULL; - JsonNode* _tmp4_ = NULL; - JsonNode* _tmp5_ = NULL; + JsonParser* _tmp3_; + JsonNode* _tmp4_; + JsonNode* _tmp5_; JsonObject* response_object = NULL; - JsonNode* _tmp6_ = NULL; - JsonObject* _tmp7_ = NULL; - JsonObject* _tmp8_ = NULL; - JsonObject* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - JsonObject* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; + JsonNode* _tmp6_; + JsonObject* _tmp7_; + JsonObject* _tmp8_; + JsonObject* _tmp9_; + const gchar* _tmp10_; + gchar* _tmp11_; + JsonObject* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp0_ = json_parser_new (); #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -2397,7 +2412,7 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso if (G_UNLIKELY (_inner_error_ != NULL)) { #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_object_unref0 (parser); -#line 2400 "FacebookPublishing.c" +#line 2415 "FacebookPublishing.c" goto __catch0_g_error; } #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -2442,17 +2457,17 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso __vala_JsonNode_free0 (root); #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_object_unref0 (parser); -#line 2445 "FacebookPublishing.c" +#line 2460 "FacebookPublishing.c" } goto __finally0; __catch0_g_error: { GError* _error_ = NULL; - SpitPublishingPluginHost* _tmp15_ = NULL; - GError* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - GError* _tmp18_ = NULL; - GError* _tmp19_ = NULL; + SpitPublishingPluginHost* _tmp15_; + GError* _tmp16_; + const gchar* _tmp17_; + GError* _tmp18_; + GError* _tmp19_; #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _error_ = _inner_error_; #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -2475,7 +2490,7 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso _g_error_free0 (_error_); #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 2478 "FacebookPublishing.c" +#line 2493 "FacebookPublishing.c" } __finally0: #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -2486,18 +2501,18 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso g_clear_error (&_inner_error_); #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 2489 "FacebookPublishing.c" +#line 2504 "FacebookPublishing.c" } #line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_on_user_info_extracted (self); -#line 2493 "FacebookPublishing.c" +#line 2508 "FacebookPublishing.c" } static gpointer _json_array_ref0 (gpointer self) { #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self ? json_array_ref (self) : NULL; -#line 2500 "FacebookPublishing.c" +#line 2515 "FacebookPublishing.c" } @@ -2510,26 +2525,26 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json ( #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_debug ("FacebookPublishing.vala:278: ACTION: extracting album info from JSON r" \ "esponse."); -#line 2512 "FacebookPublishing.c" +#line 2527 "FacebookPublishing.c" { JsonParser* parser = NULL; - JsonParser* _tmp0_ = NULL; - JsonParser* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + JsonParser* _tmp0_; + JsonParser* _tmp1_; + const gchar* _tmp2_; JsonNode* root = NULL; - JsonParser* _tmp3_ = NULL; - JsonNode* _tmp4_ = NULL; - JsonNode* _tmp5_ = NULL; + JsonParser* _tmp3_; + JsonNode* _tmp4_; + JsonNode* _tmp5_; JsonObject* response_object = NULL; - JsonNode* _tmp6_ = NULL; - JsonObject* _tmp7_ = NULL; - JsonObject* _tmp8_ = NULL; + JsonNode* _tmp6_; + JsonObject* _tmp7_; + JsonObject* _tmp8_; JsonArray* album_list = NULL; - JsonObject* _tmp9_ = NULL; - JsonArray* _tmp10_ = NULL; - JsonArray* _tmp11_ = NULL; - PublishingFacebookPublishingParameters* _tmp12_ = NULL; - PublishingFacebookAlbum** _tmp13_ = NULL; + JsonObject* _tmp9_; + JsonArray* _tmp10_; + JsonArray* _tmp11_; + PublishingFacebookPublishingParameters* _tmp12_; + PublishingFacebookAlbum** _tmp13_; #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp0_ = json_parser_new (); #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -2544,7 +2559,7 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json ( if (G_UNLIKELY (_inner_error_ != NULL)) { #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_object_unref0 (parser); -#line 2546 "FacebookPublishing.c" +#line 2561 "FacebookPublishing.c" goto __catch1_g_error; } #line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -2583,47 +2598,47 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json ( _tmp12_->albums_length1 = 0; #line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp12_->_albums_size_ = _tmp12_->albums_length1; -#line 2585 "FacebookPublishing.c" +#line 2600 "FacebookPublishing.c" { gint i = 0; #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" i = 0; -#line 2590 "FacebookPublishing.c" +#line 2605 "FacebookPublishing.c" { gboolean _tmp14_ = FALSE; #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp14_ = TRUE; #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" while (TRUE) { -#line 2597 "FacebookPublishing.c" - gint _tmp16_ = 0; - JsonArray* _tmp17_ = NULL; - guint _tmp18_ = 0U; +#line 2612 "FacebookPublishing.c" + gint _tmp16_; + JsonArray* _tmp17_; + guint _tmp18_; JsonObject* current_album = NULL; - JsonArray* _tmp19_ = NULL; - gint _tmp20_ = 0; - JsonObject* _tmp21_ = NULL; - JsonObject* _tmp22_ = NULL; + JsonArray* _tmp19_; + gint _tmp20_; + JsonObject* _tmp21_; + JsonObject* _tmp22_; gchar* album_id = NULL; - JsonObject* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; + JsonObject* _tmp23_; + const gchar* _tmp24_; + gchar* _tmp25_; gchar* album_name = NULL; - JsonObject* _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - PublishingFacebookPublishingParameters* _tmp29_ = NULL; - const gchar* _tmp30_ = NULL; - const gchar* _tmp31_ = NULL; + JsonObject* _tmp26_; + const gchar* _tmp27_; + gchar* _tmp28_; + PublishingFacebookPublishingParameters* _tmp29_; + const gchar* _tmp30_; + const gchar* _tmp31_; #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (!_tmp14_) { -#line 2619 "FacebookPublishing.c" - gint _tmp15_ = 0; +#line 2634 "FacebookPublishing.c" + gint _tmp15_; #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp15_ = i; #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" i = _tmp15_ + 1; -#line 2625 "FacebookPublishing.c" +#line 2640 "FacebookPublishing.c" } #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp14_ = FALSE; @@ -2637,7 +2652,7 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json ( if (!(((guint) _tmp16_) < _tmp18_)) { #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" break; -#line 2639 "FacebookPublishing.c" +#line 2654 "FacebookPublishing.c" } #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp19_ = album_list; @@ -2679,7 +2694,7 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json ( _g_free0 (album_id); #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _json_object_unref0 (current_album); -#line 2681 "FacebookPublishing.c" +#line 2696 "FacebookPublishing.c" } } } @@ -2691,17 +2706,17 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json ( __vala_JsonNode_free0 (root); #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_object_unref0 (parser); -#line 2693 "FacebookPublishing.c" +#line 2708 "FacebookPublishing.c" } goto __finally1; __catch1_g_error: { GError* _error_ = NULL; - SpitPublishingPluginHost* _tmp32_ = NULL; - GError* _tmp33_ = NULL; - const gchar* _tmp34_ = NULL; - GError* _tmp35_ = NULL; - GError* _tmp36_ = NULL; + SpitPublishingPluginHost* _tmp32_; + GError* _tmp33_; + const gchar* _tmp34_; + GError* _tmp35_; + GError* _tmp36_; #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _error_ = _inner_error_; #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -2724,7 +2739,7 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json ( _g_error_free0 (_error_); #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 2726 "FacebookPublishing.c" +#line 2741 "FacebookPublishing.c" } __finally1: #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -2735,42 +2750,41 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json ( g_clear_error (&_inner_error_); #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 2737 "FacebookPublishing.c" +#line 2752 "FacebookPublishing.c" } #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_on_albums_extracted (self); -#line 2741 "FacebookPublishing.c" +#line 2756 "FacebookPublishing.c" } static void _publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) { #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_on_create_album_completed ((PublishingFacebookFacebookPublisher*) self, _sender); -#line 2748 "FacebookPublishing.c" +#line 2763 "FacebookPublishing.c" } static void _publishing_facebook_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) { #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_on_create_album_error ((PublishingFacebookFacebookPublisher*) self, _sender, err); -#line 2755 "FacebookPublishing.c" +#line 2770 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_do_create_new_album (PublishingFacebookFacebookPublisher* self) { - PublishingFacebookPublishingParameters* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - SpitPublishingPluginHost* _tmp2_ = NULL; - SpitPublishingPluginHost* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; + PublishingFacebookPublishingParameters* _tmp0_; + const gchar* _tmp1_; + SpitPublishingPluginHost* _tmp2_; + SpitPublishingPluginHost* _tmp3_; PublishingFacebookGraphMessage* create_album_message = NULL; - PublishingFacebookGraphSession* _tmp5_ = NULL; - PublishingFacebookPublishingParameters* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - PublishingFacebookPublishingParameters* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - PublishingFacebookGraphMessage* _tmp10_ = NULL; - PublishingFacebookGraphSession* _tmp11_ = NULL; + PublishingFacebookGraphSession* _tmp4_; + PublishingFacebookPublishingParameters* _tmp5_; + const gchar* _tmp6_; + PublishingFacebookPublishingParameters* _tmp7_; + const gchar* _tmp8_; + PublishingFacebookGraphMessage* _tmp9_; + PublishingFacebookGraphSession* _tmp10_; #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -2787,70 +2801,68 @@ static void publishing_facebook_facebook_publisher_do_create_new_album (Publishi #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp3_ = self->priv->host; #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp4_ = _ ("Creating album…"); -#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - spit_publishing_plugin_host_install_static_message_pane (_tmp3_, _tmp4_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); + spit_publishing_plugin_host_install_static_message_pane (_tmp3_, _ ("Creating album…"), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp5_ = self->priv->graph_session; + _tmp4_ = self->priv->graph_session; #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp6_ = self->priv->publishing_params; + _tmp5_ = self->priv->publishing_params; #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp7_ = _tmp6_->new_album_name; + _tmp6_ = _tmp5_->new_album_name; #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp8_ = self->priv->publishing_params; + _tmp7_ = self->priv->publishing_params; #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp9_ = _tmp8_->privacy_object; + _tmp8_ = _tmp7_->privacy_object; #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp10_ = publishing_facebook_graph_session_new_create_album (_tmp5_, _tmp7_, _tmp9_); + _tmp9_ = publishing_facebook_graph_session_new_create_album (_tmp4_, _tmp6_, _tmp8_); #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - create_album_message = _tmp10_; + create_album_message = _tmp9_; #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_signal_connect_object (create_album_message, "completed", (GCallback) _publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed, self, 0); #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_signal_connect_object (create_album_message, "failed", (GCallback) _publishing_facebook_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed, self, 0); #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp11_ = self->priv->graph_session; + _tmp10_ = self->priv->graph_session; #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - publishing_facebook_graph_session_send_message (_tmp11_, create_album_message); + publishing_facebook_graph_session_send_message (_tmp10_, create_album_message); #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _publishing_facebook_graph_message_unref0 (create_album_message); -#line 2815 "FacebookPublishing.c" +#line 2827 "FacebookPublishing.c" } static void _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender, gpointer self) { #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_on_publishing_options_pane_logout ((PublishingFacebookFacebookPublisher*) self); -#line 2822 "FacebookPublishing.c" +#line 2834 "FacebookPublishing.c" } static void _publishing_facebook_facebook_publisher_on_publishing_options_pane_publish_publishing_facebook_publishing_options_pane_publish (PublishingFacebookPublishingOptionsPane* _sender, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution target_resolution, gboolean strip_metadata, gpointer self) { #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_on_publishing_options_pane_publish ((PublishingFacebookFacebookPublisher*) self, target_album, privacy_setting, target_resolution, strip_metadata); -#line 2829 "FacebookPublishing.c" +#line 2841 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_do_show_publishing_options_pane (PublishingFacebookFacebookPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; + SpitPublishingPluginHost* _tmp0_; GtkBuilder* builder = NULL; - GtkBuilder* _tmp1_ = NULL; - const gchar* _tmp9_ = NULL; - PublishingFacebookPublishingParameters* _tmp10_ = NULL; - PublishingFacebookAlbum** _tmp11_ = NULL; - gint _tmp11__length1 = 0; - SpitPublishingPluginHost* _tmp12_ = NULL; - SpitPublishingPublisherMediaType _tmp13_ = 0; - GtkBuilder* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; - SpitPublishingAuthenticator* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; - PublishingFacebookPublishingOptionsPane* _tmp18_ = NULL; - PublishingFacebookPublishingOptionsPane* _tmp19_ = NULL; - PublishingFacebookPublishingOptionsPane* _tmp20_ = NULL; - SpitPublishingPluginHost* _tmp21_ = NULL; - PublishingFacebookPublishingOptionsPane* _tmp22_ = NULL; + GtkBuilder* _tmp1_; + const gchar* _tmp8_; + PublishingFacebookPublishingParameters* _tmp9_; + PublishingFacebookAlbum** _tmp10_; + gint _tmp10__length1; + SpitPublishingPluginHost* _tmp11_; + SpitPublishingPublisherMediaType _tmp12_; + GtkBuilder* _tmp13_; + gboolean _tmp14_; + SpitPublishingAuthenticator* _tmp15_; + gboolean _tmp16_; + PublishingFacebookPublishingOptionsPane* _tmp17_; + PublishingFacebookPublishingOptionsPane* _tmp18_; + PublishingFacebookPublishingOptionsPane* _tmp19_; + SpitPublishingPluginHost* _tmp20_; + PublishingFacebookPublishingOptionsPane* _tmp21_; GError * _inner_error_ = NULL; #line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); @@ -2864,16 +2876,16 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa _tmp1_ = gtk_builder_new (); #line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" builder = _tmp1_; -#line 2865 "FacebookPublishing.c" +#line 2877 "FacebookPublishing.c" { - GtkBuilder* _tmp2_ = NULL; + GtkBuilder* _tmp2_; #line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp2_ = builder; #line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/" "facebook_publishing_options_pane.ui", &_inner_error_); #line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2874 "FacebookPublishing.c" +#line 2886 "FacebookPublishing.c" goto __catch2_g_error; } } @@ -2881,12 +2893,11 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa __catch2_g_error: { GError* e = NULL; - GError* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - SpitPublishingPluginHost* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - GError* _tmp7_ = NULL; - GError* _tmp8_ = NULL; + GError* _tmp3_; + const gchar* _tmp4_; + SpitPublishingPluginHost* _tmp5_; + GError* _tmp6_; + GError* _tmp7_; #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" e = _inner_error_; #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -2900,23 +2911,21 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp5_ = self->priv->host; #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp6_ = _ ("A file required for publishing is unavailable. Publishing to Facebook " \ -"can’t continue."); -#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp6_); + _tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _ ("A file required for publishing is unavailable. Publishing to Facebook " \ +"can’t continue.")); #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - spit_publishing_plugin_host_post_error (_tmp5_, _tmp8_); + spit_publishing_plugin_host_post_error (_tmp5_, _tmp7_); #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _g_error_free0 (_tmp8_); + _g_error_free0 (_tmp7_); #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_error_free0 (e); #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_object_unref0 (builder); #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 2916 "FacebookPublishing.c" +#line 2925 "FacebookPublishing.c" } __finally2: #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -2929,56 +2938,56 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa g_clear_error (&_inner_error_); #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 2929 "FacebookPublishing.c" +#line 2938 "FacebookPublishing.c" } #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp9_ = self->priv->username; + _tmp8_ = self->priv->username; #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp10_ = self->priv->publishing_params; + _tmp9_ = self->priv->publishing_params; #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp11_ = _tmp10_->albums; + _tmp10_ = _tmp9_->albums; #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp11__length1 = _tmp10_->albums_length1; + _tmp10__length1 = _tmp9_->albums_length1; #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp12_ = self->priv->host; + _tmp11_ = self->priv->host; #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp13_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp12_); + _tmp12_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp11_); #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp14_ = builder; + _tmp13_ = builder; #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp15_ = publishing_facebook_facebook_publisher_get_persistent_strip_metadata (self); + _tmp14_ = publishing_facebook_facebook_publisher_get_persistent_strip_metadata (self); #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp16_ = self->priv->authenticator; + _tmp15_ = self->priv->authenticator; #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp17_ = spit_publishing_authenticator_can_logout (_tmp16_); + _tmp16_ = spit_publishing_authenticator_can_logout (_tmp15_); #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp18_ = publishing_facebook_publishing_options_pane_new (_tmp9_, _tmp11_, _tmp11__length1, _tmp13_, self, _tmp14_, _tmp15_, _tmp17_); + _tmp17_ = publishing_facebook_publishing_options_pane_new (_tmp8_, _tmp10_, _tmp10__length1, _tmp12_, self, _tmp13_, _tmp14_, _tmp16_); #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_object_unref0 (self->priv->publishing_options_pane); #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - self->priv->publishing_options_pane = _tmp18_; + self->priv->publishing_options_pane = _tmp17_; #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp19_ = self->priv->publishing_options_pane; + _tmp18_ = self->priv->publishing_options_pane; #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - g_signal_connect_object (_tmp19_, "logout", (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout, self, 0); + g_signal_connect_object (_tmp18_, "logout", (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout, self, 0); #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp20_ = self->priv->publishing_options_pane; + _tmp19_ = self->priv->publishing_options_pane; #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - g_signal_connect_object (_tmp20_, "publish", (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_publish_publishing_facebook_publishing_options_pane_publish, self, 0); + g_signal_connect_object (_tmp19_, "publish", (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_publish_publishing_facebook_publishing_options_pane_publish, self, 0); #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp21_ = self->priv->host; + _tmp20_ = self->priv->host; #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp22_ = self->priv->publishing_options_pane; + _tmp21_ = self->priv->publishing_options_pane; #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - spit_publishing_plugin_host_install_dialog_pane (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); + spit_publishing_plugin_host_install_dialog_pane (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); #line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_object_unref0 (builder); -#line 2973 "FacebookPublishing.c" +#line 2982 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_do_logout (PublishingFacebookFacebookPublisher* self) { - SpitPublishingAuthenticator* _tmp0_ = NULL; + SpitPublishingAuthenticator* _tmp0_; #line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -2992,13 +3001,13 @@ static void publishing_facebook_facebook_publisher_do_logout (PublishingFacebook self->priv->running = FALSE; #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" spit_publishing_publisher_start (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); -#line 2991 "FacebookPublishing.c" +#line 3000 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_json (PublishingFacebookFacebookPublisher* self, const gchar* album_name, const gchar* json) { - PublishingFacebookPublishingParameters* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; + PublishingFacebookPublishingParameters* _tmp20_; + const gchar* _tmp21_; GError * _inner_error_ = NULL; #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); @@ -3006,27 +3015,27 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j g_return_if_fail (album_name != NULL); #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (json != NULL); -#line 3005 "FacebookPublishing.c" +#line 3014 "FacebookPublishing.c" { JsonParser* parser = NULL; - JsonParser* _tmp0_ = NULL; - JsonParser* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + JsonParser* _tmp0_; + JsonParser* _tmp1_; + const gchar* _tmp2_; JsonNode* root = NULL; - JsonParser* _tmp3_ = NULL; - JsonNode* _tmp4_ = NULL; - JsonNode* _tmp5_ = NULL; + JsonParser* _tmp3_; + JsonNode* _tmp4_; + JsonNode* _tmp5_; JsonObject* response_object = NULL; - JsonNode* _tmp6_ = NULL; - JsonObject* _tmp7_ = NULL; - JsonObject* _tmp8_ = NULL; + JsonNode* _tmp6_; + JsonObject* _tmp7_; + JsonObject* _tmp8_; gchar* album_id = NULL; - JsonObject* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - PublishingFacebookPublishingParameters* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; + JsonObject* _tmp9_; + const gchar* _tmp10_; + gchar* _tmp11_; + PublishingFacebookPublishingParameters* _tmp12_; + const gchar* _tmp13_; + const gchar* _tmp14_; #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp0_ = json_parser_new (); #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -3041,7 +3050,7 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j if (G_UNLIKELY (_inner_error_ != NULL)) { #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_object_unref0 (parser); -#line 3040 "FacebookPublishing.c" +#line 3049 "FacebookPublishing.c" goto __catch3_g_error; } #line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -3084,17 +3093,17 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j __vala_JsonNode_free0 (root); #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_object_unref0 (parser); -#line 3083 "FacebookPublishing.c" +#line 3092 "FacebookPublishing.c" } goto __finally3; __catch3_g_error: { GError* _error_ = NULL; - SpitPublishingPluginHost* _tmp15_ = NULL; - GError* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - GError* _tmp18_ = NULL; - GError* _tmp19_ = NULL; + SpitPublishingPluginHost* _tmp15_; + GError* _tmp16_; + const gchar* _tmp17_; + GError* _tmp18_; + GError* _tmp19_; #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _error_ = _inner_error_; #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -3117,7 +3126,7 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j _g_error_free0 (_error_); #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 3116 "FacebookPublishing.c" +#line 3125 "FacebookPublishing.c" } __finally3: #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -3128,7 +3137,7 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j g_clear_error (&_inner_error_); #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 3127 "FacebookPublishing.c" +#line 3136 "FacebookPublishing.c" } #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp20_ = self->priv->publishing_params; @@ -3138,7 +3147,7 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j publishing_facebook_publishing_parameters_set_target_album_by_name (_tmp20_, _tmp21_); #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_do_upload (self); -#line 3137 "FacebookPublishing.c" +#line 3146 "FacebookPublishing.c" } @@ -3149,35 +3158,35 @@ static void publishing_facebook_facebook_publisher_on_authenticator_succeeded (P g_debug ("FacebookPublishing.vala:382: EVENT: Authenticator login succeeded."); #line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_do_authenticate_session (self); -#line 3148 "FacebookPublishing.c" +#line 3157 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_on_authenticator_failed (PublishingFacebookFacebookPublisher* self) { #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); -#line 3155 "FacebookPublishing.c" +#line 3164 "FacebookPublishing.c" } static gpointer _g_variant_ref0 (gpointer self) { #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self ? g_variant_ref (self) : NULL; -#line 3162 "FacebookPublishing.c" +#line 3171 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_do_authenticate_session (PublishingFacebookFacebookPublisher* self) { GHashTable* parameter = NULL; - SpitPublishingAuthenticator* _tmp0_ = NULL; - GHashTable* _tmp1_ = NULL; + SpitPublishingAuthenticator* _tmp0_; + GHashTable* _tmp1_; GVariant* access_token = NULL; gconstpointer _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - GVariant* _tmp4_ = NULL; - PublishingFacebookGraphSession* _tmp5_ = NULL; - PublishingFacebookGraphSession* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; + gboolean _tmp3_; + GVariant* _tmp4_; + PublishingFacebookGraphSession* _tmp5_; + PublishingFacebookGraphSession* _tmp6_; + const gchar* _tmp7_; #line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -3201,7 +3210,7 @@ static void publishing_facebook_facebook_publisher_do_authenticate_session (Publ " not provide access token"); #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_assert_not_reached (); -#line 3199 "FacebookPublishing.c" +#line 3208 "FacebookPublishing.c" } #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp5_ = self->priv->graph_session; @@ -3217,60 +3226,60 @@ static void publishing_facebook_facebook_publisher_do_authenticate_session (Publ _g_variant_unref0 (access_token); #line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_hash_table_unref0 (parameter); -#line 3215 "FacebookPublishing.c" +#line 3224 "FacebookPublishing.c" } static void _publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete (PublishingFacebookUploader* _sender, gint num_photos_published, gpointer self) { #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_on_upload_complete ((PublishingFacebookFacebookPublisher*) self, _sender, num_photos_published); -#line 3222 "FacebookPublishing.c" +#line 3231 "FacebookPublishing.c" } static void _publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error (PublishingFacebookUploader* _sender, GError* err, gpointer self) { #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_on_upload_error ((PublishingFacebookFacebookPublisher*) self, _sender, err); -#line 3229 "FacebookPublishing.c" +#line 3238 "FacebookPublishing.c" } static void _publishing_facebook_facebook_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) { #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_on_upload_status_updated ((PublishingFacebookFacebookPublisher*) self, file_number, fraction_complete); -#line 3236 "FacebookPublishing.c" +#line 3245 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebookFacebookPublisher* self) { gchar* _tmp0_ = NULL; - PublishingFacebookPublishingParameters* _tmp1_ = NULL; - gint _tmp2_ = 0; - SpitPublishingPluginHost* _tmp6_ = NULL; - SpitPublishingPluginHost* _tmp7_ = NULL; - PublishingFacebookPublishingParameters* _tmp8_ = NULL; - PublishingFacebookResolution _tmp9_ = 0; - gint _tmp10_ = 0; - PublishingFacebookPublishingParameters* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - void* _tmp13_ = NULL; - GDestroyNotify _tmp14_ = NULL; - SpitPublishingProgressCallback _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; + PublishingFacebookPublishingParameters* _tmp1_; + gint _tmp2_; + SpitPublishingPluginHost* _tmp6_; + SpitPublishingPluginHost* _tmp7_; + PublishingFacebookPublishingParameters* _tmp8_; + PublishingFacebookResolution _tmp9_; + gint _tmp10_; + PublishingFacebookPublishingParameters* _tmp11_; + gboolean _tmp12_; + void* _tmp13_; + GDestroyNotify _tmp14_; + SpitPublishingProgressCallback _tmp15_; + gboolean _tmp16_; SpitPublishingPublishable** publishables = NULL; - SpitPublishingPluginHost* _tmp17_ = NULL; - gint _tmp18_ = 0; - SpitPublishingPublishable** _tmp19_ = NULL; - gint publishables_length1 = 0; - gint _publishables_size_ = 0; - PublishingFacebookGraphSession* _tmp20_ = NULL; - PublishingFacebookPublishingParameters* _tmp21_ = NULL; - SpitPublishingPublishable** _tmp22_ = NULL; - gint _tmp22__length1 = 0; - PublishingFacebookUploader* _tmp23_ = NULL; - PublishingFacebookUploader* _tmp24_ = NULL; - PublishingFacebookUploader* _tmp25_ = NULL; - PublishingFacebookUploader* _tmp26_ = NULL; + SpitPublishingPluginHost* _tmp17_; + gint _tmp18_; + SpitPublishingPublishable** _tmp19_; + gint publishables_length1; + gint _publishables_size_; + PublishingFacebookGraphSession* _tmp20_; + PublishingFacebookPublishingParameters* _tmp21_; + SpitPublishingPublishable** _tmp22_; + gint _tmp22__length1; + PublishingFacebookUploader* _tmp23_; + PublishingFacebookUploader* _tmp24_; + PublishingFacebookUploader* _tmp25_; + PublishingFacebookUploader* _tmp26_; #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -3279,18 +3288,18 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook _tmp2_ = _tmp1_->target_album; #line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp2_ == PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM) { -#line 3277 "FacebookPublishing.c" - gchar* _tmp3_ = NULL; +#line 3286 "FacebookPublishing.c" + gchar* _tmp3_; #line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp3_ = g_strdup ("(none)"); #line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 (_tmp0_); #line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp0_ = _tmp3_; -#line 3285 "FacebookPublishing.c" +#line 3294 "FacebookPublishing.c" } else { - PublishingFacebookPublishingParameters* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + PublishingFacebookPublishingParameters* _tmp4_; + gchar* _tmp5_; #line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp4_ = self->priv->publishing_params; #line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -3299,7 +3308,7 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook _g_free0 (_tmp0_); #line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp0_ = _tmp5_; -#line 3297 "FacebookPublishing.c" +#line 3306 "FacebookPublishing.c" } #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_debug ("FacebookPublishing.vala:402: ACTION: uploading photos to album '%s'", _tmp0_); @@ -3343,7 +3352,7 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook _g_free0 (_tmp0_); #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 3341 "FacebookPublishing.c" +#line 3350 "FacebookPublishing.c" } #line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp17_ = self->priv->host; @@ -3385,13 +3394,13 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL); #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 (_tmp0_); -#line 3383 "FacebookPublishing.c" +#line 3392 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_do_show_success_pane (PublishingFacebookFacebookPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; #line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -3404,12 +3413,12 @@ static void publishing_facebook_facebook_publisher_do_show_success_pane (Publish _tmp1_ = self->priv->host; #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" spit_publishing_plugin_host_install_success_pane (_tmp1_); -#line 3402 "FacebookPublishing.c" +#line 3411 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_on_generic_error (PublishingFacebookFacebookPublisher* self, GError* _error_) { - GError* _tmp0_ = NULL; + GError* _tmp0_; #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -3418,27 +3427,27 @@ static void publishing_facebook_facebook_publisher_on_generic_error (PublishingF if (g_error_matches (_tmp0_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) { #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_do_logout (self); -#line 3416 "FacebookPublishing.c" +#line 3425 "FacebookPublishing.c" } else { - SpitPublishingPluginHost* _tmp1_ = NULL; - GError* _tmp2_ = NULL; + SpitPublishingPluginHost* _tmp1_; + GError* _tmp2_; #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp1_ = self->priv->host; #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp2_ = _error_; #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" spit_publishing_plugin_host_post_error (_tmp1_, _tmp2_); -#line 3426 "FacebookPublishing.c" +#line 3435 "FacebookPublishing.c" } } static void publishing_facebook_facebook_publisher_on_session_authenticated (PublishingFacebookFacebookPublisher* self) { - PublishingFacebookGraphSession* _tmp0_ = NULL; - guint _tmp1_ = 0U; - gboolean _tmp2_ = FALSE; - PublishingFacebookGraphSession* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + PublishingFacebookGraphSession* _tmp0_; + guint _tmp1_; + gboolean _tmp2_; + PublishingFacebookGraphSession* _tmp3_; + gboolean _tmp4_; #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -3453,7 +3462,7 @@ static void publishing_facebook_facebook_publisher_on_session_authenticated (Pub if (!_tmp2_) { #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 3451 "FacebookPublishing.c" +#line 3460 "FacebookPublishing.c" } #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp3_ = self->priv->graph_session; @@ -3466,22 +3475,22 @@ static void publishing_facebook_facebook_publisher_on_session_authenticated (Pub "e available."); #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_do_fetch_user_info (self); -#line 3463 "FacebookPublishing.c" +#line 3472 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_on_fetch_user_info_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message) { - PublishingFacebookGraphMessage* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingFacebookGraphMessage* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingFacebookGraphMessage* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - PublishingFacebookGraphMessage* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; + PublishingFacebookGraphMessage* _tmp0_; + guint _tmp1_; + PublishingFacebookGraphMessage* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingFacebookGraphMessage* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + PublishingFacebookGraphMessage* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -3504,7 +3513,7 @@ static void publishing_facebook_facebook_publisher_on_fetch_user_info_completed if (!_tmp4_) { #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 3501 "FacebookPublishing.c" +#line 3510 "FacebookPublishing.c" } #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp5_ = message; @@ -3527,17 +3536,17 @@ static void publishing_facebook_facebook_publisher_on_fetch_user_info_completed publishing_facebook_facebook_publisher_do_extract_user_info_from_json (self, _tmp10_); #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 (_tmp10_); -#line 3523 "FacebookPublishing.c" +#line 3532 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_on_fetch_user_info_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* _error_) { - PublishingFacebookGraphMessage* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingFacebookGraphMessage* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - GError* _tmp5_ = NULL; + PublishingFacebookGraphMessage* _tmp0_; + guint _tmp1_; + PublishingFacebookGraphMessage* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + GError* _tmp5_; #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -3560,7 +3569,7 @@ static void publishing_facebook_facebook_publisher_on_fetch_user_info_error (Pub if (!_tmp4_) { #line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 3556 "FacebookPublishing.c" +#line 3565 "FacebookPublishing.c" } #line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_debug ("FacebookPublishing.vala:501: EVENT: fetching user info generated and e" \ @@ -3569,14 +3578,14 @@ static void publishing_facebook_facebook_publisher_on_fetch_user_info_error (Pub _tmp5_ = _error_; #line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_on_generic_error (self, _tmp5_); -#line 3564 "FacebookPublishing.c" +#line 3573 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_on_user_info_extracted (PublishingFacebookFacebookPublisher* self) { - gboolean _tmp0_ = FALSE; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + gboolean _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -3585,7 +3594,7 @@ static void publishing_facebook_facebook_publisher_on_user_info_extracted (Publi if (!_tmp0_) { #line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 3580 "FacebookPublishing.c" +#line 3589 "FacebookPublishing.c" } #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp1_ = self->priv->uid; @@ -3596,22 +3605,22 @@ static void publishing_facebook_facebook_publisher_on_user_info_extracted (Publi "onse: uid = %s; name = %s.", _tmp1_, _tmp2_); #line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_do_fetch_album_descriptions (self); -#line 3590 "FacebookPublishing.c" +#line 3599 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_on_fetch_albums_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message) { - PublishingFacebookGraphMessage* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingFacebookGraphMessage* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingFacebookGraphMessage* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - PublishingFacebookGraphMessage* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; + PublishingFacebookGraphMessage* _tmp0_; + guint _tmp1_; + PublishingFacebookGraphMessage* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingFacebookGraphMessage* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + PublishingFacebookGraphMessage* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -3634,7 +3643,7 @@ static void publishing_facebook_facebook_publisher_on_fetch_albums_completed (Pu if (!_tmp4_) { #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 3628 "FacebookPublishing.c" +#line 3637 "FacebookPublishing.c" } #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp5_ = message; @@ -3657,17 +3666,17 @@ static void publishing_facebook_facebook_publisher_on_fetch_albums_completed (Pu publishing_facebook_facebook_publisher_do_extract_albums_from_json (self, _tmp10_); #line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 (_tmp10_); -#line 3650 "FacebookPublishing.c" +#line 3659 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_on_fetch_albums_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* err) { - PublishingFacebookGraphMessage* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingFacebookGraphMessage* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - GError* _tmp5_ = NULL; + PublishingFacebookGraphMessage* _tmp0_; + guint _tmp1_; + PublishingFacebookGraphMessage* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + GError* _tmp5_; #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -3690,7 +3699,7 @@ static void publishing_facebook_facebook_publisher_on_fetch_albums_error (Publis if (!_tmp4_) { #line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 3683 "FacebookPublishing.c" +#line 3692 "FacebookPublishing.c" } #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_debug ("FacebookPublishing.vala:536: EVENT: album description fetch attempt ge" \ @@ -3699,15 +3708,15 @@ static void publishing_facebook_facebook_publisher_on_fetch_albums_error (Publis _tmp5_ = err; #line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_on_generic_error (self, _tmp5_); -#line 3691 "FacebookPublishing.c" +#line 3700 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_on_albums_extracted (PublishingFacebookFacebookPublisher* self) { - gboolean _tmp0_ = FALSE; - PublishingFacebookPublishingParameters* _tmp1_ = NULL; - PublishingFacebookAlbum** _tmp2_ = NULL; - gint _tmp2__length1 = 0; + gboolean _tmp0_; + PublishingFacebookPublishingParameters* _tmp1_; + PublishingFacebookAlbum** _tmp2_; + gint _tmp2__length1; #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -3716,7 +3725,7 @@ static void publishing_facebook_facebook_publisher_on_albums_extracted (Publishi if (!_tmp0_) { #line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 3708 "FacebookPublishing.c" +#line 3717 "FacebookPublishing.c" } #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp1_ = self->priv->publishing_params; @@ -3729,16 +3738,16 @@ static void publishing_facebook_facebook_publisher_on_albums_extracted (Publishi "rom JSON response", _tmp2__length1); #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_do_show_publishing_options_pane (self); -#line 3720 "FacebookPublishing.c" +#line 3729 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_on_publishing_options_pane_logout (PublishingFacebookFacebookPublisher* self) { - PublishingFacebookPublishingOptionsPane* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingFacebookPublishingOptionsPane* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; + PublishingFacebookPublishingOptionsPane* _tmp0_; + guint _tmp1_; + PublishingFacebookPublishingOptionsPane* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; #line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -3759,33 +3768,33 @@ static void publishing_facebook_facebook_publisher_on_publishing_options_pane_lo if (!_tmp4_) { #line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 3750 "FacebookPublishing.c" +#line 3759 "FacebookPublishing.c" } #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_debug ("FacebookPublishing.vala:558: EVENT: user clicked 'Logout' in publishin" \ "g options pane."); #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_do_logout (self); -#line 3756 "FacebookPublishing.c" +#line 3765 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_on_publishing_options_pane_publish (PublishingFacebookFacebookPublisher* self, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution resolution, gboolean strip_metadata) { - PublishingFacebookPublishingOptionsPane* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingFacebookPublishingOptionsPane* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingFacebookPublishingParameters* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - gboolean _tmp7_ = FALSE; - PublishingFacebookPublishingParameters* _tmp8_ = NULL; - PublishingFacebookResolution _tmp9_ = 0; - PublishingFacebookResolution _tmp10_ = 0; - PublishingFacebookPublishingParameters* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; + PublishingFacebookPublishingOptionsPane* _tmp0_; + guint _tmp1_; + PublishingFacebookPublishingOptionsPane* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingFacebookPublishingParameters* _tmp5_; + gboolean _tmp6_; + gboolean _tmp7_; + PublishingFacebookPublishingParameters* _tmp8_; + PublishingFacebookResolution _tmp9_; + PublishingFacebookResolution _tmp10_; + PublishingFacebookPublishingParameters* _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_; + const gchar* _tmp14_; #line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -3808,7 +3817,7 @@ static void publishing_facebook_facebook_publisher_on_publishing_options_pane_pu if (!_tmp4_) { #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 3798 "FacebookPublishing.c" +#line 3807 "FacebookPublishing.c" } #line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_debug ("FacebookPublishing.vala:571: EVENT: user clicked 'Publish' in publishi" \ @@ -3847,11 +3856,11 @@ static void publishing_facebook_facebook_publisher_on_publishing_options_pane_pu _tmp14_ = target_album; #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp14_ != NULL) { -#line 3836 "FacebookPublishing.c" - PublishingFacebookPublishingParameters* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - PublishingFacebookPublishingParameters* _tmp17_ = NULL; - gint _tmp18_ = 0; +#line 3845 "FacebookPublishing.c" + PublishingFacebookPublishingParameters* _tmp15_; + const gchar* _tmp16_; + PublishingFacebookPublishingParameters* _tmp17_; + gint _tmp18_; #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp15_ = self->priv->publishing_params; #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -3866,11 +3875,11 @@ static void publishing_facebook_facebook_publisher_on_publishing_options_pane_pu if (_tmp18_ != PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM) { #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_do_upload (self); -#line 3855 "FacebookPublishing.c" +#line 3864 "FacebookPublishing.c" } else { - PublishingFacebookPublishingParameters* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; + PublishingFacebookPublishingParameters* _tmp19_; + const gchar* _tmp20_; + gchar* _tmp21_; #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp19_ = self->priv->publishing_params; #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -3883,32 +3892,32 @@ static void publishing_facebook_facebook_publisher_on_publishing_options_pane_pu _tmp19_->new_album_name = _tmp21_; #line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_do_create_new_album (self); -#line 3872 "FacebookPublishing.c" +#line 3881 "FacebookPublishing.c" } } else { #line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_do_upload (self); -#line 3877 "FacebookPublishing.c" +#line 3886 "FacebookPublishing.c" } } static void publishing_facebook_facebook_publisher_on_create_album_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message) { - PublishingFacebookGraphMessage* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingFacebookGraphMessage* _tmp2_ = NULL; - guint _tmp3_ = 0U; - PublishingFacebookPublishingParameters* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - PublishingFacebookGraphMessage* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - PublishingFacebookPublishingParameters* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - PublishingFacebookGraphMessage* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; + PublishingFacebookGraphMessage* _tmp0_; + guint _tmp1_; + PublishingFacebookGraphMessage* _tmp2_; + guint _tmp3_; + PublishingFacebookPublishingParameters* _tmp4_; + const gchar* _tmp5_; + gboolean _tmp6_; + PublishingFacebookGraphMessage* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + PublishingFacebookPublishingParameters* _tmp10_; + const gchar* _tmp11_; + PublishingFacebookGraphMessage* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -3937,7 +3946,7 @@ static void publishing_facebook_facebook_publisher_on_create_album_completed (Pu if (!_tmp6_) { #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 3926 "FacebookPublishing.c" +#line 3935 "FacebookPublishing.c" } #line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp7_ = message; @@ -3964,17 +3973,17 @@ static void publishing_facebook_facebook_publisher_on_create_album_completed (Pu publishing_facebook_facebook_publisher_do_add_new_local_album_from_json (self, _tmp11_, _tmp14_); #line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 (_tmp14_); -#line 3952 "FacebookPublishing.c" +#line 3961 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_on_create_album_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* err) { - PublishingFacebookGraphMessage* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingFacebookGraphMessage* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - GError* _tmp5_ = NULL; + PublishingFacebookGraphMessage* _tmp0_; + guint _tmp1_; + PublishingFacebookGraphMessage* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + GError* _tmp5_; #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -3997,7 +4006,7 @@ static void publishing_facebook_facebook_publisher_on_create_album_error (Publis if (!_tmp4_) { #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 3985 "FacebookPublishing.c" +#line 3994 "FacebookPublishing.c" } #line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_debug ("FacebookPublishing.vala:618: EVENT: attempt to create new album genera" \ @@ -4006,19 +4015,19 @@ static void publishing_facebook_facebook_publisher_on_create_album_error (Publis _tmp5_ = err; #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_on_generic_error (self, _tmp5_); -#line 3993 "FacebookPublishing.c" +#line 4002 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_on_upload_status_updated (PublishingFacebookFacebookPublisher* self, gint file_number, gdouble completed_fraction) { - gboolean _tmp0_ = FALSE; - gdouble _tmp1_ = 0.0; - SpitPublishingProgressCallback _tmp2_ = NULL; - void* _tmp2__target = NULL; - SpitPublishingProgressCallback _tmp3_ = NULL; - void* _tmp3__target = NULL; - gint _tmp4_ = 0; - gdouble _tmp5_ = 0.0; + gboolean _tmp0_; + gdouble _tmp1_; + SpitPublishingProgressCallback _tmp2_; + void* _tmp2__target; + SpitPublishingProgressCallback _tmp3_; + void* _tmp3__target; + gint _tmp4_; + gdouble _tmp5_; #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -4027,7 +4036,7 @@ static void publishing_facebook_facebook_publisher_on_upload_status_updated (Pub if (!_tmp0_) { #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 4014 "FacebookPublishing.c" +#line 4023 "FacebookPublishing.c" } #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp1_ = completed_fraction; @@ -4050,17 +4059,17 @@ static void publishing_facebook_facebook_publisher_on_upload_status_updated (Pub _tmp5_ = completed_fraction; #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp3_ (_tmp4_, _tmp5_, _tmp3__target); -#line 4036 "FacebookPublishing.c" +#line 4045 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_on_upload_complete (PublishingFacebookFacebookPublisher* self, PublishingFacebookUploader* uploader, gint num_published) { - PublishingFacebookUploader* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingFacebookUploader* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - gint _tmp5_ = 0; + PublishingFacebookUploader* _tmp0_; + guint _tmp1_; + PublishingFacebookUploader* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + gint _tmp5_; #line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -4083,7 +4092,7 @@ static void publishing_facebook_facebook_publisher_on_upload_complete (Publishin if (!_tmp4_) { #line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 4069 "FacebookPublishing.c" +#line 4078 "FacebookPublishing.c" } #line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp5_ = num_published; @@ -4092,20 +4101,20 @@ static void publishing_facebook_facebook_publisher_on_upload_complete (Publishin "%d items published.", _tmp5_); #line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_do_show_success_pane (self); -#line 4077 "FacebookPublishing.c" +#line 4086 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_on_upload_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookUploader* uploader, GError* err) { - PublishingFacebookUploader* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingFacebookUploader* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - GError* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - SpitPublishingPluginHost* _tmp7_ = NULL; - GError* _tmp8_ = NULL; + PublishingFacebookUploader* _tmp0_; + guint _tmp1_; + PublishingFacebookUploader* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + GError* _tmp5_; + const gchar* _tmp6_; + SpitPublishingPluginHost* _tmp7_; + GError* _tmp8_; #line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self)); #line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -4128,7 +4137,7 @@ static void publishing_facebook_facebook_publisher_on_upload_error (PublishingFa if (!_tmp4_) { #line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 4113 "FacebookPublishing.c" +#line 4122 "FacebookPublishing.c" } #line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp5_ = err; @@ -4143,15 +4152,15 @@ static void publishing_facebook_facebook_publisher_on_upload_error (PublishingFa _tmp8_ = err; #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_); -#line 4127 "FacebookPublishing.c" +#line 4136 "FacebookPublishing.c" } static SpitPublishingService* publishing_facebook_facebook_publisher_real_get_service (SpitPublishingPublisher* base) { PublishingFacebookFacebookPublisher * self; SpitPublishingService* result = NULL; - SpitPublishingService* _tmp0_ = NULL; - SpitPublishingService* _tmp1_ = NULL; + SpitPublishingService* _tmp0_; + SpitPublishingService* _tmp1_; #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisher); #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -4162,13 +4171,13 @@ static SpitPublishingService* publishing_facebook_facebook_publisher_real_get_se result = _tmp1_; #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 4146 "FacebookPublishing.c" +#line 4155 "FacebookPublishing.c" } gchar* publishing_facebook_facebook_publisher_get_service_name (PublishingFacebookFacebookPublisher* self) { gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), NULL); #line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -4177,13 +4186,13 @@ gchar* publishing_facebook_facebook_publisher_get_service_name (PublishingFacebo result = _tmp0_; #line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 4161 "FacebookPublishing.c" +#line 4170 "FacebookPublishing.c" } gchar* publishing_facebook_facebook_publisher_get_user_visible_name (PublishingFacebookFacebookPublisher* self) { gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), NULL); #line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -4192,31 +4201,31 @@ gchar* publishing_facebook_facebook_publisher_get_user_visible_name (PublishingF result = _tmp0_; #line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 4176 "FacebookPublishing.c" +#line 4185 "FacebookPublishing.c" } static void _publishing_facebook_facebook_publisher_on_authenticator_succeeded_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self) { #line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_on_authenticator_succeeded ((PublishingFacebookFacebookPublisher*) self); -#line 4183 "FacebookPublishing.c" +#line 4192 "FacebookPublishing.c" } static void _publishing_facebook_facebook_publisher_on_authenticator_failed_spit_publishing_authenticator_authentication_failed (SpitPublishingAuthenticator* _sender, gpointer self) { #line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_on_authenticator_failed ((PublishingFacebookFacebookPublisher*) self); -#line 4190 "FacebookPublishing.c" +#line 4199 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_real_start (SpitPublishingPublisher* base) { PublishingFacebookFacebookPublisher * self; - gboolean _tmp0_ = FALSE; - PublishingFacebookPublishingParameters* _tmp1_ = NULL; - SpitPublishingAuthenticator* _tmp2_ = NULL; - SpitPublishingAuthenticator* _tmp3_ = NULL; - SpitPublishingAuthenticator* _tmp4_ = NULL; + gboolean _tmp0_; + PublishingFacebookPublishingParameters* _tmp1_; + SpitPublishingAuthenticator* _tmp2_; + SpitPublishingAuthenticator* _tmp3_; + SpitPublishingAuthenticator* _tmp4_; #line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisher); #line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -4225,7 +4234,7 @@ static void publishing_facebook_facebook_publisher_real_start (SpitPublishingPub if (_tmp0_) { #line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 4209 "FacebookPublishing.c" +#line 4218 "FacebookPublishing.c" } #line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_debug ("FacebookPublishing.vala:674: FacebookPublisher: starting interaction."); @@ -4249,13 +4258,13 @@ static void publishing_facebook_facebook_publisher_real_start (SpitPublishingPub _tmp4_ = self->priv->authenticator; #line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" spit_publishing_authenticator_authenticate (_tmp4_); -#line 4233 "FacebookPublishing.c" +#line 4242 "FacebookPublishing.c" } static void publishing_facebook_facebook_publisher_real_stop (SpitPublishingPublisher* base) { PublishingFacebookFacebookPublisher * self; - PublishingFacebookGraphSession* _tmp0_ = NULL; + PublishingFacebookGraphSession* _tmp0_; #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisher); #line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -4264,26 +4273,26 @@ static void publishing_facebook_facebook_publisher_real_stop (SpitPublishingPubl _tmp0_ = self->priv->graph_session; #line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp0_ != NULL) { -#line 4248 "FacebookPublishing.c" - PublishingFacebookGraphSession* _tmp1_ = NULL; +#line 4257 "FacebookPublishing.c" + PublishingFacebookGraphSession* _tmp1_; #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp1_ = self->priv->graph_session; #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_graph_session_stop_transactions (_tmp1_); -#line 4254 "FacebookPublishing.c" +#line 4263 "FacebookPublishing.c" } #line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self->priv->host = NULL; #line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self->priv->running = FALSE; -#line 4260 "FacebookPublishing.c" +#line 4269 "FacebookPublishing.c" } static gboolean publishing_facebook_facebook_publisher_real_is_running (SpitPublishingPublisher* base) { PublishingFacebookFacebookPublisher * self; gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisher); #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -4292,7 +4301,7 @@ static gboolean publishing_facebook_facebook_publisher_real_is_running (SpitPubl result = _tmp0_; #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 4276 "FacebookPublishing.c" +#line 4285 "FacebookPublishing.c" } @@ -4303,7 +4312,7 @@ static void publishing_facebook_facebook_publisher_class_init (PublishingFaceboo g_type_class_add_private (klass, sizeof (PublishingFacebookFacebookPublisherPrivate)); #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_facebook_facebook_publisher_finalize; -#line 4287 "FacebookPublishing.c" +#line 4296 "FacebookPublishing.c" } @@ -4311,14 +4320,14 @@ static void publishing_facebook_facebook_publisher_spit_publishing_publisher_int #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface); #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_facebook_facebook_publisher_real_get_service; + iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_facebook_facebook_publisher_real_get_service; #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - iface->start = (void (*)(SpitPublishingPublisher*)) publishing_facebook_facebook_publisher_real_start; + iface->start = (void (*) (SpitPublishingPublisher *)) publishing_facebook_facebook_publisher_real_start; #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_facebook_facebook_publisher_real_stop; + iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_facebook_facebook_publisher_real_stop; #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_facebook_facebook_publisher_real_is_running; -#line 4302 "FacebookPublishing.c" + iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_facebook_facebook_publisher_real_is_running; +#line 4311 "FacebookPublishing.c" } @@ -4329,6 +4338,10 @@ static void publishing_facebook_facebook_publisher_instance_init (PublishingFace self->priv->host = NULL; #line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self->priv->progress_reporter = NULL; +#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" + self->priv->progress_reporter_target = self; +#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" + self->priv->progress_reporter_target_destroy_notify = NULL; #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self->priv->service = NULL; #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -4343,11 +4356,11 @@ static void publishing_facebook_facebook_publisher_instance_init (PublishingFace self->priv->uid = NULL; #line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self->priv->username = NULL; -#line 4327 "FacebookPublishing.c" +#line 4340 "FacebookPublishing.c" } -static void publishing_facebook_facebook_publisher_finalize (GObject* obj) { +static void publishing_facebook_facebook_publisher_finalize (GObject * obj) { PublishingFacebookFacebookPublisher * self; #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisher); @@ -4375,7 +4388,7 @@ static void publishing_facebook_facebook_publisher_finalize (GObject* obj) { _g_free0 (self->priv->username); #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" G_OBJECT_CLASS (publishing_facebook_facebook_publisher_parent_class)->finalize (obj); -#line 4359 "FacebookPublishing.c" +#line 4372 "FacebookPublishing.c" } @@ -4400,132 +4413,132 @@ static PublishingFacebookAlbum** _vala_array_dup2 (PublishingFacebookAlbum** sel result = g_new0 (PublishingFacebookAlbum*, length + 1); #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" for (i = 0; i < length; i++) { -#line 4384 "FacebookPublishing.c" - PublishingFacebookAlbum* _tmp0_ = NULL; +#line 4397 "FacebookPublishing.c" + PublishingFacebookAlbum* _tmp0_; #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp0_ = _publishing_facebook_album_ref0 (self[i]); #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" result[i] = _tmp0_; -#line 4390 "FacebookPublishing.c" +#line 4403 "FacebookPublishing.c" } #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 4394 "FacebookPublishing.c" +#line 4407 "FacebookPublishing.c" } static void _publishing_facebook_publishing_options_pane_on_create_new_toggled_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_publishing_options_pane_on_create_new_toggled ((PublishingFacebookPublishingOptionsPane*) self); -#line 4401 "FacebookPublishing.c" +#line 4414 "FacebookPublishing.c" } static void _publishing_facebook_publishing_options_pane_on_use_existing_toggled_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_publishing_options_pane_on_use_existing_toggled ((PublishingFacebookPublishingOptionsPane*) self); -#line 4408 "FacebookPublishing.c" +#line 4421 "FacebookPublishing.c" } static void _publishing_facebook_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_publishing_options_pane_on_publish_button_clicked ((PublishingFacebookPublishingOptionsPane*) self); -#line 4415 "FacebookPublishing.c" +#line 4428 "FacebookPublishing.c" } static void _publishing_facebook_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_publishing_options_pane_on_logout_button_clicked ((PublishingFacebookPublishingOptionsPane*) self); -#line 4422 "FacebookPublishing.c" +#line 4435 "FacebookPublishing.c" } static void _publishing_facebook_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_publishing_options_pane_on_size_changed ((PublishingFacebookPublishingOptionsPane*) self); -#line 4429 "FacebookPublishing.c" +#line 4442 "FacebookPublishing.c" } PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_pane_construct (GType object_type, const gchar* username, PublishingFacebookAlbum** albums, int albums_length1, SpitPublishingPublisherMediaType media_type, PublishingFacebookFacebookPublisher* publisher, GtkBuilder* builder, gboolean strip_metadata, gboolean can_logout) { PublishingFacebookPublishingOptionsPane * self = NULL; - GtkBuilder* _tmp0_ = NULL; - GtkBuilder* _tmp1_ = NULL; - GtkBuilder* _tmp2_ = NULL; - GtkBuilder* _tmp3_ = NULL; - GSList* _tmp4_ = NULL; - GSList* _tmp5_ = NULL; - guint _tmp6_ = 0U; - PublishingFacebookAlbum** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - PublishingFacebookAlbum** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - gint _tmp9_ = 0; - PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp10_ = NULL; - gint _tmp11_ = 0; - PublishingFacebookResolution* _tmp12_ = NULL; - PublishingFacebookFacebookPublisher* _tmp13_ = NULL; - PublishingFacebookFacebookPublisher* _tmp14_ = NULL; - SpitPublishingPublisherMediaType _tmp15_ = 0; - GtkBuilder* _tmp16_ = NULL; - GObject* _tmp17_ = NULL; - GtkBox* _tmp18_ = NULL; - GtkBox* _tmp19_ = NULL; - GtkBuilder* _tmp20_ = NULL; - GObject* _tmp21_ = NULL; - GtkRadioButton* _tmp22_ = NULL; - GtkBuilder* _tmp23_ = NULL; - GObject* _tmp24_ = NULL; - GtkRadioButton* _tmp25_ = NULL; - GtkBuilder* _tmp26_ = NULL; - GObject* _tmp27_ = NULL; - GtkComboBoxText* _tmp28_ = NULL; - GtkBuilder* _tmp29_ = NULL; - GObject* _tmp30_ = NULL; - GtkComboBoxText* _tmp31_ = NULL; - GtkBuilder* _tmp32_ = NULL; - GObject* _tmp33_ = NULL; - GtkButton* _tmp34_ = NULL; - GtkBuilder* _tmp35_ = NULL; - GObject* _tmp36_ = NULL; - GtkButton* _tmp37_ = NULL; - gboolean _tmp38_ = FALSE; - GtkBuilder* _tmp43_ = NULL; - GObject* _tmp44_ = NULL; - GtkEntry* _tmp45_ = NULL; - GtkBuilder* _tmp46_ = NULL; - GObject* _tmp47_ = NULL; - GtkComboBoxText* _tmp48_ = NULL; - GtkBuilder* _tmp49_ = NULL; - GObject* _tmp50_ = NULL; - GtkLabel* _tmp51_ = NULL; - GtkBuilder* _tmp52_ = NULL; - GObject* _tmp53_ = NULL; - GtkCheckButton* _tmp54_ = NULL; - GtkRadioButton* _tmp55_ = NULL; - GtkRadioButton* _tmp56_ = NULL; + GtkBuilder* _tmp0_; + GtkBuilder* _tmp1_; + GtkBuilder* _tmp2_; + GtkBuilder* _tmp3_; + GSList* _tmp4_; + GSList* _tmp5_; + guint _tmp6_; + PublishingFacebookAlbum** _tmp7_; + gint _tmp7__length1; + PublishingFacebookAlbum** _tmp8_; + gint _tmp8__length1; + gint _tmp9_; + PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp10_; + gint _tmp11_; + PublishingFacebookResolution* _tmp12_; + PublishingFacebookFacebookPublisher* _tmp13_; + PublishingFacebookFacebookPublisher* _tmp14_; + SpitPublishingPublisherMediaType _tmp15_; + GtkBuilder* _tmp16_; + GObject* _tmp17_; + GtkBox* _tmp18_; + GtkBox* _tmp19_; + GtkBuilder* _tmp20_; + GObject* _tmp21_; + GtkRadioButton* _tmp22_; + GtkBuilder* _tmp23_; + GObject* _tmp24_; + GtkRadioButton* _tmp25_; + GtkBuilder* _tmp26_; + GObject* _tmp27_; + GtkComboBoxText* _tmp28_; + GtkBuilder* _tmp29_; + GObject* _tmp30_; + GtkComboBoxText* _tmp31_; + GtkBuilder* _tmp32_; + GObject* _tmp33_; + GtkButton* _tmp34_; + GtkBuilder* _tmp35_; + GObject* _tmp36_; + GtkButton* _tmp37_; + gboolean _tmp38_; + GtkBuilder* _tmp43_; + GObject* _tmp44_; + GtkEntry* _tmp45_; + GtkBuilder* _tmp46_; + GObject* _tmp47_; + GtkComboBoxText* _tmp48_; + GtkBuilder* _tmp49_; + GObject* _tmp50_; + GtkLabel* _tmp51_; + GtkBuilder* _tmp52_; + GObject* _tmp53_; + GtkCheckButton* _tmp54_; + GtkRadioButton* _tmp55_; + GtkRadioButton* _tmp56_; gchar* label_text = NULL; - const gchar* _tmp57_ = NULL; - gchar* _tmp58_ = NULL; - SpitPublishingPublisherMediaType _tmp59_ = 0; - GtkLabel* _tmp62_ = NULL; - const gchar* _tmp63_ = NULL; - GtkCheckButton* _tmp64_ = NULL; - gboolean _tmp65_ = FALSE; - GtkComboBoxText* _tmp66_ = NULL; - GtkButton* _tmp67_ = NULL; - GtkButton* _tmp68_ = NULL; - GtkComboBoxText* _tmp69_ = NULL; - PublishingFacebookFacebookPublisher* _tmp70_ = NULL; - gint _tmp71_ = 0; - GtkComboBoxText* _tmp72_ = NULL; + const gchar* _tmp57_; + gchar* _tmp58_; + SpitPublishingPublisherMediaType _tmp59_; + GtkLabel* _tmp62_; + const gchar* _tmp63_; + GtkCheckButton* _tmp64_; + gboolean _tmp65_; + GtkComboBoxText* _tmp66_; + GtkButton* _tmp67_; + GtkButton* _tmp68_; + GtkComboBoxText* _tmp69_; + PublishingFacebookFacebookPublisher* _tmp70_; + gint _tmp71_; + GtkComboBoxText* _tmp72_; gboolean _tmp73_ = FALSE; gboolean _tmp74_ = FALSE; - GtkRadioButton* _tmp75_ = NULL; - GtkComboBoxText* _tmp80_ = NULL; - SpitPublishingPublisherMediaType _tmp81_ = 0; + GtkRadioButton* _tmp75_; + GtkComboBoxText* _tmp80_; + SpitPublishingPublisherMediaType _tmp81_; #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (username != NULL, NULL); #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -4684,11 +4697,11 @@ PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_ _tmp38_ = can_logout; #line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (!_tmp38_) { -#line 4668 "FacebookPublishing.c" - GtkButton* _tmp39_ = NULL; - GtkContainer* _tmp40_ = NULL; - GtkContainer* _tmp41_ = NULL; - GtkButton* _tmp42_ = NULL; +#line 4681 "FacebookPublishing.c" + GtkButton* _tmp39_; + GtkContainer* _tmp40_; + GtkContainer* _tmp41_; + GtkButton* _tmp42_; #line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp39_ = self->priv->logout_button; #line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -4699,7 +4712,7 @@ PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_ _tmp42_ = self->priv->logout_button; #line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" gtk_container_remove (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget)); -#line 4683 "FacebookPublishing.c" +#line 4696 "FacebookPublishing.c" } #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp43_ = self->priv->builder; @@ -4759,9 +4772,9 @@ PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_ _tmp59_ = media_type; #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if ((_tmp59_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) { -#line 4743 "FacebookPublishing.c" - const gchar* _tmp60_ = NULL; - gchar* _tmp61_ = NULL; +#line 4756 "FacebookPublishing.c" + const gchar* _tmp60_; + gchar* _tmp61_; #line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp60_ = label_text; #line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -4770,7 +4783,7 @@ PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_ _g_free0 (label_text); #line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" label_text = _tmp61_; -#line 4754 "FacebookPublishing.c" +#line 4767 "FacebookPublishing.c" } #line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp62_ = self->priv->how_to_label; @@ -4816,10 +4829,10 @@ PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_ _tmp75_ = self->priv->create_new_radio; #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp75_ != NULL) { -#line 4800 "FacebookPublishing.c" - GtkRadioButton* _tmp76_ = NULL; - gboolean _tmp77_ = FALSE; - gboolean _tmp78_ = FALSE; +#line 4813 "FacebookPublishing.c" + GtkRadioButton* _tmp76_; + gboolean _tmp77_; + gboolean _tmp78_; #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp76_ = self->priv->create_new_radio; #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -4828,24 +4841,24 @@ PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_ _tmp78_ = _tmp77_; #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp74_ = _tmp78_; -#line 4812 "FacebookPublishing.c" +#line 4825 "FacebookPublishing.c" } else { #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp74_ = FALSE; -#line 4816 "FacebookPublishing.c" +#line 4829 "FacebookPublishing.c" } #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp74_) { #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp73_ = TRUE; -#line 4822 "FacebookPublishing.c" +#line 4835 "FacebookPublishing.c" } else { - SpitPublishingPublisherMediaType _tmp79_ = 0; + SpitPublishingPublisherMediaType _tmp79_; #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp79_ = media_type; #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp73_ = (_tmp79_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0; -#line 4829 "FacebookPublishing.c" +#line 4842 "FacebookPublishing.c" } #line 799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp80_ = self->priv->visibility_combo; @@ -4855,14 +4868,14 @@ PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_ _tmp81_ = media_type; #line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp81_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { -#line 4839 "FacebookPublishing.c" - GtkCheckButton* _tmp82_ = NULL; - GtkCheckButton* _tmp83_ = NULL; - GtkComboBoxText* _tmp84_ = NULL; - GtkRadioButton* _tmp85_ = NULL; - GtkRadioButton* _tmp86_ = NULL; - GtkComboBoxText* _tmp87_ = NULL; - GtkEntry* _tmp88_ = NULL; +#line 4852 "FacebookPublishing.c" + GtkCheckButton* _tmp82_; + GtkCheckButton* _tmp83_; + GtkComboBoxText* _tmp84_; + GtkRadioButton* _tmp85_; + GtkRadioButton* _tmp86_; + GtkComboBoxText* _tmp87_; + GtkEntry* _tmp88_; #line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp82_ = self->priv->strip_metadata_check; #line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -4891,26 +4904,26 @@ PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_ _tmp88_ = self->priv->new_album_entry; #line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 4875 "FacebookPublishing.c" +#line 4888 "FacebookPublishing.c" } #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 (label_text); #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self; -#line 4881 "FacebookPublishing.c" +#line 4894 "FacebookPublishing.c" } PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_pane_new (const gchar* username, PublishingFacebookAlbum** albums, int albums_length1, SpitPublishingPublisherMediaType media_type, PublishingFacebookFacebookPublisher* publisher, GtkBuilder* builder, gboolean strip_metadata, gboolean can_logout) { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return publishing_facebook_publishing_options_pane_construct (PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, username, albums, albums_length1, media_type, publisher, builder, strip_metadata, can_logout); -#line 4888 "FacebookPublishing.c" +#line 4901 "FacebookPublishing.c" } static gboolean publishing_facebook_publishing_options_pane_publishing_photos (PublishingFacebookPublishingOptionsPane* self) { gboolean result = FALSE; - SpitPublishingPublisherMediaType _tmp0_ = 0; + SpitPublishingPublisherMediaType _tmp0_; #line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self), FALSE); #line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -4919,27 +4932,27 @@ static gboolean publishing_facebook_publishing_options_pane_publishing_photos (P result = (_tmp0_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0; #line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 4903 "FacebookPublishing.c" +#line 4916 "FacebookPublishing.c" } static gpointer _publishing_facebook_publishing_options_pane_privacy_description_ref0 (gpointer self) { #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self ? publishing_facebook_publishing_options_pane_privacy_description_ref (self) : NULL; -#line 4910 "FacebookPublishing.c" +#line 4923 "FacebookPublishing.c" } static void publishing_facebook_publishing_options_pane_setup_visibility_combo (PublishingFacebookPublishingOptionsPane* self) { - PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp0_; + gint _tmp0__length1; #line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self)); #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp0_ = self->priv->privacy_descriptions; #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp0__length1 = self->priv->privacy_descriptions_length1; -#line 4923 "FacebookPublishing.c" +#line 4936 "FacebookPublishing.c" { PublishingFacebookPublishingOptionsPanePrivacyDescription** p_collection = NULL; gint p_collection_length1 = 0; @@ -4951,18 +4964,18 @@ static void publishing_facebook_publishing_options_pane_setup_visibility_combo ( p_collection_length1 = _tmp0__length1; #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" for (p_it = 0; p_it < _tmp0__length1; p_it = p_it + 1) { -#line 4935 "FacebookPublishing.c" - PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp1_ = NULL; +#line 4948 "FacebookPublishing.c" + PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp1_; PublishingFacebookPublishingOptionsPanePrivacyDescription* p = NULL; #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp1_ = _publishing_facebook_publishing_options_pane_privacy_description_ref0 (p_collection[p_it]); #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" p = _tmp1_; -#line 4942 "FacebookPublishing.c" +#line 4955 "FacebookPublishing.c" { - GtkComboBoxText* _tmp2_ = NULL; - PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; + GtkComboBoxText* _tmp2_; + PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp3_; + const gchar* _tmp4_; #line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp2_ = self->priv->visibility_combo; #line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -4973,7 +4986,7 @@ static void publishing_facebook_publishing_options_pane_setup_visibility_combo ( gtk_combo_box_text_append_text (_tmp2_, _tmp4_); #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _publishing_facebook_publishing_options_pane_privacy_description_unref0 (p); -#line 4957 "FacebookPublishing.c" +#line 4970 "FacebookPublishing.c" } } } @@ -4981,15 +4994,15 @@ static void publishing_facebook_publishing_options_pane_setup_visibility_combo ( static void publishing_facebook_publishing_options_pane_setup_resolution_combo (PublishingFacebookPublishingOptionsPane* self) { - PublishingFacebookResolution* _tmp0_ = NULL; - gint _tmp0__length1 = 0; + PublishingFacebookResolution* _tmp0_; + gint _tmp0__length1; #line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self)); #line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp0_ = self->priv->possible_resolutions; #line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp0__length1 = self->priv->possible_resolutions_length1; -#line 4973 "FacebookPublishing.c" +#line 4986 "FacebookPublishing.c" { PublishingFacebookResolution* res_collection = NULL; gint res_collection_length1 = 0; @@ -5001,16 +5014,16 @@ static void publishing_facebook_publishing_options_pane_setup_resolution_combo ( res_collection_length1 = _tmp0__length1; #line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" for (res_it = 0; res_it < _tmp0__length1; res_it = res_it + 1) { -#line 4985 "FacebookPublishing.c" +#line 4998 "FacebookPublishing.c" PublishingFacebookResolution res = 0; #line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" res = res_collection[res_it]; -#line 4989 "FacebookPublishing.c" +#line 5002 "FacebookPublishing.c" { - GtkComboBoxText* _tmp1_ = NULL; - PublishingFacebookResolution _tmp2_ = 0; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + GtkComboBoxText* _tmp1_; + PublishingFacebookResolution _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp1_ = self->priv->resolution_combo; #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5023,7 +5036,7 @@ static void publishing_facebook_publishing_options_pane_setup_resolution_combo ( gtk_combo_box_text_append_text (_tmp1_, _tmp4_); #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 (_tmp4_); -#line 5007 "FacebookPublishing.c" +#line 5020 "FacebookPublishing.c" } } } @@ -5031,9 +5044,9 @@ static void publishing_facebook_publishing_options_pane_setup_resolution_combo ( static void publishing_facebook_publishing_options_pane_on_use_existing_toggled (PublishingFacebookPublishingOptionsPane* self) { - GtkRadioButton* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; + GtkRadioButton* _tmp0_; + gboolean _tmp1_; + gboolean _tmp2_; #line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self)); #line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5044,12 +5057,12 @@ static void publishing_facebook_publishing_options_pane_on_use_existing_toggled _tmp2_ = _tmp1_; #line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp2_) { -#line 5028 "FacebookPublishing.c" - GtkComboBoxText* _tmp3_ = NULL; - GtkEntry* _tmp4_ = NULL; - GtkComboBoxText* _tmp5_ = NULL; - SpitPublishingPublisherMediaType _tmp6_ = 0; - GtkComboBoxText* _tmp7_ = NULL; +#line 5041 "FacebookPublishing.c" + GtkComboBoxText* _tmp3_; + GtkEntry* _tmp4_; + GtkComboBoxText* _tmp5_; + SpitPublishingPublisherMediaType _tmp6_; + GtkComboBoxText* _tmp7_; #line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp3_ = self->priv->existing_albums_combo; #line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5068,15 +5081,15 @@ static void publishing_facebook_publishing_options_pane_on_use_existing_toggled _tmp7_ = self->priv->existing_albums_combo; #line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget)); -#line 5052 "FacebookPublishing.c" +#line 5065 "FacebookPublishing.c" } } static void publishing_facebook_publishing_options_pane_on_create_new_toggled (PublishingFacebookPublishingOptionsPane* self) { - GtkRadioButton* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; + GtkRadioButton* _tmp0_; + gboolean _tmp1_; + gboolean _tmp2_; #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self)); #line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5087,11 +5100,11 @@ static void publishing_facebook_publishing_options_pane_on_create_new_toggled (P _tmp2_ = _tmp1_; #line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp2_) { -#line 5071 "FacebookPublishing.c" - GtkComboBoxText* _tmp3_ = NULL; - GtkEntry* _tmp4_ = NULL; - GtkEntry* _tmp5_ = NULL; - GtkComboBoxText* _tmp6_ = NULL; +#line 5084 "FacebookPublishing.c" + GtkComboBoxText* _tmp3_; + GtkEntry* _tmp4_; + GtkEntry* _tmp5_; + GtkComboBoxText* _tmp6_; #line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp3_ = self->priv->existing_albums_combo; #line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5108,15 +5121,15 @@ static void publishing_facebook_publishing_options_pane_on_create_new_toggled (P _tmp6_ = self->priv->visibility_combo; #line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 5092 "FacebookPublishing.c" +#line 5105 "FacebookPublishing.c" } } static void publishing_facebook_publishing_options_pane_on_size_changed (PublishingFacebookPublishingOptionsPane* self) { - PublishingFacebookFacebookPublisher* _tmp0_ = NULL; - GtkComboBoxText* _tmp1_ = NULL; - gint _tmp2_ = 0; + PublishingFacebookFacebookPublisher* _tmp0_; + GtkComboBoxText* _tmp1_; + gint _tmp2_; #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self)); #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5127,7 +5140,7 @@ static void publishing_facebook_publishing_options_pane_on_size_changed (Publish _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_facebook_publisher_set_persistent_default_size (_tmp0_, _tmp2_); -#line 5111 "FacebookPublishing.c" +#line 5124 "FacebookPublishing.c" } @@ -5135,28 +5148,28 @@ static void publishing_facebook_publishing_options_pane_on_logout_button_clicked #line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self)); #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - g_signal_emit_by_name (self, "logout"); -#line 5120 "FacebookPublishing.c" + g_signal_emit (self, publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0); +#line 5133 "FacebookPublishing.c" } static void publishing_facebook_publishing_options_pane_on_publish_button_clicked (PublishingFacebookPublishingOptionsPane* self) { gchar* album_name = NULL; gchar* privacy_setting = NULL; - PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - GtkComboBoxText* _tmp1_ = NULL; - gint _tmp2_ = 0; - PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp0_; + gint _tmp0__length1; + GtkComboBoxText* _tmp1_; + gint _tmp2_; + PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; PublishingFacebookResolution resolution_setting = 0; - gboolean _tmp6_ = FALSE; - const gchar* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - PublishingFacebookResolution _tmp21_ = 0; - GtkCheckButton* _tmp22_ = NULL; - gboolean _tmp23_ = FALSE; + gboolean _tmp6_; + const gchar* _tmp19_; + const gchar* _tmp20_; + PublishingFacebookResolution _tmp21_; + GtkCheckButton* _tmp22_; + gboolean _tmp23_; #line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self)); #line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5179,15 +5192,15 @@ static void publishing_facebook_publishing_options_pane_on_publish_button_clicke _tmp6_ = publishing_facebook_publishing_options_pane_publishing_photos (self); #line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp6_) { -#line 5163 "FacebookPublishing.c" - PublishingFacebookResolution* _tmp7_ = NULL; - gint _tmp7__length1 = 0; - GtkComboBoxText* _tmp8_ = NULL; - gint _tmp9_ = 0; - PublishingFacebookResolution _tmp10_ = 0; - GtkRadioButton* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - gboolean _tmp13_ = FALSE; +#line 5176 "FacebookPublishing.c" + PublishingFacebookResolution* _tmp7_; + gint _tmp7__length1; + GtkComboBoxText* _tmp8_; + gint _tmp9_; + PublishingFacebookResolution _tmp10_; + GtkRadioButton* _tmp11_; + gboolean _tmp12_; + gboolean _tmp13_; #line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp7_ = self->priv->possible_resolutions; #line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5208,9 +5221,9 @@ static void publishing_facebook_publishing_options_pane_on_publish_button_clicke _tmp13_ = _tmp12_; #line 871 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp13_) { -#line 5192 "FacebookPublishing.c" - GtkComboBoxText* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; +#line 5205 "FacebookPublishing.c" + GtkComboBoxText* _tmp14_; + gchar* _tmp15_; #line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp14_ = self->priv->existing_albums_combo; #line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5219,11 +5232,11 @@ static void publishing_facebook_publishing_options_pane_on_publish_button_clicke _g_free0 (album_name); #line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" album_name = _tmp15_; -#line 5203 "FacebookPublishing.c" +#line 5216 "FacebookPublishing.c" } else { - GtkEntry* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; + GtkEntry* _tmp16_; + const gchar* _tmp17_; + gchar* _tmp18_; #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp16_ = self->priv->new_album_entry; #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5234,7 +5247,7 @@ static void publishing_facebook_publishing_options_pane_on_publish_button_clicke _g_free0 (album_name); #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" album_name = _tmp18_; -#line 5218 "FacebookPublishing.c" +#line 5231 "FacebookPublishing.c" } } else { #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5243,7 +5256,7 @@ static void publishing_facebook_publishing_options_pane_on_publish_button_clicke _g_free0 (album_name); #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" album_name = NULL; -#line 5227 "FacebookPublishing.c" +#line 5240 "FacebookPublishing.c" } #line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp19_ = album_name; @@ -5256,86 +5269,83 @@ static void publishing_facebook_publishing_options_pane_on_publish_button_clicke #line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp23_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - g_signal_emit_by_name (self, "publish", _tmp19_, _tmp20_, _tmp21_, _tmp23_); + g_signal_emit (self, publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp19_, _tmp20_, _tmp21_, _tmp23_); #line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 (privacy_setting); #line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 (album_name); -#line 5245 "FacebookPublishing.c" +#line 5258 "FacebookPublishing.c" } -static void _vala_array_add7 (PublishingFacebookPublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) { +static void _vala_array_add7 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) { #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if ((*length) == (*size)) { #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *array = g_renew (PublishingFacebookPublishingOptionsPanePrivacyDescription*, *array, (*size) + 1); -#line 5256 "FacebookPublishing.c" +#line 5269 "FacebookPublishing.c" } #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" (*array)[(*length)++] = value; #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" (*array)[*length] = NULL; -#line 5262 "FacebookPublishing.c" +#line 5275 "FacebookPublishing.c" } -static void _vala_array_add8 (PublishingFacebookPublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) { +static void _vala_array_add8 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) { #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if ((*length) == (*size)) { #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *array = g_renew (PublishingFacebookPublishingOptionsPanePrivacyDescription*, *array, (*size) + 1); -#line 5273 "FacebookPublishing.c" +#line 5286 "FacebookPublishing.c" } #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" (*array)[(*length)++] = value; #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" (*array)[*length] = NULL; -#line 5279 "FacebookPublishing.c" +#line 5292 "FacebookPublishing.c" } -static void _vala_array_add9 (PublishingFacebookPublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) { +static void _vala_array_add9 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) { #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if ((*length) == (*size)) { #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *array = g_renew (PublishingFacebookPublishingOptionsPanePrivacyDescription*, *array, (*size) + 1); -#line 5290 "FacebookPublishing.c" +#line 5303 "FacebookPublishing.c" } #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" (*array)[(*length)++] = value; #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" (*array)[*length] = NULL; -#line 5296 "FacebookPublishing.c" +#line 5309 "FacebookPublishing.c" } static PublishingFacebookPublishingOptionsPanePrivacyDescription** publishing_facebook_publishing_options_pane_create_privacy_descriptions (PublishingFacebookPublishingOptionsPane* self, int* result_length1) { PublishingFacebookPublishingOptionsPanePrivacyDescription** result = NULL; PublishingFacebookPublishingOptionsPanePrivacyDescription** _result_ = NULL; - PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp0_ = NULL; - gint _result__length1 = 0; - gint __result__size_ = 0; - PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - const gchar* _tmp2_ = NULL; - PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp3_ = NULL; - PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - const gchar* _tmp5_ = NULL; - PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp6_ = NULL; - PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - const gchar* _tmp8_ = NULL; - PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp9_ = NULL; - PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp10_ = NULL; - gint _tmp10__length1 = 0; + PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp0_; + gint _result__length1; + gint __result__size_; + PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp1_; + gint _tmp1__length1; + PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp2_; + PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp3_; + gint _tmp3__length1; + PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp4_; + PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp5_; + gint _tmp5__length1; + PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp6_; + PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp7_; + gint _tmp7__length1; #line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self), NULL); #line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5351,91 +5361,85 @@ static PublishingFacebookPublishingOptionsPanePrivacyDescription** publishing_fa #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp1__length1 = _result__length1; #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp2_ = _ ("Just me"); + _tmp2_ = publishing_facebook_publishing_options_pane_privacy_description_new (_ ("Just me"), "{ 'value' : 'SELF' }"); #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp3_ = publishing_facebook_publishing_options_pane_privacy_description_new (_tmp2_, "{ 'value' : 'SELF' }"); -#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _vala_array_add7 (&_result_, &_result__length1, &__result__size_, _tmp3_); -#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp4_ = _result_; + _vala_array_add7 (&_result_, &_result__length1, &__result__size_, _tmp2_); #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp4__length1 = _result__length1; + _tmp3_ = _result_; #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp5_ = _ ("Friends"); + _tmp3__length1 = _result__length1; #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp6_ = publishing_facebook_publishing_options_pane_privacy_description_new (_tmp5_, "{ 'value' : 'ALL_FRIENDS' }"); + _tmp4_ = publishing_facebook_publishing_options_pane_privacy_description_new (_ ("Friends"), "{ 'value' : 'ALL_FRIENDS' }"); #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _vala_array_add8 (&_result_, &_result__length1, &__result__size_, _tmp6_); + _vala_array_add8 (&_result_, &_result__length1, &__result__size_, _tmp4_); #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp7_ = _result_; -#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp7__length1 = _result__length1; + _tmp5_ = _result_; #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp8_ = _ ("Everyone"); + _tmp5__length1 = _result__length1; #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp9_ = publishing_facebook_publishing_options_pane_privacy_description_new (_tmp8_, "{ 'value' : 'EVERYONE' }"); + _tmp6_ = publishing_facebook_publishing_options_pane_privacy_description_new (_ ("Everyone"), "{ 'value' : 'EVERYONE' }"); #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _vala_array_add9 (&_result_, &_result__length1, &__result__size_, _tmp9_); + _vala_array_add9 (&_result_, &_result__length1, &__result__size_, _tmp6_); #line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp10_ = _result_; + _tmp7_ = _result_; #line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp10__length1 = _result__length1; + _tmp7__length1 = _result__length1; #line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (result_length1) { #line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - *result_length1 = _tmp10__length1; -#line 5368 "FacebookPublishing.c" + *result_length1 = _tmp7__length1; +#line 5372 "FacebookPublishing.c" } #line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - result = _tmp10_; + result = _tmp7_; #line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 5374 "FacebookPublishing.c" +#line 5378 "FacebookPublishing.c" } -static void _vala_array_add10 (PublishingFacebookResolution** array, int* length, int* size, PublishingFacebookResolution value) { +static void _vala_array_add10 (PublishingFacebookResolution* * array, int* length, int* size, PublishingFacebookResolution value) { #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if ((*length) == (*size)) { #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *array = g_renew (PublishingFacebookResolution, *array, *size); -#line 5385 "FacebookPublishing.c" +#line 5389 "FacebookPublishing.c" } #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" (*array)[(*length)++] = value; -#line 5389 "FacebookPublishing.c" +#line 5393 "FacebookPublishing.c" } -static void _vala_array_add11 (PublishingFacebookResolution** array, int* length, int* size, PublishingFacebookResolution value) { +static void _vala_array_add11 (PublishingFacebookResolution* * array, int* length, int* size, PublishingFacebookResolution value) { #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if ((*length) == (*size)) { #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *array = g_renew (PublishingFacebookResolution, *array, *size); -#line 5400 "FacebookPublishing.c" +#line 5404 "FacebookPublishing.c" } #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" (*array)[(*length)++] = value; -#line 5404 "FacebookPublishing.c" +#line 5408 "FacebookPublishing.c" } static PublishingFacebookResolution* publishing_facebook_publishing_options_pane_create_resolution_list (PublishingFacebookPublishingOptionsPane* self, int* result_length1) { PublishingFacebookResolution* result = NULL; PublishingFacebookResolution* _result_ = NULL; - PublishingFacebookResolution* _tmp0_ = NULL; - gint _result__length1 = 0; - gint __result__size_ = 0; - PublishingFacebookResolution* _tmp1_ = NULL; - gint _tmp1__length1 = 0; - PublishingFacebookResolution* _tmp2_ = NULL; - gint _tmp2__length1 = 0; - PublishingFacebookResolution* _tmp3_ = NULL; - gint _tmp3__length1 = 0; + PublishingFacebookResolution* _tmp0_; + gint _result__length1; + gint __result__size_; + PublishingFacebookResolution* _tmp1_; + gint _tmp1__length1; + PublishingFacebookResolution* _tmp2_; + gint _tmp2__length1; + PublishingFacebookResolution* _tmp3_; + gint _tmp3__length1; #line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self), NULL); #line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5466,39 +5470,39 @@ static PublishingFacebookResolution* publishing_facebook_publishing_options_pane if (result_length1) { #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *result_length1 = _tmp3__length1; -#line 5450 "FacebookPublishing.c" +#line 5454 "FacebookPublishing.c" } #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" result = _tmp3_; #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 5456 "FacebookPublishing.c" +#line 5460 "FacebookPublishing.c" } void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPublishingOptionsPane* self) { - gboolean _tmp0_ = FALSE; - GtkButton* _tmp24_ = NULL; + gboolean _tmp0_; + GtkButton* _tmp24_; #line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self)); #line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp0_ = publishing_facebook_publishing_options_pane_publishing_photos (self); #line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp0_) { -#line 5469 "FacebookPublishing.c" - PublishingFacebookAlbum** _tmp1_ = NULL; - gint _tmp1__length1 = 0; +#line 5473 "FacebookPublishing.c" + PublishingFacebookAlbum** _tmp1_; + gint _tmp1__length1; #line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp1_ = self->priv->albums; #line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp1__length1 = self->priv->albums_length1; #line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp1__length1 == 0) { -#line 5478 "FacebookPublishing.c" - GtkRadioButton* _tmp2_ = NULL; - GtkEntry* _tmp3_ = NULL; - GtkComboBoxText* _tmp4_ = NULL; - GtkRadioButton* _tmp5_ = NULL; +#line 5482 "FacebookPublishing.c" + GtkRadioButton* _tmp2_; + GtkEntry* _tmp3_; + GtkComboBoxText* _tmp4_; + GtkRadioButton* _tmp5_; #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp2_ = self->priv->create_new_radio; #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5515,13 +5519,13 @@ void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPu _tmp5_ = self->priv->use_existing_radio; #line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 5499 "FacebookPublishing.c" +#line 5503 "FacebookPublishing.c" } else { gint default_album_seq_num = 0; gint ticker = 0; - PublishingFacebookAlbum** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - gint _tmp15_ = 0; + PublishingFacebookAlbum** _tmp6_; + gint _tmp6__length1; + gint _tmp15_; #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" default_album_seq_num = -1; #line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5530,7 +5534,7 @@ void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPu _tmp6_ = self->priv->albums; #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp6__length1 = self->priv->albums_length1; -#line 5514 "FacebookPublishing.c" +#line 5518 "FacebookPublishing.c" { PublishingFacebookAlbum** album_collection = NULL; gint album_collection_length1 = 0; @@ -5542,21 +5546,21 @@ void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPu album_collection_length1 = _tmp6__length1; #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" for (album_it = 0; album_it < _tmp6__length1; album_it = album_it + 1) { -#line 5526 "FacebookPublishing.c" - PublishingFacebookAlbum* _tmp7_ = NULL; +#line 5530 "FacebookPublishing.c" + PublishingFacebookAlbum* _tmp7_; PublishingFacebookAlbum* album = NULL; #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp7_ = _publishing_facebook_album_ref0 (album_collection[album_it]); #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" album = _tmp7_; -#line 5533 "FacebookPublishing.c" +#line 5537 "FacebookPublishing.c" { - GtkComboBoxText* _tmp8_ = NULL; - PublishingFacebookAlbum* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - PublishingFacebookAlbum* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - gint _tmp14_ = 0; + GtkComboBoxText* _tmp8_; + PublishingFacebookAlbum* _tmp9_; + const gchar* _tmp10_; + PublishingFacebookAlbum* _tmp11_; + const gchar* _tmp12_; + gint _tmp14_; #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp8_ = self->priv->existing_albums_combo; #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5571,13 +5575,13 @@ void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPu _tmp12_ = _tmp11_->name; #line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (g_strcmp0 (_tmp12_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME) == 0) { -#line 5555 "FacebookPublishing.c" - gint _tmp13_ = 0; +#line 5559 "FacebookPublishing.c" + gint _tmp13_; #line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp13_ = ticker; #line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" default_album_seq_num = _tmp13_; -#line 5561 "FacebookPublishing.c" +#line 5565 "FacebookPublishing.c" } #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp14_ = ticker; @@ -5585,7 +5589,7 @@ void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPu ticker = _tmp14_ + 1; #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _publishing_facebook_album_unref0 (album); -#line 5569 "FacebookPublishing.c" +#line 5573 "FacebookPublishing.c" } } } @@ -5593,11 +5597,11 @@ void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPu _tmp15_ = default_album_seq_num; #line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp15_ != -1) { -#line 5577 "FacebookPublishing.c" - GtkComboBoxText* _tmp16_ = NULL; - gint _tmp17_ = 0; - GtkRadioButton* _tmp18_ = NULL; - GtkEntry* _tmp19_ = NULL; +#line 5581 "FacebookPublishing.c" + GtkComboBoxText* _tmp16_; + gint _tmp17_; + GtkRadioButton* _tmp18_; + GtkEntry* _tmp19_; #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp16_ = self->priv->existing_albums_combo; #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5612,12 +5616,12 @@ void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPu _tmp19_ = self->priv->new_album_entry; #line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 5596 "FacebookPublishing.c" +#line 5600 "FacebookPublishing.c" } else { - GtkRadioButton* _tmp20_ = NULL; - GtkComboBoxText* _tmp21_ = NULL; - GtkComboBoxText* _tmp22_ = NULL; - GtkEntry* _tmp23_ = NULL; + GtkRadioButton* _tmp20_; + GtkComboBoxText* _tmp21_; + GtkComboBoxText* _tmp22_; + GtkEntry* _tmp23_; #line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp20_ = self->priv->create_new_radio; #line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5634,7 +5638,7 @@ void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPu _tmp23_ = self->priv->new_album_entry; #line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" gtk_entry_set_text (_tmp23_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME); -#line 5618 "FacebookPublishing.c" +#line 5622 "FacebookPublishing.c" } } } @@ -5642,7 +5646,7 @@ void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPu _tmp24_ = self->priv->publish_button; #line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget)); -#line 5626 "FacebookPublishing.c" +#line 5630 "FacebookPublishing.c" } @@ -5650,17 +5654,17 @@ static void publishing_facebook_publishing_options_pane_notify_logout (Publishin #line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self)); #line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - g_signal_emit_by_name (self, "logout"); -#line 5635 "FacebookPublishing.c" + g_signal_emit (self, publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0); +#line 5639 "FacebookPublishing.c" } static void publishing_facebook_publishing_options_pane_notify_publish (PublishingFacebookPublishingOptionsPane* self, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution target_resolution) { - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - PublishingFacebookResolution _tmp2_ = 0; - GtkCheckButton* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + const gchar* _tmp0_; + const gchar* _tmp1_; + PublishingFacebookResolution _tmp2_; + GtkCheckButton* _tmp3_; + gboolean _tmp4_; #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self)); #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5676,16 +5680,16 @@ static void publishing_facebook_publishing_options_pane_notify_publish (Publishi #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp4_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - g_signal_emit_by_name (self, "publish", _tmp0_, _tmp1_, _tmp2_, _tmp4_); -#line 5661 "FacebookPublishing.c" + g_signal_emit (self, publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp0_, _tmp1_, _tmp2_, _tmp4_); +#line 5665 "FacebookPublishing.c" } static GtkWidget* publishing_facebook_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) { PublishingFacebookPublishingOptionsPane * self; GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPane); #line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5696,7 +5700,7 @@ static GtkWidget* publishing_facebook_publishing_options_pane_real_get_widget (S result = _tmp1_; #line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 5680 "FacebookPublishing.c" +#line 5684 "FacebookPublishing.c" } @@ -5709,21 +5713,21 @@ static SpitPublishingDialogPaneGeometryOptions publishing_facebook_publishing_op result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; #line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 5693 "FacebookPublishing.c" +#line 5697 "FacebookPublishing.c" } static void _publishing_facebook_publishing_options_pane_notify_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender, gpointer self) { #line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_publishing_options_pane_notify_logout ((PublishingFacebookPublishingOptionsPane*) self); -#line 5700 "FacebookPublishing.c" +#line 5704 "FacebookPublishing.c" } static void _publishing_facebook_publishing_options_pane_notify_publish_publishing_facebook_publishing_options_pane_publish (PublishingFacebookPublishingOptionsPane* _sender, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution target_resolution, gboolean strip_metadata, gpointer self) { #line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_publishing_options_pane_notify_publish ((PublishingFacebookPublishingOptionsPane*) self, target_album, privacy_setting, target_resolution); -#line 5707 "FacebookPublishing.c" +#line 5711 "FacebookPublishing.c" } @@ -5737,14 +5741,14 @@ static void publishing_facebook_publishing_options_pane_real_on_pane_installed ( g_signal_connect_object (self, "publish", (GCallback) _publishing_facebook_publishing_options_pane_notify_publish_publishing_facebook_publishing_options_pane_publish, self, 0); #line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_publishing_options_pane_installed (self); -#line 5721 "FacebookPublishing.c" +#line 5725 "FacebookPublishing.c" } static void publishing_facebook_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) { PublishingFacebookPublishingOptionsPane * self; - guint _tmp0_ = 0U; - guint _tmp1_ = 0U; + guint _tmp0_; + guint _tmp1_; #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPane); #line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5755,7 +5759,7 @@ static void publishing_facebook_publishing_options_pane_real_on_pane_uninstalled g_signal_parse_name ("publish", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE); #line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_publishing_options_pane_notify_publish_publishing_facebook_publishing_options_pane_publish, self); -#line 5739 "FacebookPublishing.c" +#line 5743 "FacebookPublishing.c" } @@ -5774,28 +5778,28 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN (GClosure * data1 = closure->data; #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" data2 = param_values->data[0].v_pointer; -#line 5758 "FacebookPublishing.c" +#line 5762 "FacebookPublishing.c" } else { #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" data1 = param_values->data[0].v_pointer; #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" data2 = closure->data; -#line 5764 "FacebookPublishing.c" +#line 5768 "FacebookPublishing.c" } #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" callback = (GMarshalFunc_VOID__STRING_STRING_ENUM_BOOLEAN) (marshal_data ? marshal_data : cc->callback); #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), g_value_get_enum (param_values + 3), g_value_get_boolean (param_values + 4), data2); -#line 5770 "FacebookPublishing.c" +#line 5774 "FacebookPublishing.c" } static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_construct (GType object_type, const gchar* description, const gchar* privacy_setting) { PublishingFacebookPublishingOptionsPanePrivacyDescription* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (description != NULL, NULL); #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5820,21 +5824,21 @@ static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_fac self->privacy_setting = _tmp3_; #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self; -#line 5804 "FacebookPublishing.c" +#line 5808 "FacebookPublishing.c" } static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_new (const gchar* description, const gchar* privacy_setting) { #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return publishing_facebook_publishing_options_pane_privacy_description_construct (PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION, description, privacy_setting); -#line 5811 "FacebookPublishing.c" +#line 5815 "FacebookPublishing.c" } static void publishing_facebook_publishing_options_pane_value_privacy_description_init (GValue* value) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 5818 "FacebookPublishing.c" +#line 5822 "FacebookPublishing.c" } @@ -5843,7 +5847,7 @@ static void publishing_facebook_publishing_options_pane_value_privacy_descriptio if (value->data[0].v_pointer) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_publishing_options_pane_privacy_description_unref (value->data[0].v_pointer); -#line 5827 "FacebookPublishing.c" +#line 5831 "FacebookPublishing.c" } } @@ -5853,11 +5857,11 @@ static void publishing_facebook_publishing_options_pane_value_privacy_descriptio if (src_value->data[0].v_pointer) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" dest_value->data[0].v_pointer = publishing_facebook_publishing_options_pane_privacy_description_ref (src_value->data[0].v_pointer); -#line 5837 "FacebookPublishing.c" +#line 5841 "FacebookPublishing.c" } else { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 5841 "FacebookPublishing.c" +#line 5845 "FacebookPublishing.c" } } @@ -5865,66 +5869,66 @@ static void publishing_facebook_publishing_options_pane_value_privacy_descriptio static gpointer publishing_facebook_publishing_options_pane_value_privacy_description_peek_pointer (const GValue* value) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return value->data[0].v_pointer; -#line 5849 "FacebookPublishing.c" +#line 5853 "FacebookPublishing.c" } static gchar* publishing_facebook_publishing_options_pane_value_privacy_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (collect_values[0].v_pointer) { -#line 5856 "FacebookPublishing.c" - PublishingFacebookPublishingOptionsPanePrivacyDescription* object; +#line 5860 "FacebookPublishing.c" + PublishingFacebookPublishingOptionsPanePrivacyDescription * object; object = collect_values[0].v_pointer; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 5863 "FacebookPublishing.c" +#line 5867 "FacebookPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 5867 "FacebookPublishing.c" +#line 5871 "FacebookPublishing.c" } #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = publishing_facebook_publishing_options_pane_privacy_description_ref (object); -#line 5871 "FacebookPublishing.c" +#line 5875 "FacebookPublishing.c" } else { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 5875 "FacebookPublishing.c" +#line 5879 "FacebookPublishing.c" } #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return NULL; -#line 5879 "FacebookPublishing.c" +#line 5883 "FacebookPublishing.c" } static gchar* publishing_facebook_publishing_options_pane_value_privacy_description_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingFacebookPublishingOptionsPanePrivacyDescription** object_p; + PublishingFacebookPublishingOptionsPanePrivacyDescription ** object_p; object_p = collect_values[0].v_pointer; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (!object_p) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 5890 "FacebookPublishing.c" +#line 5894 "FacebookPublishing.c" } #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (!value->data[0].v_pointer) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *object_p = NULL; -#line 5896 "FacebookPublishing.c" +#line 5900 "FacebookPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *object_p = value->data[0].v_pointer; -#line 5900 "FacebookPublishing.c" +#line 5904 "FacebookPublishing.c" } else { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *object_p = publishing_facebook_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer); -#line 5904 "FacebookPublishing.c" +#line 5908 "FacebookPublishing.c" } #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return NULL; -#line 5908 "FacebookPublishing.c" +#line 5912 "FacebookPublishing.c" } @@ -5938,7 +5942,7 @@ static GParamSpec* publishing_facebook_publishing_options_pane_param_spec_privac G_PARAM_SPEC (spec)->value_type = object_type; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return G_PARAM_SPEC (spec); -#line 5922 "FacebookPublishing.c" +#line 5926 "FacebookPublishing.c" } @@ -5947,12 +5951,12 @@ static gpointer publishing_facebook_publishing_options_pane_value_get_privacy_de g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION), NULL); #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return value->data[0].v_pointer; -#line 5931 "FacebookPublishing.c" +#line 5935 "FacebookPublishing.c" } static void publishing_facebook_publishing_options_pane_value_set_privacy_description (GValue* value, gpointer v_object) { - PublishingFacebookPublishingOptionsPanePrivacyDescription* old; + PublishingFacebookPublishingOptionsPanePrivacyDescription * old; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION)); #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5967,23 +5971,23 @@ static void publishing_facebook_publishing_options_pane_value_set_privacy_descri value->data[0].v_pointer = v_object; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer); -#line 5951 "FacebookPublishing.c" +#line 5955 "FacebookPublishing.c" } else { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 5955 "FacebookPublishing.c" +#line 5959 "FacebookPublishing.c" } #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (old) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_publishing_options_pane_privacy_description_unref (old); -#line 5961 "FacebookPublishing.c" +#line 5965 "FacebookPublishing.c" } } static void publishing_facebook_publishing_options_pane_value_take_privacy_description (GValue* value, gpointer v_object) { - PublishingFacebookPublishingOptionsPanePrivacyDescription* old; + PublishingFacebookPublishingOptionsPanePrivacyDescription * old; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION)); #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -5996,17 +6000,17 @@ static void publishing_facebook_publishing_options_pane_value_take_privacy_descr g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = v_object; -#line 5980 "FacebookPublishing.c" +#line 5984 "FacebookPublishing.c" } else { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 5984 "FacebookPublishing.c" +#line 5988 "FacebookPublishing.c" } #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (old) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_publishing_options_pane_privacy_description_unref (old); -#line 5990 "FacebookPublishing.c" +#line 5994 "FacebookPublishing.c" } } @@ -6016,18 +6020,18 @@ static void publishing_facebook_publishing_options_pane_privacy_description_clas publishing_facebook_publishing_options_pane_privacy_description_parent_class = g_type_class_peek_parent (klass); #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" ((PublishingFacebookPublishingOptionsPanePrivacyDescriptionClass *) klass)->finalize = publishing_facebook_publishing_options_pane_privacy_description_finalize; -#line 6000 "FacebookPublishing.c" +#line 6004 "FacebookPublishing.c" } static void publishing_facebook_publishing_options_pane_privacy_description_instance_init (PublishingFacebookPublishingOptionsPanePrivacyDescription * self) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self->ref_count = 1; -#line 6007 "FacebookPublishing.c" +#line 6011 "FacebookPublishing.c" } -static void publishing_facebook_publishing_options_pane_privacy_description_finalize (PublishingFacebookPublishingOptionsPanePrivacyDescription* obj) { +static void publishing_facebook_publishing_options_pane_privacy_description_finalize (PublishingFacebookPublishingOptionsPanePrivacyDescription * obj) { PublishingFacebookPublishingOptionsPanePrivacyDescription * self; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION, PublishingFacebookPublishingOptionsPanePrivacyDescription); @@ -6037,7 +6041,7 @@ static void publishing_facebook_publishing_options_pane_privacy_description_fina _g_free0 (self->description); #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 (self->privacy_setting); -#line 6021 "FacebookPublishing.c" +#line 6025 "FacebookPublishing.c" } @@ -6056,18 +6060,18 @@ static GType publishing_facebook_publishing_options_pane_privacy_description_get static gpointer publishing_facebook_publishing_options_pane_privacy_description_ref (gpointer instance) { - PublishingFacebookPublishingOptionsPanePrivacyDescription* self; + PublishingFacebookPublishingOptionsPanePrivacyDescription * self; self = instance; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_atomic_int_inc (&self->ref_count); #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return instance; -#line 6046 "FacebookPublishing.c" +#line 6050 "FacebookPublishing.c" } static void publishing_facebook_publishing_options_pane_privacy_description_unref (gpointer instance) { - PublishingFacebookPublishingOptionsPanePrivacyDescription* self; + PublishingFacebookPublishingOptionsPanePrivacyDescription * self; self = instance; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -6075,7 +6079,7 @@ static void publishing_facebook_publishing_options_pane_privacy_description_unre PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_GET_CLASS (self)->finalize (self); #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 6059 "FacebookPublishing.c" +#line 6063 "FacebookPublishing.c" } } @@ -6088,10 +6092,10 @@ static void publishing_facebook_publishing_options_pane_class_init (PublishingFa #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_facebook_publishing_options_pane_finalize; #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - g_signal_new ("logout", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - g_signal_new ("publish", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, PUBLISHING_FACEBOOK_TYPE_RESOLUTION, G_TYPE_BOOLEAN); -#line 6075 "FacebookPublishing.c" + publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, PUBLISHING_FACEBOOK_TYPE_RESOLUTION, G_TYPE_BOOLEAN); +#line 6079 "FacebookPublishing.c" } @@ -6099,14 +6103,14 @@ static void publishing_facebook_publishing_options_pane_spit_publishing_dialog_p #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface); #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_facebook_publishing_options_pane_real_get_widget; + iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_facebook_publishing_options_pane_real_get_widget; #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_facebook_publishing_options_pane_real_get_preferred_geometry; + iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_facebook_publishing_options_pane_real_get_preferred_geometry; #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_facebook_publishing_options_pane_real_on_pane_installed; + iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_facebook_publishing_options_pane_real_on_pane_installed; #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_facebook_publishing_options_pane_real_on_pane_uninstalled; -#line 6090 "FacebookPublishing.c" + iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_facebook_publishing_options_pane_real_on_pane_uninstalled; +#line 6094 "FacebookPublishing.c" } @@ -6143,11 +6147,11 @@ static void publishing_facebook_publishing_options_pane_instance_init (Publishin self->priv->publisher = NULL; #line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self->priv->resolution_combo = NULL; -#line 6127 "FacebookPublishing.c" +#line 6131 "FacebookPublishing.c" } -static void publishing_facebook_publishing_options_pane_finalize (GObject* obj) { +static void publishing_facebook_publishing_options_pane_finalize (GObject * obj) { PublishingFacebookPublishingOptionsPane * self; #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPane); @@ -6185,7 +6189,7 @@ static void publishing_facebook_publishing_options_pane_finalize (GObject* obj) _g_object_unref0 (self->priv->resolution_combo); #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" G_OBJECT_CLASS (publishing_facebook_publishing_options_pane_parent_class)->finalize (obj); -#line 6169 "FacebookPublishing.c" +#line 6173 "FacebookPublishing.c" } @@ -6209,48 +6213,48 @@ gchar* publishing_facebook_endpoint_to_uri (PublishingFacebookEndpoint self) { switch (self) { #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" case PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT: -#line 6193 "FacebookPublishing.c" +#line 6197 "FacebookPublishing.c" { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp0_ = g_strdup ("https://graph.facebook.com/"); #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" result = _tmp0_; #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 6202 "FacebookPublishing.c" +#line 6206 "FacebookPublishing.c" } #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" case PUBLISHING_FACEBOOK_ENDPOINT_VIDEO: -#line 6206 "FacebookPublishing.c" +#line 6210 "FacebookPublishing.c" { - gchar* _tmp1_ = NULL; + gchar* _tmp1_; #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp1_ = g_strdup ("https://graph-video.facebook.com/"); #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" result = _tmp1_; #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 6215 "FacebookPublishing.c" +#line 6219 "FacebookPublishing.c" } #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" case PUBLISHING_FACEBOOK_ENDPOINT_TEST_CONNECTION: -#line 6219 "FacebookPublishing.c" +#line 6223 "FacebookPublishing.c" { - gchar* _tmp2_ = NULL; + gchar* _tmp2_; #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp2_ = g_strdup ("https://www.facebook.com/"); #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" result = _tmp2_; #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 6228 "FacebookPublishing.c" +#line 6232 "FacebookPublishing.c" } default: { #line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_assert_not_reached (); -#line 6234 "FacebookPublishing.c" +#line 6238 "FacebookPublishing.c" } } } @@ -6273,7 +6277,7 @@ static gchar* publishing_facebook_graph_message_real_get_uri (PublishingFacebook g_critical ("Type `%s' does not implement abstract method `publishing_facebook_graph_message_get_uri'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return NULL; -#line 6257 "FacebookPublishing.c" +#line 6261 "FacebookPublishing.c" } @@ -6282,7 +6286,7 @@ gchar* publishing_facebook_graph_message_get_uri (PublishingFacebookGraphMessage g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (self), NULL); #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return PUBLISHING_FACEBOOK_GRAPH_MESSAGE_GET_CLASS (self)->get_uri (self); -#line 6266 "FacebookPublishing.c" +#line 6270 "FacebookPublishing.c" } @@ -6291,7 +6295,7 @@ static gchar* publishing_facebook_graph_message_real_get_response_body (Publishi g_critical ("Type `%s' does not implement abstract method `publishing_facebook_graph_message_get_response_body'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return NULL; -#line 6275 "FacebookPublishing.c" +#line 6279 "FacebookPublishing.c" } @@ -6300,7 +6304,7 @@ gchar* publishing_facebook_graph_message_get_response_body (PublishingFacebookGr g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (self), NULL); #line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return PUBLISHING_FACEBOOK_GRAPH_MESSAGE_GET_CLASS (self)->get_response_body (self); -#line 6284 "FacebookPublishing.c" +#line 6288 "FacebookPublishing.c" } @@ -6310,7 +6314,7 @@ PublishingFacebookGraphMessage* publishing_facebook_graph_message_construct (GTy self = (PublishingFacebookGraphMessage*) g_type_create_instance (object_type); #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self; -#line 6294 "FacebookPublishing.c" +#line 6298 "FacebookPublishing.c" } @@ -6329,26 +6333,26 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue * data1 = closure->data; #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" data2 = param_values->data[0].v_pointer; -#line 6313 "FacebookPublishing.c" +#line 6317 "FacebookPublishing.c" } else { #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" data1 = param_values->data[0].v_pointer; #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" data2 = closure->data; -#line 6319 "FacebookPublishing.c" +#line 6323 "FacebookPublishing.c" } #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback); #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" callback (data1, g_value_get_int (param_values + 1), g_value_get_int (param_values + 2), data2); -#line 6325 "FacebookPublishing.c" +#line 6329 "FacebookPublishing.c" } static void publishing_facebook_value_graph_message_init (GValue* value) { #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 6332 "FacebookPublishing.c" +#line 6336 "FacebookPublishing.c" } @@ -6357,7 +6361,7 @@ static void publishing_facebook_value_graph_message_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_graph_message_unref (value->data[0].v_pointer); -#line 6341 "FacebookPublishing.c" +#line 6345 "FacebookPublishing.c" } } @@ -6367,11 +6371,11 @@ static void publishing_facebook_value_graph_message_copy_value (const GValue* sr if (src_value->data[0].v_pointer) { #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" dest_value->data[0].v_pointer = publishing_facebook_graph_message_ref (src_value->data[0].v_pointer); -#line 6351 "FacebookPublishing.c" +#line 6355 "FacebookPublishing.c" } else { #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 6355 "FacebookPublishing.c" +#line 6359 "FacebookPublishing.c" } } @@ -6379,66 +6383,66 @@ static void publishing_facebook_value_graph_message_copy_value (const GValue* sr static gpointer publishing_facebook_value_graph_message_peek_pointer (const GValue* value) { #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return value->data[0].v_pointer; -#line 6363 "FacebookPublishing.c" +#line 6367 "FacebookPublishing.c" } static gchar* publishing_facebook_value_graph_message_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (collect_values[0].v_pointer) { -#line 6370 "FacebookPublishing.c" - PublishingFacebookGraphMessage* object; +#line 6374 "FacebookPublishing.c" + PublishingFacebookGraphMessage * object; object = collect_values[0].v_pointer; #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6377 "FacebookPublishing.c" +#line 6381 "FacebookPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6381 "FacebookPublishing.c" +#line 6385 "FacebookPublishing.c" } #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = publishing_facebook_graph_message_ref (object); -#line 6385 "FacebookPublishing.c" +#line 6389 "FacebookPublishing.c" } else { #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 6389 "FacebookPublishing.c" +#line 6393 "FacebookPublishing.c" } #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return NULL; -#line 6393 "FacebookPublishing.c" +#line 6397 "FacebookPublishing.c" } static gchar* publishing_facebook_value_graph_message_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingFacebookGraphMessage** object_p; + PublishingFacebookGraphMessage ** object_p; object_p = collect_values[0].v_pointer; #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (!object_p) { #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 6404 "FacebookPublishing.c" +#line 6408 "FacebookPublishing.c" } #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (!value->data[0].v_pointer) { #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *object_p = NULL; -#line 6410 "FacebookPublishing.c" +#line 6414 "FacebookPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *object_p = value->data[0].v_pointer; -#line 6414 "FacebookPublishing.c" +#line 6418 "FacebookPublishing.c" } else { #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *object_p = publishing_facebook_graph_message_ref (value->data[0].v_pointer); -#line 6418 "FacebookPublishing.c" +#line 6422 "FacebookPublishing.c" } #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return NULL; -#line 6422 "FacebookPublishing.c" +#line 6426 "FacebookPublishing.c" } @@ -6452,7 +6456,7 @@ GParamSpec* publishing_facebook_param_spec_graph_message (const gchar* name, con G_PARAM_SPEC (spec)->value_type = object_type; #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return G_PARAM_SPEC (spec); -#line 6436 "FacebookPublishing.c" +#line 6440 "FacebookPublishing.c" } @@ -6461,12 +6465,12 @@ gpointer publishing_facebook_value_get_graph_message (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE), NULL); #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return value->data[0].v_pointer; -#line 6445 "FacebookPublishing.c" +#line 6449 "FacebookPublishing.c" } void publishing_facebook_value_set_graph_message (GValue* value, gpointer v_object) { - PublishingFacebookGraphMessage* old; + PublishingFacebookGraphMessage * old; #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE)); #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -6481,23 +6485,23 @@ void publishing_facebook_value_set_graph_message (GValue* value, gpointer v_obje value->data[0].v_pointer = v_object; #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_graph_message_ref (value->data[0].v_pointer); -#line 6465 "FacebookPublishing.c" +#line 6469 "FacebookPublishing.c" } else { #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 6469 "FacebookPublishing.c" +#line 6473 "FacebookPublishing.c" } #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (old) { #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_graph_message_unref (old); -#line 6475 "FacebookPublishing.c" +#line 6479 "FacebookPublishing.c" } } void publishing_facebook_value_take_graph_message (GValue* value, gpointer v_object) { - PublishingFacebookGraphMessage* old; + PublishingFacebookGraphMessage * old; #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE)); #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -6510,17 +6514,17 @@ void publishing_facebook_value_take_graph_message (GValue* value, gpointer v_obj g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = v_object; -#line 6494 "FacebookPublishing.c" +#line 6498 "FacebookPublishing.c" } else { #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 6498 "FacebookPublishing.c" +#line 6502 "FacebookPublishing.c" } #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (old) { #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_graph_message_unref (old); -#line 6504 "FacebookPublishing.c" +#line 6508 "FacebookPublishing.c" } } @@ -6531,33 +6535,33 @@ static void publishing_facebook_graph_message_class_init (PublishingFacebookGrap #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" ((PublishingFacebookGraphMessageClass *) klass)->finalize = publishing_facebook_graph_message_finalize; #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - ((PublishingFacebookGraphMessageClass *) klass)->get_uri = (gchar* (*)(PublishingFacebookGraphMessage*)) publishing_facebook_graph_message_real_get_uri; + ((PublishingFacebookGraphMessageClass *) klass)->get_uri = (gchar* (*) (PublishingFacebookGraphMessage *)) publishing_facebook_graph_message_real_get_uri; #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - ((PublishingFacebookGraphMessageClass *) klass)->get_response_body = (gchar* (*)(PublishingFacebookGraphMessage*)) publishing_facebook_graph_message_real_get_response_body; + ((PublishingFacebookGraphMessageClass *) klass)->get_response_body = (gchar* (*) (PublishingFacebookGraphMessage *)) publishing_facebook_graph_message_real_get_response_body; #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - g_signal_new ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_COMPLETED_SIGNAL] = g_signal_new ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - g_signal_new ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); + publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_FAILED_SIGNAL] = g_signal_new ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - g_signal_new ("data_transmitted", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); -#line 6524 "FacebookPublishing.c" + publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_DATA_TRANSMITTED_SIGNAL] = g_signal_new ("data-transmitted", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); +#line 6528 "FacebookPublishing.c" } static void publishing_facebook_graph_message_instance_init (PublishingFacebookGraphMessage * self) { #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self->ref_count = 1; -#line 6531 "FacebookPublishing.c" +#line 6535 "FacebookPublishing.c" } -static void publishing_facebook_graph_message_finalize (PublishingFacebookGraphMessage* obj) { +static void publishing_facebook_graph_message_finalize (PublishingFacebookGraphMessage * obj) { PublishingFacebookGraphMessage * self; #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage); #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_signal_handlers_destroy (self); -#line 6541 "FacebookPublishing.c" +#line 6545 "FacebookPublishing.c" } @@ -6576,18 +6580,18 @@ GType publishing_facebook_graph_message_get_type (void) { gpointer publishing_facebook_graph_message_ref (gpointer instance) { - PublishingFacebookGraphMessage* self; + PublishingFacebookGraphMessage * self; self = instance; #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_atomic_int_inc (&self->ref_count); #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return instance; -#line 6566 "FacebookPublishing.c" +#line 6570 "FacebookPublishing.c" } void publishing_facebook_graph_message_unref (gpointer instance) { - PublishingFacebookGraphMessage* self; + PublishingFacebookGraphMessage * self; self = instance; #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -6595,7 +6599,7 @@ void publishing_facebook_graph_message_unref (gpointer instance) { PUBLISHING_FACEBOOK_GRAPH_MESSAGE_GET_CLASS (self)->finalize (self); #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 6579 "FacebookPublishing.c" +#line 6583 "FacebookPublishing.c" } } @@ -6603,16 +6607,16 @@ void publishing_facebook_graph_message_unref (gpointer instance) { static void _publishing_facebook_graph_session_on_request_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self) { #line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_graph_session_on_request_unqueued ((PublishingFacebookGraphSession*) self, msg); -#line 6587 "FacebookPublishing.c" +#line 6591 "FacebookPublishing.c" } PublishingFacebookGraphSession* publishing_facebook_graph_session_construct (GType object_type) { PublishingFacebookGraphSession* self = NULL; - SoupSession* _tmp0_ = NULL; - SoupSession* _tmp1_ = NULL; - SoupSession* _tmp2_ = NULL; - SoupSession* _tmp3_ = NULL; + SoupSession* _tmp0_; + SoupSession* _tmp1_; + SoupSession* _tmp2_; + SoupSession* _tmp3_; #line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = (PublishingFacebookGraphSession*) g_type_create_instance (object_type); #line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -6643,28 +6647,28 @@ PublishingFacebookGraphSession* publishing_facebook_graph_session_construct (GTy g_object_set (_tmp3_, "ssl-use-system-ca-file", TRUE, NULL); #line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self; -#line 6627 "FacebookPublishing.c" +#line 6631 "FacebookPublishing.c" } PublishingFacebookGraphSession* publishing_facebook_graph_session_new (void) { #line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return publishing_facebook_graph_session_construct (PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION); -#line 6634 "FacebookPublishing.c" +#line 6638 "FacebookPublishing.c" } static gpointer _publishing_facebook_graph_message_ref0 (gpointer self) { #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self ? publishing_facebook_graph_message_ref (self) : NULL; -#line 6641 "FacebookPublishing.c" +#line 6645 "FacebookPublishing.c" } static void publishing_facebook_graph_session_manage_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* msg) { - PublishingFacebookGraphMessage* _tmp0_ = NULL; - PublishingFacebookGraphMessage* _tmp1_ = NULL; - PublishingFacebookGraphMessage* _tmp2_ = NULL; + PublishingFacebookGraphMessage* _tmp0_; + PublishingFacebookGraphMessage* _tmp1_; + PublishingFacebookGraphMessage* _tmp2_; #line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self)); #line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -6681,12 +6685,12 @@ static void publishing_facebook_graph_session_manage_message (PublishingFacebook _publishing_facebook_graph_message_unref0 (self->priv->current_message); #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self->priv->current_message = _tmp2_; -#line 6665 "FacebookPublishing.c" +#line 6669 "FacebookPublishing.c" } static void publishing_facebook_graph_session_unmanage_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* msg) { - PublishingFacebookGraphMessage* _tmp0_ = NULL; + PublishingFacebookGraphMessage* _tmp0_; #line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self)); #line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -6699,40 +6703,40 @@ static void publishing_facebook_graph_session_unmanage_message (PublishingFacebo _publishing_facebook_graph_message_unref0 (self->priv->current_message); #line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self->priv->current_message = NULL; -#line 6683 "FacebookPublishing.c" +#line 6687 "FacebookPublishing.c" } static void _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender, SoupBuffer* chunk, gpointer self) { #line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data ((PublishingFacebookGraphSessionGraphMessageImpl*) self, chunk); -#line 6690 "FacebookPublishing.c" +#line 6694 "FacebookPublishing.c" } static void publishing_facebook_graph_session_on_request_unqueued (PublishingFacebookGraphSession* self, SoupMessage* msg) { - PublishingFacebookGraphMessage* _tmp0_ = NULL; + PublishingFacebookGraphMessage* _tmp0_; PublishingFacebookGraphSessionGraphMessageImpl* real_message = NULL; - PublishingFacebookGraphMessage* _tmp1_ = NULL; - PublishingFacebookGraphSessionGraphMessageImpl* _tmp2_ = NULL; - PublishingFacebookGraphSessionGraphMessageImpl* _tmp3_ = NULL; - SoupMessage* _tmp4_ = NULL; - SoupMessage* _tmp5_ = NULL; + PublishingFacebookGraphMessage* _tmp1_; + PublishingFacebookGraphSessionGraphMessageImpl* _tmp2_; + PublishingFacebookGraphSessionGraphMessageImpl* _tmp3_; + SoupMessage* _tmp4_; + SoupMessage* _tmp5_; gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; - SoupMessage* _tmp8_ = NULL; - guint _tmp9_ = 0U; - guint _tmp10_ = 0U; - PublishingFacebookGraphSessionGraphMessageImpl* _tmp21_ = NULL; - SoupMessage* _tmp22_ = NULL; - PublishingFacebookGraphSessionGraphMessageImpl* _tmp23_ = NULL; - guint _tmp24_ = 0U; + SoupMessage* _tmp8_; + guint _tmp9_; + guint _tmp10_; + PublishingFacebookGraphSessionGraphMessageImpl* _tmp21_; + SoupMessage* _tmp22_; + PublishingFacebookGraphSessionGraphMessageImpl* _tmp23_; + guint _tmp24_; GError* _error_ = NULL; - SoupMessage* _tmp25_ = NULL; - guint _tmp26_ = 0U; - guint _tmp27_ = 0U; - GError* _tmp68_ = NULL; - GError* _tmp80_ = NULL; + SoupMessage* _tmp25_; + guint _tmp26_; + guint _tmp27_; + GError* _tmp68_; + GError* _tmp80_; #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self)); #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -6765,11 +6769,11 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac if (_tmp10_ == ((guint) SOUP_STATUS_IO_ERROR)) { #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp7_ = TRUE; -#line 6749 "FacebookPublishing.c" +#line 6753 "FacebookPublishing.c" } else { - SoupMessage* _tmp11_ = NULL; - guint _tmp12_ = 0U; - guint _tmp13_ = 0U; + SoupMessage* _tmp11_; + guint _tmp12_; + guint _tmp13_; #line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp11_ = msg; #line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -6778,17 +6782,17 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac _tmp13_ = _tmp12_; #line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp7_ = _tmp13_ == ((guint) SOUP_STATUS_MALFORMED); -#line 6762 "FacebookPublishing.c" +#line 6766 "FacebookPublishing.c" } #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp7_) { #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp6_ = TRUE; -#line 6768 "FacebookPublishing.c" +#line 6772 "FacebookPublishing.c" } else { - SoupMessage* _tmp14_ = NULL; - guint _tmp15_ = 0U; - guint _tmp16_ = 0U; + SoupMessage* _tmp14_; + guint _tmp15_; + guint _tmp16_; #line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp14_ = msg; #line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -6797,15 +6801,15 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac _tmp16_ = _tmp15_; #line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp6_ = _tmp16_ == ((guint) SOUP_STATUS_TRY_AGAIN); -#line 6781 "FacebookPublishing.c" +#line 6785 "FacebookPublishing.c" } #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp6_) { -#line 6785 "FacebookPublishing.c" - PublishingFacebookGraphSessionGraphMessageImpl* _tmp17_ = NULL; - SoupSession* _tmp18_ = NULL; - SoupMessage* _tmp19_ = NULL; - SoupMessage* _tmp20_ = NULL; +#line 6789 "FacebookPublishing.c" + PublishingFacebookGraphSessionGraphMessageImpl* _tmp17_; + SoupSession* _tmp18_; + SoupMessage* _tmp19_; + SoupMessage* _tmp20_; #line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp17_ = real_message; #line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -6822,7 +6826,7 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac _publishing_facebook_graph_message_unref0 (real_message); #line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 6806 "FacebookPublishing.c" +#line 6810 "FacebookPublishing.c" } #line 1202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp21_ = real_message; @@ -6850,17 +6854,17 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac case SOUP_STATUS_OK: #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" case SOUP_STATUS_CREATED: -#line 6834 "FacebookPublishing.c" +#line 6838 "FacebookPublishing.c" { #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" break; -#line 6838 "FacebookPublishing.c" +#line 6842 "FacebookPublishing.c" } #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" case PUBLISHING_FACEBOOK_EXPIRED_SESSION_STATUS_CODE: -#line 6842 "FacebookPublishing.c" +#line 6846 "FacebookPublishing.c" { - GError* _tmp28_ = NULL; + GError* _tmp28_; #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp28_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION, "OAuth Access Token has Expired. Logout user."); #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -6869,21 +6873,21 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac _error_ = _tmp28_; #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" break; -#line 6853 "FacebookPublishing.c" +#line 6857 "FacebookPublishing.c" } #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" case SOUP_STATUS_CANT_RESOLVE: #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" case SOUP_STATUS_CANT_RESOLVE_PROXY: -#line 6859 "FacebookPublishing.c" +#line 6863 "FacebookPublishing.c" { - PublishingFacebookGraphSessionGraphMessageImpl* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; - SoupMessage* _tmp32_ = NULL; - guint _tmp33_ = 0U; - guint _tmp34_ = 0U; - GError* _tmp35_ = NULL; + PublishingFacebookGraphSessionGraphMessageImpl* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; + SoupMessage* _tmp32_; + guint _tmp33_; + guint _tmp34_; + GError* _tmp35_; #line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp29_ = real_message; #line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -6906,21 +6910,21 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac _g_free0 (_tmp31_); #line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" break; -#line 6890 "FacebookPublishing.c" +#line 6894 "FacebookPublishing.c" } #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" case SOUP_STATUS_CANT_CONNECT: #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" case SOUP_STATUS_CANT_CONNECT_PROXY: -#line 6896 "FacebookPublishing.c" +#line 6900 "FacebookPublishing.c" { - PublishingFacebookGraphSessionGraphMessageImpl* _tmp36_ = NULL; - gchar* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; - SoupMessage* _tmp39_ = NULL; - guint _tmp40_ = 0U; - guint _tmp41_ = 0U; - GError* _tmp42_ = NULL; + PublishingFacebookGraphSessionGraphMessageImpl* _tmp36_; + gchar* _tmp37_; + gchar* _tmp38_; + SoupMessage* _tmp39_; + guint _tmp40_; + guint _tmp41_; + GError* _tmp42_; #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp36_ = real_message; #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -6943,13 +6947,13 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac _g_free0 (_tmp38_); #line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" break; -#line 6927 "FacebookPublishing.c" +#line 6931 "FacebookPublishing.c" } default: { - SoupMessage* _tmp43_ = NULL; - guint _tmp44_ = 0U; - guint _tmp45_ = 0U; + SoupMessage* _tmp43_; + guint _tmp44_; + guint _tmp45_; #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp43_ = msg; #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -6958,18 +6962,18 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac _tmp45_ = _tmp44_; #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp45_ >= ((guint) 100)) { -#line 6942 "FacebookPublishing.c" - PublishingFacebookGraphSessionGraphMessageImpl* _tmp46_ = NULL; - gchar* _tmp47_ = NULL; - gchar* _tmp48_ = NULL; - SoupMessage* _tmp49_ = NULL; - guint _tmp50_ = 0U; - guint _tmp51_ = 0U; - SoupMessage* _tmp52_ = NULL; - gchar* _tmp53_ = NULL; - gchar* _tmp54_ = NULL; - gchar* _tmp55_ = NULL; - GError* _tmp56_ = NULL; +#line 6946 "FacebookPublishing.c" + PublishingFacebookGraphSessionGraphMessageImpl* _tmp46_; + gchar* _tmp47_; + gchar* _tmp48_; + SoupMessage* _tmp49_; + guint _tmp50_; + guint _tmp51_; + SoupMessage* _tmp52_; + gchar* _tmp53_; + gchar* _tmp54_; + gchar* _tmp55_; + GError* _tmp56_; #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp46_ = real_message; #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -7000,19 +7004,19 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac _g_free0 (_tmp55_); #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 (_tmp48_); -#line 6984 "FacebookPublishing.c" +#line 6988 "FacebookPublishing.c" } else { - SoupMessage* _tmp57_ = NULL; - gchar* _tmp58_ = NULL; - gchar* _tmp59_ = NULL; - gchar* _tmp60_ = NULL; - PublishingFacebookGraphSessionGraphMessageImpl* _tmp61_ = NULL; - gchar* _tmp62_ = NULL; - gchar* _tmp63_ = NULL; - SoupMessage* _tmp64_ = NULL; - guint _tmp65_ = 0U; - guint _tmp66_ = 0U; - GError* _tmp67_ = NULL; + SoupMessage* _tmp57_; + gchar* _tmp58_; + gchar* _tmp59_; + gchar* _tmp60_; + PublishingFacebookGraphSessionGraphMessageImpl* _tmp61_; + gchar* _tmp62_; + gchar* _tmp63_; + SoupMessage* _tmp64_; + guint _tmp65_; + guint _tmp66_; + GError* _tmp67_; #line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp57_ = msg; #line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -7045,23 +7049,23 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac _error_ = _tmp67_; #line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 (_tmp63_); -#line 7029 "FacebookPublishing.c" +#line 7033 "FacebookPublishing.c" } #line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" break; -#line 7033 "FacebookPublishing.c" +#line 7037 "FacebookPublishing.c" } } #line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp68_ = _error_; #line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp68_ == NULL) { -#line 7040 "FacebookPublishing.c" +#line 7044 "FacebookPublishing.c" gboolean _tmp69_ = FALSE; - SoupMessage* _tmp70_ = NULL; - SoupMessageBody* _tmp71_ = NULL; - guint8* _tmp72_ = NULL; - gint _tmp72__length1 = 0; + SoupMessage* _tmp70_; + SoupMessageBody* _tmp71_; + guint8* _tmp72_; + gint _tmp72__length1; #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp70_ = msg; #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -7074,12 +7078,12 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac if (_tmp72_ == NULL) { #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp69_ = TRUE; -#line 7058 "FacebookPublishing.c" +#line 7062 "FacebookPublishing.c" } else { - SoupMessage* _tmp73_ = NULL; - SoupMessageBody* _tmp74_ = NULL; - guint8* _tmp75_ = NULL; - gint _tmp75__length1 = 0; + SoupMessage* _tmp73_; + SoupMessageBody* _tmp74_; + guint8* _tmp75_; + gint _tmp75__length1; #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp73_ = msg; #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -7090,15 +7094,15 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac _tmp75__length1 = (gint) _tmp74_->length; #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp69_ = _tmp75__length1 == 0; -#line 7074 "FacebookPublishing.c" +#line 7078 "FacebookPublishing.c" } #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp69_) { -#line 7078 "FacebookPublishing.c" - PublishingFacebookGraphSessionGraphMessageImpl* _tmp76_ = NULL; - gchar* _tmp77_ = NULL; - gchar* _tmp78_ = NULL; - GError* _tmp79_ = NULL; +#line 7082 "FacebookPublishing.c" + PublishingFacebookGraphSessionGraphMessageImpl* _tmp76_; + gchar* _tmp77_; + gchar* _tmp78_; + GError* _tmp79_; #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp76_ = real_message; #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -7113,42 +7117,42 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac _error_ = _tmp79_; #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 (_tmp78_); -#line 7097 "FacebookPublishing.c" +#line 7101 "FacebookPublishing.c" } } #line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp80_ = _error_; #line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp80_ == NULL) { -#line 7104 "FacebookPublishing.c" - PublishingFacebookGraphSessionGraphMessageImpl* _tmp81_ = NULL; +#line 7108 "FacebookPublishing.c" + PublishingFacebookGraphSessionGraphMessageImpl* _tmp81_; #line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp81_ = real_message; #line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), "completed"); -#line 7110 "FacebookPublishing.c" + g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_COMPLETED_SIGNAL], 0); +#line 7114 "FacebookPublishing.c" } else { - PublishingFacebookGraphSessionGraphMessageImpl* _tmp82_ = NULL; - GError* _tmp83_ = NULL; + PublishingFacebookGraphSessionGraphMessageImpl* _tmp82_; + GError* _tmp83_; #line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp82_ = real_message; #line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp83_ = _error_; #line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), "failed", _tmp83_); -#line 7120 "FacebookPublishing.c" + g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_FAILED_SIGNAL], 0, _tmp83_); +#line 7124 "FacebookPublishing.c" } #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_error_free0 (_error_); #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _publishing_facebook_graph_message_unref0 (real_message); -#line 7126 "FacebookPublishing.c" +#line 7130 "FacebookPublishing.c" } void publishing_facebook_graph_session_authenticate (PublishingFacebookGraphSession* self, const gchar* access_token) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self)); #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -7162,14 +7166,14 @@ void publishing_facebook_graph_session_authenticate (PublishingFacebookGraphSess #line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self->priv->access_token = _tmp1_; #line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - g_signal_emit_by_name (self, "authenticated"); -#line 7147 "FacebookPublishing.c" + g_signal_emit (self, publishing_facebook_graph_session_signals[PUBLISHING_FACEBOOK_GRAPH_SESSION_AUTHENTICATED_SIGNAL], 0); +#line 7151 "FacebookPublishing.c" } gboolean publishing_facebook_graph_session_is_authenticated (PublishingFacebookGraphSession* self) { gboolean result = FALSE; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), FALSE); #line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -7178,15 +7182,15 @@ gboolean publishing_facebook_graph_session_is_authenticated (PublishingFacebookG result = _tmp0_ != NULL; #line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 7162 "FacebookPublishing.c" +#line 7166 "FacebookPublishing.c" } PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_query (PublishingFacebookGraphSession* self, const gchar* resource_path) { PublishingFacebookGraphMessage* result = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - PublishingFacebookGraphSessionGraphQueryMessage* _tmp2_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + PublishingFacebookGraphSessionGraphQueryMessage* _tmp2_; #line 1273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL); #line 1273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -7201,18 +7205,18 @@ PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_query (Pub result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage); #line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 7185 "FacebookPublishing.c" +#line 7189 "FacebookPublishing.c" } PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_upload (PublishingFacebookGraphSession* self, const gchar* resource_path, SpitPublishingPublishable* publishable, gboolean suppress_titling, const gchar* resource_privacy) { PublishingFacebookGraphMessage* result = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - SpitPublishingPublishable* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - const gchar* _tmp4_ = NULL; - PublishingFacebookGraphSessionGraphUploadMessage* _tmp5_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + SpitPublishingPublishable* _tmp2_; + gboolean _tmp3_; + const gchar* _tmp4_; + PublishingFacebookGraphSessionGraphUploadMessage* _tmp5_; #line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL); #line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -7235,16 +7239,16 @@ PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_upload (Pu result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage); #line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 7219 "FacebookPublishing.c" +#line 7223 "FacebookPublishing.c" } PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_create_album (PublishingFacebookGraphSession* self, const gchar* album_name, const gchar* privacy) { PublishingFacebookGraphMessage* result = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PublishingFacebookGraphSessionGraphCreateAlbumMessage* _tmp3_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + PublishingFacebookGraphSessionGraphCreateAlbumMessage* _tmp3_; #line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL); #line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -7263,24 +7267,24 @@ PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_create_alb result = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage); #line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 7247 "FacebookPublishing.c" +#line 7251 "FacebookPublishing.c" } void publishing_facebook_graph_session_send_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* message) { PublishingFacebookGraphSessionGraphMessageImpl* real_message = NULL; - PublishingFacebookGraphMessage* _tmp0_ = NULL; - PublishingFacebookGraphSessionGraphMessageImpl* _tmp1_ = NULL; - PublishingFacebookGraphSessionGraphMessageImpl* _tmp2_ = NULL; - SoupMessage* _tmp3_ = NULL; - SoupURI* _tmp4_ = NULL; - SoupURI* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - PublishingFacebookGraphSessionGraphMessageImpl* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; + PublishingFacebookGraphMessage* _tmp0_; + PublishingFacebookGraphSessionGraphMessageImpl* _tmp1_; + PublishingFacebookGraphSessionGraphMessageImpl* _tmp2_; + SoupMessage* _tmp3_; + SoupURI* _tmp4_; + SoupURI* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + PublishingFacebookGraphSessionGraphMessageImpl* _tmp10_; + gboolean _tmp11_; #line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self)); #line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -7319,12 +7323,12 @@ void publishing_facebook_graph_session_send_message (PublishingFacebookGraphSess _tmp11_ = publishing_facebook_graph_session_graph_message_impl_prepare_for_transmission (_tmp10_); #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp11_) { -#line 7303 "FacebookPublishing.c" - PublishingFacebookGraphMessage* _tmp12_ = NULL; - SoupSession* _tmp13_ = NULL; - PublishingFacebookGraphSessionGraphMessageImpl* _tmp14_ = NULL; - SoupMessage* _tmp15_ = NULL; - SoupMessage* _tmp16_ = NULL; +#line 7307 "FacebookPublishing.c" + PublishingFacebookGraphMessage* _tmp12_; + SoupSession* _tmp13_; + PublishingFacebookGraphSessionGraphMessageImpl* _tmp14_; + SoupMessage* _tmp15_; + SoupMessage* _tmp16_; #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp12_ = message; #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -7339,35 +7343,35 @@ void publishing_facebook_graph_session_send_message (PublishingFacebookGraphSess _tmp16_ = _g_object_ref0 (_tmp15_); #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" soup_session_queue_message (_tmp13_, _tmp16_, NULL, NULL); -#line 7323 "FacebookPublishing.c" +#line 7327 "FacebookPublishing.c" } #line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _publishing_facebook_graph_message_unref0 (real_message); -#line 7327 "FacebookPublishing.c" +#line 7331 "FacebookPublishing.c" } void publishing_facebook_graph_session_stop_transactions (PublishingFacebookGraphSession* self) { - SoupSession* _tmp0_ = NULL; + SoupSession* _tmp0_; #line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self)); #line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp0_ = self->priv->soup_session; #line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" soup_session_abort (_tmp0_); -#line 7339 "FacebookPublishing.c" +#line 7343 "FacebookPublishing.c" } static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph_session_graph_message_impl_construct (GType object_type, PublishingFacebookGraphSession* host_session, PublishingRESTSupportHttpMethod method, const gchar* relative_uri, const gchar* access_token, PublishingFacebookEndpoint endpoint) { PublishingFacebookGraphSessionGraphMessageImpl* self = NULL; - PublishingRESTSupportHttpMethod _tmp0_ = 0; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - PublishingFacebookGraphSession* _tmp3_ = NULL; + PublishingRESTSupportHttpMethod _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + PublishingFacebookGraphSession* _tmp3_; gchar* endpoint_uri = NULL; - PublishingFacebookEndpoint _tmp4_ = 0; - gchar* _tmp5_ = NULL; + PublishingFacebookEndpoint _tmp4_; + gchar* _tmp5_; GError * _inner_error_ = NULL; #line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL); @@ -7401,18 +7405,16 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph _tmp5_ = publishing_facebook_endpoint_to_uri (_tmp4_); #line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" endpoint_uri = _tmp5_; -#line 7385 "FacebookPublishing.c" +#line 7389 "FacebookPublishing.c" { GRegex* starting_slashes = NULL; - GRegex* _tmp6_ = NULL; + GRegex* _tmp6_; gchar* _tmp7_ = NULL; - GRegex* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; + GRegex* _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp6_ = g_regex_new ("^/+", 0, 0, &_inner_error_); #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -7421,7 +7423,7 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 7405 "FacebookPublishing.c" +#line 7407 "FacebookPublishing.c" goto __catch4_g_regex_error; } #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -7432,7 +7434,7 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph g_clear_error (&_inner_error_); #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return NULL; -#line 7416 "FacebookPublishing.c" +#line 7418 "FacebookPublishing.c" } #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp8_ = starting_slashes; @@ -7448,7 +7450,7 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph _g_regex_unref0 (starting_slashes); #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 7432 "FacebookPublishing.c" +#line 7434 "FacebookPublishing.c" goto __catch4_g_regex_error; } #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -7461,29 +7463,21 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph g_clear_error (&_inner_error_); #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return NULL; -#line 7445 "FacebookPublishing.c" +#line 7447 "FacebookPublishing.c" } #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp11_ = endpoint_uri; #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp12_ = _tmp7_; -#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp7_ = NULL; -#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp13_ = _tmp12_; -#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp14_ = g_strconcat (_tmp11_, _tmp13_, NULL); + _tmp12_ = g_strconcat (_tmp11_, _tmp7_, NULL); #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 (self->uri); #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - self->uri = _tmp14_; -#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _g_free0 (_tmp13_); + self->uri = _tmp12_; #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 (_tmp7_); #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_regex_unref0 (starting_slashes); -#line 7467 "FacebookPublishing.c" +#line 7461 "FacebookPublishing.c" } goto __finally4; __catch4_g_regex_error: @@ -7497,7 +7491,7 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph g_assert_not_reached (); #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_error_free0 (err); -#line 7481 "FacebookPublishing.c" +#line 7475 "FacebookPublishing.c" } __finally4: #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -7510,13 +7504,13 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph g_clear_error (&_inner_error_); #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return NULL; -#line 7494 "FacebookPublishing.c" +#line 7488 "FacebookPublishing.c" } #line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 (endpoint_uri); #line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self; -#line 7500 "FacebookPublishing.c" +#line 7494 "FacebookPublishing.c" } @@ -7526,7 +7520,7 @@ static gboolean publishing_facebook_graph_session_graph_message_impl_real_prepar result = TRUE; #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 7510 "FacebookPublishing.c" +#line 7504 "FacebookPublishing.c" } @@ -7535,15 +7529,15 @@ gboolean publishing_facebook_graph_session_graph_message_impl_prepare_for_transm g_return_val_if_fail (PUBLISHING_FACEBOOK_GRAPH_SESSION_IS_GRAPH_MESSAGE_IMPL (self), FALSE); #line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_MESSAGE_IMPL_GET_CLASS (self)->prepare_for_transmission (self); -#line 7519 "FacebookPublishing.c" +#line 7513 "FacebookPublishing.c" } static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_uri (PublishingFacebookGraphMessage* base) { PublishingFacebookGraphSessionGraphMessageImpl * self; gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl); #line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -7554,18 +7548,18 @@ static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_uri result = _tmp1_; #line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 7538 "FacebookPublishing.c" +#line 7532 "FacebookPublishing.c" } static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_response_body (PublishingFacebookGraphMessage* base) { PublishingFacebookGraphSessionGraphMessageImpl * self; gchar* result = NULL; - SoupMessage* _tmp0_ = NULL; - SoupMessageBody* _tmp1_ = NULL; - guint8* _tmp2_ = NULL; - gint _tmp2__length1 = 0; - gchar* _tmp3_ = NULL; + SoupMessage* _tmp0_; + SoupMessageBody* _tmp1_; + guint8* _tmp2_; + gint _tmp2__length1; + gchar* _tmp3_; #line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl); #line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -7582,18 +7576,18 @@ static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_resp result = _tmp3_; #line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 7566 "FacebookPublishing.c" +#line 7560 "FacebookPublishing.c" } static void publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data (PublishingFacebookGraphSessionGraphMessageImpl* self, SoupBuffer* chunk) { - gint _tmp0_ = 0; - SoupBuffer* _tmp1_ = NULL; - gsize _tmp2_ = 0UL; - gint _tmp3_ = 0; - SoupMessage* _tmp4_ = NULL; - SoupMessageBody* _tmp5_ = NULL; - gint64 _tmp6_ = 0LL; + gint _tmp0_; + SoupBuffer* _tmp1_; + gsize _tmp2_; + gint _tmp3_; + SoupMessage* _tmp4_; + SoupMessageBody* _tmp5_; + gint64 _tmp6_; #line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_GRAPH_SESSION_IS_GRAPH_MESSAGE_IMPL (self)); #line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -7615,8 +7609,8 @@ static void publishing_facebook_graph_session_graph_message_impl_on_wrote_body_d #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp6_ = _tmp5_->length; #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), "data-transmitted", _tmp3_, (gint) _tmp6_); -#line 7600 "FacebookPublishing.c" + g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_DATA_TRANSMITTED_SIGNAL], 0, _tmp3_, (gint) _tmp6_); +#line 7594 "FacebookPublishing.c" } @@ -7626,12 +7620,12 @@ static void publishing_facebook_graph_session_graph_message_impl_class_init (Pub #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" ((PublishingFacebookGraphMessageClass *) klass)->finalize = publishing_facebook_graph_session_graph_message_impl_finalize; #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - ((PublishingFacebookGraphSessionGraphMessageImplClass *) klass)->prepare_for_transmission = (gboolean (*)(PublishingFacebookGraphSessionGraphMessageImpl*)) publishing_facebook_graph_session_graph_message_impl_real_prepare_for_transmission; + ((PublishingFacebookGraphSessionGraphMessageImplClass *) klass)->prepare_for_transmission = (gboolean (*) (PublishingFacebookGraphSessionGraphMessageImpl *)) publishing_facebook_graph_session_graph_message_impl_real_prepare_for_transmission; #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - ((PublishingFacebookGraphMessageClass *) klass)->get_uri = (gchar* (*)(PublishingFacebookGraphMessage*)) publishing_facebook_graph_session_graph_message_impl_real_get_uri; + ((PublishingFacebookGraphMessageClass *) klass)->get_uri = (gchar* (*) (PublishingFacebookGraphMessage *)) publishing_facebook_graph_session_graph_message_impl_real_get_uri; #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - ((PublishingFacebookGraphMessageClass *) klass)->get_response_body = (gchar* (*)(PublishingFacebookGraphMessage*)) publishing_facebook_graph_session_graph_message_impl_real_get_response_body; -#line 7615 "FacebookPublishing.c" + ((PublishingFacebookGraphMessageClass *) klass)->get_response_body = (gchar* (*) (PublishingFacebookGraphMessage *)) publishing_facebook_graph_session_graph_message_impl_real_get_response_body; +#line 7609 "FacebookPublishing.c" } @@ -7639,7 +7633,7 @@ static void publishing_facebook_graph_session_graph_message_impl_instance_init ( } -static void publishing_facebook_graph_session_graph_message_impl_finalize (PublishingFacebookGraphMessage* obj) { +static void publishing_facebook_graph_session_graph_message_impl_finalize (PublishingFacebookGraphMessage * obj) { PublishingFacebookGraphSessionGraphMessageImpl * self; #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl); @@ -7651,7 +7645,7 @@ static void publishing_facebook_graph_session_graph_message_impl_finalize (Publi _g_object_unref0 (self->soup_message); #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" PUBLISHING_FACEBOOK_GRAPH_MESSAGE_CLASS (publishing_facebook_graph_session_graph_message_impl_parent_class)->finalize (obj); -#line 7635 "FacebookPublishing.c" +#line 7629 "FacebookPublishing.c" } @@ -7670,29 +7664,29 @@ static GType publishing_facebook_graph_session_graph_message_impl_get_type (void static void _vala_SoupURI_free (SoupURI* self) { #line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_boxed_free (soup_uri_get_type (), self); -#line 7654 "FacebookPublishing.c" +#line 7648 "FacebookPublishing.c" } static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_graph_session_graph_query_message_construct (GType object_type, PublishingFacebookGraphSession* host_session, const gchar* relative_uri, const gchar* access_token) { PublishingFacebookGraphSessionGraphQueryMessage* self = NULL; - PublishingFacebookGraphSession* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + PublishingFacebookGraphSession* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; SoupURI* destination_uri = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - SoupURI* _tmp9_ = NULL; - SoupURI* _tmp10_ = NULL; - PublishingRESTSupportHttpMethod _tmp11_ = 0; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - SoupMessage* _tmp14_ = NULL; - SoupMessage* _tmp15_ = NULL; + const gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + SoupURI* _tmp9_; + SoupURI* _tmp10_; + PublishingRESTSupportHttpMethod _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + SoupMessage* _tmp14_; + SoupMessage* _tmp15_; #line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL); #line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -7751,21 +7745,21 @@ static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_grap __vala_SoupURI_free0 (destination_uri); #line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self; -#line 7735 "FacebookPublishing.c" +#line 7729 "FacebookPublishing.c" } static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_graph_session_graph_query_message_new (PublishingFacebookGraphSession* host_session, const gchar* relative_uri, const gchar* access_token) { #line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return publishing_facebook_graph_session_graph_query_message_construct (PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_QUERY_MESSAGE, host_session, relative_uri, access_token); -#line 7742 "FacebookPublishing.c" +#line 7736 "FacebookPublishing.c" } static void publishing_facebook_graph_session_graph_query_message_class_init (PublishingFacebookGraphSessionGraphQueryMessageClass * klass) { #line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_graph_session_graph_query_message_parent_class = g_type_class_peek_parent (klass); -#line 7749 "FacebookPublishing.c" +#line 7743 "FacebookPublishing.c" } @@ -7787,15 +7781,15 @@ static GType publishing_facebook_graph_session_graph_query_message_get_type (voi static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_facebook_graph_session_graph_endpoint_probe_message_construct (GType object_type, PublishingFacebookGraphSession* host_session) { PublishingFacebookGraphSessionGraphEndpointProbeMessage* self = NULL; - PublishingFacebookGraphSession* _tmp0_ = NULL; - PublishingRESTSupportHttpMethod _tmp1_ = 0; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - SoupURI* _tmp5_ = NULL; - SoupURI* _tmp6_ = NULL; - SoupMessage* _tmp7_ = NULL; - SoupMessage* _tmp8_ = NULL; + PublishingFacebookGraphSession* _tmp0_; + PublishingRESTSupportHttpMethod _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; + SoupURI* _tmp5_; + SoupURI* _tmp6_; + SoupMessage* _tmp7_; + SoupMessage* _tmp8_; #line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL); #line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -7830,21 +7824,21 @@ static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_faceb g_signal_connect (_tmp8_, "wrote-body-data", (GCallback) _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)); #line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self; -#line 7814 "FacebookPublishing.c" +#line 7808 "FacebookPublishing.c" } static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_facebook_graph_session_graph_endpoint_probe_message_new (PublishingFacebookGraphSession* host_session) { #line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return publishing_facebook_graph_session_graph_endpoint_probe_message_construct (PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE, host_session); -#line 7821 "FacebookPublishing.c" +#line 7815 "FacebookPublishing.c" } static void publishing_facebook_graph_session_graph_endpoint_probe_message_class_init (PublishingFacebookGraphSessionGraphEndpointProbeMessageClass * klass) { #line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_graph_session_graph_endpoint_probe_message_parent_class = g_type_class_peek_parent (klass); -#line 7828 "FacebookPublishing.c" +#line 7822 "FacebookPublishing.c" } @@ -7866,101 +7860,101 @@ static GType publishing_facebook_graph_session_graph_endpoint_probe_message_get_ static gchar* g_date_time_to_string (GDateTime* self) { gchar* result = NULL; - gchar* _tmp0_ = NULL; -#line 2834 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; +#line 2930 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 2835 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2931 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_date_time_format (self, "%FT%H:%M:%S%z"); -#line 2835 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2931 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp0_; -#line 2835 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2931 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 7859 "FacebookPublishing.c" +#line 7853 "FacebookPublishing.c" } static void _vala_SoupMultipart_free (SoupMultipart* self) { #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_boxed_free (soup_multipart_get_type (), self); -#line 7866 "FacebookPublishing.c" +#line 7860 "FacebookPublishing.c" } static void _vala_SoupBuffer_free (SoupBuffer* self) { #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_boxed_free (soup_buffer_get_type (), self); -#line 7873 "FacebookPublishing.c" +#line 7867 "FacebookPublishing.c" } static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_graph_session_graph_upload_message_construct (GType object_type, PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* relative_uri, SpitPublishingPublishable* publishable, gboolean suppress_titling, const gchar* resource_privacy) { PublishingFacebookGraphSessionGraphUploadMessage* self = NULL; PublishingFacebookEndpoint _tmp0_ = 0; - SpitPublishingPublishable* _tmp1_ = NULL; - SpitPublishingPublisherMediaType _tmp2_ = 0; - PublishingFacebookGraphSession* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; + SpitPublishingPublishable* _tmp1_; + SpitPublishingPublisherMediaType _tmp2_; + PublishingFacebookGraphSession* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp5_; gboolean _tmp6_ = FALSE; - SpitPublishingPublishable* _tmp7_ = NULL; - SpitPublishingPublisherMediaType _tmp8_ = 0; - SpitPublishingPublishable* _tmp10_ = NULL; - SpitPublishingPublishable* _tmp11_ = NULL; - PublishingRESTSupportHttpMethod _tmp21_ = 0; - gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - SoupURI* _tmp25_ = NULL; - SoupURI* _tmp26_ = NULL; - SoupMessage* _tmp27_ = NULL; - SoupMessage* _tmp28_ = NULL; + SpitPublishingPublishable* _tmp7_; + SpitPublishingPublisherMediaType _tmp8_; + SpitPublishingPublishable* _tmp10_; + SpitPublishingPublishable* _tmp11_; + PublishingRESTSupportHttpMethod _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + const gchar* _tmp24_; + SoupURI* _tmp25_; + SoupURI* _tmp26_; + SoupMessage* _tmp27_; + SoupMessage* _tmp28_; guint8* payload = NULL; - GMappedFile* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - gint payload_length1 = 0; - gint _payload_size_ = 0; - GMappedFile* _tmp31_ = NULL; - gsize _tmp32_ = 0UL; - gint _tmp33_ = 0; + GMappedFile* _tmp29_; + gchar* _tmp30_; + gint payload_length1; + gint _payload_size_; + GMappedFile* _tmp31_; + gsize _tmp32_; + gint _tmp33_; SoupBuffer* image_data = NULL; - guint8* _tmp34_ = NULL; - gint _tmp34__length1 = 0; - SoupBuffer* _tmp35_ = NULL; + guint8* _tmp34_; + gint _tmp34__length1; + SoupBuffer* _tmp35_; SoupMultipart* mp_envelope = NULL; - SoupMultipart* _tmp36_ = NULL; - SoupMultipart* _tmp37_ = NULL; - const gchar* _tmp38_ = NULL; - SpitPublishingPublishable* _tmp39_ = NULL; - SpitPublishingPublisherMediaType _tmp40_ = 0; + SoupMultipart* _tmp36_; + SoupMultipart* _tmp37_; + const gchar* _tmp38_; + SpitPublishingPublishable* _tmp39_; + SpitPublishingPublisherMediaType _tmp40_; gchar* publishable_title = NULL; - SpitPublishingPublishable* _tmp43_ = NULL; - gchar* _tmp44_ = NULL; + SpitPublishingPublishable* _tmp43_; + gchar* _tmp44_; gboolean _tmp45_ = FALSE; - gboolean _tmp46_ = FALSE; + gboolean _tmp46_; gchar* publishable_comment = NULL; - SpitPublishingPublishable* _tmp50_ = NULL; - gchar* _tmp51_ = NULL; + SpitPublishingPublishable* _tmp50_; + gchar* _tmp51_; gboolean _tmp52_ = FALSE; - gboolean _tmp53_ = FALSE; - gboolean _tmp57_ = FALSE; + gboolean _tmp53_; + gboolean _tmp57_; const gchar* _tmp64_ = NULL; - SpitPublishingPublishable* _tmp65_ = NULL; - SpitPublishingPublisherMediaType _tmp66_ = 0; + SpitPublishingPublishable* _tmp65_; + SpitPublishingPublisherMediaType _tmp66_; gchar* source_file_mime_type = NULL; - gchar* _tmp67_ = NULL; - SoupMultipart* _tmp68_ = NULL; - SpitPublishingPublishable* _tmp69_ = NULL; - GFile* _tmp70_ = NULL; - GFile* _tmp71_ = NULL; - gchar* _tmp72_ = NULL; - gchar* _tmp73_ = NULL; - const gchar* _tmp74_ = NULL; - SoupBuffer* _tmp75_ = NULL; - SoupMultipart* _tmp76_ = NULL; - SoupMessage* _tmp77_ = NULL; - SoupMessageHeaders* _tmp78_ = NULL; - SoupMessage* _tmp79_ = NULL; - SoupMessageBody* _tmp80_ = NULL; + gchar* _tmp67_; + SoupMultipart* _tmp68_; + SpitPublishingPublishable* _tmp69_; + GFile* _tmp70_; + GFile* _tmp71_; + gchar* _tmp72_; + gchar* _tmp73_; + const gchar* _tmp74_; + SoupBuffer* _tmp75_; + SoupMultipart* _tmp76_; + SoupMessage* _tmp77_; + SoupMessageHeaders* _tmp78_; + SoupMessage* _tmp79_; + SoupMessageBody* _tmp80_; GError * _inner_error_ = NULL; #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL); @@ -7978,11 +7972,11 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra if (_tmp2_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { #line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp0_ = PUBLISHING_FACEBOOK_ENDPOINT_VIDEO; -#line 7962 "FacebookPublishing.c" +#line 7956 "FacebookPublishing.c" } else { #line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp0_ = PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT; -#line 7966 "FacebookPublishing.c" +#line 7960 "FacebookPublishing.c" } #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp3_ = host_session; @@ -8000,14 +7994,14 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra if (_tmp8_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { #line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp6_ = TRUE; -#line 7984 "FacebookPublishing.c" +#line 7978 "FacebookPublishing.c" } else { - const gchar* _tmp9_ = NULL; + const gchar* _tmp9_; #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp9_ = resource_privacy; #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp6_ = _tmp9_ != NULL; -#line 7991 "FacebookPublishing.c" +#line 7985 "FacebookPublishing.c" } #line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _vala_assert (_tmp6_, "publishable.get_media_type() != Spit.Publishing.Publisher.MediaType.VIDEO || resource_privacy != null"); @@ -8019,17 +8013,17 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra _g_object_unref0 (self->priv->publishable); #line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self->priv->publishable = _tmp11_; -#line 8003 "FacebookPublishing.c" +#line 7997 "FacebookPublishing.c" { GMappedFile* _tmp12_ = NULL; - SpitPublishingPublishable* _tmp13_ = NULL; - GFile* _tmp14_ = NULL; - GFile* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - GMappedFile* _tmp18_ = NULL; - GMappedFile* _tmp19_ = NULL; - GMappedFile* _tmp20_ = NULL; + SpitPublishingPublishable* _tmp13_; + GFile* _tmp14_; + GFile* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + GMappedFile* _tmp18_; + GMappedFile* _tmp19_; + GMappedFile* _tmp20_; #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp13_ = publishable; #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -8054,7 +8048,7 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_inner_error_->domain == G_FILE_ERROR) { -#line 8038 "FacebookPublishing.c" +#line 8032 "FacebookPublishing.c" goto __catch5_g_file_error; } #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -8063,7 +8057,7 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra g_clear_error (&_inner_error_); #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return NULL; -#line 8047 "FacebookPublishing.c" +#line 8041 "FacebookPublishing.c" } #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp20_ = _tmp12_; @@ -8075,7 +8069,7 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra self->priv->mapped_file = _tmp20_; #line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_mapped_file_unref0 (_tmp12_); -#line 8059 "FacebookPublishing.c" +#line 8053 "FacebookPublishing.c" } goto __finally5; __catch5_g_file_error: @@ -8089,7 +8083,7 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra _g_error_free0 (e); #line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self; -#line 8073 "FacebookPublishing.c" +#line 8067 "FacebookPublishing.c" } __finally5: #line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -8100,7 +8094,7 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra g_clear_error (&_inner_error_); #line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return NULL; -#line 8084 "FacebookPublishing.c" +#line 8078 "FacebookPublishing.c" } #line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->method; @@ -8135,7 +8129,7 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra #line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" payload = (guint8*) _tmp30_; #line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - payload_length1 = -1; + payload_length1 = sizeof (gchar) / sizeof (guint8); #line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _payload_size_ = payload_length1; #line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -8170,16 +8164,16 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra _tmp40_ = spit_publishing_publishable_get_media_type (_tmp39_); #line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp40_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { -#line 8154 "FacebookPublishing.c" - SoupMultipart* _tmp41_ = NULL; - const gchar* _tmp42_ = NULL; +#line 8148 "FacebookPublishing.c" + SoupMultipart* _tmp41_; + const gchar* _tmp42_; #line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp41_ = mp_envelope; #line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp42_ = resource_privacy; #line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" soup_multipart_append_form_string (_tmp41_, "privacy", _tmp42_); -#line 8163 "FacebookPublishing.c" +#line 8157 "FacebookPublishing.c" } #line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp43_ = publishable; @@ -8191,30 +8185,30 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra _tmp46_ = suppress_titling; #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (!_tmp46_) { -#line 8175 "FacebookPublishing.c" - const gchar* _tmp47_ = NULL; +#line 8169 "FacebookPublishing.c" + const gchar* _tmp47_; #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp47_ = publishable_title; #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp45_ = _tmp47_ != NULL; -#line 8181 "FacebookPublishing.c" +#line 8175 "FacebookPublishing.c" } else { #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp45_ = FALSE; -#line 8185 "FacebookPublishing.c" +#line 8179 "FacebookPublishing.c" } #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp45_) { -#line 8189 "FacebookPublishing.c" - SoupMultipart* _tmp48_ = NULL; - const gchar* _tmp49_ = NULL; +#line 8183 "FacebookPublishing.c" + SoupMultipart* _tmp48_; + const gchar* _tmp49_; #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp48_ = mp_envelope; #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp49_ = publishable_title; #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" soup_multipart_append_form_string (_tmp48_, "name", _tmp49_); -#line 8198 "FacebookPublishing.c" +#line 8192 "FacebookPublishing.c" } #line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp50_ = publishable; @@ -8226,42 +8220,42 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra _tmp53_ = suppress_titling; #line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (!_tmp53_) { -#line 8210 "FacebookPublishing.c" - const gchar* _tmp54_ = NULL; +#line 8204 "FacebookPublishing.c" + const gchar* _tmp54_; #line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp54_ = publishable_comment; #line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp52_ = _tmp54_ != NULL; -#line 8216 "FacebookPublishing.c" +#line 8210 "FacebookPublishing.c" } else { #line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp52_ = FALSE; -#line 8220 "FacebookPublishing.c" +#line 8214 "FacebookPublishing.c" } #line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp52_) { -#line 8224 "FacebookPublishing.c" - SoupMultipart* _tmp55_ = NULL; - const gchar* _tmp56_ = NULL; +#line 8218 "FacebookPublishing.c" + SoupMultipart* _tmp55_; + const gchar* _tmp56_; #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp55_ = mp_envelope; #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp56_ = publishable_comment; #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" soup_multipart_append_form_string (_tmp55_, "message", _tmp56_); -#line 8233 "FacebookPublishing.c" +#line 8227 "FacebookPublishing.c" } #line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp57_ = suppress_titling; #line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (!_tmp57_) { -#line 8239 "FacebookPublishing.c" - SoupMultipart* _tmp58_ = NULL; - SpitPublishingPublishable* _tmp59_ = NULL; - GDateTime* _tmp60_ = NULL; - GDateTime* _tmp61_ = NULL; - gchar* _tmp62_ = NULL; - gchar* _tmp63_ = NULL; +#line 8233 "FacebookPublishing.c" + SoupMultipart* _tmp58_; + SpitPublishingPublishable* _tmp59_; + GDateTime* _tmp60_; + GDateTime* _tmp61_; + gchar* _tmp62_; + gchar* _tmp63_; #line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp58_ = mp_envelope; #line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -8280,7 +8274,7 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra _g_free0 (_tmp63_); #line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_date_time_unref0 (_tmp61_); -#line 8264 "FacebookPublishing.c" +#line 8258 "FacebookPublishing.c" } #line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp65_ = publishable; @@ -8290,11 +8284,11 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra if (_tmp66_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { #line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp64_ = "video"; -#line 8274 "FacebookPublishing.c" +#line 8268 "FacebookPublishing.c" } else { #line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp64_ = "image/jpeg"; -#line 8278 "FacebookPublishing.c" +#line 8272 "FacebookPublishing.c" } #line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp67_ = g_strdup (_tmp64_); @@ -8346,37 +8340,37 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra __vala_SoupBuffer_free0 (image_data); #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self; -#line 8330 "FacebookPublishing.c" +#line 8324 "FacebookPublishing.c" } static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_graph_session_graph_upload_message_new (PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* relative_uri, SpitPublishingPublishable* publishable, gboolean suppress_titling, const gchar* resource_privacy) { #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return publishing_facebook_graph_session_graph_upload_message_construct (PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_UPLOAD_MESSAGE, host_session, access_token, relative_uri, publishable, suppress_titling, resource_privacy); -#line 8337 "FacebookPublishing.c" +#line 8331 "FacebookPublishing.c" } static gboolean publishing_facebook_graph_session_graph_upload_message_real_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* base) { PublishingFacebookGraphSessionGraphUploadMessage * self; gboolean result = FALSE; - GMappedFile* _tmp0_ = NULL; + GMappedFile* _tmp0_; #line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_UPLOAD_MESSAGE, PublishingFacebookGraphSessionGraphUploadMessage); #line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp0_ = self->priv->mapped_file; #line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp0_ == NULL) { -#line 8351 "FacebookPublishing.c" - SpitPublishingPublishable* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GError* _tmp8_ = NULL; - GError* _tmp9_ = NULL; +#line 8345 "FacebookPublishing.c" + SpitPublishingPublishable* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + GError* _tmp8_; + GError* _tmp9_; #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp1_ = self->priv->publishable; #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -8396,7 +8390,7 @@ static gboolean publishing_facebook_graph_session_graph_upload_message_real_prep #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp9_ = _tmp8_; #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), "failed", _tmp9_); + g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_FAILED_SIGNAL], 0, _tmp9_); #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_error_free0 (_tmp9_); #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -8409,13 +8403,13 @@ static gboolean publishing_facebook_graph_session_graph_upload_message_real_prep result = FALSE; #line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 8393 "FacebookPublishing.c" +#line 8387 "FacebookPublishing.c" } else { #line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" result = TRUE; #line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 8399 "FacebookPublishing.c" +#line 8393 "FacebookPublishing.c" } } @@ -8428,8 +8422,8 @@ static void publishing_facebook_graph_session_graph_upload_message_class_init (P #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingFacebookGraphSessionGraphUploadMessagePrivate)); #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - ((PublishingFacebookGraphSessionGraphMessageImplClass *) klass)->prepare_for_transmission = (gboolean (*)(PublishingFacebookGraphSessionGraphMessageImpl*)) publishing_facebook_graph_session_graph_upload_message_real_prepare_for_transmission; -#line 8413 "FacebookPublishing.c" + ((PublishingFacebookGraphSessionGraphMessageImplClass *) klass)->prepare_for_transmission = (gboolean (*) (PublishingFacebookGraphSessionGraphMessageImpl *)) publishing_facebook_graph_session_graph_upload_message_real_prepare_for_transmission; +#line 8407 "FacebookPublishing.c" } @@ -8438,11 +8432,11 @@ static void publishing_facebook_graph_session_graph_upload_message_instance_init self->priv = PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_UPLOAD_MESSAGE_GET_PRIVATE (self); #line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self->priv->mapped_file = NULL; -#line 8422 "FacebookPublishing.c" +#line 8416 "FacebookPublishing.c" } -static void publishing_facebook_graph_session_graph_upload_message_finalize (PublishingFacebookGraphMessage* obj) { +static void publishing_facebook_graph_session_graph_upload_message_finalize (PublishingFacebookGraphMessage * obj) { PublishingFacebookGraphSessionGraphUploadMessage * self; #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_UPLOAD_MESSAGE, PublishingFacebookGraphSessionGraphUploadMessage); @@ -8452,7 +8446,7 @@ static void publishing_facebook_graph_session_graph_upload_message_finalize (Pub _g_object_unref0 (self->priv->publishable); #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" PUBLISHING_FACEBOOK_GRAPH_MESSAGE_CLASS (publishing_facebook_graph_session_graph_upload_message_parent_class)->finalize (obj); -#line 8436 "FacebookPublishing.c" +#line 8430 "FacebookPublishing.c" } @@ -8470,26 +8464,26 @@ static GType publishing_facebook_graph_session_graph_upload_message_get_type (vo static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_facebook_graph_session_graph_create_album_message_construct (GType object_type, PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* album_name, const gchar* album_privacy) { PublishingFacebookGraphSessionGraphCreateAlbumMessage* self = NULL; - PublishingFacebookGraphSession* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + PublishingFacebookGraphSession* _tmp0_; + const gchar* _tmp1_; gboolean _tmp2_ = FALSE; - const gchar* _tmp3_ = NULL; - PublishingRESTSupportHttpMethod _tmp5_ = 0; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - SoupURI* _tmp9_ = NULL; - SoupURI* _tmp10_ = NULL; - SoupMessage* _tmp11_ = NULL; + const gchar* _tmp3_; + PublishingRESTSupportHttpMethod _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + const gchar* _tmp8_; + SoupURI* _tmp9_; + SoupURI* _tmp10_; + SoupMessage* _tmp11_; SoupMultipart* mp_envelope = NULL; - SoupMultipart* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - SoupMessage* _tmp16_ = NULL; - SoupMessageHeaders* _tmp17_ = NULL; - SoupMessage* _tmp18_ = NULL; - SoupMessageBody* _tmp19_ = NULL; + SoupMultipart* _tmp12_; + const gchar* _tmp13_; + const gchar* _tmp14_; + const gchar* _tmp15_; + SoupMessage* _tmp16_; + SoupMessageHeaders* _tmp17_; + SoupMessage* _tmp18_; + SoupMessageBody* _tmp19_; #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL); #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -8508,17 +8502,17 @@ static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_faceboo _tmp3_ = album_privacy; #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp3_ != NULL) { -#line 8492 "FacebookPublishing.c" - const gchar* _tmp4_ = NULL; +#line 8486 "FacebookPublishing.c" + const gchar* _tmp4_; #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp4_ = album_privacy; #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp2_ = g_strcmp0 (_tmp4_, "") != 0; -#line 8498 "FacebookPublishing.c" +#line 8492 "FacebookPublishing.c" } else { #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp2_ = FALSE; -#line 8502 "FacebookPublishing.c" +#line 8496 "FacebookPublishing.c" } #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _vala_assert (_tmp2_, "album_privacy != null && album_privacy != \"\""); @@ -8574,21 +8568,21 @@ static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_faceboo __vala_SoupMultipart_free0 (mp_envelope); #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self; -#line 8558 "FacebookPublishing.c" +#line 8552 "FacebookPublishing.c" } static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_facebook_graph_session_graph_create_album_message_new (PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* album_name, const gchar* album_privacy) { #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return publishing_facebook_graph_session_graph_create_album_message_construct (PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_CREATE_ALBUM_MESSAGE, host_session, access_token, album_name, album_privacy); -#line 8565 "FacebookPublishing.c" +#line 8559 "FacebookPublishing.c" } static void publishing_facebook_graph_session_graph_create_album_message_class_init (PublishingFacebookGraphSessionGraphCreateAlbumMessageClass * klass) { #line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_graph_session_graph_create_album_message_parent_class = g_type_class_peek_parent (klass); -#line 8572 "FacebookPublishing.c" +#line 8566 "FacebookPublishing.c" } @@ -8611,7 +8605,7 @@ static GType publishing_facebook_graph_session_graph_create_album_message_get_ty static void publishing_facebook_value_graph_session_init (GValue* value) { #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 8595 "FacebookPublishing.c" +#line 8589 "FacebookPublishing.c" } @@ -8620,7 +8614,7 @@ static void publishing_facebook_value_graph_session_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_graph_session_unref (value->data[0].v_pointer); -#line 8604 "FacebookPublishing.c" +#line 8598 "FacebookPublishing.c" } } @@ -8630,11 +8624,11 @@ static void publishing_facebook_value_graph_session_copy_value (const GValue* sr if (src_value->data[0].v_pointer) { #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" dest_value->data[0].v_pointer = publishing_facebook_graph_session_ref (src_value->data[0].v_pointer); -#line 8614 "FacebookPublishing.c" +#line 8608 "FacebookPublishing.c" } else { #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 8618 "FacebookPublishing.c" +#line 8612 "FacebookPublishing.c" } } @@ -8642,66 +8636,66 @@ static void publishing_facebook_value_graph_session_copy_value (const GValue* sr static gpointer publishing_facebook_value_graph_session_peek_pointer (const GValue* value) { #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return value->data[0].v_pointer; -#line 8626 "FacebookPublishing.c" +#line 8620 "FacebookPublishing.c" } static gchar* publishing_facebook_value_graph_session_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (collect_values[0].v_pointer) { -#line 8633 "FacebookPublishing.c" - PublishingFacebookGraphSession* object; +#line 8627 "FacebookPublishing.c" + PublishingFacebookGraphSession * object; object = collect_values[0].v_pointer; #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8640 "FacebookPublishing.c" +#line 8634 "FacebookPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8644 "FacebookPublishing.c" +#line 8638 "FacebookPublishing.c" } #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = publishing_facebook_graph_session_ref (object); -#line 8648 "FacebookPublishing.c" +#line 8642 "FacebookPublishing.c" } else { #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 8652 "FacebookPublishing.c" +#line 8646 "FacebookPublishing.c" } #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return NULL; -#line 8656 "FacebookPublishing.c" +#line 8650 "FacebookPublishing.c" } static gchar* publishing_facebook_value_graph_session_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingFacebookGraphSession** object_p; + PublishingFacebookGraphSession ** object_p; object_p = collect_values[0].v_pointer; #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (!object_p) { #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 8667 "FacebookPublishing.c" +#line 8661 "FacebookPublishing.c" } #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (!value->data[0].v_pointer) { #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *object_p = NULL; -#line 8673 "FacebookPublishing.c" +#line 8667 "FacebookPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *object_p = value->data[0].v_pointer; -#line 8677 "FacebookPublishing.c" +#line 8671 "FacebookPublishing.c" } else { #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *object_p = publishing_facebook_graph_session_ref (value->data[0].v_pointer); -#line 8681 "FacebookPublishing.c" +#line 8675 "FacebookPublishing.c" } #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return NULL; -#line 8685 "FacebookPublishing.c" +#line 8679 "FacebookPublishing.c" } @@ -8715,7 +8709,7 @@ GParamSpec* publishing_facebook_param_spec_graph_session (const gchar* name, con G_PARAM_SPEC (spec)->value_type = object_type; #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return G_PARAM_SPEC (spec); -#line 8699 "FacebookPublishing.c" +#line 8693 "FacebookPublishing.c" } @@ -8724,12 +8718,12 @@ gpointer publishing_facebook_value_get_graph_session (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION), NULL); #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return value->data[0].v_pointer; -#line 8708 "FacebookPublishing.c" +#line 8702 "FacebookPublishing.c" } void publishing_facebook_value_set_graph_session (GValue* value, gpointer v_object) { - PublishingFacebookGraphSession* old; + PublishingFacebookGraphSession * old; #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION)); #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -8744,23 +8738,23 @@ void publishing_facebook_value_set_graph_session (GValue* value, gpointer v_obje value->data[0].v_pointer = v_object; #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_graph_session_ref (value->data[0].v_pointer); -#line 8728 "FacebookPublishing.c" +#line 8722 "FacebookPublishing.c" } else { #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 8732 "FacebookPublishing.c" +#line 8726 "FacebookPublishing.c" } #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (old) { #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_graph_session_unref (old); -#line 8738 "FacebookPublishing.c" +#line 8732 "FacebookPublishing.c" } } void publishing_facebook_value_take_graph_session (GValue* value, gpointer v_object) { - PublishingFacebookGraphSession* old; + PublishingFacebookGraphSession * old; #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION)); #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -8773,17 +8767,17 @@ void publishing_facebook_value_take_graph_session (GValue* value, gpointer v_obj g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = v_object; -#line 8757 "FacebookPublishing.c" +#line 8751 "FacebookPublishing.c" } else { #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 8761 "FacebookPublishing.c" +#line 8755 "FacebookPublishing.c" } #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (old) { #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_graph_session_unref (old); -#line 8767 "FacebookPublishing.c" +#line 8761 "FacebookPublishing.c" } } @@ -8796,8 +8790,8 @@ static void publishing_facebook_graph_session_class_init (PublishingFacebookGrap #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingFacebookGraphSessionPrivate)); #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - g_signal_new ("authenticated", PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 8781 "FacebookPublishing.c" + publishing_facebook_graph_session_signals[PUBLISHING_FACEBOOK_GRAPH_SESSION_AUTHENTICATED_SIGNAL] = g_signal_new ("authenticated", PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 8775 "FacebookPublishing.c" } @@ -8806,14 +8800,14 @@ static void publishing_facebook_graph_session_instance_init (PublishingFacebookG self->priv = PUBLISHING_FACEBOOK_GRAPH_SESSION_GET_PRIVATE (self); #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self->ref_count = 1; -#line 8790 "FacebookPublishing.c" +#line 8784 "FacebookPublishing.c" } -static void publishing_facebook_graph_session_finalize (PublishingFacebookGraphSession* obj) { +static void publishing_facebook_graph_session_finalize (PublishingFacebookGraphSession * obj) { PublishingFacebookGraphSession * self; - SoupSession* _tmp0_ = NULL; - guint _tmp1_ = 0U; + SoupSession* _tmp0_; + guint _tmp1_; #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION, PublishingFacebookGraphSession); #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -8830,7 +8824,7 @@ static void publishing_facebook_graph_session_finalize (PublishingFacebookGraphS _g_free0 (self->priv->access_token); #line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _publishing_facebook_graph_message_unref0 (self->priv->current_message); -#line 8814 "FacebookPublishing.c" +#line 8808 "FacebookPublishing.c" } @@ -8849,18 +8843,18 @@ GType publishing_facebook_graph_session_get_type (void) { gpointer publishing_facebook_graph_session_ref (gpointer instance) { - PublishingFacebookGraphSession* self; + PublishingFacebookGraphSession * self; self = instance; #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_atomic_int_inc (&self->ref_count); #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return instance; -#line 8839 "FacebookPublishing.c" +#line 8833 "FacebookPublishing.c" } void publishing_facebook_graph_session_unref (gpointer instance) { - PublishingFacebookGraphSession* self; + PublishingFacebookGraphSession * self; self = instance; #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -8868,7 +8862,7 @@ void publishing_facebook_graph_session_unref (gpointer instance) { PUBLISHING_FACEBOOK_GRAPH_SESSION_GET_CLASS (self)->finalize (self); #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 8852 "FacebookPublishing.c" +#line 8846 "FacebookPublishing.c" } } @@ -8880,44 +8874,44 @@ static SpitPublishingPublishable** _vala_array_dup3 (SpitPublishingPublishable** result = g_new0 (SpitPublishingPublishable*, length + 1); #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" for (i = 0; i < length; i++) { -#line 8864 "FacebookPublishing.c" - SpitPublishingPublishable* _tmp0_ = NULL; +#line 8858 "FacebookPublishing.c" + SpitPublishingPublishable* _tmp0_; #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" result[i] = _tmp0_; -#line 8870 "FacebookPublishing.c" +#line 8864 "FacebookPublishing.c" } #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return result; -#line 8874 "FacebookPublishing.c" +#line 8868 "FacebookPublishing.c" } static gpointer _publishing_facebook_graph_session_ref0 (gpointer self) { #line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self ? publishing_facebook_graph_session_ref (self) : NULL; -#line 8881 "FacebookPublishing.c" +#line 8875 "FacebookPublishing.c" } static gpointer _publishing_facebook_publishing_parameters_ref0 (gpointer self) { #line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self ? publishing_facebook_publishing_parameters_ref (self) : NULL; -#line 8888 "FacebookPublishing.c" +#line 8882 "FacebookPublishing.c" } PublishingFacebookUploader* publishing_facebook_uploader_construct (GType object_type, PublishingFacebookGraphSession* session, PublishingFacebookPublishingParameters* publishing_params, SpitPublishingPublishable** publishables, int publishables_length1) { PublishingFacebookUploader* self = NULL; - SpitPublishingPublishable** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - SpitPublishingPublishable** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - PublishingFacebookGraphSession* _tmp2_ = NULL; - PublishingFacebookGraphSession* _tmp3_ = NULL; - PublishingFacebookPublishingParameters* _tmp4_ = NULL; - PublishingFacebookPublishingParameters* _tmp5_ = NULL; + SpitPublishingPublishable** _tmp0_; + gint _tmp0__length1; + SpitPublishingPublishable** _tmp1_; + gint _tmp1__length1; + PublishingFacebookGraphSession* _tmp2_; + PublishingFacebookGraphSession* _tmp3_; + PublishingFacebookPublishingParameters* _tmp4_; + PublishingFacebookPublishingParameters* _tmp5_; #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (session), NULL); #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -8960,72 +8954,72 @@ PublishingFacebookUploader* publishing_facebook_uploader_construct (GType object self->priv->publishing_params = _tmp5_; #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return self; -#line 8944 "FacebookPublishing.c" +#line 8938 "FacebookPublishing.c" } PublishingFacebookUploader* publishing_facebook_uploader_new (PublishingFacebookGraphSession* session, PublishingFacebookPublishingParameters* publishing_params, SpitPublishingPublishable** publishables, int publishables_length1) { #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return publishing_facebook_uploader_construct (PUBLISHING_FACEBOOK_TYPE_UPLOADER, session, publishing_params, publishables, publishables_length1); -#line 8951 "FacebookPublishing.c" +#line 8945 "FacebookPublishing.c" } static void _publishing_facebook_uploader_on_chunk_transmitted_publishing_facebook_graph_message_data_transmitted (PublishingFacebookGraphMessage* _sender, gint bytes_sent_so_far, gint total_bytes, gpointer self) { #line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_uploader_on_chunk_transmitted ((PublishingFacebookUploader*) self, bytes_sent_so_far, total_bytes); -#line 8958 "FacebookPublishing.c" +#line 8952 "FacebookPublishing.c" } static void _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) { #line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_uploader_on_message_completed ((PublishingFacebookUploader*) self, _sender); -#line 8965 "FacebookPublishing.c" +#line 8959 "FacebookPublishing.c" } static void _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) { #line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_uploader_on_message_failed ((PublishingFacebookUploader*) self, _sender, err); -#line 8972 "FacebookPublishing.c" +#line 8966 "FacebookPublishing.c" } static void publishing_facebook_uploader_send_current_file (PublishingFacebookUploader* self) { SpitPublishingPublishable* publishable = NULL; - SpitPublishingPublishable** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - gint _tmp1_ = 0; - SpitPublishingPublishable* _tmp2_ = NULL; - SpitPublishingPublishable* _tmp3_ = NULL; + SpitPublishingPublishable** _tmp0_; + gint _tmp0__length1; + gint _tmp1_; + SpitPublishingPublishable* _tmp2_; + SpitPublishingPublishable* _tmp3_; GFile* file = NULL; - SpitPublishingPublishable* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; + SpitPublishingPublishable* _tmp4_; + GFile* _tmp5_; + GFile* _tmp6_; gchar* _tmp8_ = NULL; - SpitPublishingPublishable* _tmp9_ = NULL; - SpitPublishingPublisherMediaType _tmp10_ = 0; + SpitPublishingPublishable* _tmp9_; + SpitPublishingPublisherMediaType _tmp10_; gchar* resource_uri = NULL; - gchar* _tmp16_ = NULL; + gchar* _tmp16_; const gchar* _tmp17_ = NULL; - SpitPublishingPublishable* _tmp18_ = NULL; - SpitPublishingPublisherMediaType _tmp19_ = 0; + SpitPublishingPublishable* _tmp18_; + SpitPublishingPublisherMediaType _tmp19_; gchar* resource_privacy = NULL; - gchar* _tmp22_ = NULL; + gchar* _tmp22_; PublishingFacebookGraphMessage* upload_message = NULL; - PublishingFacebookGraphSession* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - SpitPublishingPublishable* _tmp25_ = NULL; - PublishingFacebookPublishingParameters* _tmp26_ = NULL; - gboolean _tmp27_ = FALSE; - const gchar* _tmp28_ = NULL; - PublishingFacebookGraphMessage* _tmp29_ = NULL; - PublishingFacebookGraphMessage* _tmp30_ = NULL; - PublishingFacebookGraphMessage* _tmp31_ = NULL; - PublishingFacebookGraphMessage* _tmp32_ = NULL; - PublishingFacebookGraphSession* _tmp33_ = NULL; - PublishingFacebookGraphMessage* _tmp34_ = NULL; + PublishingFacebookGraphSession* _tmp23_; + const gchar* _tmp24_; + SpitPublishingPublishable* _tmp25_; + PublishingFacebookPublishingParameters* _tmp26_; + gboolean _tmp27_; + const gchar* _tmp28_; + PublishingFacebookGraphMessage* _tmp29_; + PublishingFacebookGraphMessage* _tmp30_; + PublishingFacebookGraphMessage* _tmp31_; + PublishingFacebookGraphMessage* _tmp32_; + PublishingFacebookGraphSession* _tmp33_; + PublishingFacebookGraphMessage* _tmp34_; #line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self)); #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -9050,8 +9044,8 @@ static void publishing_facebook_uploader_send_current_file (PublishingFacebookUp _tmp6_ = file; #line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp6_ == NULL) { -#line 9034 "FacebookPublishing.c" - gint _tmp7_ = 0; +#line 9028 "FacebookPublishing.c" + gint _tmp7_; #line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp7_ = self->priv->current_file; #line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -9062,7 +9056,7 @@ static void publishing_facebook_uploader_send_current_file (PublishingFacebookUp _g_object_unref0 (publishable); #line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return; -#line 9046 "FacebookPublishing.c" +#line 9040 "FacebookPublishing.c" } #line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp9_ = publishable; @@ -9070,11 +9064,11 @@ static void publishing_facebook_uploader_send_current_file (PublishingFacebookUp _tmp10_ = spit_publishing_publishable_get_media_type (_tmp9_); #line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp10_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) { -#line 9054 "FacebookPublishing.c" - PublishingFacebookPublishingParameters* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; +#line 9048 "FacebookPublishing.c" + PublishingFacebookPublishingParameters* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp11_ = self->priv->publishing_params; #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -9089,16 +9083,16 @@ static void publishing_facebook_uploader_send_current_file (PublishingFacebookUp _tmp8_ = _tmp14_; #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 (_tmp13_); -#line 9073 "FacebookPublishing.c" +#line 9067 "FacebookPublishing.c" } else { - gchar* _tmp15_ = NULL; + gchar* _tmp15_; #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp15_ = g_strdup ("/me/videos"); #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_free0 (_tmp8_); #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp8_ = _tmp15_; -#line 9082 "FacebookPublishing.c" +#line 9076 "FacebookPublishing.c" } #line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp16_ = g_strdup (_tmp8_); @@ -9110,20 +9104,20 @@ static void publishing_facebook_uploader_send_current_file (PublishingFacebookUp _tmp19_ = spit_publishing_publishable_get_media_type (_tmp18_); #line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp19_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { -#line 9094 "FacebookPublishing.c" - PublishingFacebookPublishingParameters* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; +#line 9088 "FacebookPublishing.c" + PublishingFacebookPublishingParameters* _tmp20_; + const gchar* _tmp21_; #line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp20_ = self->priv->publishing_params; #line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp21_ = _tmp20_->privacy_object; #line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp17_ = _tmp21_; -#line 9103 "FacebookPublishing.c" +#line 9097 "FacebookPublishing.c" } else { #line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp17_ = NULL; -#line 9107 "FacebookPublishing.c" +#line 9101 "FacebookPublishing.c" } #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp22_ = g_strdup (_tmp17_); @@ -9175,7 +9169,7 @@ static void publishing_facebook_uploader_send_current_file (PublishingFacebookUp _g_object_unref0 (file); #line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _g_object_unref0 (publishable); -#line 9159 "FacebookPublishing.c" +#line 9153 "FacebookPublishing.c" } @@ -9186,24 +9180,24 @@ static void publishing_facebook_uploader_send_files (PublishingFacebookUploader* self->priv->current_file = 0; #line 1349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_uploader_send_current_file (self); -#line 9170 "FacebookPublishing.c" +#line 9164 "FacebookPublishing.c" } static void publishing_facebook_uploader_on_chunk_transmitted (PublishingFacebookUploader* self, gint bytes_written_so_far, gint total_bytes) { gdouble file_span = 0.0; - SpitPublishingPublishable** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + SpitPublishingPublishable** _tmp0_; + gint _tmp0__length1; gdouble this_file_fraction_complete = 0.0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp1_; + gint _tmp2_; gdouble fraction_complete = 0.0; - gint _tmp3_ = 0; - gdouble _tmp4_ = 0.0; - gdouble _tmp5_ = 0.0; - gdouble _tmp6_ = 0.0; - SpitPublishingProgressCallback _tmp7_ = NULL; - void* _tmp7__target = NULL; + gint _tmp3_; + gdouble _tmp4_; + gdouble _tmp5_; + gdouble _tmp6_; + SpitPublishingProgressCallback _tmp7_; + void* _tmp7__target; #line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self)); #line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -9234,11 +9228,11 @@ static void publishing_facebook_uploader_on_chunk_transmitted (PublishingFaceboo _tmp7__target = self->priv->status_updated_target; #line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (_tmp7_ != NULL) { -#line 9218 "FacebookPublishing.c" - SpitPublishingProgressCallback _tmp8_ = NULL; - void* _tmp8__target = NULL; - gint _tmp9_ = 0; - gdouble _tmp10_ = 0.0; +#line 9212 "FacebookPublishing.c" + SpitPublishingProgressCallback _tmp8_; + void* _tmp8__target; + gint _tmp9_; + gdouble _tmp10_; #line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp8_ = self->priv->status_updated; #line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -9249,22 +9243,22 @@ static void publishing_facebook_uploader_on_chunk_transmitted (PublishingFaceboo _tmp10_ = fraction_complete; #line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp8_ (_tmp9_ + 1, _tmp10_, _tmp8__target); -#line 9233 "FacebookPublishing.c" +#line 9227 "FacebookPublishing.c" } } static void publishing_facebook_uploader_on_message_completed (PublishingFacebookUploader* self, PublishingFacebookGraphMessage* message) { - PublishingFacebookGraphMessage* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingFacebookGraphMessage* _tmp2_ = NULL; - guint _tmp3_ = 0U; - PublishingFacebookGraphMessage* _tmp4_ = NULL; - guint _tmp5_ = 0U; - gint _tmp6_ = 0; - gint _tmp7_ = 0; - SpitPublishingPublishable** _tmp8_ = NULL; - gint _tmp8__length1 = 0; + PublishingFacebookGraphMessage* _tmp0_; + guint _tmp1_; + PublishingFacebookGraphMessage* _tmp2_; + guint _tmp3_; + PublishingFacebookGraphMessage* _tmp4_; + guint _tmp5_; + gint _tmp6_; + gint _tmp7_; + SpitPublishingPublishable** _tmp8_; + gint _tmp8__length1; #line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self)); #line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -9301,26 +9295,26 @@ static void publishing_facebook_uploader_on_message_completed (PublishingFaceboo if (_tmp7_ < _tmp8__length1) { #line 1369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_uploader_send_current_file (self); -#line 9285 "FacebookPublishing.c" +#line 9279 "FacebookPublishing.c" } else { - gint _tmp9_ = 0; + gint _tmp9_; #line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp9_ = self->priv->current_file; #line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - g_signal_emit_by_name (self, "upload-complete", _tmp9_); -#line 9292 "FacebookPublishing.c" + g_signal_emit (self, publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_COMPLETE_SIGNAL], 0, _tmp9_); +#line 9286 "FacebookPublishing.c" } } static void publishing_facebook_uploader_on_message_failed (PublishingFacebookUploader* self, PublishingFacebookGraphMessage* message, GError* _error_) { - PublishingFacebookGraphMessage* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingFacebookGraphMessage* _tmp2_ = NULL; - guint _tmp3_ = 0U; - PublishingFacebookGraphMessage* _tmp4_ = NULL; - guint _tmp5_ = 0U; - GError* _tmp6_ = NULL; + PublishingFacebookGraphMessage* _tmp0_; + guint _tmp1_; + PublishingFacebookGraphMessage* _tmp2_; + guint _tmp3_; + PublishingFacebookGraphMessage* _tmp4_; + guint _tmp5_; + GError* _tmp6_; #line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self)); #line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -9346,16 +9340,16 @@ static void publishing_facebook_uploader_on_message_failed (PublishingFacebookUp #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp6_ = _error_; #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - g_signal_emit_by_name (self, "upload-error", _tmp6_); -#line 9331 "FacebookPublishing.c" + g_signal_emit (self, publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_ERROR_SIGNAL], 0, _tmp6_); +#line 9325 "FacebookPublishing.c" } void publishing_facebook_uploader_upload (PublishingFacebookUploader* self, SpitPublishingProgressCallback status_updated, void* status_updated_target) { - SpitPublishingProgressCallback _tmp0_ = NULL; - void* _tmp0__target = NULL; - SpitPublishingPublishable** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + SpitPublishingProgressCallback _tmp0_; + void* _tmp0__target; + SpitPublishingPublishable** _tmp1_; + gint _tmp1__length1; #line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self)); #line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -9374,7 +9368,7 @@ void publishing_facebook_uploader_upload (PublishingFacebookUploader* self, Spit if (_tmp1__length1 > 0) { #line 1387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_uploader_send_files (self); -#line 9358 "FacebookPublishing.c" +#line 9352 "FacebookPublishing.c" } } @@ -9382,7 +9376,7 @@ void publishing_facebook_uploader_upload (PublishingFacebookUploader* self, Spit static void publishing_facebook_value_uploader_init (GValue* value) { #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 9366 "FacebookPublishing.c" +#line 9360 "FacebookPublishing.c" } @@ -9391,7 +9385,7 @@ static void publishing_facebook_value_uploader_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_uploader_unref (value->data[0].v_pointer); -#line 9375 "FacebookPublishing.c" +#line 9369 "FacebookPublishing.c" } } @@ -9401,11 +9395,11 @@ static void publishing_facebook_value_uploader_copy_value (const GValue* src_val if (src_value->data[0].v_pointer) { #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" dest_value->data[0].v_pointer = publishing_facebook_uploader_ref (src_value->data[0].v_pointer); -#line 9385 "FacebookPublishing.c" +#line 9379 "FacebookPublishing.c" } else { #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 9389 "FacebookPublishing.c" +#line 9383 "FacebookPublishing.c" } } @@ -9413,66 +9407,66 @@ static void publishing_facebook_value_uploader_copy_value (const GValue* src_val static gpointer publishing_facebook_value_uploader_peek_pointer (const GValue* value) { #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return value->data[0].v_pointer; -#line 9397 "FacebookPublishing.c" +#line 9391 "FacebookPublishing.c" } static gchar* publishing_facebook_value_uploader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (collect_values[0].v_pointer) { -#line 9404 "FacebookPublishing.c" - PublishingFacebookUploader* object; +#line 9398 "FacebookPublishing.c" + PublishingFacebookUploader * object; object = collect_values[0].v_pointer; #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 9411 "FacebookPublishing.c" +#line 9405 "FacebookPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 9415 "FacebookPublishing.c" +#line 9409 "FacebookPublishing.c" } #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = publishing_facebook_uploader_ref (object); -#line 9419 "FacebookPublishing.c" +#line 9413 "FacebookPublishing.c" } else { #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 9423 "FacebookPublishing.c" +#line 9417 "FacebookPublishing.c" } #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return NULL; -#line 9427 "FacebookPublishing.c" +#line 9421 "FacebookPublishing.c" } static gchar* publishing_facebook_value_uploader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingFacebookUploader** object_p; + PublishingFacebookUploader ** object_p; object_p = collect_values[0].v_pointer; #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (!object_p) { #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 9438 "FacebookPublishing.c" +#line 9432 "FacebookPublishing.c" } #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (!value->data[0].v_pointer) { #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *object_p = NULL; -#line 9444 "FacebookPublishing.c" +#line 9438 "FacebookPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *object_p = value->data[0].v_pointer; -#line 9448 "FacebookPublishing.c" +#line 9442 "FacebookPublishing.c" } else { #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" *object_p = publishing_facebook_uploader_ref (value->data[0].v_pointer); -#line 9452 "FacebookPublishing.c" +#line 9446 "FacebookPublishing.c" } #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return NULL; -#line 9456 "FacebookPublishing.c" +#line 9450 "FacebookPublishing.c" } @@ -9486,7 +9480,7 @@ GParamSpec* publishing_facebook_param_spec_uploader (const gchar* name, const gc G_PARAM_SPEC (spec)->value_type = object_type; #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return G_PARAM_SPEC (spec); -#line 9470 "FacebookPublishing.c" +#line 9464 "FacebookPublishing.c" } @@ -9495,12 +9489,12 @@ gpointer publishing_facebook_value_get_uploader (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_UPLOADER), NULL); #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return value->data[0].v_pointer; -#line 9479 "FacebookPublishing.c" +#line 9473 "FacebookPublishing.c" } void publishing_facebook_value_set_uploader (GValue* value, gpointer v_object) { - PublishingFacebookUploader* old; + PublishingFacebookUploader * old; #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_UPLOADER)); #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -9515,23 +9509,23 @@ void publishing_facebook_value_set_uploader (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_uploader_ref (value->data[0].v_pointer); -#line 9499 "FacebookPublishing.c" +#line 9493 "FacebookPublishing.c" } else { #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 9503 "FacebookPublishing.c" +#line 9497 "FacebookPublishing.c" } #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (old) { #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_uploader_unref (old); -#line 9509 "FacebookPublishing.c" +#line 9503 "FacebookPublishing.c" } } void publishing_facebook_value_take_uploader (GValue* value, gpointer v_object) { - PublishingFacebookUploader* old; + PublishingFacebookUploader * old; #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_UPLOADER)); #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -9544,17 +9538,17 @@ void publishing_facebook_value_take_uploader (GValue* value, gpointer v_object) g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = v_object; -#line 9528 "FacebookPublishing.c" +#line 9522 "FacebookPublishing.c" } else { #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" value->data[0].v_pointer = NULL; -#line 9532 "FacebookPublishing.c" +#line 9526 "FacebookPublishing.c" } #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (old) { #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" publishing_facebook_uploader_unref (old); -#line 9538 "FacebookPublishing.c" +#line 9532 "FacebookPublishing.c" } } @@ -9567,10 +9561,10 @@ static void publishing_facebook_uploader_class_init (PublishingFacebookUploaderC #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingFacebookUploaderPrivate)); #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - g_signal_new ("upload_complete", PUBLISHING_FACEBOOK_TYPE_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); + publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_COMPLETE_SIGNAL] = g_signal_new ("upload-complete", PUBLISHING_FACEBOOK_TYPE_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - g_signal_new ("upload_error", PUBLISHING_FACEBOOK_TYPE_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); -#line 9554 "FacebookPublishing.c" + publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_ERROR_SIGNAL] = g_signal_new ("upload-error", PUBLISHING_FACEBOOK_TYPE_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); +#line 9548 "FacebookPublishing.c" } @@ -9579,13 +9573,15 @@ static void publishing_facebook_uploader_instance_init (PublishingFacebookUpload self->priv = PUBLISHING_FACEBOOK_UPLOADER_GET_PRIVATE (self); #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self->priv->status_updated = NULL; +#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" + self->priv->status_updated_target = self; #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self->ref_count = 1; -#line 9565 "FacebookPublishing.c" +#line 9561 "FacebookPublishing.c" } -static void publishing_facebook_uploader_finalize (PublishingFacebookUploader* obj) { +static void publishing_facebook_uploader_finalize (PublishingFacebookUploader * obj) { PublishingFacebookUploader * self; #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_UPLOADER, PublishingFacebookUploader); @@ -9597,7 +9593,7 @@ static void publishing_facebook_uploader_finalize (PublishingFacebookUploader* o _publishing_facebook_graph_session_unref0 (self->priv->session); #line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _publishing_facebook_publishing_parameters_unref0 (self->priv->publishing_params); -#line 9581 "FacebookPublishing.c" +#line 9577 "FacebookPublishing.c" } @@ -9616,18 +9612,18 @@ GType publishing_facebook_uploader_get_type (void) { gpointer publishing_facebook_uploader_ref (gpointer instance) { - PublishingFacebookUploader* self; + PublishingFacebookUploader * self; self = instance; #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_atomic_int_inc (&self->ref_count); #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" return instance; -#line 9606 "FacebookPublishing.c" +#line 9602 "FacebookPublishing.c" } void publishing_facebook_uploader_unref (gpointer instance) { - PublishingFacebookUploader* self; + PublishingFacebookUploader * self; self = instance; #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -9635,7 +9631,7 @@ void publishing_facebook_uploader_unref (gpointer instance) { PUBLISHING_FACEBOOK_UPLOADER_GET_CLASS (self)->finalize (self); #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 9619 "FacebookPublishing.c" +#line 9615 "FacebookPublishing.c" } } diff --git a/plugins/shotwell-publishing/FlickrPublishing.c b/plugins/shotwell-publishing/FlickrPublishing.c index a15a23d..25f2d69 100644 --- a/plugins/shotwell-publishing/FlickrPublishing.c +++ b/plugins/shotwell-publishing/FlickrPublishing.c @@ -1,4 +1,4 @@ -/* FlickrPublishing.c generated by valac 0.34.7, the Vala compiler +/* FlickrPublishing.c generated by valac 0.36.6, the Vala compiler * generated from FlickrPublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -179,6 +179,12 @@ typedef struct _PublishingFlickrPublishingOptionsPaneSizeEntryPrivate Publishing #define _publishing_flickr_publishing_options_pane_size_entry_unref0(var) ((var == NULL) ? NULL : (var = (publishing_flickr_publishing_options_pane_size_entry_unref (var), NULL))) typedef struct _PublishingFlickrPublishingOptionsPaneParamSpecSizeEntry PublishingFlickrPublishingOptionsPaneParamSpecSizeEntry; typedef struct _PublishingFlickrPublishingOptionsPaneParamSpecVisibilityEntry PublishingFlickrPublishingOptionsPaneParamSpecVisibilityEntry; +enum { + PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL, + PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL, + PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL +}; +static guint publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0}; typedef struct _PublishingFlickrUploaderPrivate PublishingFlickrUploaderPrivate; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } @@ -398,12 +404,12 @@ static gint flickr_service_icon_pixbuf_set_length1; static GdkPixbuf** flickr_service_icon_pixbuf_set = NULL; static gint flickr_service_icon_pixbuf_set_length1 = 0; static gint _flickr_service_icon_pixbuf_set_size_ = 0; -static SpitPluggableIface* flickr_service_spit_pluggable_parent_iface = NULL; -static SpitPublishingServiceIface* flickr_service_spit_publishing_service_parent_iface = NULL; +static SpitPluggableIface * flickr_service_spit_pluggable_parent_iface = NULL; +static SpitPublishingServiceIface * flickr_service_spit_publishing_service_parent_iface = NULL; static gpointer publishing_flickr_visibility_specification_parent_class = NULL; static gpointer publishing_flickr_publishing_parameters_parent_class = NULL; static gpointer publishing_flickr_flickr_publisher_parent_class = NULL; -static SpitPublishingPublisherIface* publishing_flickr_flickr_publisher_spit_publishing_publisher_parent_iface = NULL; +static SpitPublishingPublisherIface * publishing_flickr_flickr_publisher_spit_publishing_publisher_parent_iface = NULL; static gpointer publishing_flickr_transaction_parent_class = NULL; static gpointer publishing_flickr_account_info_fetch_transaction_parent_class = NULL; static gpointer publishing_flickr_upload_transaction_parent_class = NULL; @@ -411,7 +417,7 @@ static gpointer publishing_flickr_session_parent_class = NULL; static gpointer publishing_flickr_publishing_options_pane_parent_class = NULL; static gpointer publishing_flickr_publishing_options_pane_size_entry_parent_class = NULL; static gpointer publishing_flickr_publishing_options_pane_visibility_entry_parent_class = NULL; -static SpitPublishingDialogPaneIface* publishing_flickr_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL; +static SpitPublishingDialogPaneIface * publishing_flickr_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL; static gpointer publishing_flickr_uploader_parent_class = NULL; GType flickr_service_get_type (void) G_GNUC_CONST; @@ -432,7 +438,7 @@ PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_new (SpitPub PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host); GType publishing_flickr_flickr_publisher_get_type (void) G_GNUC_CONST; static SpitPublishingPublisherMediaType flickr_service_real_get_supported_media (SpitPublishingService* base); -static void flickr_service_finalize (GObject* obj); +static void flickr_service_finalize (GObject * obj); #define PUBLISHING_FLICKR_SERVICE_NAME "Flickr" #define PUBLISHING_FLICKR_ENDPOINT_URL "https://api.flickr.com/services/rest" #define PUBLISHING_FLICKR_ORIGINAL_SIZE -1 @@ -451,7 +457,7 @@ enum { }; PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_new (gint friends_level, gint family_level, gint everyone_level); PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_construct (GType object_type, gint friends_level, gint family_level, gint everyone_level); -static void publishing_flickr_visibility_specification_finalize (PublishingFlickrVisibilitySpecification* obj); +static void publishing_flickr_visibility_specification_finalize (PublishingFlickrVisibilitySpecification * obj); gpointer publishing_flickr_publishing_parameters_ref (gpointer instance); void publishing_flickr_publishing_parameters_unref (gpointer instance); GParamSpec* publishing_flickr_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -464,7 +470,7 @@ enum { }; PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_new (void); PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_construct (GType object_type); -static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPublishingParameters* obj); +static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPublishingParameters * obj); GType publishing_flickr_session_get_type (void) G_GNUC_CONST; GType publishing_flickr_publishing_options_pane_get_type (void) G_GNUC_CONST; #define PUBLISHING_FLICKR_FLICKR_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisherPrivate)) @@ -523,7 +529,7 @@ static SpitPublishingService* publishing_flickr_flickr_publisher_real_get_servic static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishingPublisher* base); static void publishing_flickr_flickr_publisher_real_start (SpitPublishingPublisher* base); static void publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublisher* base); -static void publishing_flickr_flickr_publisher_finalize (GObject* obj); +static void publishing_flickr_flickr_publisher_finalize (GObject * obj); enum { PUBLISHING_FLICKR_TRANSACTION_DUMMY_PROPERTY }; @@ -551,19 +557,19 @@ PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (Pub PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construct (GType object_type, PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable); void publishing_flickr_upload_transaction_add_authorization_header_field (PublishingFlickrUploadTransaction* self, const gchar* key, const gchar* value); static void _g_free0_ (gpointer var); -static void _vala_array_add19 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value); +static void _vala_array_add19 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value); PublishingRESTSupportArgument** publishing_flickr_upload_transaction_get_authorization_header_fields (PublishingFlickrUploadTransaction* self, int* result_length1); static PublishingRESTSupportArgument** _vala_array_dup8 (PublishingRESTSupportArgument** self, int length); gchar* publishing_flickr_upload_transaction_get_authorization_header_string (PublishingFlickrUploadTransaction* self); static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error); -static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction* obj); +static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction * obj); #define PUBLISHING_FLICKR_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSessionPrivate)) enum { PUBLISHING_FLICKR_SESSION_DUMMY_PROPERTY }; static gboolean publishing_flickr_session_real_is_authenticated (PublishingRESTSupportSession* base); -static void _vala_array_add20 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value); -static void publishing_flickr_session_finalize (PublishingRESTSupportSession* obj); +static void _vala_array_add20 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value); +static void publishing_flickr_session_finalize (PublishingRESTSupportSession * obj); static gpointer publishing_flickr_publishing_options_pane_visibility_entry_ref (gpointer instance); static void publishing_flickr_publishing_options_pane_visibility_entry_unref (gpointer instance); static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_visibility_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; @@ -596,18 +602,18 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis static void _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_new (const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification); static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_construct (GType object_type, const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification); -static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value); -static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value); -static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value); -static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value); -static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value); +static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value); +static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value); +static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value); +static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value); +static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value); static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_new (const gchar* creator_title, gint creator_size); static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_construct (GType object_type, const gchar* creator_title, gint creator_size); -static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value); -static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value); -static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value); -static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value); -static void _vala_array_add30 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value); +static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value); +static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value); +static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value); +static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value); +static void _vala_array_add30 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value); void publishing_flickr_publishing_options_pane_notify_publish (PublishingFlickrPublishingOptionsPane* self); void publishing_flickr_publishing_options_pane_notify_logout (PublishingFlickrPublishingOptionsPane* self); static GtkWidget* publishing_flickr_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base); @@ -619,20 +625,20 @@ static void publishing_flickr_publishing_options_pane_real_on_pane_uninstalled ( enum { PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_SIZE_ENTRY_DUMMY_PROPERTY }; -static void publishing_flickr_publishing_options_pane_size_entry_finalize (PublishingFlickrPublishingOptionsPaneSizeEntry* obj); +static void publishing_flickr_publishing_options_pane_size_entry_finalize (PublishingFlickrPublishingOptionsPaneSizeEntry * obj); enum { PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_VISIBILITY_ENTRY_DUMMY_PROPERTY }; -static void publishing_flickr_publishing_options_pane_visibility_entry_finalize (PublishingFlickrPublishingOptionsPaneVisibilityEntry* obj); -static void publishing_flickr_publishing_options_pane_finalize (GObject* obj); +static void publishing_flickr_publishing_options_pane_visibility_entry_finalize (PublishingFlickrPublishingOptionsPaneVisibilityEntry * obj); +static void publishing_flickr_publishing_options_pane_finalize (GObject * obj); #define PUBLISHING_FLICKR_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploaderPrivate)) enum { PUBLISHING_FLICKR_UPLOADER_DUMMY_PROPERTY }; static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrUploader* self, SpitPublishingPublishable* publishable); -static void _vala_array_add31 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add31 (gchar** * array, int* length, int* size, gchar* value); static PublishingRESTSupportTransaction* publishing_flickr_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable); -static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader* obj); +static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); @@ -640,8 +646,8 @@ static gint _vala_array_length (gpointer array); FlickrService* flickr_service_construct (GType object_type, GFile* resource_directory) { FlickrService * self = NULL; - GdkPixbuf** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + GdkPixbuf** _tmp0_; + gint _tmp0__length1; #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (G_IS_FILE (resource_directory), NULL); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -652,9 +658,9 @@ FlickrService* flickr_service_construct (GType object_type, GFile* resource_dire _tmp0__length1 = flickr_service_icon_pixbuf_set_length1; #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp0_ == NULL) { -#line 656 "FlickrPublishing.c" - gint _tmp1_ = 0; - GdkPixbuf** _tmp2_ = NULL; +#line 662 "FlickrPublishing.c" + gint _tmp1_; + GdkPixbuf** _tmp2_; #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" FLICKR_SERVICE_ICON_FILENAME, &_tmp1_); #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -665,27 +671,27 @@ FlickrService* flickr_service_construct (GType object_type, GFile* resource_dire flickr_service_icon_pixbuf_set_length1 = _tmp1_; #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _flickr_service_icon_pixbuf_set_size_ = flickr_service_icon_pixbuf_set_length1; -#line 669 "FlickrPublishing.c" +#line 675 "FlickrPublishing.c" } #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 673 "FlickrPublishing.c" +#line 679 "FlickrPublishing.c" } FlickrService* flickr_service_new (GFile* resource_directory) { #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return flickr_service_construct (TYPE_FLICKR_SERVICE, resource_directory); -#line 680 "FlickrPublishing.c" +#line 686 "FlickrPublishing.c" } static gint flickr_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) { FlickrService * self; gint result = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLICKR_SERVICE, FlickrService); #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -698,7 +704,7 @@ static gint flickr_service_real_get_pluggable_interface (SpitPluggable* base, gi result = _tmp2_; #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 702 "FlickrPublishing.c" +#line 708 "FlickrPublishing.c" } @@ -711,7 +717,7 @@ static const gchar* flickr_service_real_get_id (SpitPluggable* base) { result = "org.yorba.shotwell.publishing.flickr"; #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 715 "FlickrPublishing.c" +#line 721 "FlickrPublishing.c" } @@ -724,14 +730,14 @@ static const gchar* flickr_service_real_get_pluggable_name (SpitPluggable* base) result = "Flickr"; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 728 "FlickrPublishing.c" +#line 734 "FlickrPublishing.c" } static gpointer _g_object_ref0 (gpointer self) { #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? g_object_ref (self) : NULL; -#line 735 "FlickrPublishing.c" +#line 741 "FlickrPublishing.c" } @@ -742,34 +748,33 @@ static GdkPixbuf** _vala_array_dup7 (GdkPixbuf** self, int length) { result = g_new0 (GdkPixbuf*, length + 1); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (i = 0; i < length; i++) { -#line 746 "FlickrPublishing.c" - GdkPixbuf* _tmp0_ = NULL; +#line 752 "FlickrPublishing.c" + GdkPixbuf* _tmp0_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result[i] = _tmp0_; -#line 752 "FlickrPublishing.c" +#line 758 "FlickrPublishing.c" } #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 756 "FlickrPublishing.c" +#line 762 "FlickrPublishing.c" } static void flickr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) { FlickrService * self; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GdkPixbuf** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - GdkPixbuf** _tmp9_ = NULL; - gint _tmp9__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + GdkPixbuf** _tmp7_; + gint _tmp7__length1; + GdkPixbuf** _tmp8_; + gint _tmp8__length1; #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLICKR_SERVICE, FlickrService); #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -781,60 +786,58 @@ static void flickr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*info).authors = _tmp0_; #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1_ = _ ("Copyright 2016 Software Freedom Conservancy Inc."); -#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp1_ = g_strdup (_ ("Copyright 2016 Software Freedom Conservancy Inc.")); #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 ((*info).copyright); #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - (*info).copyright = _tmp2_; + (*info).copyright = _tmp1_; #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp3_ = g_strdup (RESOURCES_TRANSLATORS); + _tmp2_ = g_strdup (RESOURCES_TRANSLATORS); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 ((*info).translators); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - (*info).translators = _tmp3_; + (*info).translators = _tmp2_; #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4_ = g_strdup (_VERSION); + _tmp3_ = g_strdup (_VERSION); #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 ((*info).version); #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - (*info).version = _tmp4_; + (*info).version = _tmp3_; #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp5_ = g_strdup (RESOURCES_WEBSITE_NAME); + _tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 ((*info).website_name); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - (*info).website_name = _tmp5_; + (*info).website_name = _tmp4_; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp6_ = g_strdup (RESOURCES_WEBSITE_URL); + _tmp5_ = g_strdup (RESOURCES_WEBSITE_URL); #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 ((*info).website_url); #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - (*info).website_url = _tmp6_; + (*info).website_url = _tmp5_; #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*info).is_license_wordwrapped = FALSE; #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp7_ = g_strdup (RESOURCES_LICENSE); + _tmp6_ = g_strdup (RESOURCES_LICENSE); #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 ((*info).license); #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - (*info).license = _tmp7_; + (*info).license = _tmp6_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp8_ = flickr_service_icon_pixbuf_set; + _tmp7_ = flickr_service_icon_pixbuf_set; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp8__length1 = flickr_service_icon_pixbuf_set_length1; + _tmp7__length1 = flickr_service_icon_pixbuf_set_length1; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup7 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_); + _tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup7 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp9__length1 = _tmp8__length1; + _tmp8__length1 = _tmp7__length1; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - (*info).icons = _tmp9_; + (*info).icons = _tmp8_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - (*info).icons_length1 = _tmp9__length1; -#line 838 "FlickrPublishing.c" + (*info).icons_length1 = _tmp8__length1; +#line 841 "FlickrPublishing.c" } @@ -842,15 +845,15 @@ static void flickr_service_real_activation (SpitPluggable* base, gboolean enable FlickrService * self; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLICKR_SERVICE, FlickrService); -#line 846 "FlickrPublishing.c" +#line 849 "FlickrPublishing.c" } static SpitPublishingPublisher* flickr_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) { FlickrService * self; SpitPublishingPublisher* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - PublishingFlickrFlickrPublisher* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + PublishingFlickrFlickrPublisher* _tmp1_; #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLICKR_SERVICE, FlickrService); #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -863,7 +866,7 @@ static SpitPublishingPublisher* flickr_service_real_create_publisher (SpitPublis result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 867 "FlickrPublishing.c" +#line 870 "FlickrPublishing.c" } @@ -876,7 +879,7 @@ static SpitPublishingPublisherMediaType flickr_service_real_get_supported_media result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO; #line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 880 "FlickrPublishing.c" +#line 883 "FlickrPublishing.c" } @@ -885,7 +888,7 @@ static void flickr_service_class_init (FlickrServiceClass * klass) { flickr_service_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (klass)->finalize = flickr_service_finalize; -#line 889 "FlickrPublishing.c" +#line 892 "FlickrPublishing.c" } @@ -893,16 +896,16 @@ static void flickr_service_spit_pluggable_interface_init (SpitPluggableIface * i #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" flickr_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) flickr_service_real_get_pluggable_interface; + iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) flickr_service_real_get_pluggable_interface; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->get_id = (const gchar* (*)(SpitPluggable*)) flickr_service_real_get_id; + iface->get_id = (const gchar* (*) (SpitPluggable *)) flickr_service_real_get_id; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) flickr_service_real_get_pluggable_name; + iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) flickr_service_real_get_pluggable_name; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) flickr_service_real_get_info; + iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) flickr_service_real_get_info; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->activation = (void (*)(SpitPluggable*, gboolean)) flickr_service_real_activation; -#line 906 "FlickrPublishing.c" + iface->activation = (void (*) (SpitPluggable *, gboolean)) flickr_service_real_activation; +#line 909 "FlickrPublishing.c" } @@ -910,10 +913,10 @@ static void flickr_service_spit_publishing_service_interface_init (SpitPublishin #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" flickr_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) flickr_service_real_create_publisher; + iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) flickr_service_real_create_publisher; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) flickr_service_real_get_supported_media; -#line 917 "FlickrPublishing.c" + iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) flickr_service_real_get_supported_media; +#line 920 "FlickrPublishing.c" } @@ -921,13 +924,13 @@ static void flickr_service_instance_init (FlickrService * self) { } -static void flickr_service_finalize (GObject* obj) { +static void flickr_service_finalize (GObject * obj) { FlickrService * self; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FLICKR_SERVICE, FlickrService); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (flickr_service_parent_class)->finalize (obj); -#line 931 "FlickrPublishing.c" +#line 934 "FlickrPublishing.c" } @@ -961,9 +964,9 @@ GType publishing_flickr_user_kind_get_type (void) { PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_construct (GType object_type, gint friends_level, gint family_level, gint everyone_level) { PublishingFlickrVisibilitySpecification* self = NULL; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = (PublishingFlickrVisibilitySpecification*) g_type_create_instance (object_type); #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -980,21 +983,21 @@ PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specificat self->everyone_level = _tmp2_; #line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 984 "FlickrPublishing.c" +#line 987 "FlickrPublishing.c" } PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_new (gint friends_level, gint family_level, gint everyone_level) { #line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_visibility_specification_construct (PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION, friends_level, family_level, everyone_level); -#line 991 "FlickrPublishing.c" +#line 994 "FlickrPublishing.c" } static void publishing_flickr_value_visibility_specification_init (GValue* value) { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 998 "FlickrPublishing.c" +#line 1001 "FlickrPublishing.c" } @@ -1003,7 +1006,7 @@ static void publishing_flickr_value_visibility_specification_free_value (GValue* if (value->data[0].v_pointer) { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_visibility_specification_unref (value->data[0].v_pointer); -#line 1007 "FlickrPublishing.c" +#line 1010 "FlickrPublishing.c" } } @@ -1013,11 +1016,11 @@ static void publishing_flickr_value_visibility_specification_copy_value (const G if (src_value->data[0].v_pointer) { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = publishing_flickr_visibility_specification_ref (src_value->data[0].v_pointer); -#line 1017 "FlickrPublishing.c" +#line 1020 "FlickrPublishing.c" } else { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 1021 "FlickrPublishing.c" +#line 1024 "FlickrPublishing.c" } } @@ -1025,66 +1028,66 @@ static void publishing_flickr_value_visibility_specification_copy_value (const G static gpointer publishing_flickr_value_visibility_specification_peek_pointer (const GValue* value) { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 1029 "FlickrPublishing.c" +#line 1032 "FlickrPublishing.c" } static gchar* publishing_flickr_value_visibility_specification_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (collect_values[0].v_pointer) { -#line 1036 "FlickrPublishing.c" - PublishingFlickrVisibilitySpecification* object; +#line 1039 "FlickrPublishing.c" + PublishingFlickrVisibilitySpecification * object; object = collect_values[0].v_pointer; #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1043 "FlickrPublishing.c" +#line 1046 "FlickrPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1047 "FlickrPublishing.c" +#line 1050 "FlickrPublishing.c" } #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = publishing_flickr_visibility_specification_ref (object); -#line 1051 "FlickrPublishing.c" +#line 1054 "FlickrPublishing.c" } else { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1055 "FlickrPublishing.c" +#line 1058 "FlickrPublishing.c" } #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 1059 "FlickrPublishing.c" +#line 1062 "FlickrPublishing.c" } static gchar* publishing_flickr_value_visibility_specification_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingFlickrVisibilitySpecification** object_p; + PublishingFlickrVisibilitySpecification ** object_p; object_p = collect_values[0].v_pointer; #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!object_p) { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1070 "FlickrPublishing.c" +#line 1073 "FlickrPublishing.c" } #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!value->data[0].v_pointer) { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = NULL; -#line 1076 "FlickrPublishing.c" +#line 1079 "FlickrPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = value->data[0].v_pointer; -#line 1080 "FlickrPublishing.c" +#line 1083 "FlickrPublishing.c" } else { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = publishing_flickr_visibility_specification_ref (value->data[0].v_pointer); -#line 1084 "FlickrPublishing.c" +#line 1087 "FlickrPublishing.c" } #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 1088 "FlickrPublishing.c" +#line 1091 "FlickrPublishing.c" } @@ -1098,7 +1101,7 @@ GParamSpec* publishing_flickr_param_spec_visibility_specification (const gchar* G_PARAM_SPEC (spec)->value_type = object_type; #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return G_PARAM_SPEC (spec); -#line 1102 "FlickrPublishing.c" +#line 1105 "FlickrPublishing.c" } @@ -1107,12 +1110,12 @@ gpointer publishing_flickr_value_get_visibility_specification (const GValue* val g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION), NULL); #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 1111 "FlickrPublishing.c" +#line 1114 "FlickrPublishing.c" } void publishing_flickr_value_set_visibility_specification (GValue* value, gpointer v_object) { - PublishingFlickrVisibilitySpecification* old; + PublishingFlickrVisibilitySpecification * old; #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION)); #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -1127,23 +1130,23 @@ void publishing_flickr_value_set_visibility_specification (GValue* value, gpoint value->data[0].v_pointer = v_object; #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_visibility_specification_ref (value->data[0].v_pointer); -#line 1131 "FlickrPublishing.c" +#line 1134 "FlickrPublishing.c" } else { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1135 "FlickrPublishing.c" +#line 1138 "FlickrPublishing.c" } #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_visibility_specification_unref (old); -#line 1141 "FlickrPublishing.c" +#line 1144 "FlickrPublishing.c" } } void publishing_flickr_value_take_visibility_specification (GValue* value, gpointer v_object) { - PublishingFlickrVisibilitySpecification* old; + PublishingFlickrVisibilitySpecification * old; #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION)); #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -1156,17 +1159,17 @@ void publishing_flickr_value_take_visibility_specification (GValue* value, gpoin g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = v_object; -#line 1160 "FlickrPublishing.c" +#line 1163 "FlickrPublishing.c" } else { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1164 "FlickrPublishing.c" +#line 1167 "FlickrPublishing.c" } #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_visibility_specification_unref (old); -#line 1170 "FlickrPublishing.c" +#line 1173 "FlickrPublishing.c" } } @@ -1176,24 +1179,24 @@ static void publishing_flickr_visibility_specification_class_init (PublishingFli publishing_flickr_visibility_specification_parent_class = g_type_class_peek_parent (klass); #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingFlickrVisibilitySpecificationClass *) klass)->finalize = publishing_flickr_visibility_specification_finalize; -#line 1180 "FlickrPublishing.c" +#line 1183 "FlickrPublishing.c" } static void publishing_flickr_visibility_specification_instance_init (PublishingFlickrVisibilitySpecification * self) { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->ref_count = 1; -#line 1187 "FlickrPublishing.c" +#line 1190 "FlickrPublishing.c" } -static void publishing_flickr_visibility_specification_finalize (PublishingFlickrVisibilitySpecification* obj) { +static void publishing_flickr_visibility_specification_finalize (PublishingFlickrVisibilitySpecification * obj) { PublishingFlickrVisibilitySpecification * self; #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION, PublishingFlickrVisibilitySpecification); #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_handlers_destroy (self); -#line 1197 "FlickrPublishing.c" +#line 1200 "FlickrPublishing.c" } @@ -1212,18 +1215,18 @@ GType publishing_flickr_visibility_specification_get_type (void) { gpointer publishing_flickr_visibility_specification_ref (gpointer instance) { - PublishingFlickrVisibilitySpecification* self; + PublishingFlickrVisibilitySpecification * self; self = instance; #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_atomic_int_inc (&self->ref_count); #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return instance; -#line 1222 "FlickrPublishing.c" +#line 1225 "FlickrPublishing.c" } void publishing_flickr_visibility_specification_unref (gpointer instance) { - PublishingFlickrVisibilitySpecification* self; + PublishingFlickrVisibilitySpecification * self; self = instance; #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1231,7 +1234,7 @@ void publishing_flickr_visibility_specification_unref (gpointer instance) { PUBLISHING_FLICKR_VISIBILITY_SPECIFICATION_GET_CLASS (self)->finalize (self); #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1235 "FlickrPublishing.c" +#line 1238 "FlickrPublishing.c" } } @@ -1242,21 +1245,21 @@ PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_co self = (PublishingFlickrPublishingParameters*) g_type_create_instance (object_type); #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 1246 "FlickrPublishing.c" +#line 1249 "FlickrPublishing.c" } PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_new (void) { #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_publishing_parameters_construct (PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS); -#line 1253 "FlickrPublishing.c" +#line 1256 "FlickrPublishing.c" } static void publishing_flickr_value_publishing_parameters_init (GValue* value) { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1260 "FlickrPublishing.c" +#line 1263 "FlickrPublishing.c" } @@ -1265,7 +1268,7 @@ static void publishing_flickr_value_publishing_parameters_free_value (GValue* va if (value->data[0].v_pointer) { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_parameters_unref (value->data[0].v_pointer); -#line 1269 "FlickrPublishing.c" +#line 1272 "FlickrPublishing.c" } } @@ -1275,11 +1278,11 @@ static void publishing_flickr_value_publishing_parameters_copy_value (const GVal if (src_value->data[0].v_pointer) { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = publishing_flickr_publishing_parameters_ref (src_value->data[0].v_pointer); -#line 1279 "FlickrPublishing.c" +#line 1282 "FlickrPublishing.c" } else { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 1283 "FlickrPublishing.c" +#line 1286 "FlickrPublishing.c" } } @@ -1287,66 +1290,66 @@ static void publishing_flickr_value_publishing_parameters_copy_value (const GVal static gpointer publishing_flickr_value_publishing_parameters_peek_pointer (const GValue* value) { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 1291 "FlickrPublishing.c" +#line 1294 "FlickrPublishing.c" } static gchar* publishing_flickr_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (collect_values[0].v_pointer) { -#line 1298 "FlickrPublishing.c" - PublishingFlickrPublishingParameters* object; +#line 1301 "FlickrPublishing.c" + PublishingFlickrPublishingParameters * object; object = collect_values[0].v_pointer; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1305 "FlickrPublishing.c" +#line 1308 "FlickrPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1309 "FlickrPublishing.c" +#line 1312 "FlickrPublishing.c" } #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = publishing_flickr_publishing_parameters_ref (object); -#line 1313 "FlickrPublishing.c" +#line 1316 "FlickrPublishing.c" } else { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1317 "FlickrPublishing.c" +#line 1320 "FlickrPublishing.c" } #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 1321 "FlickrPublishing.c" +#line 1324 "FlickrPublishing.c" } static gchar* publishing_flickr_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingFlickrPublishingParameters** object_p; + PublishingFlickrPublishingParameters ** object_p; object_p = collect_values[0].v_pointer; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!object_p) { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1332 "FlickrPublishing.c" +#line 1335 "FlickrPublishing.c" } #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!value->data[0].v_pointer) { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = NULL; -#line 1338 "FlickrPublishing.c" +#line 1341 "FlickrPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = value->data[0].v_pointer; -#line 1342 "FlickrPublishing.c" +#line 1345 "FlickrPublishing.c" } else { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = publishing_flickr_publishing_parameters_ref (value->data[0].v_pointer); -#line 1346 "FlickrPublishing.c" +#line 1349 "FlickrPublishing.c" } #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 1350 "FlickrPublishing.c" +#line 1353 "FlickrPublishing.c" } @@ -1360,7 +1363,7 @@ GParamSpec* publishing_flickr_param_spec_publishing_parameters (const gchar* nam G_PARAM_SPEC (spec)->value_type = object_type; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return G_PARAM_SPEC (spec); -#line 1364 "FlickrPublishing.c" +#line 1367 "FlickrPublishing.c" } @@ -1369,12 +1372,12 @@ gpointer publishing_flickr_value_get_publishing_parameters (const GValue* value) g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS), NULL); #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 1373 "FlickrPublishing.c" +#line 1376 "FlickrPublishing.c" } void publishing_flickr_value_set_publishing_parameters (GValue* value, gpointer v_object) { - PublishingFlickrPublishingParameters* old; + PublishingFlickrPublishingParameters * old; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS)); #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -1389,23 +1392,23 @@ void publishing_flickr_value_set_publishing_parameters (GValue* value, gpointer value->data[0].v_pointer = v_object; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_parameters_ref (value->data[0].v_pointer); -#line 1393 "FlickrPublishing.c" +#line 1396 "FlickrPublishing.c" } else { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1397 "FlickrPublishing.c" +#line 1400 "FlickrPublishing.c" } #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_parameters_unref (old); -#line 1403 "FlickrPublishing.c" +#line 1406 "FlickrPublishing.c" } } void publishing_flickr_value_take_publishing_parameters (GValue* value, gpointer v_object) { - PublishingFlickrPublishingParameters* old; + PublishingFlickrPublishingParameters * old; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS)); #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -1418,17 +1421,17 @@ void publishing_flickr_value_take_publishing_parameters (GValue* value, gpointer g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = v_object; -#line 1422 "FlickrPublishing.c" +#line 1425 "FlickrPublishing.c" } else { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1426 "FlickrPublishing.c" +#line 1429 "FlickrPublishing.c" } #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_parameters_unref (old); -#line 1432 "FlickrPublishing.c" +#line 1435 "FlickrPublishing.c" } } @@ -1438,18 +1441,18 @@ static void publishing_flickr_publishing_parameters_class_init (PublishingFlickr publishing_flickr_publishing_parameters_parent_class = g_type_class_peek_parent (klass); #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingFlickrPublishingParametersClass *) klass)->finalize = publishing_flickr_publishing_parameters_finalize; -#line 1442 "FlickrPublishing.c" +#line 1445 "FlickrPublishing.c" } static void publishing_flickr_publishing_parameters_instance_init (PublishingFlickrPublishingParameters * self) { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->ref_count = 1; -#line 1449 "FlickrPublishing.c" +#line 1452 "FlickrPublishing.c" } -static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPublishingParameters* obj) { +static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPublishingParameters * obj) { PublishingFlickrPublishingParameters * self; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS, PublishingFlickrPublishingParameters); @@ -1459,7 +1462,7 @@ static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPu _g_free0 (self->username); #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_visibility_specification_unref0 (self->visibility_specification); -#line 1463 "FlickrPublishing.c" +#line 1466 "FlickrPublishing.c" } @@ -1478,18 +1481,18 @@ GType publishing_flickr_publishing_parameters_get_type (void) { gpointer publishing_flickr_publishing_parameters_ref (gpointer instance) { - PublishingFlickrPublishingParameters* self; + PublishingFlickrPublishingParameters * self; self = instance; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_atomic_int_inc (&self->ref_count); #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return instance; -#line 1488 "FlickrPublishing.c" +#line 1491 "FlickrPublishing.c" } void publishing_flickr_publishing_parameters_unref (gpointer instance) { - PublishingFlickrPublishingParameters* self; + PublishingFlickrPublishingParameters * self; self = instance; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1497,7 +1500,7 @@ void publishing_flickr_publishing_parameters_unref (gpointer instance) { PUBLISHING_FLICKR_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self); #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1501 "FlickrPublishing.c" +#line 1504 "FlickrPublishing.c" } } @@ -1505,23 +1508,23 @@ void publishing_flickr_publishing_parameters_unref (gpointer instance) { static void _publishing_flickr_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self) { #line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_session_authenticated ((PublishingFlickrFlickrPublisher*) self); -#line 1509 "FlickrPublishing.c" +#line 1512 "FlickrPublishing.c" } PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) { PublishingFlickrFlickrPublisher * self = NULL; - SpitPublishingService* _tmp0_ = NULL; - SpitPublishingService* _tmp1_ = NULL; - SpitPublishingPluginHost* _tmp2_ = NULL; - SpitPublishingPluginHost* _tmp3_ = NULL; - PublishingFlickrSession* _tmp4_ = NULL; - PublishingFlickrPublishingParameters* _tmp5_ = NULL; - PublishingAuthenticatorFactory* _tmp6_ = NULL; - PublishingAuthenticatorFactory* _tmp7_ = NULL; - SpitPublishingPluginHost* _tmp8_ = NULL; - SpitPublishingAuthenticator* _tmp9_ = NULL; - SpitPublishingAuthenticator* _tmp10_ = NULL; + SpitPublishingService* _tmp0_; + SpitPublishingService* _tmp1_; + SpitPublishingPluginHost* _tmp2_; + SpitPublishingPluginHost* _tmp3_; + PublishingFlickrSession* _tmp4_; + PublishingFlickrPublishingParameters* _tmp5_; + PublishingAuthenticatorFactory* _tmp6_; + PublishingAuthenticatorFactory* _tmp7_; + SpitPublishingPluginHost* _tmp8_; + SpitPublishingAuthenticator* _tmp9_; + SpitPublishingAuthenticator* _tmp10_; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL); #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -1578,21 +1581,21 @@ PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_construct (G g_signal_connect_object (_tmp10_, "authenticated", (GCallback) _publishing_flickr_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated, self, 0); #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 1582 "FlickrPublishing.c" +#line 1585 "FlickrPublishing.c" } PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_flickr_publisher_construct (PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, service, host); -#line 1589 "FlickrPublishing.c" +#line 1592 "FlickrPublishing.c" } SpitPublishingAuthenticator* publishing_flickr_flickr_publisher_get_authenticator (PublishingFlickrFlickrPublisher* self) { SpitPublishingAuthenticator* result = NULL; - SpitPublishingAuthenticator* _tmp0_ = NULL; - SpitPublishingAuthenticator* _tmp1_ = NULL; + SpitPublishingAuthenticator* _tmp0_; + SpitPublishingAuthenticator* _tmp1_; #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), NULL); #line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -1603,14 +1606,14 @@ SpitPublishingAuthenticator* publishing_flickr_flickr_publisher_get_authenticato result = _tmp1_; #line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 1607 "FlickrPublishing.c" +#line 1610 "FlickrPublishing.c" } static gboolean publishing_flickr_flickr_publisher_get_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self) { gboolean result = FALSE; - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), FALSE); #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -1621,13 +1624,13 @@ static gboolean publishing_flickr_flickr_publisher_get_persistent_strip_metadata result = _tmp1_; #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 1625 "FlickrPublishing.c" +#line 1628 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_set_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -1636,57 +1639,57 @@ static void publishing_flickr_flickr_publisher_set_persistent_strip_metadata (Pu _tmp1_ = strip_metadata; #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", _tmp1_); -#line 1640 "FlickrPublishing.c" +#line 1643 "FlickrPublishing.c" } static gpointer _g_variant_ref0 (gpointer self) { #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? g_variant_ref (self) : NULL; -#line 1647 "FlickrPublishing.c" +#line 1650 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_on_session_authenticated (PublishingFlickrFlickrPublisher* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; GHashTable* params = NULL; - SpitPublishingAuthenticator* _tmp1_ = NULL; - GHashTable* _tmp2_ = NULL; + SpitPublishingAuthenticator* _tmp1_; + GHashTable* _tmp2_; GVariant* consumer_key = NULL; GVariant* consumer_secret = NULL; GVariant* auth_token = NULL; GVariant* auth_token_secret = NULL; GVariant* username = NULL; - GHashTable* _tmp3_ = NULL; + GHashTable* _tmp3_; gconstpointer _tmp4_ = NULL; - GVariant* _tmp5_ = NULL; - GHashTable* _tmp6_ = NULL; + GVariant* _tmp5_; + GHashTable* _tmp6_; gconstpointer _tmp7_ = NULL; - GVariant* _tmp8_ = NULL; - PublishingFlickrSession* _tmp9_ = NULL; - GVariant* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - GVariant* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - GHashTable* _tmp14_ = NULL; + GVariant* _tmp8_; + PublishingFlickrSession* _tmp9_; + GVariant* _tmp10_; + const gchar* _tmp11_; + GVariant* _tmp12_; + const gchar* _tmp13_; + GHashTable* _tmp14_; gconstpointer _tmp15_ = NULL; - GVariant* _tmp16_ = NULL; - GHashTable* _tmp17_ = NULL; + GVariant* _tmp16_; + GHashTable* _tmp17_; gconstpointer _tmp18_ = NULL; - GVariant* _tmp19_ = NULL; - GHashTable* _tmp20_ = NULL; + GVariant* _tmp19_; + GHashTable* _tmp20_; gconstpointer _tmp21_ = NULL; - GVariant* _tmp22_ = NULL; - PublishingFlickrSession* _tmp23_ = NULL; - GVariant* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; - GVariant* _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; - GVariant* _tmp28_ = NULL; - const gchar* _tmp29_ = NULL; - PublishingFlickrPublishingParameters* _tmp30_ = NULL; - PublishingFlickrSession* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; + GVariant* _tmp22_; + PublishingFlickrSession* _tmp23_; + GVariant* _tmp24_; + const gchar* _tmp25_; + GVariant* _tmp26_; + const gchar* _tmp27_; + GVariant* _tmp28_; + const gchar* _tmp29_; + PublishingFlickrPublishingParameters* _tmp30_; + PublishingFlickrSession* _tmp31_; + gchar* _tmp32_; #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); #line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -1695,7 +1698,7 @@ static void publishing_flickr_flickr_publisher_on_session_authenticated (Publish if (!_tmp0_) { #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 1699 "FlickrPublishing.c" +#line 1702 "FlickrPublishing.c" } #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:137: EVENT: a fully authenticated session has be" \ @@ -1818,33 +1821,33 @@ static void publishing_flickr_flickr_publisher_on_session_authenticated (Publish _g_variant_unref0 (consumer_key); #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_hash_table_unref0 (params); -#line 1821 "FlickrPublishing.c" +#line 1824 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_account_fetch_txn_completed ((PublishingFlickrFlickrPublisher*) self, _sender); -#line 1828 "FlickrPublishing.c" +#line 1831 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_account_fetch_txn_error ((PublishingFlickrFlickrPublisher*) self, _sender, err); -#line 1835 "FlickrPublishing.c" +#line 1838 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingRESTSupportTransaction* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingRESTSupportTransaction* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -1867,7 +1870,7 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (P if (!_tmp4_) { #line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 1870 "FlickrPublishing.c" +#line 1873 "FlickrPublishing.c" } #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:168: EVENT: account fetch transaction response r" \ @@ -1882,18 +1885,18 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (P publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (self, _tmp7_); #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp7_); -#line 1884 "FlickrPublishing.c" +#line 1887 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_on_account_fetch_txn_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - SpitPublishingPluginHost* _tmp5_ = NULL; - GError* _tmp6_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + SpitPublishingPluginHost* _tmp5_; + GError* _tmp6_; #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -1916,7 +1919,7 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_error (Publi if (!_tmp4_) { #line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 1918 "FlickrPublishing.c" +#line 1921 "FlickrPublishing.c" } #line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:180: EVENT: account fetch transaction caused a n" \ @@ -1927,12 +1930,12 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_error (Publi _tmp6_ = err; #line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_); -#line 1928 "FlickrPublishing.c" +#line 1931 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_on_account_info_available (PublishingFlickrFlickrPublisher* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -1941,38 +1944,38 @@ static void publishing_flickr_flickr_publisher_on_account_info_available (Publis if (!_tmp0_) { #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 1942 "FlickrPublishing.c" +#line 1945 "FlickrPublishing.c" } #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:188: EVENT: account information has become avail" \ "able"); #line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_show_publishing_options_pane (self); -#line 1948 "FlickrPublishing.c" +#line 1951 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender, gboolean strip_metadata, gpointer self) { #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_publishing_options_pane_publish ((PublishingFlickrFlickrPublisher*) self, strip_metadata); -#line 1955 "FlickrPublishing.c" +#line 1958 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self) { #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_publishing_options_pane_logout ((PublishingFlickrFlickrPublisher*) self); -#line 1962 "FlickrPublishing.c" +#line 1965 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_on_publishing_options_pane_publish (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata) { - PublishingFlickrPublishingOptionsPane* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingFlickrPublishingOptionsPane* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_ = FALSE; + PublishingFlickrPublishingOptionsPane* _tmp0_; + guint _tmp1_; + PublishingFlickrPublishingOptionsPane* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + gboolean _tmp5_; #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -1993,7 +1996,7 @@ static void publishing_flickr_flickr_publisher_on_publishing_options_pane_publis if (!_tmp4_) { #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 1993 "FlickrPublishing.c" +#line 1996 "FlickrPublishing.c" } #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:199: EVENT: user clicked the 'Publish' button in" \ @@ -2002,16 +2005,16 @@ static void publishing_flickr_flickr_publisher_on_publishing_options_pane_publis _tmp5_ = strip_metadata; #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_publish (self, _tmp5_); -#line 2001 "FlickrPublishing.c" +#line 2004 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_on_publishing_options_pane_logout (PublishingFlickrFlickrPublisher* self) { - PublishingFlickrPublishingOptionsPane* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingFlickrPublishingOptionsPane* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; + PublishingFlickrPublishingOptionsPane* _tmp0_; + guint _tmp1_; + PublishingFlickrPublishingOptionsPane* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); #line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2032,26 +2035,26 @@ static void publishing_flickr_flickr_publisher_on_publishing_options_pane_logout if (!_tmp4_) { #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2031 "FlickrPublishing.c" +#line 2034 "FlickrPublishing.c" } #line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:210: EVENT: user clicked the 'Logout' button in " \ "the publishing options pane"); #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_logout (self); -#line 2037 "FlickrPublishing.c" +#line 2040 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_on_upload_status_updated (PublishingFlickrFlickrPublisher* self, gint file_number, gdouble completed_fraction) { - gboolean _tmp0_ = FALSE; - gdouble _tmp1_ = 0.0; - SpitPublishingProgressCallback _tmp2_ = NULL; - void* _tmp2__target = NULL; - SpitPublishingProgressCallback _tmp3_ = NULL; - void* _tmp3__target = NULL; - gint _tmp4_ = 0; - gdouble _tmp5_ = 0.0; + gboolean _tmp0_; + gdouble _tmp1_; + SpitPublishingProgressCallback _tmp2_; + void* _tmp2__target; + SpitPublishingProgressCallback _tmp3_; + void* _tmp3__target; + gint _tmp4_; + gdouble _tmp5_; #line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2060,7 +2063,7 @@ static void publishing_flickr_flickr_publisher_on_upload_status_updated (Publish if (!_tmp0_) { #line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2058 "FlickrPublishing.c" +#line 2061 "FlickrPublishing.c" } #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = completed_fraction; @@ -2083,31 +2086,31 @@ static void publishing_flickr_flickr_publisher_on_upload_status_updated (Publish _tmp5_ = completed_fraction; #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ (_tmp4_, _tmp5_, _tmp3__target); -#line 2080 "FlickrPublishing.c" +#line 2083 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) { #line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_upload_complete ((PublishingFlickrFlickrPublisher*) self, _sender, num_photos_published); -#line 2087 "FlickrPublishing.c" +#line 2090 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) { #line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_upload_error ((PublishingFlickrFlickrPublisher*) self, _sender, err); -#line 2094 "FlickrPublishing.c" +#line 2097 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_on_upload_complete (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) { - gboolean _tmp0_ = FALSE; - gint _tmp1_ = 0; - PublishingRESTSupportBatchUploader* _tmp2_ = NULL; - guint _tmp3_ = 0U; - PublishingRESTSupportBatchUploader* _tmp4_ = NULL; - guint _tmp5_ = 0U; + gboolean _tmp0_; + gint _tmp1_; + PublishingRESTSupportBatchUploader* _tmp2_; + guint _tmp3_; + PublishingRESTSupportBatchUploader* _tmp4_; + guint _tmp5_; #line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); #line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2118,7 +2121,7 @@ static void publishing_flickr_flickr_publisher_on_upload_complete (PublishingFli if (!_tmp0_) { #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2115 "FlickrPublishing.c" +#line 2118 "FlickrPublishing.c" } #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = num_published; @@ -2139,20 +2142,20 @@ static void publishing_flickr_flickr_publisher_on_upload_complete (PublishingFli g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self); #line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_show_success_pane (self); -#line 2135 "FlickrPublishing.c" +#line 2138 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) { - gboolean _tmp0_ = FALSE; - GError* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PublishingRESTSupportBatchUploader* _tmp3_ = NULL; - guint _tmp4_ = 0U; - PublishingRESTSupportBatchUploader* _tmp5_ = NULL; - guint _tmp6_ = 0U; - SpitPublishingPluginHost* _tmp7_ = NULL; - GError* _tmp8_ = NULL; + gboolean _tmp0_; + GError* _tmp1_; + const gchar* _tmp2_; + PublishingRESTSupportBatchUploader* _tmp3_; + guint _tmp4_; + PublishingRESTSupportBatchUploader* _tmp5_; + guint _tmp6_; + SpitPublishingPluginHost* _tmp7_; + GError* _tmp8_; #line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); #line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2163,7 +2166,7 @@ static void publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickr if (!_tmp0_) { #line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2159 "FlickrPublishing.c" +#line 2162 "FlickrPublishing.c" } #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = err; @@ -2190,16 +2193,16 @@ static void publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickr _tmp8_ = err; #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_); -#line 2185 "FlickrPublishing.c" +#line 2188 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_do_fetch_account_info (PublishingFlickrFlickrPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; PublishingFlickrAccountInfoFetchTransaction* txn = NULL; - PublishingFlickrSession* _tmp2_ = NULL; - PublishingFlickrAccountInfoFetchTransaction* _tmp3_ = NULL; + PublishingFlickrSession* _tmp2_; + PublishingFlickrAccountInfoFetchTransaction* _tmp3_; GError * _inner_error_ = NULL; #line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); @@ -2224,7 +2227,7 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed, self, 0); #line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error, self, 0); -#line 2218 "FlickrPublishing.c" +#line 2221 "FlickrPublishing.c" { #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -2232,7 +2235,7 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing if (G_UNLIKELY (_inner_error_ != NULL)) { #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2226 "FlickrPublishing.c" +#line 2229 "FlickrPublishing.c" goto __catch13_spit_publishing_publishing_error; } #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2243,15 +2246,15 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing g_clear_error (&_inner_error_); #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2237 "FlickrPublishing.c" +#line 2240 "FlickrPublishing.c" } } goto __finally13; __catch13_spit_publishing_publishing_error: { GError* err = NULL; - SpitPublishingPluginHost* _tmp4_ = NULL; - GError* _tmp5_ = NULL; + SpitPublishingPluginHost* _tmp4_; + GError* _tmp5_; #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" err = _inner_error_; #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2264,7 +2267,7 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_); #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 2258 "FlickrPublishing.c" +#line 2261 "FlickrPublishing.c" } __finally13: #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2277,34 +2280,34 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing g_clear_error (&_inner_error_); #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2271 "FlickrPublishing.c" +#line 2274 "FlickrPublishing.c" } #line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_transaction_unref0 (txn); -#line 2275 "FlickrPublishing.c" +#line 2278 "FlickrPublishing.c" } static gint64 int64_parse (const gchar* str) { gint64 result = 0LL; - const gchar* _tmp0_ = NULL; - gint64 _tmp1_ = 0LL; -#line 679 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp0_; + gint64 _tmp1_; +#line 687 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (str != NULL, 0LL); -#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0); -#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_; -#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2293 "FlickrPublishing.c" +#line 2296 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (PublishingFlickrFlickrPublisher* self, const gchar* xml) { - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; GError * _inner_error_ = NULL; #line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); @@ -2315,39 +2318,39 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:270: ACTION: parsing account information from xm" \ "l = '%s'", _tmp0_); -#line 2308 "FlickrPublishing.c" +#line 2311 "FlickrPublishing.c" { PublishingRESTSupportXmlDocument* response_doc = NULL; - const gchar* _tmp1_ = NULL; - PublishingRESTSupportXmlDocument* _tmp2_ = NULL; + const gchar* _tmp1_; + PublishingRESTSupportXmlDocument* _tmp2_; xmlNode* root_node = NULL; - PublishingRESTSupportXmlDocument* _tmp3_ = NULL; - xmlNode* _tmp4_ = NULL; + PublishingRESTSupportXmlDocument* _tmp3_; + xmlNode* _tmp4_; xmlNode* user_node = NULL; - PublishingRESTSupportXmlDocument* _tmp5_ = NULL; - xmlNode* _tmp6_ = NULL; - xmlNode* _tmp7_ = NULL; + PublishingRESTSupportXmlDocument* _tmp5_; + xmlNode* _tmp6_; + xmlNode* _tmp7_; gchar* is_pro_str = NULL; - PublishingRESTSupportXmlDocument* _tmp8_ = NULL; - xmlNode* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; + PublishingRESTSupportXmlDocument* _tmp8_; + xmlNode* _tmp9_; + gchar* _tmp10_; xmlNode* bandwidth_node = NULL; - PublishingRESTSupportXmlDocument* _tmp11_ = NULL; - xmlNode* _tmp12_ = NULL; - xmlNode* _tmp13_ = NULL; + PublishingRESTSupportXmlDocument* _tmp11_; + xmlNode* _tmp12_; + xmlNode* _tmp13_; gchar* remaining_kb_str = NULL; - PublishingRESTSupportXmlDocument* _tmp14_ = NULL; - xmlNode* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; + PublishingRESTSupportXmlDocument* _tmp14_; + xmlNode* _tmp15_; + gchar* _tmp16_; PublishingFlickrUserKind user_kind = 0; - const gchar* _tmp17_ = NULL; + const gchar* _tmp17_; gint64 quota_bytes_left = 0LL; - const gchar* _tmp20_ = NULL; - gint64 _tmp21_ = 0LL; - PublishingFlickrPublishingParameters* _tmp22_ = NULL; - gint64 _tmp23_ = 0LL; - PublishingFlickrPublishingParameters* _tmp24_ = NULL; - PublishingFlickrUserKind _tmp25_ = 0; + const gchar* _tmp20_; + gint64 _tmp21_; + PublishingFlickrPublishingParameters* _tmp22_; + gint64 _tmp23_; + PublishingFlickrPublishingParameters* _tmp24_; + PublishingFlickrUserKind _tmp25_; #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = xml; #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2358,7 +2361,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P if (G_UNLIKELY (_inner_error_ != NULL)) { #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2351 "FlickrPublishing.c" +#line 2354 "FlickrPublishing.c" goto __catch14_spit_publishing_publishing_error; } #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2367,7 +2370,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P g_clear_error (&_inner_error_); #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2360 "FlickrPublishing.c" +#line 2363 "FlickrPublishing.c" } #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = response_doc; @@ -2389,7 +2392,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _publishing_rest_support_xml_document_unref0 (response_doc); #line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2382 "FlickrPublishing.c" +#line 2385 "FlickrPublishing.c" goto __catch14_spit_publishing_publishing_error; } #line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2400,7 +2403,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P g_clear_error (&_inner_error_); #line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2393 "FlickrPublishing.c" +#line 2396 "FlickrPublishing.c" } #line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = response_doc; @@ -2416,7 +2419,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _publishing_rest_support_xml_document_unref0 (response_doc); #line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2409 "FlickrPublishing.c" +#line 2412 "FlickrPublishing.c" goto __catch14_spit_publishing_publishing_error; } #line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2427,7 +2430,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P g_clear_error (&_inner_error_); #line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2420 "FlickrPublishing.c" +#line 2423 "FlickrPublishing.c" } #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = response_doc; @@ -2445,7 +2448,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _publishing_rest_support_xml_document_unref0 (response_doc); #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2438 "FlickrPublishing.c" +#line 2441 "FlickrPublishing.c" goto __catch14_spit_publishing_publishing_error; } #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2458,7 +2461,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P g_clear_error (&_inner_error_); #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2451 "FlickrPublishing.c" +#line 2454 "FlickrPublishing.c" } #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = response_doc; @@ -2476,7 +2479,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _publishing_rest_support_xml_document_unref0 (response_doc); #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2469 "FlickrPublishing.c" +#line 2472 "FlickrPublishing.c" goto __catch14_spit_publishing_publishing_error; } #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2489,7 +2492,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P g_clear_error (&_inner_error_); #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2482 "FlickrPublishing.c" +#line 2485 "FlickrPublishing.c" } #line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17_ = is_pro_str; @@ -2497,18 +2500,18 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P if (g_strcmp0 (_tmp17_, "0") == 0) { #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" user_kind = PUBLISHING_FLICKR_USER_KIND_FREE; -#line 2490 "FlickrPublishing.c" +#line 2493 "FlickrPublishing.c" } else { - const gchar* _tmp18_ = NULL; + const gchar* _tmp18_; #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp18_ = is_pro_str; #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_strcmp0 (_tmp18_, "1") == 0) { #line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" user_kind = PUBLISHING_FLICKR_USER_KIND_PRO; -#line 2499 "FlickrPublishing.c" +#line 2502 "FlickrPublishing.c" } else { - GError* _tmp19_ = NULL; + GError* _tmp19_; #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp19_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to determine if user has free or pro account"); #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2521,7 +2524,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _publishing_rest_support_xml_document_unref0 (response_doc); #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2514 "FlickrPublishing.c" +#line 2517 "FlickrPublishing.c" goto __catch14_spit_publishing_publishing_error; } #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2536,7 +2539,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P g_clear_error (&_inner_error_); #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2529 "FlickrPublishing.c" +#line 2532 "FlickrPublishing.c" } } #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2563,15 +2566,15 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _g_free0 (is_pro_str); #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 2556 "FlickrPublishing.c" +#line 2559 "FlickrPublishing.c" } goto __finally14; __catch14_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp26_ = NULL; - SpitPublishingPluginHost* _tmp27_ = NULL; - GError* _tmp28_ = NULL; + GError* _tmp26_; + SpitPublishingPluginHost* _tmp27_; + GError* _tmp28_; #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" err = _inner_error_; #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2586,7 +2589,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _g_error_free0 (err); #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2579 "FlickrPublishing.c" +#line 2582 "FlickrPublishing.c" } #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp27_ = self->priv->host; @@ -2598,7 +2601,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _g_error_free0 (err); #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2591 "FlickrPublishing.c" +#line 2594 "FlickrPublishing.c" } __finally14: #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2609,17 +2612,17 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P g_clear_error (&_inner_error_); #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2602 "FlickrPublishing.c" +#line 2605 "FlickrPublishing.c" } #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_account_info_available (self); -#line 2606 "FlickrPublishing.c" +#line 2609 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_do_logout (PublishingFlickrFlickrPublisher* self) { - SpitPublishingAuthenticator* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingAuthenticator* _tmp0_; + gboolean _tmp1_; #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2631,36 +2634,36 @@ static void publishing_flickr_flickr_publisher_do_logout (PublishingFlickrFlickr _tmp1_ = spit_publishing_authenticator_can_logout (_tmp0_); #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp1_) { -#line 2623 "FlickrPublishing.c" - SpitPublishingAuthenticator* _tmp2_ = NULL; +#line 2626 "FlickrPublishing.c" + SpitPublishingAuthenticator* _tmp2_; #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = self->priv->authenticator; #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_authenticator_logout (_tmp2_); -#line 2629 "FlickrPublishing.c" +#line 2632 "FlickrPublishing.c" } #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->running = FALSE; #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_attempt_start (self); -#line 2635 "FlickrPublishing.c" +#line 2638 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (PublishingFlickrFlickrPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; + SpitPublishingPluginHost* _tmp0_; GtkBuilder* builder = NULL; - GtkBuilder* _tmp1_ = NULL; - PublishingFlickrPublishingParameters* _tmp9_ = NULL; - SpitPublishingPluginHost* _tmp10_ = NULL; - SpitPublishingPublisherMediaType _tmp11_ = 0; - GtkBuilder* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; - PublishingFlickrPublishingOptionsPane* _tmp14_ = NULL; - PublishingFlickrPublishingOptionsPane* _tmp15_ = NULL; - PublishingFlickrPublishingOptionsPane* _tmp16_ = NULL; - SpitPublishingPluginHost* _tmp17_ = NULL; - PublishingFlickrPublishingOptionsPane* _tmp18_ = NULL; + GtkBuilder* _tmp1_; + PublishingFlickrPublishingParameters* _tmp8_; + SpitPublishingPluginHost* _tmp9_; + SpitPublishingPublisherMediaType _tmp10_; + GtkBuilder* _tmp11_; + gboolean _tmp12_; + PublishingFlickrPublishingOptionsPane* _tmp13_; + PublishingFlickrPublishingOptionsPane* _tmp14_; + PublishingFlickrPublishingOptionsPane* _tmp15_; + SpitPublishingPluginHost* _tmp16_; + PublishingFlickrPublishingOptionsPane* _tmp17_; GError * _inner_error_ = NULL; #line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); @@ -2674,16 +2677,16 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane ( _tmp1_ = gtk_builder_new (); #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" builder = _tmp1_; -#line 2666 "FlickrPublishing.c" +#line 2669 "FlickrPublishing.c" { - GtkBuilder* _tmp2_ = NULL; + GtkBuilder* _tmp2_; #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = builder; #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/" "flickr_publishing_options_pane.ui", &_inner_error_); #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2675 "FlickrPublishing.c" +#line 2678 "FlickrPublishing.c" goto __catch15_g_error; } } @@ -2691,12 +2694,11 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane ( __catch15_g_error: { GError* e = NULL; - GError* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - SpitPublishingPluginHost* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - GError* _tmp7_ = NULL; - GError* _tmp8_ = NULL; + GError* _tmp3_; + const gchar* _tmp4_; + SpitPublishingPluginHost* _tmp5_; + GError* _tmp6_; + GError* _tmp7_; #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" e = _inner_error_; #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2710,16 +2712,14 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane ( #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = self->priv->host; #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp6_ = _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \ -"n’t continue."); -#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp6_); + _tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \ +"n’t continue.")); #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - spit_publishing_plugin_host_post_error (_tmp5_, _tmp8_); + spit_publishing_plugin_host_post_error (_tmp5_, _tmp7_); #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_error_free0 (_tmp8_); + _g_error_free0 (_tmp7_); #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (e); #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2742,35 +2742,35 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane ( #line 2730 "FlickrPublishing.c" } #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp9_ = self->priv->parameters; + _tmp8_ = self->priv->parameters; #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp10_ = self->priv->host; + _tmp9_ = self->priv->host; #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp11_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp10_); + _tmp10_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp9_); #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp12_ = builder; + _tmp11_ = builder; #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp13_ = publishing_flickr_flickr_publisher_get_persistent_strip_metadata (self); + _tmp12_ = publishing_flickr_flickr_publisher_get_persistent_strip_metadata (self); #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp14_ = publishing_flickr_publishing_options_pane_new (self, _tmp9_, _tmp11_, _tmp12_, _tmp13_); + _tmp13_ = publishing_flickr_publishing_options_pane_new (self, _tmp8_, _tmp10_, _tmp11_, _tmp12_); #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->publishing_options_pane); #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - self->priv->publishing_options_pane = _tmp14_; + self->priv->publishing_options_pane = _tmp13_; #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp15_ = self->priv->publishing_options_pane; + _tmp14_ = self->priv->publishing_options_pane; #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_signal_connect_object (_tmp15_, "publish", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish, self, 0); + g_signal_connect_object (_tmp14_, "publish", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish, self, 0); #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp16_ = self->priv->publishing_options_pane; + _tmp15_ = self->priv->publishing_options_pane; #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_signal_connect_object (_tmp16_, "logout", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout, self, 0); + g_signal_connect_object (_tmp15_, "logout", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout, self, 0); #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp17_ = self->priv->host; + _tmp16_ = self->priv->host; #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp18_ = self->priv->publishing_options_pane; + _tmp17_ = self->priv->publishing_options_pane; #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - spit_publishing_plugin_host_install_dialog_pane (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); + spit_publishing_plugin_host_install_dialog_pane (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); #line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (builder); #line 2764 "FlickrPublishing.c" @@ -2779,14 +2779,14 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane ( gint publishing_flickr_flickr_publisher_flickr_date_time_compare_func (SpitPublishingPublishable* a, SpitPublishingPublishable* b) { gint result = 0; - SpitPublishingPublishable* _tmp0_ = NULL; - GDateTime* _tmp1_ = NULL; - GDateTime* _tmp2_ = NULL; - SpitPublishingPublishable* _tmp3_ = NULL; - GDateTime* _tmp4_ = NULL; - GDateTime* _tmp5_ = NULL; - gint _tmp6_ = 0; - gint _tmp7_ = 0; + SpitPublishingPublishable* _tmp0_; + GDateTime* _tmp1_; + GDateTime* _tmp2_; + SpitPublishingPublishable* _tmp3_; + GDateTime* _tmp4_; + GDateTime* _tmp5_; + gint _tmp6_; + gint _tmp7_; #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (a), 0); #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2836,41 +2836,41 @@ static void _publishing_flickr_flickr_publisher_on_upload_status_updated_spit_pu static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata) { - gboolean _tmp0_ = FALSE; - SpitPublishingPluginHost* _tmp1_ = NULL; - SpitPublishingPluginHost* _tmp2_ = NULL; - PublishingFlickrPublishingParameters* _tmp3_ = NULL; - gint _tmp4_ = 0; - gboolean _tmp5_ = FALSE; - void* _tmp6_ = NULL; - GDestroyNotify _tmp7_ = NULL; - SpitPublishingProgressCallback _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; + gboolean _tmp0_; + SpitPublishingPluginHost* _tmp1_; + SpitPublishingPluginHost* _tmp2_; + PublishingFlickrPublishingParameters* _tmp3_; + gint _tmp4_; + gboolean _tmp5_; + void* _tmp6_; + GDestroyNotify _tmp7_; + SpitPublishingProgressCallback _tmp8_; + gboolean _tmp9_; SpitPublishingPublishable** publishables = NULL; - SpitPublishingPluginHost* _tmp10_ = NULL; - gint _tmp11_ = 0; - SpitPublishingPublishable** _tmp12_ = NULL; - gint publishables_length1 = 0; - gint _publishables_size_ = 0; + SpitPublishingPluginHost* _tmp10_; + gint _tmp11_; + SpitPublishingPublishable** _tmp12_; + gint publishables_length1; + gint _publishables_size_; GeeArrayList* sorted_list = NULL; - GeeArrayList* _tmp13_ = NULL; - SpitPublishingPublishable** _tmp14_ = NULL; - gint _tmp14__length1 = 0; - GeeArrayList* _tmp18_ = NULL; + GeeArrayList* _tmp13_; + SpitPublishingPublishable** _tmp14_; + gint _tmp14__length1; + GeeArrayList* _tmp18_; PublishingFlickrUploader* uploader = NULL; - PublishingFlickrSession* _tmp19_ = NULL; - GeeArrayList* _tmp20_ = NULL; - gint _tmp21_ = 0; - gpointer* _tmp22_ = NULL; - SpitPublishingPublishable** _tmp23_ = NULL; - gint _tmp23__length1 = 0; - PublishingFlickrPublishingParameters* _tmp24_ = NULL; - gboolean _tmp25_ = FALSE; - PublishingFlickrUploader* _tmp26_ = NULL; - PublishingFlickrUploader* _tmp27_ = NULL; - PublishingFlickrUploader* _tmp28_ = NULL; - PublishingFlickrUploader* _tmp29_ = NULL; - PublishingFlickrUploader* _tmp30_ = NULL; + PublishingFlickrSession* _tmp19_; + GeeArrayList* _tmp20_; + gint _tmp21_; + gpointer* _tmp22_; + SpitPublishingPublishable** _tmp23_; + gint _tmp23__length1; + PublishingFlickrPublishingParameters* _tmp24_; + gboolean _tmp25_; + PublishingFlickrUploader* _tmp26_; + PublishingFlickrUploader* _tmp27_; + PublishingFlickrUploader* _tmp28_; + PublishingFlickrUploader* _tmp29_; + PublishingFlickrUploader* _tmp30_; #line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2947,7 +2947,7 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (p_it = 0; p_it < _tmp14__length1; p_it = p_it + 1) { #line 2936 "FlickrPublishing.c" - SpitPublishingPublishable* _tmp15_ = NULL; + SpitPublishingPublishable* _tmp15_; SpitPublishingPublishable* p = NULL; #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15_ = _g_object_ref0 (p_collection[p_it]); @@ -2955,8 +2955,8 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick p = _tmp15_; #line 2943 "FlickrPublishing.c" { - GeeArrayList* _tmp16_ = NULL; - SpitPublishingPublishable* _tmp17_ = NULL; + GeeArrayList* _tmp16_; + SpitPublishingPublishable* _tmp17_; #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = sorted_list; #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3018,8 +3018,8 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick static void publishing_flickr_flickr_publisher_do_show_success_pane (PublishingFlickrFlickrPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3038,8 +3038,8 @@ static void publishing_flickr_flickr_publisher_do_show_success_pane (PublishingF gint publishing_flickr_flickr_publisher_get_persistent_visibility (PublishingFlickrFlickrPublisher* self) { gint result = 0; - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), 0); #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3055,8 +3055,8 @@ gint publishing_flickr_flickr_publisher_get_persistent_visibility (PublishingFli void publishing_flickr_flickr_publisher_set_persistent_visibility (PublishingFlickrFlickrPublisher* self, gint vis) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3071,8 +3071,8 @@ void publishing_flickr_flickr_publisher_set_persistent_visibility (PublishingFli gint publishing_flickr_flickr_publisher_get_persistent_default_size (PublishingFlickrFlickrPublisher* self) { gint result = 0; - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), 0); #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3088,8 +3088,8 @@ gint publishing_flickr_flickr_publisher_get_persistent_default_size (PublishingF void publishing_flickr_flickr_publisher_set_persistent_default_size (PublishingFlickrFlickrPublisher* self, gint size) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); #line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3105,8 +3105,8 @@ void publishing_flickr_flickr_publisher_set_persistent_default_size (PublishingF static SpitPublishingService* publishing_flickr_flickr_publisher_real_get_service (SpitPublishingPublisher* base) { PublishingFlickrFlickrPublisher * self; SpitPublishingService* result = NULL; - SpitPublishingService* _tmp0_ = NULL; - SpitPublishingService* _tmp1_ = NULL; + SpitPublishingService* _tmp0_; + SpitPublishingService* _tmp1_; #line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher); #line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3124,7 +3124,7 @@ static SpitPublishingService* publishing_flickr_flickr_publisher_real_get_servic static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishingPublisher* base) { PublishingFlickrFlickrPublisher * self; gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher); #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3138,7 +3138,7 @@ static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishi static void publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFlickrPublisher* self) { - SpitPublishingAuthenticator* _tmp0_ = NULL; + SpitPublishingAuthenticator* _tmp0_; #line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); #line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3155,8 +3155,8 @@ static void publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFl static void publishing_flickr_flickr_publisher_real_start (SpitPublishingPublisher* base) { PublishingFlickrFlickrPublisher * self; - gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; + gboolean _tmp0_; + gboolean _tmp1_; #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher); #line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3186,7 +3186,7 @@ static void publishing_flickr_flickr_publisher_real_start (SpitPublishingPublish static void publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublisher* base) { PublishingFlickrFlickrPublisher * self; - PublishingFlickrSession* _tmp0_ = NULL; + PublishingFlickrSession* _tmp0_; #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher); #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3196,7 +3196,7 @@ static void publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublishe #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp0_ != NULL) { #line 3184 "FlickrPublishing.c" - PublishingFlickrSession* _tmp1_ = NULL; + PublishingFlickrSession* _tmp1_; #line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->session; #line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3224,13 +3224,13 @@ static void publishing_flickr_flickr_publisher_spit_publishing_publisher_interfa #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface); #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_get_service; + iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_get_service; #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_is_running; + iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_is_running; #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->start = (void (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_start; + iface->start = (void (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_start; #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_stop; + iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_stop; #line 3220 "FlickrPublishing.c" } @@ -3240,6 +3240,10 @@ static void publishing_flickr_flickr_publisher_instance_init (PublishingFlickrFl self->priv = PUBLISHING_FLICKR_FLICKR_PUBLISHER_GET_PRIVATE (self); #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->progress_reporter = NULL; +#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + self->priv->progress_reporter_target = self; +#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + self->priv->progress_reporter_target_destroy_notify = NULL; #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->running = FALSE; #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3252,14 +3256,14 @@ static void publishing_flickr_flickr_publisher_instance_init (PublishingFlickrFl self->priv->authenticator = NULL; #line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->parameters = NULL; -#line 3241 "FlickrPublishing.c" +#line 3245 "FlickrPublishing.c" } -static void publishing_flickr_flickr_publisher_finalize (GObject* obj) { +static void publishing_flickr_flickr_publisher_finalize (GObject * obj) { PublishingFlickrFlickrPublisher * self; - SpitPublishingAuthenticator* _tmp0_ = NULL; - guint _tmp1_ = 0U; + SpitPublishingAuthenticator* _tmp0_; + guint _tmp1_; #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher); #line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3290,7 +3294,7 @@ static void publishing_flickr_flickr_publisher_finalize (GObject* obj) { _publishing_flickr_publishing_parameters_unref0 (self->priv->parameters); #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (publishing_flickr_flickr_publisher_parent_class)->finalize (obj); -#line 3279 "FlickrPublishing.c" +#line 3283 "FlickrPublishing.c" } @@ -3310,17 +3314,17 @@ GType publishing_flickr_flickr_publisher_get_type (void) { PublishingFlickrTransaction* publishing_flickr_transaction_construct (GType object_type, PublishingFlickrSession* session, PublishingRESTSupportHttpMethod method) { PublishingFlickrTransaction* self = NULL; - PublishingFlickrSession* _tmp0_ = NULL; - PublishingRESTSupportHttpMethod _tmp1_ = 0; - PublishingFlickrSession* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - PublishingFlickrSession* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - PublishingFlickrSession* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; + PublishingFlickrSession* _tmp0_; + PublishingRESTSupportHttpMethod _tmp1_; + PublishingFlickrSession* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + PublishingFlickrSession* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + PublishingFlickrSession* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; #line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL); #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3367,31 +3371,31 @@ PublishingFlickrTransaction* publishing_flickr_transaction_construct (GType obje _g_free0 (_tmp10_); #line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 3356 "FlickrPublishing.c" +#line 3360 "FlickrPublishing.c" } PublishingFlickrTransaction* publishing_flickr_transaction_new (PublishingFlickrSession* session, PublishingRESTSupportHttpMethod method) { #line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_transaction_construct (PUBLISHING_FLICKR_TYPE_TRANSACTION, session, method); -#line 3363 "FlickrPublishing.c" +#line 3367 "FlickrPublishing.c" } PublishingFlickrTransaction* publishing_flickr_transaction_construct_with_uri (GType object_type, PublishingFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) { PublishingFlickrTransaction* self = NULL; - PublishingFlickrSession* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - PublishingRESTSupportHttpMethod _tmp2_ = 0; - PublishingFlickrSession* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - PublishingFlickrSession* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - PublishingFlickrSession* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; + PublishingFlickrSession* _tmp0_; + const gchar* _tmp1_; + PublishingRESTSupportHttpMethod _tmp2_; + PublishingFlickrSession* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + PublishingFlickrSession* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + PublishingFlickrSession* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; #line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL); #line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3442,21 +3446,21 @@ PublishingFlickrTransaction* publishing_flickr_transaction_construct_with_uri (G _g_free0 (_tmp11_); #line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 3431 "FlickrPublishing.c" +#line 3435 "FlickrPublishing.c" } PublishingFlickrTransaction* publishing_flickr_transaction_new_with_uri (PublishingFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) { #line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_transaction_construct_with_uri (PUBLISHING_FLICKR_TYPE_TRANSACTION, session, uri, method); -#line 3438 "FlickrPublishing.c" +#line 3442 "FlickrPublishing.c" } static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) { PublishingFlickrTransaction * self; - PublishingRESTSupportSession* _tmp0_ = NULL; - PublishingFlickrSession* _tmp1_ = NULL; + PublishingRESTSupportSession* _tmp0_; + PublishingFlickrSession* _tmp1_; GError * _inner_error_ = NULL; #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_TRANSACTION, PublishingFlickrTransaction); @@ -3478,7 +3482,7 @@ static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTra g_propagate_error (error, _inner_error_); #line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3467 "FlickrPublishing.c" +#line 3471 "FlickrPublishing.c" } else { #line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3486,7 +3490,7 @@ static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTra g_clear_error (&_inner_error_); #line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3475 "FlickrPublishing.c" +#line 3479 "FlickrPublishing.c" } } } @@ -3495,22 +3499,22 @@ static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTra gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc) { gchar* result = NULL; xmlNode* root = NULL; - PublishingRESTSupportXmlDocument* _tmp0_ = NULL; - xmlNode* _tmp1_ = NULL; + PublishingRESTSupportXmlDocument* _tmp0_; + xmlNode* _tmp1_; gchar* status = NULL; - xmlNode* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - const gchar* _tmp6_ = NULL; + xmlNode* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp6_; xmlNode* errcode = NULL; - xmlNode* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - xmlNode* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; + xmlNode* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + xmlNode* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; GError * _inner_error_ = NULL; #line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL); @@ -3530,8 +3534,8 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum _tmp4_ = status; #line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp4_ == NULL) { -#line 3519 "FlickrPublishing.c" - gchar* _tmp5_ = NULL; +#line 3523 "FlickrPublishing.c" + gchar* _tmp5_; #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = g_strdup ("No status property in root node"); #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3540,7 +3544,7 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum _g_free0 (status); #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 3529 "FlickrPublishing.c" +#line 3533 "FlickrPublishing.c" } #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = status; @@ -3552,13 +3556,13 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum _g_free0 (status); #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 3541 "FlickrPublishing.c" +#line 3545 "FlickrPublishing.c" } { xmlNode* _tmp7_ = NULL; - PublishingRESTSupportXmlDocument* _tmp8_ = NULL; - xmlNode* _tmp9_ = NULL; - xmlNode* _tmp10_ = NULL; + PublishingRESTSupportXmlDocument* _tmp8_; + xmlNode* _tmp9_; + xmlNode* _tmp10_; #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = doc; #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3571,7 +3575,7 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum if (G_UNLIKELY (_inner_error_ != NULL)) { #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3560 "FlickrPublishing.c" +#line 3564 "FlickrPublishing.c" goto __catch16_spit_publishing_publishing_error; } #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3582,17 +3586,17 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum g_clear_error (&_inner_error_); #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 3571 "FlickrPublishing.c" +#line 3575 "FlickrPublishing.c" } #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" errcode = _tmp7_; -#line 3575 "FlickrPublishing.c" +#line 3579 "FlickrPublishing.c" } goto __finally16; __catch16_spit_publishing_publishing_error: { GError* err = NULL; - gchar* _tmp11_ = NULL; + gchar* _tmp11_; #line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" err = _inner_error_; #line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3607,7 +3611,7 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum _g_free0 (status); #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 3596 "FlickrPublishing.c" +#line 3600 "FlickrPublishing.c" } __finally16: #line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3620,7 +3624,7 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum g_clear_error (&_inner_error_); #line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 3609 "FlickrPublishing.c" +#line 3613 "FlickrPublishing.c" } #line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = errcode; @@ -3648,7 +3652,7 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum _g_free0 (status); #line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 3637 "FlickrPublishing.c" +#line 3641 "FlickrPublishing.c" } @@ -3657,34 +3661,34 @@ static gchar* _publishing_flickr_transaction_validate_xml_publishing_rest_suppor result = publishing_flickr_transaction_validate_xml (doc); #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 3646 "FlickrPublishing.c" +#line 3650 "FlickrPublishing.c" } static gboolean string_contains (const gchar* self, const gchar* needle) { gboolean result = FALSE; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; -#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp0_; + gchar* _tmp1_; +#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = needle; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_ != NULL; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3666 "FlickrPublishing.c" +#line 3670 "FlickrPublishing.c" } static gpointer _g_error_copy0 (gpointer self) { #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? g_error_copy (self) : NULL; -#line 3673 "FlickrPublishing.c" +#line 3677 "FlickrPublishing.c" } @@ -3696,12 +3700,12 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res g_return_val_if_fail (xml != NULL, NULL); #line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result_ = NULL; -#line 3685 "FlickrPublishing.c" +#line 3689 "FlickrPublishing.c" { PublishingRESTSupportXmlDocument* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - PublishingRESTSupportXmlDocument* _tmp2_ = NULL; - PublishingRESTSupportXmlDocument* _tmp3_ = NULL; + const gchar* _tmp1_; + PublishingRESTSupportXmlDocument* _tmp2_; + PublishingRESTSupportXmlDocument* _tmp3_; #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = xml; #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3712,7 +3716,7 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res if (G_UNLIKELY (_inner_error_ != NULL)) { #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3701 "FlickrPublishing.c" +#line 3705 "FlickrPublishing.c" goto __catch17_spit_publishing_publishing_error; } #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3723,7 +3727,7 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res g_clear_error (&_inner_error_); #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 3712 "FlickrPublishing.c" +#line 3716 "FlickrPublishing.c" } #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = _tmp0_; @@ -3735,18 +3739,18 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res _result_ = _tmp3_; #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (_tmp0_); -#line 3724 "FlickrPublishing.c" +#line 3728 "FlickrPublishing.c" } goto __finally17; __catch17_spit_publishing_publishing_error: { GError* e = NULL; - GError* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; - gboolean _tmp9_ = FALSE; + GError* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gboolean _tmp8_; + gboolean _tmp9_; #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" e = _inner_error_; #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3767,10 +3771,10 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res _g_free0 (_tmp7_); #line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp9_) { -#line 3756 "FlickrPublishing.c" - GError* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - GError* _tmp12_ = NULL; +#line 3760 "FlickrPublishing.c" + GError* _tmp10_; + const gchar* _tmp11_; + GError* _tmp12_; #line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = e; #line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3781,11 +3785,11 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res _inner_error_ = _tmp12_; #line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (e); -#line 3770 "FlickrPublishing.c" +#line 3774 "FlickrPublishing.c" goto __finally17; } else { - GError* _tmp13_ = NULL; - GError* _tmp14_ = NULL; + GError* _tmp13_; + GError* _tmp14_; #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = e; #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3794,12 +3798,12 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res _inner_error_ = _tmp14_; #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (e); -#line 3783 "FlickrPublishing.c" +#line 3787 "FlickrPublishing.c" goto __finally17; } #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (e); -#line 3788 "FlickrPublishing.c" +#line 3792 "FlickrPublishing.c" } __finally17: #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3812,7 +3816,7 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res _publishing_rest_support_xml_document_unref0 (_result_); #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 3801 "FlickrPublishing.c" +#line 3805 "FlickrPublishing.c" } else { #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (_result_); @@ -3822,14 +3826,14 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res g_clear_error (&_inner_error_); #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 3811 "FlickrPublishing.c" +#line 3815 "FlickrPublishing.c" } } #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _result_; #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 3818 "FlickrPublishing.c" +#line 3822 "FlickrPublishing.c" } @@ -3837,8 +3841,8 @@ static void publishing_flickr_transaction_class_init (PublishingFlickrTransactio #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_transaction_parent_class = g_type_class_peek_parent (klass); #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_flickr_transaction_real_execute; -#line 3827 "FlickrPublishing.c" + ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_flickr_transaction_real_execute; +#line 3831 "FlickrPublishing.c" } @@ -3860,10 +3864,10 @@ GType publishing_flickr_transaction_get_type (void) { PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_construct (GType object_type, PublishingFlickrSession* session) { PublishingFlickrAccountInfoFetchTransaction* self = NULL; - PublishingFlickrSession* _tmp0_ = NULL; - PublishingFlickrSession* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + PublishingFlickrSession* _tmp0_; + PublishingFlickrSession* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL); #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3884,21 +3888,21 @@ PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetc _g_free0 (_tmp3_); #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 3873 "FlickrPublishing.c" +#line 3877 "FlickrPublishing.c" } PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_new (PublishingFlickrSession* session) { #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_account_info_fetch_transaction_construct (PUBLISHING_FLICKR_TYPE_ACCOUNT_INFO_FETCH_TRANSACTION, session); -#line 3880 "FlickrPublishing.c" +#line 3884 "FlickrPublishing.c" } static void publishing_flickr_account_info_fetch_transaction_class_init (PublishingFlickrAccountInfoFetchTransactionClass * klass) { #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_account_info_fetch_transaction_parent_class = g_type_class_peek_parent (klass); -#line 3887 "FlickrPublishing.c" +#line 3891 "FlickrPublishing.c" } @@ -3921,79 +3925,79 @@ GType publishing_flickr_account_info_fetch_transaction_get_type (void) { static gpointer _publishing_flickr_publishing_parameters_ref0 (gpointer self) { #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_flickr_publishing_parameters_ref (self) : NULL; -#line 3910 "FlickrPublishing.c" +#line 3914 "FlickrPublishing.c" } static gpointer _publishing_rest_support_session_ref0 (gpointer self) { #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_rest_support_session_ref (self) : NULL; -#line 3917 "FlickrPublishing.c" +#line 3921 "FlickrPublishing.c" } static void _g_free0_ (gpointer var) { #line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" var = (g_free (var), NULL); -#line 3924 "FlickrPublishing.c" +#line 3928 "FlickrPublishing.c" } PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construct (GType object_type, PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable) { PublishingFlickrUploadTransaction* self = NULL; - PublishingFlickrSession* _tmp0_ = NULL; - SpitPublishingPublishable* _tmp1_ = NULL; - PublishingFlickrPublishingParameters* _tmp2_ = NULL; - PublishingFlickrPublishingParameters* _tmp3_ = NULL; - PublishingFlickrSession* _tmp4_ = NULL; - PublishingFlickrSession* _tmp5_ = NULL; - PublishingRESTSupportArgument** _tmp6_ = NULL; - PublishingFlickrSession* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - PublishingFlickrSession* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - PublishingFlickrSession* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - PublishingFlickrSession* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - PublishingFlickrPublishingParameters* _tmp19_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp20_ = NULL; - gint _tmp21_ = 0; - gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - PublishingFlickrPublishingParameters* _tmp24_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp25_ = NULL; - gint _tmp26_ = 0; - gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - PublishingFlickrPublishingParameters* _tmp29_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp30_ = NULL; - gint _tmp31_ = 0; - gchar* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; + PublishingFlickrSession* _tmp0_; + SpitPublishingPublishable* _tmp1_; + PublishingFlickrPublishingParameters* _tmp2_; + PublishingFlickrPublishingParameters* _tmp3_; + PublishingFlickrSession* _tmp4_; + PublishingFlickrSession* _tmp5_; + PublishingRESTSupportArgument** _tmp6_; + PublishingFlickrSession* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + PublishingFlickrSession* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + PublishingFlickrSession* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + PublishingFlickrSession* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + PublishingFlickrPublishingParameters* _tmp19_; + PublishingFlickrVisibilitySpecification* _tmp20_; + gint _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + PublishingFlickrPublishingParameters* _tmp24_; + PublishingFlickrVisibilitySpecification* _tmp25_; + gint _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + PublishingFlickrPublishingParameters* _tmp29_; + PublishingFlickrVisibilitySpecification* _tmp30_; + gint _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; GHashTable* disposition_table = NULL; - GHashFunc _tmp34_ = NULL; - GEqualFunc _tmp35_ = NULL; - GHashTable* _tmp36_ = NULL; + GHashFunc _tmp34_; + GEqualFunc _tmp35_; + GHashTable* _tmp36_; gchar* filename = NULL; - SpitPublishingPublishable* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; + SpitPublishingPublishable* _tmp37_; + gchar* _tmp38_; gboolean _tmp39_ = FALSE; - const gchar* _tmp40_ = NULL; - GHashTable* _tmp44_ = NULL; - gchar* _tmp45_ = NULL; - SpitPublishingPublishable* _tmp46_ = NULL; - gchar* _tmp47_ = NULL; - gchar* _tmp48_ = NULL; - gchar* _tmp49_ = NULL; - GHashTable* _tmp50_ = NULL; - gchar* _tmp51_ = NULL; - gchar* _tmp52_ = NULL; - GHashTable* _tmp53_ = NULL; + const gchar* _tmp40_; + GHashTable* _tmp44_; + gchar* _tmp45_; + SpitPublishingPublishable* _tmp46_; + gchar* _tmp47_; + gchar* _tmp48_; + gchar* _tmp49_; + GHashTable* _tmp50_; + gchar* _tmp51_; + gchar* _tmp52_; + GHashTable* _tmp53_; #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL); #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -4140,20 +4144,20 @@ PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construc if (_tmp40_ == NULL) { #line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp39_ = TRUE; -#line 4129 "FlickrPublishing.c" +#line 4133 "FlickrPublishing.c" } else { - const gchar* _tmp41_ = NULL; + const gchar* _tmp41_; #line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp41_ = filename; #line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp39_ = g_strcmp0 (_tmp41_, "") == 0; -#line 4136 "FlickrPublishing.c" +#line 4140 "FlickrPublishing.c" } #line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp39_) { -#line 4140 "FlickrPublishing.c" - SpitPublishingPublishable* _tmp42_ = NULL; - gchar* _tmp43_ = NULL; +#line 4144 "FlickrPublishing.c" + SpitPublishingPublishable* _tmp42_; + gchar* _tmp43_; #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp42_ = publishable; #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -4162,7 +4166,7 @@ PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construc _g_free0 (filename); #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" filename = _tmp43_; -#line 4151 "FlickrPublishing.c" +#line 4155 "FlickrPublishing.c" } #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp44_ = disposition_table; @@ -4198,40 +4202,40 @@ PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construc _g_hash_table_unref0 (disposition_table); #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 4187 "FlickrPublishing.c" +#line 4191 "FlickrPublishing.c" } PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable) { #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_upload_transaction_construct (PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable); -#line 4194 "FlickrPublishing.c" +#line 4198 "FlickrPublishing.c" } -static void _vala_array_add19 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) { +static void _vala_array_add19 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) { #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1); -#line 4205 "FlickrPublishing.c" +#line 4209 "FlickrPublishing.c" } #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 4211 "FlickrPublishing.c" +#line 4215 "FlickrPublishing.c" } void publishing_flickr_upload_transaction_add_authorization_header_field (PublishingFlickrUploadTransaction* self, const gchar* key, const gchar* value) { - PublishingRESTSupportArgument** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PublishingRESTSupportArgument* _tmp3_ = NULL; + PublishingRESTSupportArgument** _tmp0_; + gint _tmp0__length1; + const gchar* _tmp1_; + const gchar* _tmp2_; + PublishingRESTSupportArgument* _tmp3_; #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self)); #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -4250,14 +4254,14 @@ void publishing_flickr_upload_transaction_add_authorization_header_field (Publis _tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_); #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_array_add19 (&self->priv->auth_header_fields, &self->priv->auth_header_fields_length1, &self->priv->_auth_header_fields_size_, _tmp3_); -#line 4239 "FlickrPublishing.c" +#line 4243 "FlickrPublishing.c" } static gpointer _publishing_rest_support_argument_ref0 (gpointer self) { #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_rest_support_argument_ref (self) : NULL; -#line 4246 "FlickrPublishing.c" +#line 4250 "FlickrPublishing.c" } @@ -4268,28 +4272,28 @@ static PublishingRESTSupportArgument** _vala_array_dup8 (PublishingRESTSupportAr result = g_new0 (PublishingRESTSupportArgument*, length + 1); #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (i = 0; i < length; i++) { -#line 4257 "FlickrPublishing.c" - PublishingRESTSupportArgument* _tmp0_ = NULL; +#line 4261 "FlickrPublishing.c" + PublishingRESTSupportArgument* _tmp0_; #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = _publishing_rest_support_argument_ref0 (self[i]); #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result[i] = _tmp0_; -#line 4263 "FlickrPublishing.c" +#line 4267 "FlickrPublishing.c" } #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 4267 "FlickrPublishing.c" +#line 4271 "FlickrPublishing.c" } PublishingRESTSupportArgument** publishing_flickr_upload_transaction_get_authorization_header_fields (PublishingFlickrUploadTransaction* self, int* result_length1) { PublishingRESTSupportArgument** result = NULL; - PublishingRESTSupportArgument** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - PublishingRESTSupportArgument** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - PublishingRESTSupportArgument** _tmp2_ = NULL; - gint _tmp2__length1 = 0; + PublishingRESTSupportArgument** _tmp0_; + gint _tmp0__length1; + PublishingRESTSupportArgument** _tmp1_; + gint _tmp1__length1; + PublishingRESTSupportArgument** _tmp2_; + gint _tmp2__length1; #line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self), NULL); #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -4308,74 +4312,74 @@ PublishingRESTSupportArgument** publishing_flickr_upload_transaction_get_authori if (result_length1) { #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *result_length1 = _tmp2__length1; -#line 4297 "FlickrPublishing.c" +#line 4301 "FlickrPublishing.c" } #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp2_; #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 4303 "FlickrPublishing.c" +#line 4307 "FlickrPublishing.c" } gchar* publishing_flickr_upload_transaction_get_authorization_header_string (PublishingFlickrUploadTransaction* self) { gchar* result = NULL; gchar* _result_ = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self), NULL); #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = g_strdup ("OAuth "); #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result_ = _tmp0_; -#line 4317 "FlickrPublishing.c" +#line 4321 "FlickrPublishing.c" { gint i = 0; #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" i = 0; -#line 4322 "FlickrPublishing.c" +#line 4326 "FlickrPublishing.c" { gboolean _tmp1_ = FALSE; #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = TRUE; #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" while (TRUE) { -#line 4329 "FlickrPublishing.c" - gint _tmp3_ = 0; - PublishingRESTSupportArgument** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - const gchar* _tmp5_ = NULL; - PublishingRESTSupportArgument** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - gint _tmp7_ = 0; - PublishingRESTSupportArgument* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - PublishingRESTSupportArgument** _tmp14_ = NULL; - gint _tmp14__length1 = 0; - gint _tmp15_ = 0; - PublishingRESTSupportArgument* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - gint _tmp23_ = 0; - PublishingRESTSupportArgument** _tmp24_ = NULL; - gint _tmp24__length1 = 0; +#line 4333 "FlickrPublishing.c" + gint _tmp3_; + PublishingRESTSupportArgument** _tmp4_; + gint _tmp4__length1; + const gchar* _tmp5_; + PublishingRESTSupportArgument** _tmp6_; + gint _tmp6__length1; + gint _tmp7_; + PublishingRESTSupportArgument* _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; + const gchar* _tmp13_; + PublishingRESTSupportArgument** _tmp14_; + gint _tmp14__length1; + gint _tmp15_; + PublishingRESTSupportArgument* _tmp16_; + const gchar* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; + gint _tmp23_; + PublishingRESTSupportArgument** _tmp24_; + gint _tmp24__length1; #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!_tmp1_) { -#line 4358 "FlickrPublishing.c" - gint _tmp2_ = 0; +#line 4362 "FlickrPublishing.c" + gint _tmp2_; #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = i; #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" i = _tmp2_ + 1; -#line 4364 "FlickrPublishing.c" +#line 4368 "FlickrPublishing.c" } #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = FALSE; @@ -4389,7 +4393,7 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub if (!(_tmp3_ < _tmp4__length1)) { #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" break; -#line 4378 "FlickrPublishing.c" +#line 4382 "FlickrPublishing.c" } #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = _result_; @@ -4455,9 +4459,9 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub _tmp24__length1 = self->priv->auth_header_fields_length1; #line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp23_ < (_tmp24__length1 - 1)) { -#line 4444 "FlickrPublishing.c" - const gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; +#line 4448 "FlickrPublishing.c" + const gchar* _tmp25_; + gchar* _tmp26_; #line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp25_ = _result_; #line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -4466,7 +4470,7 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub _g_free0 (_result_); #line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result_ = _tmp26_; -#line 4455 "FlickrPublishing.c" +#line 4459 "FlickrPublishing.c" } } } @@ -4475,15 +4479,15 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub result = _result_; #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 4464 "FlickrPublishing.c" +#line 4468 "FlickrPublishing.c" } static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) { PublishingFlickrUploadTransaction * self; - PublishingFlickrSession* _tmp0_ = NULL; + PublishingFlickrSession* _tmp0_; gchar* authorization_header = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp1_; GError * _inner_error_ = NULL; #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransaction); @@ -4512,7 +4516,7 @@ static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSup _g_free0 (authorization_header); #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 4500 "FlickrPublishing.c" +#line 4504 "FlickrPublishing.c" } else { #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (authorization_header); @@ -4522,12 +4526,12 @@ static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSup g_clear_error (&_inner_error_); #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 4510 "FlickrPublishing.c" +#line 4514 "FlickrPublishing.c" } } #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (authorization_header); -#line 4515 "FlickrPublishing.c" +#line 4519 "FlickrPublishing.c" } @@ -4539,19 +4543,19 @@ static void publishing_flickr_upload_transaction_class_init (PublishingFlickrUpl #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingFlickrUploadTransactionPrivate)); #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_flickr_upload_transaction_real_execute; -#line 4528 "FlickrPublishing.c" + ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_flickr_upload_transaction_real_execute; +#line 4532 "FlickrPublishing.c" } static void publishing_flickr_upload_transaction_instance_init (PublishingFlickrUploadTransaction * self) { #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv = PUBLISHING_FLICKR_UPLOAD_TRANSACTION_GET_PRIVATE (self); -#line 4535 "FlickrPublishing.c" +#line 4539 "FlickrPublishing.c" } -static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) { +static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) { PublishingFlickrUploadTransaction * self; #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransaction); @@ -4563,7 +4567,7 @@ static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupport self->priv->auth_header_fields = (_vala_array_free (self->priv->auth_header_fields, self->priv->auth_header_fields_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_flickr_upload_transaction_parent_class)->finalize (obj); -#line 4551 "FlickrPublishing.c" +#line 4555 "FlickrPublishing.c" } @@ -4585,14 +4589,14 @@ PublishingFlickrSession* publishing_flickr_session_construct (GType object_type) self = (PublishingFlickrSession*) publishing_rest_support_session_construct (object_type, PUBLISHING_FLICKR_ENDPOINT_URL); #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 4573 "FlickrPublishing.c" +#line 4577 "FlickrPublishing.c" } PublishingFlickrSession* publishing_flickr_session_new (void) { #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_session_construct (PUBLISHING_FLICKR_TYPE_SESSION); -#line 4580 "FlickrPublishing.c" +#line 4584 "FlickrPublishing.c" } @@ -4601,52 +4605,52 @@ static gboolean publishing_flickr_session_real_is_authenticated (PublishingRESTS gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession); #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = self->priv->access_phase_token; #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp2_ != NULL) { -#line 4596 "FlickrPublishing.c" - const gchar* _tmp3_ = NULL; +#line 4600 "FlickrPublishing.c" + const gchar* _tmp3_; #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = self->priv->access_phase_token_secret; #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = _tmp3_ != NULL; -#line 4602 "FlickrPublishing.c" +#line 4606 "FlickrPublishing.c" } else { #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = FALSE; -#line 4606 "FlickrPublishing.c" +#line 4610 "FlickrPublishing.c" } #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp1_) { -#line 4610 "FlickrPublishing.c" - const gchar* _tmp4_ = NULL; +#line 4614 "FlickrPublishing.c" + const gchar* _tmp4_; #line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = self->priv->username; #line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = _tmp4_ != NULL; -#line 4616 "FlickrPublishing.c" +#line 4620 "FlickrPublishing.c" } else { #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = FALSE; -#line 4620 "FlickrPublishing.c" +#line 4624 "FlickrPublishing.c" } #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp0_; #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 4626 "FlickrPublishing.c" +#line 4630 "FlickrPublishing.c" } void publishing_flickr_session_set_api_credentials (PublishingFlickrSession* self, const gchar* consumer_key, const gchar* consumer_secret) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self)); #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -4669,91 +4673,91 @@ void publishing_flickr_session_set_api_credentials (PublishingFlickrSession* sel _g_free0 (self->priv->consumer_secret); #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->consumer_secret = _tmp3_; -#line 4657 "FlickrPublishing.c" +#line 4661 "FlickrPublishing.c" } static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) { #line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_rest_support_transaction_ref (self) : NULL; -#line 4664 "FlickrPublishing.c" +#line 4668 "FlickrPublishing.c" } -static void _vala_array_add20 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) { +static void _vala_array_add20 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) { #line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1); -#line 4675 "FlickrPublishing.c" +#line 4679 "FlickrPublishing.c" } #line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 4681 "FlickrPublishing.c" +#line 4685 "FlickrPublishing.c" } void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, PublishingRESTSupportTransaction* txn) { gchar* http_method = NULL; - PublishingRESTSupportTransaction* _tmp0_ = NULL; - PublishingRESTSupportHttpMethod _tmp1_ = 0; - gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + PublishingRESTSupportHttpMethod _tmp1_; + gchar* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; PublishingRESTSupportArgument** base_string_arguments = NULL; - PublishingRESTSupportTransaction* _tmp6_ = NULL; - gint _tmp7_ = 0; - PublishingRESTSupportArgument** _tmp8_ = NULL; - gint base_string_arguments_length1 = 0; - gint _base_string_arguments_size_ = 0; + PublishingRESTSupportTransaction* _tmp6_; + gint _tmp7_; + PublishingRESTSupportArgument** _tmp8_; + gint base_string_arguments_length1; + gint _base_string_arguments_size_; PublishingFlickrUploadTransaction* upload_txn = NULL; - PublishingRESTSupportTransaction* _tmp9_ = NULL; - PublishingFlickrUploadTransaction* _tmp10_ = NULL; - PublishingFlickrUploadTransaction* _tmp11_ = NULL; + PublishingRESTSupportTransaction* _tmp9_; + PublishingFlickrUploadTransaction* _tmp10_; + PublishingFlickrUploadTransaction* _tmp11_; PublishingRESTSupportArgument** sorted_args = NULL; - PublishingRESTSupportArgument** _tmp20_ = NULL; - gint _tmp20__length1 = 0; - gint _tmp21_ = 0; - PublishingRESTSupportArgument** _tmp22_ = NULL; - gint sorted_args_length1 = 0; - gint _sorted_args_size_ = 0; + PublishingRESTSupportArgument** _tmp20_; + gint _tmp20__length1; + gint _tmp21_; + PublishingRESTSupportArgument** _tmp22_; + gint sorted_args_length1; + gint _sorted_args_size_; gchar* arguments_string = NULL; - gchar* _tmp23_ = NULL; + gchar* _tmp23_; gchar* signing_key = NULL; - const gchar* _tmp46_ = NULL; + const gchar* _tmp46_; gchar* signature_base_string = NULL; - const gchar* _tmp54_ = NULL; - gchar* _tmp55_ = NULL; - gchar* _tmp56_ = NULL; - PublishingRESTSupportTransaction* _tmp57_ = NULL; - gchar* _tmp58_ = NULL; - gchar* _tmp59_ = NULL; - gchar* _tmp60_ = NULL; - gchar* _tmp61_ = NULL; - gchar* _tmp62_ = NULL; - gchar* _tmp63_ = NULL; - gchar* _tmp64_ = NULL; - gchar* _tmp65_ = NULL; - const gchar* _tmp66_ = NULL; - gchar* _tmp67_ = NULL; - gchar* _tmp68_ = NULL; - gchar* _tmp69_ = NULL; - gchar* _tmp70_ = NULL; - const gchar* _tmp71_ = NULL; - const gchar* _tmp72_ = NULL; + const gchar* _tmp54_; + gchar* _tmp55_; + gchar* _tmp56_; + PublishingRESTSupportTransaction* _tmp57_; + gchar* _tmp58_; + gchar* _tmp59_; + gchar* _tmp60_; + gchar* _tmp61_; + gchar* _tmp62_; + gchar* _tmp63_; + gchar* _tmp64_; + gchar* _tmp65_; + const gchar* _tmp66_; + gchar* _tmp67_; + gchar* _tmp68_; + gchar* _tmp69_; + gchar* _tmp70_; + const gchar* _tmp71_; + const gchar* _tmp72_; gchar* signature = NULL; - const gchar* _tmp73_ = NULL; - const gchar* _tmp74_ = NULL; - gchar* _tmp75_ = NULL; - const gchar* _tmp76_ = NULL; - gchar* _tmp77_ = NULL; - const gchar* _tmp78_ = NULL; - PublishingFlickrUploadTransaction* _tmp79_ = NULL; + const gchar* _tmp73_; + const gchar* _tmp74_; + gchar* _tmp75_; + const gchar* _tmp76_; + gchar* _tmp77_; + const gchar* _tmp78_; + PublishingFlickrUploadTransaction* _tmp79_; #line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self)); #line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -4798,15 +4802,15 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _tmp11_ = upload_txn; #line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp11_ != NULL) { -#line 4786 "FlickrPublishing.c" +#line 4790 "FlickrPublishing.c" PublishingRESTSupportArgument** auth_header_args = NULL; - PublishingFlickrUploadTransaction* _tmp12_ = NULL; - gint _tmp13_ = 0; - PublishingRESTSupportArgument** _tmp14_ = NULL; - gint auth_header_args_length1 = 0; - gint _auth_header_args_size_ = 0; - PublishingRESTSupportArgument** _tmp15_ = NULL; - gint _tmp15__length1 = 0; + PublishingFlickrUploadTransaction* _tmp12_; + gint _tmp13_; + PublishingRESTSupportArgument** _tmp14_; + gint auth_header_args_length1; + gint _auth_header_args_size_; + PublishingRESTSupportArgument** _tmp15_; + gint _tmp15__length1; #line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:644: %s", "this transaction is an UploadTransaction; including Authorization head" \ "er " "fields in signature base string"); @@ -4824,7 +4828,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _tmp15_ = auth_header_args; #line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15__length1 = auth_header_args_length1; -#line 4811 "FlickrPublishing.c" +#line 4815 "FlickrPublishing.c" { PublishingRESTSupportArgument** arg_collection = NULL; gint arg_collection_length1 = 0; @@ -4836,19 +4840,19 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, arg_collection_length1 = _tmp15__length1; #line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (arg_it = 0; arg_it < _tmp15__length1; arg_it = arg_it + 1) { -#line 4823 "FlickrPublishing.c" - PublishingRESTSupportArgument* _tmp16_ = NULL; +#line 4827 "FlickrPublishing.c" + PublishingRESTSupportArgument* _tmp16_; PublishingRESTSupportArgument* arg = NULL; #line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]); #line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" arg = _tmp16_; -#line 4830 "FlickrPublishing.c" +#line 4834 "FlickrPublishing.c" { - PublishingRESTSupportArgument** _tmp17_ = NULL; - gint _tmp17__length1 = 0; - PublishingRESTSupportArgument* _tmp18_ = NULL; - PublishingRESTSupportArgument* _tmp19_ = NULL; + PublishingRESTSupportArgument** _tmp17_; + gint _tmp17__length1; + PublishingRESTSupportArgument* _tmp18_; + PublishingRESTSupportArgument* _tmp19_; #line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17_ = base_string_arguments; #line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -4861,13 +4865,13 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _vala_array_add20 (&base_string_arguments, &base_string_arguments_length1, &_base_string_arguments_size_, _tmp19_); #line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_argument_unref0 (arg); -#line 4848 "FlickrPublishing.c" +#line 4852 "FlickrPublishing.c" } } } #line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" auth_header_args = (_vala_array_free (auth_header_args, auth_header_args_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); -#line 4854 "FlickrPublishing.c" +#line 4858 "FlickrPublishing.c" } #line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp20_ = base_string_arguments; @@ -4885,50 +4889,50 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _tmp23_ = g_strdup (""); #line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" arguments_string = _tmp23_; -#line 4872 "FlickrPublishing.c" +#line 4876 "FlickrPublishing.c" { gint i = 0; #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" i = 0; -#line 4877 "FlickrPublishing.c" +#line 4881 "FlickrPublishing.c" { gboolean _tmp24_ = FALSE; #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_ = TRUE; #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" while (TRUE) { -#line 4884 "FlickrPublishing.c" - gint _tmp26_ = 0; - PublishingRESTSupportArgument** _tmp27_ = NULL; - gint _tmp27__length1 = 0; - const gchar* _tmp28_ = NULL; - PublishingRESTSupportArgument** _tmp29_ = NULL; - gint _tmp29__length1 = 0; - gint _tmp30_ = 0; - PublishingRESTSupportArgument* _tmp31_ = NULL; - const gchar* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; - PublishingRESTSupportArgument** _tmp35_ = NULL; - gint _tmp35__length1 = 0; - gint _tmp36_ = 0; - PublishingRESTSupportArgument* _tmp37_ = NULL; - const gchar* _tmp38_ = NULL; - gchar* _tmp39_ = NULL; - gchar* _tmp40_ = NULL; - gchar* _tmp41_ = NULL; - gint _tmp42_ = 0; - PublishingRESTSupportArgument** _tmp43_ = NULL; - gint _tmp43__length1 = 0; +#line 4888 "FlickrPublishing.c" + gint _tmp26_; + PublishingRESTSupportArgument** _tmp27_; + gint _tmp27__length1; + const gchar* _tmp28_; + PublishingRESTSupportArgument** _tmp29_; + gint _tmp29__length1; + gint _tmp30_; + PublishingRESTSupportArgument* _tmp31_; + const gchar* _tmp32_; + gchar* _tmp33_; + gchar* _tmp34_; + PublishingRESTSupportArgument** _tmp35_; + gint _tmp35__length1; + gint _tmp36_; + PublishingRESTSupportArgument* _tmp37_; + const gchar* _tmp38_; + gchar* _tmp39_; + gchar* _tmp40_; + gchar* _tmp41_; + gint _tmp42_; + PublishingRESTSupportArgument** _tmp43_; + gint _tmp43__length1; #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!_tmp24_) { -#line 4909 "FlickrPublishing.c" - gint _tmp25_ = 0; +#line 4913 "FlickrPublishing.c" + gint _tmp25_; #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp25_ = i; #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" i = _tmp25_ + 1; -#line 4915 "FlickrPublishing.c" +#line 4919 "FlickrPublishing.c" } #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_ = FALSE; @@ -4942,7 +4946,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, if (!(_tmp26_ < _tmp27__length1)) { #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" break; -#line 4929 "FlickrPublishing.c" +#line 4933 "FlickrPublishing.c" } #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp28_ = arguments_string; @@ -4992,9 +4996,9 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _tmp43__length1 = sorted_args_length1; #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp42_ < (_tmp43__length1 - 1)) { -#line 4979 "FlickrPublishing.c" - const gchar* _tmp44_ = NULL; - gchar* _tmp45_ = NULL; +#line 4983 "FlickrPublishing.c" + const gchar* _tmp44_; + gchar* _tmp45_; #line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp44_ = arguments_string; #line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -5003,7 +5007,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _g_free0 (arguments_string); #line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" arguments_string = _tmp45_; -#line 4990 "FlickrPublishing.c" +#line 4994 "FlickrPublishing.c" } } } @@ -5014,12 +5018,12 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _tmp46_ = self->priv->access_phase_token_secret; #line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp46_ != NULL) { -#line 5001 "FlickrPublishing.c" - const gchar* _tmp47_ = NULL; - gchar* _tmp48_ = NULL; - gchar* _tmp49_ = NULL; - const gchar* _tmp50_ = NULL; - gchar* _tmp51_ = NULL; +#line 5005 "FlickrPublishing.c" + const gchar* _tmp47_; + gchar* _tmp48_; + gchar* _tmp49_; + const gchar* _tmp50_; + gchar* _tmp51_; #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:666: access phase token secret available; using " \ "it as signing key"); @@ -5039,10 +5043,10 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, signing_key = _tmp51_; #line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp49_); -#line 5025 "FlickrPublishing.c" +#line 5029 "FlickrPublishing.c" } else { - const gchar* _tmp52_ = NULL; - gchar* _tmp53_ = NULL; + const gchar* _tmp52_; + gchar* _tmp53_; #line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:670: %s", "neither access phase nor request phase token secrets available; using " \ "API " "key as signing key"); @@ -5054,7 +5058,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _g_free0 (signing_key); #line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" signing_key = _tmp53_; -#line 5039 "FlickrPublishing.c" +#line 5043 "FlickrPublishing.c" } #line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp54_ = http_method; @@ -5136,26 +5140,26 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _tmp79_ = upload_txn; #line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp79_ != NULL) { -#line 5121 "FlickrPublishing.c" - PublishingFlickrUploadTransaction* _tmp80_ = NULL; - const gchar* _tmp81_ = NULL; +#line 5125 "FlickrPublishing.c" + PublishingFlickrUploadTransaction* _tmp80_; + const gchar* _tmp81_; #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp80_ = upload_txn; #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp81_ = signature; #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_upload_transaction_add_authorization_header_field (_tmp80_, "oauth_signature", _tmp81_); -#line 5130 "FlickrPublishing.c" +#line 5134 "FlickrPublishing.c" } else { - PublishingRESTSupportTransaction* _tmp82_ = NULL; - const gchar* _tmp83_ = NULL; + PublishingRESTSupportTransaction* _tmp82_; + const gchar* _tmp83_; #line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp82_ = txn; #line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp83_ = signature; #line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_add_argument (_tmp82_, "oauth_signature", _tmp83_); -#line 5140 "FlickrPublishing.c" +#line 5144 "FlickrPublishing.c" } #line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (signature); @@ -5173,17 +5177,17 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, base_string_arguments = (_vala_array_free (base_string_arguments, base_string_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); #line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (http_method); -#line 5158 "FlickrPublishing.c" +#line 5162 "FlickrPublishing.c" } void publishing_flickr_session_set_access_phase_credentials (PublishingFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; #line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self)); #line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -5218,25 +5222,25 @@ void publishing_flickr_session_set_access_phase_credentials (PublishingFlickrSes self->priv->username = _tmp5_; #line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated"); -#line 5203 "FlickrPublishing.c" +#line 5207 "FlickrPublishing.c" } gchar* publishing_flickr_session_get_oauth_nonce (PublishingFlickrSession* self) { gchar* result = NULL; GTimeVal currtime = {0}; - GTimeVal _tmp0_ = {0}; - glong _tmp1_ = 0L; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - GTimeVal _tmp4_ = {0}; - glong _tmp5_ = 0L; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; + GTimeVal _tmp0_; + glong _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + GTimeVal _tmp4_; + glong _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; #line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL); #line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -5277,50 +5281,50 @@ gchar* publishing_flickr_session_get_oauth_nonce (PublishingFlickrSession* self) result = _tmp11_; #line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 5262 "FlickrPublishing.c" +#line 5266 "FlickrPublishing.c" } static glong string_strnlen (gchar* str, glong maxlen) { glong result = 0L; gchar* end = NULL; - gchar* _tmp0_ = NULL; - glong _tmp1_ = 0L; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + glong _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = maxlen; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp2_; -#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = end; -#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { -#line 5285 "FlickrPublishing.c" - glong _tmp4_ = 0L; -#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 5289 "FlickrPublishing.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 5293 "FlickrPublishing.c" +#line 5297 "FlickrPublishing.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 5305 "FlickrPublishing.c" +#line 5309 "FlickrPublishing.c" } } @@ -5329,133 +5333,133 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_ = 0L; - glong _tmp8_ = 0L; - glong _tmp14_ = 0L; - glong _tmp17_ = 0L; - glong _tmp18_ = 0L; - glong _tmp19_ = 0L; - glong _tmp20_ = 0L; - glong _tmp21_ = 0L; - gchar* _tmp22_ = NULL; -#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp1_; + glong _tmp8_; + glong _tmp14_; + glong _tmp17_; + glong _tmp18_; + glong _tmp19_; + glong _tmp20_; + glong _tmp21_; + gchar* _tmp22_; +#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = offset; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { -#line 5329 "FlickrPublishing.c" - glong _tmp2_ = 0L; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 5333 "FlickrPublishing.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 5335 "FlickrPublishing.c" +#line 5339 "FlickrPublishing.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 5339 "FlickrPublishing.c" +#line 5343 "FlickrPublishing.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 5343 "FlickrPublishing.c" - glong _tmp3_ = 0L; - glong _tmp4_ = 0L; - glong _tmp5_ = 0L; -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 5347 "FlickrPublishing.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 5355 "FlickrPublishing.c" +#line 5359 "FlickrPublishing.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 5365 "FlickrPublishing.c" +#line 5369 "FlickrPublishing.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 5371 "FlickrPublishing.c" - glong _tmp9_ = 0L; - glong _tmp10_ = 0L; - glong _tmp11_ = 0L; -#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 5375 "FlickrPublishing.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 5385 "FlickrPublishing.c" +#line 5389 "FlickrPublishing.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 5395 "FlickrPublishing.c" +#line 5399 "FlickrPublishing.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 5401 "FlickrPublishing.c" - glong _tmp15_ = 0L; - glong _tmp16_ = 0L; -#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 5405 "FlickrPublishing.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 5410 "FlickrPublishing.c" +#line 5414 "FlickrPublishing.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 5430 "FlickrPublishing.c" +#line 5434 "FlickrPublishing.c" } gchar* publishing_flickr_session_get_oauth_timestamp (PublishingFlickrSession* self) { gchar* result = NULL; - gint64 _tmp0_ = 0LL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + gint64 _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL); #line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -5474,15 +5478,15 @@ gchar* publishing_flickr_session_get_oauth_timestamp (PublishingFlickrSession* s result = _tmp4_; #line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 5459 "FlickrPublishing.c" +#line 5463 "FlickrPublishing.c" } gchar* publishing_flickr_session_get_consumer_key (PublishingFlickrSession* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL); #line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -5497,15 +5501,15 @@ gchar* publishing_flickr_session_get_consumer_key (PublishingFlickrSession* self result = _tmp2_; #line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 5482 "FlickrPublishing.c" +#line 5486 "FlickrPublishing.c" } gchar* publishing_flickr_session_get_access_phase_token (PublishingFlickrSession* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; #line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL); #line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -5520,15 +5524,15 @@ gchar* publishing_flickr_session_get_access_phase_token (PublishingFlickrSession result = _tmp2_; #line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 5505 "FlickrPublishing.c" +#line 5509 "FlickrPublishing.c" } gchar* publishing_flickr_session_get_username (PublishingFlickrSession* self) { gchar* result = NULL; - gboolean _tmp0_ = FALSE; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + gboolean _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL); #line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -5543,7 +5547,7 @@ gchar* publishing_flickr_session_get_username (PublishingFlickrSession* self) { result = _tmp2_; #line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 5528 "FlickrPublishing.c" +#line 5532 "FlickrPublishing.c" } @@ -5555,8 +5559,8 @@ static void publishing_flickr_session_class_init (PublishingFlickrSessionClass * #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingFlickrSessionPrivate)); #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_flickr_session_real_is_authenticated; -#line 5541 "FlickrPublishing.c" + ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_flickr_session_real_is_authenticated; +#line 5545 "FlickrPublishing.c" } @@ -5573,11 +5577,11 @@ static void publishing_flickr_session_instance_init (PublishingFlickrSession * s self->priv->consumer_key = NULL; #line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->consumer_secret = NULL; -#line 5558 "FlickrPublishing.c" +#line 5562 "FlickrPublishing.c" } -static void publishing_flickr_session_finalize (PublishingRESTSupportSession* obj) { +static void publishing_flickr_session_finalize (PublishingRESTSupportSession * obj) { PublishingFlickrSession * self; #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession); @@ -5593,7 +5597,7 @@ static void publishing_flickr_session_finalize (PublishingRESTSupportSession* ob _g_free0 (self->priv->consumer_secret); #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_flickr_session_parent_class)->finalize (obj); -#line 5578 "FlickrPublishing.c" +#line 5582 "FlickrPublishing.c" } @@ -5612,102 +5616,100 @@ GType publishing_flickr_session_get_type (void) { static void _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_on_visibility_changed ((PublishingFlickrPublishingOptionsPane*) self); -#line 5597 "FlickrPublishing.c" +#line 5601 "FlickrPublishing.c" } static void _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_on_size_changed ((PublishingFlickrPublishingOptionsPane*) self); -#line 5604 "FlickrPublishing.c" +#line 5608 "FlickrPublishing.c" } static void _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_on_logout_clicked ((PublishingFlickrPublishingOptionsPane*) self); -#line 5611 "FlickrPublishing.c" +#line 5615 "FlickrPublishing.c" } static void _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_on_publish_clicked ((PublishingFlickrPublishingOptionsPane*) self); -#line 5618 "FlickrPublishing.c" +#line 5622 "FlickrPublishing.c" } PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_construct (GType object_type, PublishingFlickrFlickrPublisher* publisher, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublisherMediaType media_type, GtkBuilder* builder, gboolean strip_metadata) { PublishingFlickrPublishingOptionsPane * self = NULL; - GtkBuilder* _tmp0_ = NULL; - GtkBuilder* _tmp1_ = NULL; - GtkBuilder* _tmp2_ = NULL; - GtkBuilder* _tmp3_ = NULL; - GSList* _tmp4_ = NULL; - GSList* _tmp5_ = NULL; - guint _tmp6_ = 0U; - GtkBuilder* _tmp7_ = NULL; - GObject* _tmp8_ = NULL; - GtkBox* _tmp9_ = NULL; - GtkBuilder* _tmp10_ = NULL; - GObject* _tmp11_ = NULL; - GtkLabel* _tmp12_ = NULL; - GtkBuilder* _tmp13_ = NULL; - GObject* _tmp14_ = NULL; - GtkLabel* _tmp15_ = NULL; - GtkBuilder* _tmp16_ = NULL; - GObject* _tmp17_ = NULL; - GtkButton* _tmp18_ = NULL; - GtkBuilder* _tmp19_ = NULL; - GObject* _tmp20_ = NULL; - GtkButton* _tmp21_ = NULL; - GtkBuilder* _tmp22_ = NULL; - GObject* _tmp23_ = NULL; - GtkComboBoxText* _tmp24_ = NULL; - GtkBuilder* _tmp25_ = NULL; - GObject* _tmp26_ = NULL; - GtkComboBoxText* _tmp27_ = NULL; - GtkBuilder* _tmp28_ = NULL; - GObject* _tmp29_ = NULL; - GtkLabel* _tmp30_ = NULL; - GtkBuilder* _tmp31_ = NULL; - GObject* _tmp32_ = NULL; - GtkCheckButton* _tmp33_ = NULL; - PublishingFlickrFlickrPublisher* _tmp34_ = NULL; - SpitPublishingAuthenticator* _tmp35_ = NULL; - SpitPublishingAuthenticator* _tmp36_ = NULL; - gboolean _tmp37_ = FALSE; - gboolean _tmp38_ = FALSE; - PublishingFlickrPublishingParameters* _tmp43_ = NULL; - PublishingFlickrPublishingParameters* _tmp44_ = NULL; - PublishingFlickrFlickrPublisher* _tmp45_ = NULL; - PublishingFlickrFlickrPublisher* _tmp46_ = NULL; - SpitPublishingPublisherMediaType _tmp47_ = 0; - gint _tmp48_ = 0; - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp49_ = NULL; - gint _tmp50_ = 0; - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp51_ = NULL; + GtkBuilder* _tmp0_; + GtkBuilder* _tmp1_; + GtkBuilder* _tmp2_; + GtkBuilder* _tmp3_; + GSList* _tmp4_; + GSList* _tmp5_; + guint _tmp6_; + GtkBuilder* _tmp7_; + GObject* _tmp8_; + GtkBox* _tmp9_; + GtkBuilder* _tmp10_; + GObject* _tmp11_; + GtkLabel* _tmp12_; + GtkBuilder* _tmp13_; + GObject* _tmp14_; + GtkLabel* _tmp15_; + GtkBuilder* _tmp16_; + GObject* _tmp17_; + GtkButton* _tmp18_; + GtkBuilder* _tmp19_; + GObject* _tmp20_; + GtkButton* _tmp21_; + GtkBuilder* _tmp22_; + GObject* _tmp23_; + GtkComboBoxText* _tmp24_; + GtkBuilder* _tmp25_; + GObject* _tmp26_; + GtkComboBoxText* _tmp27_; + GtkBuilder* _tmp28_; + GObject* _tmp29_; + GtkLabel* _tmp30_; + GtkBuilder* _tmp31_; + GObject* _tmp32_; + GtkCheckButton* _tmp33_; + PublishingFlickrFlickrPublisher* _tmp34_; + SpitPublishingAuthenticator* _tmp35_; + SpitPublishingAuthenticator* _tmp36_; + gboolean _tmp37_; + gboolean _tmp38_; + PublishingFlickrPublishingParameters* _tmp43_; + PublishingFlickrPublishingParameters* _tmp44_; + PublishingFlickrFlickrPublisher* _tmp45_; + PublishingFlickrFlickrPublisher* _tmp46_; + SpitPublishingPublisherMediaType _tmp47_; + gint _tmp48_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp49_; + gint _tmp50_; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp51_; gchar* upload_label_text = NULL; - const gchar* _tmp52_ = NULL; - PublishingFlickrPublishingParameters* _tmp53_ = NULL; - const gchar* _tmp54_ = NULL; - gchar* _tmp55_ = NULL; - PublishingFlickrPublishingParameters* _tmp56_ = NULL; - PublishingFlickrUserKind _tmp57_ = 0; - GtkLabel* _tmp70_ = NULL; - const gchar* _tmp71_ = NULL; + PublishingFlickrPublishingParameters* _tmp52_; + const gchar* _tmp53_; + gchar* _tmp54_; + PublishingFlickrPublishingParameters* _tmp55_; + PublishingFlickrUserKind _tmp56_; + GtkLabel* _tmp67_; + const gchar* _tmp68_; gchar* visibility_label_text = NULL; - const gchar* _tmp72_ = NULL; - gchar* _tmp73_ = NULL; - SpitPublishingPublisherMediaType _tmp74_ = 0; - GtkLabel* _tmp80_ = NULL; - const gchar* _tmp81_ = NULL; - GtkComboBoxText* _tmp82_ = NULL; - SpitPublishingPublisherMediaType _tmp83_ = 0; - GtkCheckButton* _tmp87_ = NULL; - gboolean _tmp88_ = FALSE; - GtkButton* _tmp89_ = NULL; - GtkButton* _tmp90_ = NULL; + gchar* _tmp69_; + SpitPublishingPublisherMediaType _tmp70_; + GtkLabel* _tmp74_; + const gchar* _tmp75_; + GtkComboBoxText* _tmp76_; + SpitPublishingPublisherMediaType _tmp77_; + GtkCheckButton* _tmp81_; + gboolean _tmp82_; + GtkButton* _tmp83_; + GtkButton* _tmp84_; #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (publisher), NULL); #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -5844,11 +5846,11 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane _g_object_unref0 (_tmp36_); #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp38_) { -#line 5829 "FlickrPublishing.c" - GtkButton* _tmp39_ = NULL; - GtkContainer* _tmp40_ = NULL; - GtkContainer* _tmp41_ = NULL; - GtkButton* _tmp42_ = NULL; +#line 5831 "FlickrPublishing.c" + GtkButton* _tmp39_; + GtkContainer* _tmp40_; + GtkContainer* _tmp41_; + GtkButton* _tmp42_; #line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp39_ = self->priv->logout_button; #line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -5859,7 +5861,7 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane _tmp42_ = self->priv->logout_button; #line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_container_remove (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget)); -#line 5844 "FlickrPublishing.c" +#line 5846 "FlickrPublishing.c" } #line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp43_ = parameters; @@ -5902,190 +5904,174 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane #line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->_sizes_size_ = self->priv->sizes_length1; #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp52_ = _ ("You are logged into Flickr as %s.\n\n"); + _tmp52_ = parameters; #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp53_ = parameters; + _tmp53_ = _tmp52_->username; #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp54_ = _tmp53_->username; + _tmp54_ = g_strdup_printf (_ ("You are logged into Flickr as %s.\n\n"), _tmp53_); #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp55_ = g_strdup_printf (_tmp52_, _tmp54_); -#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - upload_label_text = _tmp55_; + upload_label_text = _tmp54_; #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp56_ = parameters; + _tmp55_ = parameters; #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp57_ = _tmp56_->user_kind; + _tmp56_ = _tmp55_->user_kind; #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp57_ == PUBLISHING_FLICKR_USER_KIND_FREE) { + if (_tmp56_ == PUBLISHING_FLICKR_USER_KIND_FREE) { #line 5902 "FlickrPublishing.c" - const gchar* _tmp58_ = NULL; - const gchar* _tmp59_ = NULL; - PublishingFlickrPublishingParameters* _tmp60_ = NULL; - gint64 _tmp61_ = 0LL; - gchar* _tmp62_ = NULL; - gchar* _tmp63_ = NULL; - gchar* _tmp64_ = NULL; - gchar* _tmp65_ = NULL; - gchar* _tmp66_ = NULL; -#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp58_ = upload_label_text; + const gchar* _tmp57_; + PublishingFlickrPublishingParameters* _tmp58_; + gint64 _tmp59_; + gchar* _tmp60_; + gchar* _tmp61_; + gchar* _tmp62_; + gchar* _tmp63_; + gchar* _tmp64_; #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp59_ = _ ("Your free Flickr account limits how much data you can upload per month" \ -".\n" \ -"This month you have %s remaining in your upload quota."); + _tmp57_ = upload_label_text; #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp60_ = parameters; + _tmp58_ = parameters; #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp61_ = _tmp60_->quota_free_bytes; + _tmp59_ = _tmp58_->quota_free_bytes; #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp62_ = g_format_size_full ((guint64) _tmp61_, G_FORMAT_SIZE_LONG_FORMAT | G_FORMAT_SIZE_IEC_UNITS); + _tmp60_ = g_format_size_full ((guint64) _tmp59_, G_FORMAT_SIZE_LONG_FORMAT | G_FORMAT_SIZE_IEC_UNITS); #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp63_ = _tmp62_; + _tmp61_ = _tmp60_; #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp64_ = g_strdup_printf (_tmp59_, _tmp63_); + _tmp62_ = g_strdup_printf (_ ("Your free Flickr account limits how much data you can upload per month" \ +".\n" \ +"This month you have %s remaining in your upload quota."), _tmp61_); #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp65_ = _tmp64_; + _tmp63_ = _tmp62_; #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp66_ = g_strconcat (_tmp58_, _tmp65_, NULL); + _tmp64_ = g_strconcat (_tmp57_, _tmp63_, NULL); #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (upload_label_text); #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - upload_label_text = _tmp66_; -#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp65_); + upload_label_text = _tmp64_; #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp63_); -#line 5938 "FlickrPublishing.c" +#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _g_free0 (_tmp61_); +#line 5935 "FlickrPublishing.c" } else { - const gchar* _tmp67_ = NULL; - const gchar* _tmp68_ = NULL; - gchar* _tmp69_ = NULL; -#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp67_ = upload_label_text; + const gchar* _tmp65_; + gchar* _tmp66_; #line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp68_ = _ ("Your Flickr Pro account entitles you to unlimited uploads."); + _tmp65_ = upload_label_text; #line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp69_ = g_strconcat (_tmp67_, _tmp68_, NULL); + _tmp66_ = g_strconcat (_tmp65_, _ ("Your Flickr Pro account entitles you to unlimited uploads."), NULL); #line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (upload_label_text); #line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - upload_label_text = _tmp69_; -#line 5953 "FlickrPublishing.c" + upload_label_text = _tmp66_; +#line 5947 "FlickrPublishing.c" } #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp70_ = self->priv->upload_info_label; + _tmp67_ = self->priv->upload_info_label; #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp71_ = upload_label_text; + _tmp68_ = upload_label_text; #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - gtk_label_set_label (_tmp70_, _tmp71_); -#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp72_ = _ ("Photos _visible to:"); + gtk_label_set_label (_tmp67_, _tmp68_); #line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp73_ = g_strdup (_tmp72_); + _tmp69_ = g_strdup (_ ("Photos _visible to:")); #line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - visibility_label_text = _tmp73_; + visibility_label_text = _tmp69_; #line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp74_ = media_type; + _tmp70_ = media_type; #line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp74_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { -#line 5971 "FlickrPublishing.c" - const gchar* _tmp75_ = NULL; - gchar* _tmp76_ = NULL; + if (_tmp70_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { +#line 5963 "FlickrPublishing.c" + gchar* _tmp71_; #line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp75_ = _ ("Videos _visible to:"); -#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp76_ = g_strdup (_tmp75_); + _tmp71_ = g_strdup (_ ("Videos _visible to:")); #line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (visibility_label_text); #line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - visibility_label_text = _tmp76_; -#line 5982 "FlickrPublishing.c" + visibility_label_text = _tmp71_; +#line 5971 "FlickrPublishing.c" } else { - SpitPublishingPublisherMediaType _tmp77_ = 0; + SpitPublishingPublisherMediaType _tmp72_; #line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp77_ = media_type; + _tmp72_ = media_type; #line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp77_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) { -#line 5989 "FlickrPublishing.c" - const gchar* _tmp78_ = NULL; - gchar* _tmp79_ = NULL; + if (_tmp72_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) { +#line 5978 "FlickrPublishing.c" + gchar* _tmp73_; #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp78_ = _ ("Photos and videos _visible to:"); -#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp79_ = g_strdup (_tmp78_); + _tmp73_ = g_strdup (_ ("Photos and videos _visible to:")); #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (visibility_label_text); #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - visibility_label_text = _tmp79_; -#line 6000 "FlickrPublishing.c" + visibility_label_text = _tmp73_; +#line 5986 "FlickrPublishing.c" } } #line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp80_ = self->priv->visibility_label; + _tmp74_ = self->priv->visibility_label; #line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp81_ = visibility_label_text; + _tmp75_ = visibility_label_text; #line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - gtk_label_set_label (_tmp80_, _tmp81_); + gtk_label_set_label (_tmp74_, _tmp75_); #line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_populate_visibility_combo (self); #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp82_ = self->priv->visibility_combo; + _tmp76_ = self->priv->visibility_combo; #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed, self, 0); #line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp83_ = media_type; + _tmp77_ = media_type; #line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp83_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { -#line 6019 "FlickrPublishing.c" - GtkComboBoxText* _tmp84_ = NULL; + if (_tmp77_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { +#line 6005 "FlickrPublishing.c" + GtkComboBoxText* _tmp78_; #line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_populate_size_combo (self); #line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp84_ = self->priv->size_combo; + _tmp78_ = self->priv->size_combo; #line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0); -#line 6027 "FlickrPublishing.c" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0); +#line 6013 "FlickrPublishing.c" } else { - GtkComboBoxText* _tmp85_ = NULL; - GtkLabel* _tmp86_ = NULL; + GtkComboBoxText* _tmp79_; + GtkLabel* _tmp80_; #line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp85_ = self->priv->size_combo; + _tmp79_ = self->priv->size_combo; #line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_widget_get_type (), GtkWidget), FALSE); #line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp86_ = self->priv->size_label; + _tmp80_ = self->priv->size_label; #line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 6039 "FlickrPublishing.c" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget), FALSE); +#line 6025 "FlickrPublishing.c" } #line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp87_ = self->priv->strip_metadata_check; + _tmp81_ = self->priv->strip_metadata_check; #line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp88_ = strip_metadata; + _tmp82_ = strip_metadata; #line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp88_); + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp82_); #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp89_ = self->priv->logout_button; + _tmp83_ = self->priv->logout_button; #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_signal_connect_object (_tmp89_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp83_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0); #line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp90_ = self->priv->publish_button; + _tmp84_ = self->priv->publish_button; #line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_signal_connect_object (_tmp90_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp84_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0); #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (visibility_label_text); #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (upload_label_text); #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 6061 "FlickrPublishing.c" +#line 6047 "FlickrPublishing.c" } PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_new (PublishingFlickrFlickrPublisher* publisher, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublisherMediaType media_type, GtkBuilder* builder, gboolean strip_metadata) { #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_publishing_options_pane_construct (PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, publisher, parameters, media_type, builder, strip_metadata); -#line 6068 "FlickrPublishing.c" +#line 6054 "FlickrPublishing.c" } @@ -6093,30 +6079,30 @@ static void publishing_flickr_publishing_options_pane_on_logout_clicked (Publish #line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); #line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_signal_emit_by_name (self, "logout"); -#line 6077 "FlickrPublishing.c" + g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0); +#line 6063 "FlickrPublishing.c" } static gpointer _publishing_flickr_visibility_specification_ref0 (gpointer self) { #line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_flickr_visibility_specification_ref (self) : NULL; -#line 6084 "FlickrPublishing.c" +#line 6070 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_on_publish_clicked (PublishingFlickrPublishingOptionsPane* self) { - PublishingFlickrPublishingParameters* _tmp0_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - GtkComboBoxText* _tmp2_ = NULL; - gint _tmp3_ = 0; - PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp5_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp6_ = NULL; - SpitPublishingPublisherMediaType _tmp7_ = 0; - GtkCheckButton* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; + PublishingFlickrPublishingParameters* _tmp0_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp1_; + gint _tmp1__length1; + GtkComboBoxText* _tmp2_; + gint _tmp3_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_; + PublishingFlickrVisibilitySpecification* _tmp5_; + PublishingFlickrVisibilitySpecification* _tmp6_; + SpitPublishingPublisherMediaType _tmp7_; + GtkCheckButton* _tmp14_; + gboolean _tmp15_; #line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); #line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -6143,14 +6129,14 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis _tmp7_ = self->priv->media_type; #line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((_tmp7_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) { -#line 6126 "FlickrPublishing.c" - PublishingFlickrPublishingParameters* _tmp8_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - GtkComboBoxText* _tmp10_ = NULL; - gint _tmp11_ = 0; - PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp12_ = NULL; - gint _tmp13_ = 0; +#line 6112 "FlickrPublishing.c" + PublishingFlickrPublishingParameters* _tmp8_; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp9_; + gint _tmp9__length1; + GtkComboBoxText* _tmp10_; + gint _tmp11_; + PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp12_; + gint _tmp13_; #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = self->priv->parameters; #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -6167,141 +6153,136 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis _tmp13_ = _tmp12_->size; #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_->photo_major_axis_size = _tmp13_; -#line 6150 "FlickrPublishing.c" +#line 6136 "FlickrPublishing.c" } #line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = self->priv->strip_metadata_check; #line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_signal_emit_by_name (self, "publish", _tmp15_); -#line 6158 "FlickrPublishing.c" + g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp15_); +#line 6144 "FlickrPublishing.c" } -static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { +static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 6169 "FlickrPublishing.c" +#line 6155 "FlickrPublishing.c" } #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6175 "FlickrPublishing.c" +#line 6161 "FlickrPublishing.c" } -static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { +static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 6186 "FlickrPublishing.c" +#line 6172 "FlickrPublishing.c" } #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6192 "FlickrPublishing.c" +#line 6178 "FlickrPublishing.c" } -static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { +static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 6203 "FlickrPublishing.c" +#line 6189 "FlickrPublishing.c" } #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6209 "FlickrPublishing.c" +#line 6195 "FlickrPublishing.c" } -static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { +static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 6220 "FlickrPublishing.c" +#line 6206 "FlickrPublishing.c" } #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6226 "FlickrPublishing.c" +#line 6212 "FlickrPublishing.c" } -static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { +static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 6237 "FlickrPublishing.c" +#line 6223 "FlickrPublishing.c" } #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6243 "FlickrPublishing.c" +#line 6229 "FlickrPublishing.c" } static PublishingFlickrPublishingOptionsPaneVisibilityEntry** publishing_flickr_publishing_options_pane_create_visibilities (PublishingFlickrPublishingOptionsPane* self, int* result_length1) { PublishingFlickrPublishingOptionsPaneVisibilityEntry** result = NULL; PublishingFlickrPublishingOptionsPaneVisibilityEntry** _result_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp0_ = NULL; - gint _result__length1 = 0; - gint __result__size_ = 0; - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - const gchar* _tmp2_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp3_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp4_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp5_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - const gchar* _tmp7_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp8_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp9_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp10_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp11_ = NULL; - gint _tmp11__length1 = 0; - const gchar* _tmp12_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp13_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp14_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp15_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp16_ = NULL; - gint _tmp16__length1 = 0; - const gchar* _tmp17_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp18_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp19_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp20_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp21_ = NULL; - gint _tmp21__length1 = 0; - const gchar* _tmp22_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp23_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp24_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp25_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp26_ = NULL; - gint _tmp26__length1 = 0; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp0_; + gint _result__length1; + gint __result__size_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp1_; + gint _tmp1__length1; + PublishingFlickrVisibilitySpecification* _tmp2_; + PublishingFlickrVisibilitySpecification* _tmp3_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp5_; + gint _tmp5__length1; + PublishingFlickrVisibilitySpecification* _tmp6_; + PublishingFlickrVisibilitySpecification* _tmp7_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp8_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp9_; + gint _tmp9__length1; + PublishingFlickrVisibilitySpecification* _tmp10_; + PublishingFlickrVisibilitySpecification* _tmp11_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp12_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp13_; + gint _tmp13__length1; + PublishingFlickrVisibilitySpecification* _tmp14_; + PublishingFlickrVisibilitySpecification* _tmp15_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp16_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp17_; + gint _tmp17__length1; + PublishingFlickrVisibilitySpecification* _tmp18_; + PublishingFlickrVisibilitySpecification* _tmp19_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp20_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp21_; + gint _tmp21__length1; #line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self), NULL); #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -6317,114 +6298,104 @@ static PublishingFlickrPublishingOptionsPaneVisibilityEntry** publishing_flickr_ #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1__length1 = _result__length1; #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp2_ = _ ("Everyone"); -#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp3_ = publishing_flickr_visibility_specification_new (1, 1, 1); + _tmp2_ = publishing_flickr_visibility_specification_new (1, 1, 1); #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp5_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp2_, _tmp4_); + _tmp4_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Everyone"), _tmp3_); #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp5_); + _vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp4_); #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _publishing_flickr_visibility_specification_unref0 (_tmp4_); + _publishing_flickr_visibility_specification_unref0 (_tmp3_); #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp6_ = _result_; + _tmp5_ = _result_; #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp6__length1 = _result__length1; + _tmp5__length1 = _result__length1; #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp7_ = _ ("Friends & family only"); + _tmp6_ = publishing_flickr_visibility_specification_new (1, 1, 0); #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp8_ = publishing_flickr_visibility_specification_new (1, 1, 0); -#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp10_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp7_, _tmp9_); + _tmp8_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Friends & family only"), _tmp7_); #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp10_); + _vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp8_); #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _publishing_flickr_visibility_specification_unref0 (_tmp9_); -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp11_ = _result_; + _publishing_flickr_visibility_specification_unref0 (_tmp7_); #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp11__length1 = _result__length1; + _tmp9_ = _result_; #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp12_ = _ ("Family only"); + _tmp9__length1 = _result__length1; #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp13_ = publishing_flickr_visibility_specification_new (0, 1, 0); + _tmp10_ = publishing_flickr_visibility_specification_new (0, 1, 0); #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp14_ = _tmp13_; + _tmp11_ = _tmp10_; #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp15_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp12_, _tmp14_); + _tmp12_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Family only"), _tmp11_); #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp15_); + _vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp12_); #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _publishing_flickr_visibility_specification_unref0 (_tmp14_); + _publishing_flickr_visibility_specification_unref0 (_tmp11_); #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp16_ = _result_; -#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp16__length1 = _result__length1; + _tmp13_ = _result_; #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp17_ = _ ("Friends only"); + _tmp13__length1 = _result__length1; #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp18_ = publishing_flickr_visibility_specification_new (1, 0, 0); + _tmp14_ = publishing_flickr_visibility_specification_new (1, 0, 0); #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp19_ = _tmp18_; + _tmp15_ = _tmp14_; #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp20_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp17_, _tmp19_); + _tmp16_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Friends only"), _tmp15_); #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp20_); + _vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp16_); #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _publishing_flickr_visibility_specification_unref0 (_tmp19_); + _publishing_flickr_visibility_specification_unref0 (_tmp15_); #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp21_ = _result_; -#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp21__length1 = _result__length1; + _tmp17_ = _result_; #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp22_ = _ ("Just me"); + _tmp17__length1 = _result__length1; #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp23_ = publishing_flickr_visibility_specification_new (0, 0, 0); + _tmp18_ = publishing_flickr_visibility_specification_new (0, 0, 0); #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp24_ = _tmp23_; + _tmp19_ = _tmp18_; #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp25_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp22_, _tmp24_); + _tmp20_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Just me"), _tmp19_); #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp25_); + _vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp20_); #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _publishing_flickr_visibility_specification_unref0 (_tmp24_); + _publishing_flickr_visibility_specification_unref0 (_tmp19_); #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp26_ = _result_; + _tmp21_ = _result_; #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp26__length1 = _result__length1; + _tmp21__length1 = _result__length1; #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (result_length1) { #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - *result_length1 = _tmp26__length1; -#line 6383 "FlickrPublishing.c" + *result_length1 = _tmp21__length1; +#line 6354 "FlickrPublishing.c" } #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - result = _tmp26_; + result = _tmp21_; #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 6389 "FlickrPublishing.c" +#line 6360 "FlickrPublishing.c" } static gpointer _publishing_flickr_publishing_options_pane_visibility_entry_ref0 (gpointer self) { #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_flickr_publishing_options_pane_visibility_entry_ref (self) : NULL; -#line 6396 "FlickrPublishing.c" +#line 6367 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_populate_visibility_combo (PublishingFlickrPublishingOptionsPane* self) { - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp3_ = NULL; - gint _tmp3__length1 = 0; - GtkComboBoxText* _tmp8_ = NULL; - PublishingFlickrFlickrPublisher* _tmp9_ = NULL; - gint _tmp10_ = 0; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp0_; + gint _tmp0__length1; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp3_; + gint _tmp3__length1; + GtkComboBoxText* _tmp8_; + PublishingFlickrFlickrPublisher* _tmp9_; + gint _tmp10_; #line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); #line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -6433,9 +6404,9 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo _tmp0__length1 = self->priv->visibilities_length1; #line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp0_ == NULL) { -#line 6416 "FlickrPublishing.c" - gint _tmp1_ = 0; - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp2_ = NULL; +#line 6387 "FlickrPublishing.c" + gint _tmp1_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp2_; #line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = publishing_flickr_publishing_options_pane_create_visibilities (self, &_tmp1_); #line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -6446,13 +6417,13 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo self->priv->visibilities_length1 = _tmp1_; #line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->_visibilities_size_ = self->priv->visibilities_length1; -#line 6429 "FlickrPublishing.c" +#line 6400 "FlickrPublishing.c" } #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = self->priv->visibilities; #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3__length1 = self->priv->visibilities_length1; -#line 6435 "FlickrPublishing.c" +#line 6406 "FlickrPublishing.c" { PublishingFlickrPublishingOptionsPaneVisibilityEntry** v_collection = NULL; gint v_collection_length1 = 0; @@ -6464,18 +6435,18 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo v_collection_length1 = _tmp3__length1; #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (v_it = 0; v_it < _tmp3__length1; v_it = v_it + 1) { -#line 6447 "FlickrPublishing.c" - PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_ = NULL; +#line 6418 "FlickrPublishing.c" + PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_; PublishingFlickrPublishingOptionsPaneVisibilityEntry* v = NULL; #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = _publishing_flickr_publishing_options_pane_visibility_entry_ref0 (v_collection[v_it]); #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" v = _tmp4_; -#line 6454 "FlickrPublishing.c" +#line 6425 "FlickrPublishing.c" { - GtkComboBoxText* _tmp5_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; + GtkComboBoxText* _tmp5_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp6_; + const gchar* _tmp7_; #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = self->priv->visibility_combo; #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -6486,7 +6457,7 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo gtk_combo_box_text_append_text (_tmp5_, _tmp7_); #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_options_pane_visibility_entry_unref0 (v); -#line 6469 "FlickrPublishing.c" +#line 6440 "FlickrPublishing.c" } } } @@ -6498,123 +6469,118 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo _tmp10_ = publishing_flickr_flickr_publisher_get_persistent_visibility (_tmp9_); #line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp10_); -#line 6481 "FlickrPublishing.c" +#line 6452 "FlickrPublishing.c" } -static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { +static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 6492 "FlickrPublishing.c" +#line 6463 "FlickrPublishing.c" } #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6498 "FlickrPublishing.c" +#line 6469 "FlickrPublishing.c" } -static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { +static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 6509 "FlickrPublishing.c" +#line 6480 "FlickrPublishing.c" } #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6515 "FlickrPublishing.c" +#line 6486 "FlickrPublishing.c" } -static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { +static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 6526 "FlickrPublishing.c" +#line 6497 "FlickrPublishing.c" } #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6532 "FlickrPublishing.c" +#line 6503 "FlickrPublishing.c" } -static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { +static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 6543 "FlickrPublishing.c" +#line 6514 "FlickrPublishing.c" } #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6549 "FlickrPublishing.c" +#line 6520 "FlickrPublishing.c" } -static void _vala_array_add30 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { +static void _vala_array_add30 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 6560 "FlickrPublishing.c" +#line 6531 "FlickrPublishing.c" } #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6566 "FlickrPublishing.c" +#line 6537 "FlickrPublishing.c" } static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publishing_options_pane_create_sizes (PublishingFlickrPublishingOptionsPane* self, int* result_length1) { PublishingFlickrPublishingOptionsPaneSizeEntry** result = NULL; PublishingFlickrPublishingOptionsPaneSizeEntry** _result_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp0_ = NULL; - gint _result__length1 = 0; - gint __result__size_ = 0; - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - const gchar* _tmp2_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp3_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - const gchar* _tmp5_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp6_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - const gchar* _tmp8_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp9_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp10_ = NULL; - gint _tmp10__length1 = 0; - const gchar* _tmp11_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp12_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp13_ = NULL; - gint _tmp13__length1 = 0; - const gchar* _tmp14_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp15_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp16_ = NULL; - gint _tmp16__length1 = 0; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp0_; + gint _result__length1; + gint __result__size_; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp1_; + gint _tmp1__length1; + PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp2_; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp3_; + gint _tmp3__length1; + PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp4_; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp5_; + gint _tmp5__length1; + PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp6_; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp7_; + gint _tmp7__length1; + PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp8_; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp9_; + gint _tmp9__length1; + PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp10_; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp11_; + gint _tmp11__length1; #line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self), NULL); #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -6630,84 +6596,74 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publis #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1__length1 = _result__length1; #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp2_ = _ ("500 × 375 pixels"); -#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp3_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp2_, 500); + _tmp2_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("500 × 375 pixels"), 500); #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp3_); -#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4_ = _result_; + _vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp2_); #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4__length1 = _result__length1; + _tmp3_ = _result_; #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp5_ = _ ("1024 × 768 pixels"); + _tmp3__length1 = _result__length1; #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp6_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp5_, 1024); + _tmp4_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("1024 × 768 pixels"), 1024); #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp6_); + _vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp4_); #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp7_ = _result_; -#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp7__length1 = _result__length1; + _tmp5_ = _result_; #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp8_ = _ ("2048 × 1536 pixels"); + _tmp5__length1 = _result__length1; #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp9_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp8_, 2048); + _tmp6_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("2048 × 1536 pixels"), 2048); #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp9_); -#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp10_ = _result_; + _vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp6_); #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp10__length1 = _result__length1; + _tmp7_ = _result_; #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp11_ = _ ("4096 × 3072 pixels"); + _tmp7__length1 = _result__length1; #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp12_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp11_, 4096); + _tmp8_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("4096 × 3072 pixels"), 4096); #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp12_); -#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp13_ = _result_; + _vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp8_); #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp13__length1 = _result__length1; + _tmp9_ = _result_; #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp14_ = _ ("Original size"); + _tmp9__length1 = _result__length1; #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp15_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp14_, PUBLISHING_FLICKR_ORIGINAL_SIZE); + _tmp10_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("Original size"), PUBLISHING_FLICKR_ORIGINAL_SIZE); #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_array_add30 (&_result_, &_result__length1, &__result__size_, _tmp15_); + _vala_array_add30 (&_result_, &_result__length1, &__result__size_, _tmp10_); #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp16_ = _result_; + _tmp11_ = _result_; #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp16__length1 = _result__length1; + _tmp11__length1 = _result__length1; #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (result_length1) { #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - *result_length1 = _tmp16__length1; -#line 6666 "FlickrPublishing.c" + *result_length1 = _tmp11__length1; +#line 6622 "FlickrPublishing.c" } #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - result = _tmp16_; + result = _tmp11_; #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 6672 "FlickrPublishing.c" +#line 6628 "FlickrPublishing.c" } static gpointer _publishing_flickr_publishing_options_pane_size_entry_ref0 (gpointer self) { #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_flickr_publishing_options_pane_size_entry_ref (self) : NULL; -#line 6679 "FlickrPublishing.c" +#line 6635 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_populate_size_combo (PublishingFlickrPublishingOptionsPane* self) { - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp3_ = NULL; - gint _tmp3__length1 = 0; - GtkComboBoxText* _tmp8_ = NULL; - PublishingFlickrFlickrPublisher* _tmp9_ = NULL; - gint _tmp10_ = 0; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp0_; + gint _tmp0__length1; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp3_; + gint _tmp3__length1; + GtkComboBoxText* _tmp8_; + PublishingFlickrFlickrPublisher* _tmp9_; + gint _tmp10_; #line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -6716,9 +6672,9 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi _tmp0__length1 = self->priv->sizes_length1; #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp0_ == NULL) { -#line 6699 "FlickrPublishing.c" - gint _tmp1_ = 0; - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp2_ = NULL; +#line 6655 "FlickrPublishing.c" + gint _tmp1_; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp2_; #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = publishing_flickr_publishing_options_pane_create_sizes (self, &_tmp1_); #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -6729,13 +6685,13 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi self->priv->sizes_length1 = _tmp1_; #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->_sizes_size_ = self->priv->sizes_length1; -#line 6712 "FlickrPublishing.c" +#line 6668 "FlickrPublishing.c" } #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = self->priv->sizes; #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3__length1 = self->priv->sizes_length1; -#line 6718 "FlickrPublishing.c" +#line 6674 "FlickrPublishing.c" { PublishingFlickrPublishingOptionsPaneSizeEntry** e_collection = NULL; gint e_collection_length1 = 0; @@ -6747,18 +6703,18 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi e_collection_length1 = _tmp3__length1; #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (e_it = 0; e_it < _tmp3__length1; e_it = e_it + 1) { -#line 6730 "FlickrPublishing.c" - PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp4_ = NULL; +#line 6686 "FlickrPublishing.c" + PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp4_; PublishingFlickrPublishingOptionsPaneSizeEntry* e = NULL; #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = _publishing_flickr_publishing_options_pane_size_entry_ref0 (e_collection[e_it]); #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" e = _tmp4_; -#line 6737 "FlickrPublishing.c" +#line 6693 "FlickrPublishing.c" { - GtkComboBoxText* _tmp5_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; + GtkComboBoxText* _tmp5_; + PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp6_; + const gchar* _tmp7_; #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = self->priv->size_combo; #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -6769,7 +6725,7 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi gtk_combo_box_text_append_text (_tmp5_, _tmp7_); #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_options_pane_size_entry_unref0 (e); -#line 6752 "FlickrPublishing.c" +#line 6708 "FlickrPublishing.c" } } } @@ -6781,14 +6737,14 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi _tmp10_ = publishing_flickr_flickr_publisher_get_persistent_default_size (_tmp9_); #line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp10_); -#line 6764 "FlickrPublishing.c" +#line 6720 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_on_size_changed (PublishingFlickrPublishingOptionsPane* self) { - PublishingFlickrFlickrPublisher* _tmp0_ = NULL; - GtkComboBoxText* _tmp1_ = NULL; - gint _tmp2_ = 0; + PublishingFlickrFlickrPublisher* _tmp0_; + GtkComboBoxText* _tmp1_; + gint _tmp2_; #line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); #line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -6799,14 +6755,14 @@ static void publishing_flickr_publishing_options_pane_on_size_changed (Publishin _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); #line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_set_persistent_default_size (_tmp0_, _tmp2_); -#line 6782 "FlickrPublishing.c" +#line 6738 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_on_visibility_changed (PublishingFlickrPublishingOptionsPane* self) { - PublishingFlickrFlickrPublisher* _tmp0_ = NULL; - GtkComboBoxText* _tmp1_ = NULL; - gint _tmp2_ = 0; + PublishingFlickrFlickrPublisher* _tmp0_; + GtkComboBoxText* _tmp1_; + gint _tmp2_; #line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -6817,13 +6773,13 @@ static void publishing_flickr_publishing_options_pane_on_visibility_changed (Pub _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_set_persistent_visibility (_tmp0_, _tmp2_); -#line 6800 "FlickrPublishing.c" +#line 6756 "FlickrPublishing.c" } void publishing_flickr_publishing_options_pane_notify_publish (PublishingFlickrPublishingOptionsPane* self) { - GtkCheckButton* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + GtkCheckButton* _tmp0_; + gboolean _tmp1_; #line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); #line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -6831,8 +6787,8 @@ void publishing_flickr_publishing_options_pane_notify_publish (PublishingFlickrP #line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_signal_emit_by_name (self, "publish", _tmp1_); -#line 6815 "FlickrPublishing.c" + g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp1_); +#line 6771 "FlickrPublishing.c" } @@ -6840,16 +6796,16 @@ void publishing_flickr_publishing_options_pane_notify_logout (PublishingFlickrPu #line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); #line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_signal_emit_by_name (self, "logout"); -#line 6824 "FlickrPublishing.c" + g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0); +#line 6780 "FlickrPublishing.c" } static GtkWidget* publishing_flickr_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) { PublishingFlickrPublishingOptionsPane * self; GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane); #line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -6860,7 +6816,7 @@ static GtkWidget* publishing_flickr_publishing_options_pane_real_get_widget (Spi result = _tmp1_; #line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 6843 "FlickrPublishing.c" +#line 6799 "FlickrPublishing.c" } @@ -6873,21 +6829,21 @@ static SpitPublishingDialogPaneGeometryOptions publishing_flickr_publishing_opti result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; #line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 6856 "FlickrPublishing.c" +#line 6812 "FlickrPublishing.c" } static void _publishing_flickr_publishing_options_pane_notify_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender, gboolean strip_metadata, gpointer self) { #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_notify_publish ((PublishingFlickrPublishingOptionsPane*) self); -#line 6863 "FlickrPublishing.c" +#line 6819 "FlickrPublishing.c" } static void _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self) { #line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_notify_logout ((PublishingFlickrPublishingOptionsPane*) self); -#line 6870 "FlickrPublishing.c" +#line 6826 "FlickrPublishing.c" } @@ -6899,14 +6855,14 @@ static void publishing_flickr_publishing_options_pane_real_on_pane_installed (Sp g_signal_connect_object (self, "publish", (GCallback) _publishing_flickr_publishing_options_pane_notify_publish_publishing_flickr_publishing_options_pane_publish, self, 0); #line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (self, "logout", (GCallback) _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout, self, 0); -#line 6882 "FlickrPublishing.c" +#line 6838 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) { PublishingFlickrPublishingOptionsPane * self; - guint _tmp0_ = 0U; - guint _tmp1_ = 0U; + guint _tmp0_; + guint _tmp1_; #line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane); #line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -6917,15 +6873,15 @@ static void publishing_flickr_publishing_options_pane_real_on_pane_uninstalled ( g_signal_parse_name ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE); #line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout, self); -#line 6900 "FlickrPublishing.c" +#line 6856 "FlickrPublishing.c" } static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_construct (GType object_type, const gchar* creator_title, gint creator_size) { PublishingFlickrPublishingOptionsPaneSizeEntry* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gint _tmp2_ = 0; + const gchar* _tmp0_; + gchar* _tmp1_; + gint _tmp2_; #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (creator_title != NULL, NULL); #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -6944,21 +6900,21 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publish self->size = _tmp2_; #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 6927 "FlickrPublishing.c" +#line 6883 "FlickrPublishing.c" } static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_new (const gchar* creator_title, gint creator_size) { #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_publishing_options_pane_size_entry_construct (PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY, creator_title, creator_size); -#line 6934 "FlickrPublishing.c" +#line 6890 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_value_size_entry_init (GValue* value) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 6941 "FlickrPublishing.c" +#line 6897 "FlickrPublishing.c" } @@ -6967,7 +6923,7 @@ static void publishing_flickr_publishing_options_pane_value_size_entry_free_valu if (value->data[0].v_pointer) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_size_entry_unref (value->data[0].v_pointer); -#line 6950 "FlickrPublishing.c" +#line 6906 "FlickrPublishing.c" } } @@ -6977,11 +6933,11 @@ static void publishing_flickr_publishing_options_pane_value_size_entry_copy_valu if (src_value->data[0].v_pointer) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = publishing_flickr_publishing_options_pane_size_entry_ref (src_value->data[0].v_pointer); -#line 6960 "FlickrPublishing.c" +#line 6916 "FlickrPublishing.c" } else { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 6964 "FlickrPublishing.c" +#line 6920 "FlickrPublishing.c" } } @@ -6989,66 +6945,66 @@ static void publishing_flickr_publishing_options_pane_value_size_entry_copy_valu static gpointer publishing_flickr_publishing_options_pane_value_size_entry_peek_pointer (const GValue* value) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 6972 "FlickrPublishing.c" +#line 6928 "FlickrPublishing.c" } static gchar* publishing_flickr_publishing_options_pane_value_size_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (collect_values[0].v_pointer) { -#line 6979 "FlickrPublishing.c" - PublishingFlickrPublishingOptionsPaneSizeEntry* object; +#line 6935 "FlickrPublishing.c" + PublishingFlickrPublishingOptionsPaneSizeEntry * object; object = collect_values[0].v_pointer; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6986 "FlickrPublishing.c" +#line 6942 "FlickrPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6990 "FlickrPublishing.c" +#line 6946 "FlickrPublishing.c" } #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = publishing_flickr_publishing_options_pane_size_entry_ref (object); -#line 6994 "FlickrPublishing.c" +#line 6950 "FlickrPublishing.c" } else { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 6998 "FlickrPublishing.c" +#line 6954 "FlickrPublishing.c" } #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 7002 "FlickrPublishing.c" +#line 6958 "FlickrPublishing.c" } static gchar* publishing_flickr_publishing_options_pane_value_size_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingFlickrPublishingOptionsPaneSizeEntry** object_p; + PublishingFlickrPublishingOptionsPaneSizeEntry ** object_p; object_p = collect_values[0].v_pointer; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!object_p) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 7013 "FlickrPublishing.c" +#line 6969 "FlickrPublishing.c" } #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!value->data[0].v_pointer) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = NULL; -#line 7019 "FlickrPublishing.c" +#line 6975 "FlickrPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = value->data[0].v_pointer; -#line 7023 "FlickrPublishing.c" +#line 6979 "FlickrPublishing.c" } else { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = publishing_flickr_publishing_options_pane_size_entry_ref (value->data[0].v_pointer); -#line 7027 "FlickrPublishing.c" +#line 6983 "FlickrPublishing.c" } #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 7031 "FlickrPublishing.c" +#line 6987 "FlickrPublishing.c" } @@ -7062,7 +7018,7 @@ static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_size_ent G_PARAM_SPEC (spec)->value_type = object_type; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return G_PARAM_SPEC (spec); -#line 7045 "FlickrPublishing.c" +#line 7001 "FlickrPublishing.c" } @@ -7071,12 +7027,12 @@ static gpointer publishing_flickr_publishing_options_pane_value_get_size_entry ( g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY), NULL); #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 7054 "FlickrPublishing.c" +#line 7010 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_value_set_size_entry (GValue* value, gpointer v_object) { - PublishingFlickrPublishingOptionsPaneSizeEntry* old; + PublishingFlickrPublishingOptionsPaneSizeEntry * old; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY)); #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7091,23 +7047,23 @@ static void publishing_flickr_publishing_options_pane_value_set_size_entry (GVal value->data[0].v_pointer = v_object; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_size_entry_ref (value->data[0].v_pointer); -#line 7074 "FlickrPublishing.c" +#line 7030 "FlickrPublishing.c" } else { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 7078 "FlickrPublishing.c" +#line 7034 "FlickrPublishing.c" } #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_size_entry_unref (old); -#line 7084 "FlickrPublishing.c" +#line 7040 "FlickrPublishing.c" } } static void publishing_flickr_publishing_options_pane_value_take_size_entry (GValue* value, gpointer v_object) { - PublishingFlickrPublishingOptionsPaneSizeEntry* old; + PublishingFlickrPublishingOptionsPaneSizeEntry * old; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY)); #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7120,17 +7076,17 @@ static void publishing_flickr_publishing_options_pane_value_take_size_entry (GVa g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = v_object; -#line 7103 "FlickrPublishing.c" +#line 7059 "FlickrPublishing.c" } else { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 7107 "FlickrPublishing.c" +#line 7063 "FlickrPublishing.c" } #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_size_entry_unref (old); -#line 7113 "FlickrPublishing.c" +#line 7069 "FlickrPublishing.c" } } @@ -7140,18 +7096,18 @@ static void publishing_flickr_publishing_options_pane_size_entry_class_init (Pub publishing_flickr_publishing_options_pane_size_entry_parent_class = g_type_class_peek_parent (klass); #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingFlickrPublishingOptionsPaneSizeEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_size_entry_finalize; -#line 7123 "FlickrPublishing.c" +#line 7079 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_size_entry_instance_init (PublishingFlickrPublishingOptionsPaneSizeEntry * self) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->ref_count = 1; -#line 7130 "FlickrPublishing.c" +#line 7086 "FlickrPublishing.c" } -static void publishing_flickr_publishing_options_pane_size_entry_finalize (PublishingFlickrPublishingOptionsPaneSizeEntry* obj) { +static void publishing_flickr_publishing_options_pane_size_entry_finalize (PublishingFlickrPublishingOptionsPaneSizeEntry * obj) { PublishingFlickrPublishingOptionsPaneSizeEntry * self; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY, PublishingFlickrPublishingOptionsPaneSizeEntry); @@ -7159,7 +7115,7 @@ static void publishing_flickr_publishing_options_pane_size_entry_finalize (Publi g_signal_handlers_destroy (self); #line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->title); -#line 7142 "FlickrPublishing.c" +#line 7098 "FlickrPublishing.c" } @@ -7178,18 +7134,18 @@ static GType publishing_flickr_publishing_options_pane_size_entry_get_type (void static gpointer publishing_flickr_publishing_options_pane_size_entry_ref (gpointer instance) { - PublishingFlickrPublishingOptionsPaneSizeEntry* self; + PublishingFlickrPublishingOptionsPaneSizeEntry * self; self = instance; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_atomic_int_inc (&self->ref_count); #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return instance; -#line 7167 "FlickrPublishing.c" +#line 7123 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_size_entry_unref (gpointer instance) { - PublishingFlickrPublishingOptionsPaneSizeEntry* self; + PublishingFlickrPublishingOptionsPaneSizeEntry * self; self = instance; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -7197,17 +7153,17 @@ static void publishing_flickr_publishing_options_pane_size_entry_unref (gpointer PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_SIZE_ENTRY_GET_CLASS (self)->finalize (self); #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 7180 "FlickrPublishing.c" +#line 7136 "FlickrPublishing.c" } } static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_construct (GType object_type, const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification) { PublishingFlickrPublishingOptionsPaneVisibilityEntry* self = NULL; - PublishingFlickrVisibilitySpecification* _tmp0_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + PublishingFlickrVisibilitySpecification* _tmp0_; + PublishingFlickrVisibilitySpecification* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (creator_title != NULL, NULL); #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7232,21 +7188,21 @@ static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_p self->title = _tmp3_; #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 7215 "FlickrPublishing.c" +#line 7171 "FlickrPublishing.c" } static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_new (const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification) { #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_publishing_options_pane_visibility_entry_construct (PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY, creator_title, creator_specification); -#line 7222 "FlickrPublishing.c" +#line 7178 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_value_visibility_entry_init (GValue* value) { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 7229 "FlickrPublishing.c" +#line 7185 "FlickrPublishing.c" } @@ -7255,7 +7211,7 @@ static void publishing_flickr_publishing_options_pane_value_visibility_entry_fre if (value->data[0].v_pointer) { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_visibility_entry_unref (value->data[0].v_pointer); -#line 7238 "FlickrPublishing.c" +#line 7194 "FlickrPublishing.c" } } @@ -7265,11 +7221,11 @@ static void publishing_flickr_publishing_options_pane_value_visibility_entry_cop if (src_value->data[0].v_pointer) { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = publishing_flickr_publishing_options_pane_visibility_entry_ref (src_value->data[0].v_pointer); -#line 7248 "FlickrPublishing.c" +#line 7204 "FlickrPublishing.c" } else { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 7252 "FlickrPublishing.c" +#line 7208 "FlickrPublishing.c" } } @@ -7277,66 +7233,66 @@ static void publishing_flickr_publishing_options_pane_value_visibility_entry_cop static gpointer publishing_flickr_publishing_options_pane_value_visibility_entry_peek_pointer (const GValue* value) { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 7260 "FlickrPublishing.c" +#line 7216 "FlickrPublishing.c" } static gchar* publishing_flickr_publishing_options_pane_value_visibility_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (collect_values[0].v_pointer) { -#line 7267 "FlickrPublishing.c" - PublishingFlickrPublishingOptionsPaneVisibilityEntry* object; +#line 7223 "FlickrPublishing.c" + PublishingFlickrPublishingOptionsPaneVisibilityEntry * object; object = collect_values[0].v_pointer; #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 7274 "FlickrPublishing.c" +#line 7230 "FlickrPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 7278 "FlickrPublishing.c" +#line 7234 "FlickrPublishing.c" } #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = publishing_flickr_publishing_options_pane_visibility_entry_ref (object); -#line 7282 "FlickrPublishing.c" +#line 7238 "FlickrPublishing.c" } else { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 7286 "FlickrPublishing.c" +#line 7242 "FlickrPublishing.c" } #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 7290 "FlickrPublishing.c" +#line 7246 "FlickrPublishing.c" } static gchar* publishing_flickr_publishing_options_pane_value_visibility_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingFlickrPublishingOptionsPaneVisibilityEntry** object_p; + PublishingFlickrPublishingOptionsPaneVisibilityEntry ** object_p; object_p = collect_values[0].v_pointer; #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!object_p) { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 7301 "FlickrPublishing.c" +#line 7257 "FlickrPublishing.c" } #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!value->data[0].v_pointer) { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = NULL; -#line 7307 "FlickrPublishing.c" +#line 7263 "FlickrPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = value->data[0].v_pointer; -#line 7311 "FlickrPublishing.c" +#line 7267 "FlickrPublishing.c" } else { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = publishing_flickr_publishing_options_pane_visibility_entry_ref (value->data[0].v_pointer); -#line 7315 "FlickrPublishing.c" +#line 7271 "FlickrPublishing.c" } #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 7319 "FlickrPublishing.c" +#line 7275 "FlickrPublishing.c" } @@ -7350,7 +7306,7 @@ static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_visibili G_PARAM_SPEC (spec)->value_type = object_type; #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return G_PARAM_SPEC (spec); -#line 7333 "FlickrPublishing.c" +#line 7289 "FlickrPublishing.c" } @@ -7359,12 +7315,12 @@ static gpointer publishing_flickr_publishing_options_pane_value_get_visibility_e g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY), NULL); #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 7342 "FlickrPublishing.c" +#line 7298 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_value_set_visibility_entry (GValue* value, gpointer v_object) { - PublishingFlickrPublishingOptionsPaneVisibilityEntry* old; + PublishingFlickrPublishingOptionsPaneVisibilityEntry * old; #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY)); #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7379,23 +7335,23 @@ static void publishing_flickr_publishing_options_pane_value_set_visibility_entry value->data[0].v_pointer = v_object; #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_visibility_entry_ref (value->data[0].v_pointer); -#line 7362 "FlickrPublishing.c" +#line 7318 "FlickrPublishing.c" } else { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 7366 "FlickrPublishing.c" +#line 7322 "FlickrPublishing.c" } #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_visibility_entry_unref (old); -#line 7372 "FlickrPublishing.c" +#line 7328 "FlickrPublishing.c" } } static void publishing_flickr_publishing_options_pane_value_take_visibility_entry (GValue* value, gpointer v_object) { - PublishingFlickrPublishingOptionsPaneVisibilityEntry* old; + PublishingFlickrPublishingOptionsPaneVisibilityEntry * old; #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY)); #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7408,17 +7364,17 @@ static void publishing_flickr_publishing_options_pane_value_take_visibility_entr g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = v_object; -#line 7391 "FlickrPublishing.c" +#line 7347 "FlickrPublishing.c" } else { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 7395 "FlickrPublishing.c" +#line 7351 "FlickrPublishing.c" } #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_visibility_entry_unref (old); -#line 7401 "FlickrPublishing.c" +#line 7357 "FlickrPublishing.c" } } @@ -7428,18 +7384,18 @@ static void publishing_flickr_publishing_options_pane_visibility_entry_class_ini publishing_flickr_publishing_options_pane_visibility_entry_parent_class = g_type_class_peek_parent (klass); #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingFlickrPublishingOptionsPaneVisibilityEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_visibility_entry_finalize; -#line 7411 "FlickrPublishing.c" +#line 7367 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_visibility_entry_instance_init (PublishingFlickrPublishingOptionsPaneVisibilityEntry * self) { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->ref_count = 1; -#line 7418 "FlickrPublishing.c" +#line 7374 "FlickrPublishing.c" } -static void publishing_flickr_publishing_options_pane_visibility_entry_finalize (PublishingFlickrPublishingOptionsPaneVisibilityEntry* obj) { +static void publishing_flickr_publishing_options_pane_visibility_entry_finalize (PublishingFlickrPublishingOptionsPaneVisibilityEntry * obj) { PublishingFlickrPublishingOptionsPaneVisibilityEntry * self; #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY, PublishingFlickrPublishingOptionsPaneVisibilityEntry); @@ -7449,7 +7405,7 @@ static void publishing_flickr_publishing_options_pane_visibility_entry_finalize _publishing_flickr_visibility_specification_unref0 (self->specification); #line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->title); -#line 7432 "FlickrPublishing.c" +#line 7388 "FlickrPublishing.c" } @@ -7468,18 +7424,18 @@ static GType publishing_flickr_publishing_options_pane_visibility_entry_get_type static gpointer publishing_flickr_publishing_options_pane_visibility_entry_ref (gpointer instance) { - PublishingFlickrPublishingOptionsPaneVisibilityEntry* self; + PublishingFlickrPublishingOptionsPaneVisibilityEntry * self; self = instance; #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_atomic_int_inc (&self->ref_count); #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return instance; -#line 7457 "FlickrPublishing.c" +#line 7413 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_visibility_entry_unref (gpointer instance) { - PublishingFlickrPublishingOptionsPaneVisibilityEntry* self; + PublishingFlickrPublishingOptionsPaneVisibilityEntry * self; self = instance; #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -7487,7 +7443,7 @@ static void publishing_flickr_publishing_options_pane_visibility_entry_unref (gp PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_VISIBILITY_ENTRY_GET_CLASS (self)->finalize (self); #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 7470 "FlickrPublishing.c" +#line 7426 "FlickrPublishing.c" } } @@ -7500,10 +7456,10 @@ static void publishing_flickr_publishing_options_pane_class_init (PublishingFlic #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_flickr_publishing_options_pane_finalize; #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_signal_new ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); + publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_signal_new ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 7486 "FlickrPublishing.c" + publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 7442 "FlickrPublishing.c" } @@ -7511,14 +7467,14 @@ static void publishing_flickr_publishing_options_pane_spit_publishing_dialog_pan #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface); #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_get_widget; + iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_flickr_publishing_options_pane_real_get_widget; #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_get_preferred_geometry; + iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_flickr_publishing_options_pane_real_get_preferred_geometry; #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_on_pane_installed; + iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_flickr_publishing_options_pane_real_on_pane_installed; #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_on_pane_uninstalled; -#line 7501 "FlickrPublishing.c" + iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_flickr_publishing_options_pane_real_on_pane_uninstalled; +#line 7457 "FlickrPublishing.c" } @@ -7559,11 +7515,11 @@ static void publishing_flickr_publishing_options_pane_instance_init (PublishingF self->priv->parameters = NULL; #line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->publisher = NULL; -#line 7542 "FlickrPublishing.c" +#line 7498 "FlickrPublishing.c" } -static void publishing_flickr_publishing_options_pane_finalize (GObject* obj) { +static void publishing_flickr_publishing_options_pane_finalize (GObject * obj) { PublishingFlickrPublishingOptionsPane * self; #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane); @@ -7597,7 +7553,7 @@ static void publishing_flickr_publishing_options_pane_finalize (GObject* obj) { _g_object_unref0 (self->priv->publisher); #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (publishing_flickr_publishing_options_pane_parent_class)->finalize (obj); -#line 7580 "FlickrPublishing.c" +#line 7536 "FlickrPublishing.c" } @@ -7617,12 +7573,12 @@ GType publishing_flickr_publishing_options_pane_get_type (void) { PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_type, PublishingFlickrSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata) { PublishingFlickrUploader* self = NULL; - PublishingFlickrSession* _tmp0_ = NULL; - SpitPublishingPublishable** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - PublishingFlickrPublishingParameters* _tmp2_ = NULL; - PublishingFlickrPublishingParameters* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + PublishingFlickrSession* _tmp0_; + SpitPublishingPublishable** _tmp1_; + gint _tmp1__length1; + PublishingFlickrPublishingParameters* _tmp2_; + PublishingFlickrPublishingParameters* _tmp3_; + gboolean _tmp4_; #line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL); #line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7649,47 +7605,47 @@ PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_typ self->priv->strip_metadata = _tmp4_; #line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 7632 "FlickrPublishing.c" +#line 7588 "FlickrPublishing.c" } PublishingFlickrUploader* publishing_flickr_uploader_new (PublishingFlickrSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata) { #line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_uploader_construct (PUBLISHING_FLICKR_TYPE_UPLOADER, session, publishables, publishables_length1, parameters, strip_metadata); -#line 7639 "FlickrPublishing.c" +#line 7595 "FlickrPublishing.c" } -static void _vala_array_add31 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add31 (gchar** * array, int* length, int* size, gchar* value) { #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 7650 "FlickrPublishing.c" +#line 7606 "FlickrPublishing.c" } #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 7656 "FlickrPublishing.c" +#line 7612 "FlickrPublishing.c" } static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrUploader* self, SpitPublishingPublishable* publishable) { - SpitPublishingPublishable* _tmp0_ = NULL; - SpitPublishingPublisherMediaType _tmp1_ = 0; + SpitPublishingPublishable* _tmp0_; + SpitPublishingPublisherMediaType _tmp1_; GExiv2Metadata* publishable_metadata = NULL; - GExiv2Metadata* _tmp2_ = NULL; - GExiv2Metadata* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; - GExiv2Metadata* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; - GExiv2Metadata* _tmp24_ = NULL; - gboolean _tmp25_ = FALSE; - GExiv2Metadata* _tmp32_ = NULL; - gboolean _tmp33_ = FALSE; + GExiv2Metadata* _tmp2_; + GExiv2Metadata* _tmp14_; + gboolean _tmp15_; + GExiv2Metadata* _tmp16_; + gboolean _tmp17_; + GExiv2Metadata* _tmp24_; + gboolean _tmp25_; + GExiv2Metadata* _tmp32_; + gboolean _tmp33_; GError * _inner_error_ = NULL; #line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_UPLOADER (self)); @@ -7703,20 +7659,20 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU if (_tmp1_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) { #line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 7686 "FlickrPublishing.c" +#line 7642 "FlickrPublishing.c" } #line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = gexiv2_metadata_new (); #line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishable_metadata = _tmp2_; -#line 7692 "FlickrPublishing.c" +#line 7648 "FlickrPublishing.c" { - GExiv2Metadata* _tmp3_ = NULL; - SpitPublishingPublishable* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + GExiv2Metadata* _tmp3_; + SpitPublishingPublishable* _tmp4_; + GFile* _tmp5_; + GFile* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; #line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = publishable_metadata; #line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7737,7 +7693,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _g_object_unref0 (_tmp6_); #line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7720 "FlickrPublishing.c" +#line 7676 "FlickrPublishing.c" goto __catch18_g_error; } } @@ -7745,11 +7701,11 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU __catch18_g_error: { GError* err = NULL; - SpitPublishingPublishable* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; + SpitPublishingPublishable* _tmp9_; + GFile* _tmp10_; + GFile* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" err = _inner_error_; #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7773,7 +7729,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _g_object_unref0 (_tmp11_); #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 7755 "FlickrPublishing.c" +#line 7711 "FlickrPublishing.c" } __finally18: #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7786,7 +7742,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU g_clear_error (&_inner_error_); #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 7768 "FlickrPublishing.c" +#line 7724 "FlickrPublishing.c" } #line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = publishable_metadata; @@ -7798,7 +7754,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _g_object_unref0 (publishable_metadata); #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 7780 "FlickrPublishing.c" +#line 7736 "FlickrPublishing.c" } #line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = publishable_metadata; @@ -7806,13 +7762,13 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _tmp17_ = gexiv2_metadata_has_tag (_tmp16_, "Iptc.Application2.Caption"); #line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp17_) { -#line 7788 "FlickrPublishing.c" - GExiv2Metadata* _tmp18_ = NULL; - GExiv2Metadata* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; +#line 7744 "FlickrPublishing.c" + GExiv2Metadata* _tmp18_; + GExiv2Metadata* _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; #line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp18_ = publishable_metadata; #line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7831,7 +7787,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _g_free0 (_tmp23_); #line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp21_); -#line 7813 "FlickrPublishing.c" +#line 7769 "FlickrPublishing.c" } #line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_ = publishable_metadata; @@ -7839,13 +7795,13 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _tmp25_ = gexiv2_metadata_has_tag (_tmp24_, "Iptc.Application2.Headline"); #line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp25_) { -#line 7821 "FlickrPublishing.c" - GExiv2Metadata* _tmp26_ = NULL; - GExiv2Metadata* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; +#line 7777 "FlickrPublishing.c" + GExiv2Metadata* _tmp26_; + GExiv2Metadata* _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; #line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp26_ = publishable_metadata; #line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7864,7 +7820,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _g_free0 (_tmp31_); #line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp29_); -#line 7846 "FlickrPublishing.c" +#line 7802 "FlickrPublishing.c" } #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp32_ = publishable_metadata; @@ -7872,46 +7828,46 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _tmp33_ = gexiv2_metadata_has_tag (_tmp32_, "Iptc.Application2.Keywords"); #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp33_) { -#line 7854 "FlickrPublishing.c" +#line 7810 "FlickrPublishing.c" GeeSet* keyword_set = NULL; - GeeHashSet* _tmp34_ = NULL; + GeeHashSet* _tmp34_; gchar** iptc_keywords = NULL; - GExiv2Metadata* _tmp35_ = NULL; - gchar** _tmp36_ = NULL; - gchar** _tmp37_ = NULL; - gint iptc_keywords_length1 = 0; - gint _iptc_keywords_size_ = 0; - gchar** _tmp38_ = NULL; - gint _tmp38__length1 = 0; + GExiv2Metadata* _tmp35_; + gchar** _tmp36_; + gchar** _tmp37_; + gint iptc_keywords_length1; + gint _iptc_keywords_size_; + gchar** _tmp38_; + gint _tmp38__length1; gchar** xmp_keywords = NULL; - GExiv2Metadata* _tmp43_ = NULL; - gchar** _tmp44_ = NULL; - gchar** _tmp45_ = NULL; - gint xmp_keywords_length1 = 0; - gint _xmp_keywords_size_ = 0; - gchar** _tmp46_ = NULL; - gint _tmp46__length1 = 0; + GExiv2Metadata* _tmp43_; + gchar** _tmp44_; + gchar** _tmp45_; + gint xmp_keywords_length1; + gint _xmp_keywords_size_; + gchar** _tmp46_; + gint _tmp46__length1; gchar** all_keywords = NULL; - GeeSet* _tmp51_ = NULL; - gint _tmp52_ = 0; - gpointer* _tmp53_ = NULL; - gint all_keywords_length1 = 0; - gint _all_keywords_size_ = 0; - gchar** _tmp54_ = NULL; - gint _tmp54__length1 = 0; + GeeSet* _tmp51_; + gint _tmp52_; + gpointer* _tmp53_; + gint all_keywords_length1; + gint _all_keywords_size_; + gchar** _tmp54_; + gint _tmp54__length1; gchar** no_keywords = NULL; - gchar** _tmp55_ = NULL; - gint no_keywords_length1 = 0; - gint _no_keywords_size_ = 0; - gchar** _tmp56_ = NULL; - gint _tmp56__length1 = 0; - gchar* _tmp57_ = NULL; - GExiv2Metadata* _tmp58_ = NULL; - gchar** _tmp59_ = NULL; - gint _tmp59__length1 = 0; - GExiv2Metadata* _tmp60_ = NULL; - gchar** _tmp61_ = NULL; - gint _tmp61__length1 = 0; + gchar** _tmp55_; + gint no_keywords_length1; + gint _no_keywords_size_; + gchar** _tmp56_; + gint _tmp56__length1; + gchar* _tmp57_; + GExiv2Metadata* _tmp58_; + gchar** _tmp59_; + gint _tmp59__length1; + GExiv2Metadata* _tmp60_; + gchar** _tmp61_; + gint _tmp61__length1; #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp34_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7932,14 +7888,14 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _tmp38__length1 = iptc_keywords_length1; #line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp38_ != NULL) { -#line 7914 "FlickrPublishing.c" - gchar** _tmp39_ = NULL; - gint _tmp39__length1 = 0; +#line 7870 "FlickrPublishing.c" + gchar** _tmp39_; + gint _tmp39__length1; #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp39_ = iptc_keywords; #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp39__length1 = iptc_keywords_length1; -#line 7921 "FlickrPublishing.c" +#line 7877 "FlickrPublishing.c" { gchar** keyword_collection = NULL; gint keyword_collection_length1 = 0; @@ -7951,17 +7907,17 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU keyword_collection_length1 = _tmp39__length1; #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (keyword_it = 0; keyword_it < _tmp39__length1; keyword_it = keyword_it + 1) { -#line 7933 "FlickrPublishing.c" - gchar* _tmp40_ = NULL; +#line 7889 "FlickrPublishing.c" + gchar* _tmp40_; gchar* keyword = NULL; #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp40_ = g_strdup (keyword_collection[keyword_it]); #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" keyword = _tmp40_; -#line 7940 "FlickrPublishing.c" +#line 7896 "FlickrPublishing.c" { - GeeSet* _tmp41_ = NULL; - const gchar* _tmp42_ = NULL; + GeeSet* _tmp41_; + const gchar* _tmp42_; #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp41_ = keyword_set; #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7970,7 +7926,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection), _tmp42_); #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (keyword); -#line 7952 "FlickrPublishing.c" +#line 7908 "FlickrPublishing.c" } } } @@ -7991,14 +7947,14 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _tmp46__length1 = xmp_keywords_length1; #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp46_ != NULL) { -#line 7973 "FlickrPublishing.c" - gchar** _tmp47_ = NULL; - gint _tmp47__length1 = 0; +#line 7929 "FlickrPublishing.c" + gchar** _tmp47_; + gint _tmp47__length1; #line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp47_ = xmp_keywords; #line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp47__length1 = xmp_keywords_length1; -#line 7980 "FlickrPublishing.c" +#line 7936 "FlickrPublishing.c" { gchar** keyword_collection = NULL; gint keyword_collection_length1 = 0; @@ -8010,17 +7966,17 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU keyword_collection_length1 = _tmp47__length1; #line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (keyword_it = 0; keyword_it < _tmp47__length1; keyword_it = keyword_it + 1) { -#line 7992 "FlickrPublishing.c" - gchar* _tmp48_ = NULL; +#line 7948 "FlickrPublishing.c" + gchar* _tmp48_; gchar* keyword = NULL; #line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp48_ = g_strdup (keyword_collection[keyword_it]); #line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" keyword = _tmp48_; -#line 7999 "FlickrPublishing.c" +#line 7955 "FlickrPublishing.c" { - GeeSet* _tmp49_ = NULL; - const gchar* _tmp50_ = NULL; + GeeSet* _tmp49_; + const gchar* _tmp50_; #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp49_ = keyword_set; #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -8029,7 +7985,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_COLLECTION, GeeCollection), _tmp50_); #line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (keyword); -#line 8011 "FlickrPublishing.c" +#line 7967 "FlickrPublishing.c" } } } @@ -8084,14 +8040,14 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _tmp61__length1 = no_keywords_length1; #line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gexiv2_metadata_set_tag_multiple (_tmp60_, "Iptc.Application2.Keywords", _tmp61_); -#line 8066 "FlickrPublishing.c" +#line 8022 "FlickrPublishing.c" { - GExiv2Metadata* _tmp62_ = NULL; - SpitPublishingPublishable* _tmp63_ = NULL; - GFile* _tmp64_ = NULL; - GFile* _tmp65_ = NULL; - gchar* _tmp66_ = NULL; - gchar* _tmp67_ = NULL; + GExiv2Metadata* _tmp62_; + SpitPublishingPublishable* _tmp63_; + GFile* _tmp64_; + GFile* _tmp65_; + gchar* _tmp66_; + gchar* _tmp67_; #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp62_ = publishable_metadata; #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -8112,7 +8068,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _g_object_unref0 (_tmp65_); #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8094 "FlickrPublishing.c" +#line 8050 "FlickrPublishing.c" goto __catch19_g_error; } } @@ -8120,11 +8076,11 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU __catch19_g_error: { GError* err = NULL; - SpitPublishingPublishable* _tmp68_ = NULL; - GFile* _tmp69_ = NULL; - GFile* _tmp70_ = NULL; - gchar* _tmp71_ = NULL; - gchar* _tmp72_ = NULL; + SpitPublishingPublishable* _tmp68_; + GFile* _tmp69_; + GFile* _tmp70_; + gchar* _tmp71_; + gchar* _tmp72_; #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" err = _inner_error_; #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -8148,7 +8104,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _g_object_unref0 (_tmp70_); #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 8129 "FlickrPublishing.c" +#line 8085 "FlickrPublishing.c" } __finally19: #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -8171,7 +8127,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU g_clear_error (&_inner_error_); #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 8152 "FlickrPublishing.c" +#line 8108 "FlickrPublishing.c" } #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" no_keywords = (_vala_array_free (no_keywords, no_keywords_length1, (GDestroyNotify) g_free), NULL); @@ -8183,26 +8139,26 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU iptc_keywords = (_vala_array_free (iptc_keywords, iptc_keywords_length1, (GDestroyNotify) g_free), NULL); #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (keyword_set); -#line 8164 "FlickrPublishing.c" +#line 8120 "FlickrPublishing.c" } #line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (publishable_metadata); -#line 8168 "FlickrPublishing.c" +#line 8124 "FlickrPublishing.c" } static PublishingRESTSupportTransaction* publishing_flickr_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) { PublishingFlickrUploader * self; PublishingRESTSupportTransaction* result = NULL; - SpitPublishingPublishable* _tmp0_ = NULL; - SpitPublishingPublishable* _tmp1_ = NULL; - PublishingRESTSupportSession* _tmp2_ = NULL; - PublishingFlickrSession* _tmp3_ = NULL; - PublishingFlickrPublishingParameters* _tmp4_ = NULL; - SpitPublishingPublishable* _tmp5_ = NULL; - SpitPublishingPublishable* _tmp6_ = NULL; - PublishingFlickrUploadTransaction* _tmp7_ = NULL; - PublishingRESTSupportTransaction* _tmp8_ = NULL; + SpitPublishingPublishable* _tmp0_; + SpitPublishingPublishable* _tmp1_; + PublishingRESTSupportSession* _tmp2_; + PublishingFlickrSession* _tmp3_; + PublishingFlickrPublishingParameters* _tmp4_; + SpitPublishingPublishable* _tmp5_; + SpitPublishingPublishable* _tmp6_; + PublishingFlickrUploadTransaction* _tmp7_; + PublishingRESTSupportTransaction* _tmp8_; #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploader); #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -8237,7 +8193,7 @@ static PublishingRESTSupportTransaction* publishing_flickr_uploader_real_create_ result = _tmp8_; #line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 8218 "FlickrPublishing.c" +#line 8174 "FlickrPublishing.c" } @@ -8249,19 +8205,19 @@ static void publishing_flickr_uploader_class_init (PublishingFlickrUploaderClass #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingFlickrUploaderPrivate)); #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_flickr_uploader_real_create_transaction; -#line 8231 "FlickrPublishing.c" + ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_flickr_uploader_real_create_transaction; +#line 8187 "FlickrPublishing.c" } static void publishing_flickr_uploader_instance_init (PublishingFlickrUploader * self) { #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv = PUBLISHING_FLICKR_UPLOADER_GET_PRIVATE (self); -#line 8238 "FlickrPublishing.c" +#line 8194 "FlickrPublishing.c" } -static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader* obj) { +static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader * obj) { PublishingFlickrUploader * self; #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploader); @@ -8269,7 +8225,7 @@ static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploa _publishing_flickr_publishing_parameters_unref0 (self->priv->parameters); #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_flickr_uploader_parent_class)->finalize (obj); -#line 8250 "FlickrPublishing.c" +#line 8206 "FlickrPublishing.c" } diff --git a/plugins/shotwell-publishing/PicasaPublishing.c b/plugins/shotwell-publishing/PicasaPublishing.c index e066a1f..286f53b 100644 --- a/plugins/shotwell-publishing/PicasaPublishing.c +++ b/plugins/shotwell-publishing/PicasaPublishing.c @@ -1,4 +1,4 @@ -/* PicasaPublishing.c generated by valac 0.34.7, the Vala compiler +/* PicasaPublishing.c generated by valac 0.36.6, the Vala compiler * generated from PicasaPublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -136,6 +136,12 @@ typedef struct _PublishingPicasaPublishingOptionsPaneSizeDescriptionClass Publis typedef struct _PublishingPicasaPublishingOptionsPaneSizeDescriptionPrivate PublishingPicasaPublishingOptionsPaneSizeDescriptionPrivate; #define _publishing_picasa_publishing_options_pane_size_description_unref0(var) ((var == NULL) ? NULL : (var = (publishing_picasa_publishing_options_pane_size_description_unref (var), NULL))) typedef struct _PublishingPicasaPublishingOptionsPaneParamSpecSizeDescription PublishingPicasaPublishingOptionsPaneParamSpecSizeDescription; +enum { + PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL, + PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL, + PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL +}; +static guint publishing_picasa_publishing_options_pane_signals[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0}; typedef struct _PublishingPicasaPublishingParametersPrivate PublishingPicasaPublishingParametersPrivate; #define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL))) typedef struct _PublishingPicasaParamSpecPublishingParameters PublishingPicasaParamSpecPublishingParameters; @@ -307,15 +313,15 @@ static gint picasa_service_icon_pixbuf_set_length1; static GdkPixbuf** picasa_service_icon_pixbuf_set = NULL; static gint picasa_service_icon_pixbuf_set_length1 = 0; static gint _picasa_service_icon_pixbuf_set_size_ = 0; -static SpitPluggableIface* picasa_service_spit_pluggable_parent_iface = NULL; -static SpitPublishingServiceIface* picasa_service_spit_publishing_service_parent_iface = NULL; +static SpitPluggableIface * picasa_service_spit_pluggable_parent_iface = NULL; +static SpitPublishingServiceIface * picasa_service_spit_publishing_service_parent_iface = NULL; static gpointer publishing_picasa_picasa_publisher_parent_class = NULL; static gpointer publishing_picasa_album_parent_class = NULL; static gpointer publishing_picasa_album_directory_transaction_parent_class = NULL; static gpointer publishing_picasa_upload_transaction_parent_class = NULL; static gpointer publishing_picasa_publishing_options_pane_parent_class = NULL; static gpointer publishing_picasa_publishing_options_pane_size_description_parent_class = NULL; -static SpitPublishingDialogPaneIface* publishing_picasa_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL; +static SpitPublishingDialogPaneIface * publishing_picasa_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL; static gpointer publishing_picasa_publishing_parameters_parent_class = NULL; static gpointer publishing_picasa_uploader_parent_class = NULL; @@ -337,7 +343,7 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G GType publishing_picasa_picasa_publisher_get_type (void) G_GNUC_CONST; static SpitPublishingPublisherMediaType picasa_service_real_get_supported_media (SpitPublishingService* base); static void picasa_service_real_activation (SpitPluggable* base, gboolean enabled); -static void picasa_service_finalize (GObject* obj); +static void picasa_service_finalize (GObject * obj); #define PUBLISHING_PICASA_DEFAULT_ALBUM_NAME _ ("Shotwell Connect") gpointer publishing_picasa_publishing_parameters_ref (gpointer instance); void publishing_picasa_publishing_parameters_unref (gpointer instance); @@ -366,8 +372,8 @@ GType publishing_picasa_album_get_type (void) G_GNUC_CONST; static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums_helper (PublishingPicasaPicasaPublisher* self, xmlNode* document_root, int* result_length1, GError** error); PublishingPicasaAlbum* publishing_picasa_album_new (const gchar* name, const gchar* url); PublishingPicasaAlbum* publishing_picasa_album_construct (GType object_type, const gchar* name, const gchar* url); -static void _vala_array_add12 (PublishingPicasaAlbum*** array, int* length, int* size, PublishingPicasaAlbum* value); -static void _vala_array_add13 (PublishingPicasaAlbum*** array, int* length, int* size, PublishingPicasaAlbum* value); +static void _vala_array_add12 (PublishingPicasaAlbum** * array, int* length, int* size, PublishingPicasaAlbum* value); +static void _vala_array_add13 (PublishingPicasaAlbum** * array, int* length, int* size, PublishingPicasaAlbum* value); void publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self, gint selection_id); void publishing_picasa_publishing_parameters_set_strip_metadata (PublishingPicasaPublishingParameters* self, gboolean strip_metadata); void publishing_picasa_publishing_parameters_set_target_album_name (PublishingPicasaPublishingParameters* self, const gchar* target_album_name); @@ -414,11 +420,11 @@ static gboolean publishing_picasa_picasa_publisher_real_is_running (PublishingRE static void publishing_picasa_picasa_publisher_real_start (PublishingRESTSupportGooglePublisher* base); static void publishing_picasa_picasa_publisher_real_stop (PublishingRESTSupportGooglePublisher* base); static SpitPublishingAuthenticator* publishing_picasa_picasa_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base); -static void publishing_picasa_picasa_publisher_finalize (GObject* obj); +static void publishing_picasa_picasa_publisher_finalize (GObject * obj); enum { PUBLISHING_PICASA_ALBUM_DUMMY_PROPERTY }; -static void publishing_picasa_album_finalize (PublishingPicasaAlbum* obj); +static void publishing_picasa_album_finalize (PublishingPicasaAlbum * obj); enum { PUBLISHING_PICASA_ALBUM_DIRECTORY_TRANSACTION_DUMMY_PROPERTY }; @@ -439,7 +445,7 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_feed_url (Publis static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error); static void _vala_SoupBuffer_free (SoupBuffer* self); static void _vala_SoupMultipart_free (SoupMultipart* self); -static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupportTransaction* obj); +static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupportTransaction * obj); static gpointer publishing_picasa_publishing_options_pane_size_description_ref (gpointer instance); static void publishing_picasa_publishing_options_pane_size_description_unref (gpointer instance); static GParamSpec* publishing_picasa_publishing_options_pane_param_spec_size_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; @@ -465,12 +471,12 @@ PublishingPicasaAlbum** publishing_picasa_publishing_parameters_get_albums (Publ void publishing_picasa_publishing_parameters_set_target_album_entry_url (PublishingPicasaPublishingParameters* self, const gchar* target_album_url); static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_new (const gchar* name, gint major_axis_pixels); static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_construct (GType object_type, const gchar* name, gint major_axis_pixels); -static void _vala_array_add14 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value); -static void _vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value); -static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value); -static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value); +static void _vala_array_add14 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value); +static void _vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value); +static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value); +static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value); #define PUBLISHING_PICASA_PUBLISHING_PARAMETERS_ORIGINAL_SIZE -1 -static void _vala_array_add18 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value); +static void _vala_array_add18 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value); void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublishingOptionsPane* self); static GtkWidget* publishing_picasa_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base); static SpitPublishingDialogPaneGeometryOptions publishing_picasa_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base); @@ -479,8 +485,8 @@ static void publishing_picasa_publishing_options_pane_real_on_pane_uninstalled ( enum { PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_SIZE_DESCRIPTION_DUMMY_PROPERTY }; -static void publishing_picasa_publishing_options_pane_size_description_finalize (PublishingPicasaPublishingOptionsPaneSizeDescription* obj); -static void publishing_picasa_publishing_options_pane_finalize (GObject* obj); +static void publishing_picasa_publishing_options_pane_size_description_finalize (PublishingPicasaPublishingOptionsPaneSizeDescription * obj); +static void publishing_picasa_publishing_options_pane_finalize (GObject * obj); #define PUBLISHING_PICASA_PUBLISHING_PARAMETERS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS, PublishingPicasaPublishingParametersPrivate)) enum { PUBLISHING_PICASA_PUBLISHING_PARAMETERS_DUMMY_PROPERTY @@ -488,13 +494,13 @@ enum { gchar* publishing_picasa_publishing_parameters_get_target_album_entry_url (PublishingPicasaPublishingParameters* self); static PublishingPicasaAlbum** _vala_array_dup5 (PublishingPicasaAlbum** self, int length); static PublishingPicasaAlbum** _vala_array_dup6 (PublishingPicasaAlbum** self, int length); -static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPublishingParameters* obj); +static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPublishingParameters * obj); #define PUBLISHING_PICASA_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PICASA_TYPE_UPLOADER, PublishingPicasaUploaderPrivate)) enum { PUBLISHING_PICASA_UPLOADER_DUMMY_PROPERTY }; static PublishingRESTSupportTransaction* publishing_picasa_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable); -static void publishing_picasa_uploader_finalize (PublishingRESTSupportBatchUploader* obj); +static void publishing_picasa_uploader_finalize (PublishingRESTSupportBatchUploader * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); @@ -502,8 +508,8 @@ static gint _vala_array_length (gpointer array); PicasaService* picasa_service_construct (GType object_type, GFile* resource_directory) { PicasaService * self = NULL; - GdkPixbuf** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + GdkPixbuf** _tmp0_; + gint _tmp0__length1; #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_val_if_fail (G_IS_FILE (resource_directory), NULL); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -514,9 +520,9 @@ PicasaService* picasa_service_construct (GType object_type, GFile* resource_dire _tmp0__length1 = picasa_service_icon_pixbuf_set_length1; #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp0_ == NULL) { -#line 513 "PicasaPublishing.c" - gint _tmp1_ = 0; - GdkPixbuf** _tmp2_ = NULL; +#line 519 "PicasaPublishing.c" + gint _tmp1_; + GdkPixbuf** _tmp2_; #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" PICASA_SERVICE_ICON_FILENAME, &_tmp1_); #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -527,27 +533,27 @@ PicasaService* picasa_service_construct (GType object_type, GFile* resource_dire picasa_service_icon_pixbuf_set_length1 = _tmp1_; #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _picasa_service_icon_pixbuf_set_size_ = picasa_service_icon_pixbuf_set_length1; -#line 526 "PicasaPublishing.c" +#line 532 "PicasaPublishing.c" } #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self; -#line 530 "PicasaPublishing.c" +#line 536 "PicasaPublishing.c" } PicasaService* picasa_service_new (GFile* resource_directory) { #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return picasa_service_construct (TYPE_PICASA_SERVICE, resource_directory); -#line 537 "PicasaPublishing.c" +#line 543 "PicasaPublishing.c" } static gint picasa_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) { PicasaService * self; gint result = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PICASA_SERVICE, PicasaService); #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -560,7 +566,7 @@ static gint picasa_service_real_get_pluggable_interface (SpitPluggable* base, gi result = _tmp2_; #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 559 "PicasaPublishing.c" +#line 565 "PicasaPublishing.c" } @@ -573,7 +579,7 @@ static const gchar* picasa_service_real_get_id (SpitPluggable* base) { result = "org.yorba.shotwell.publishing.picasa"; #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 572 "PicasaPublishing.c" +#line 578 "PicasaPublishing.c" } @@ -586,14 +592,14 @@ static const gchar* picasa_service_real_get_pluggable_name (SpitPluggable* base) result = "Picasa Web Albums"; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 585 "PicasaPublishing.c" +#line 591 "PicasaPublishing.c" } static gpointer _g_object_ref0 (gpointer self) { #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self ? g_object_ref (self) : NULL; -#line 592 "PicasaPublishing.c" +#line 598 "PicasaPublishing.c" } @@ -604,34 +610,33 @@ static GdkPixbuf** _vala_array_dup4 (GdkPixbuf** self, int length) { result = g_new0 (GdkPixbuf*, length + 1); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" for (i = 0; i < length; i++) { -#line 603 "PicasaPublishing.c" - GdkPixbuf* _tmp0_ = NULL; +#line 609 "PicasaPublishing.c" + GdkPixbuf* _tmp0_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" result[i] = _tmp0_; -#line 609 "PicasaPublishing.c" +#line 615 "PicasaPublishing.c" } #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 613 "PicasaPublishing.c" +#line 619 "PicasaPublishing.c" } static void picasa_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) { PicasaService * self; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GdkPixbuf** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - GdkPixbuf** _tmp9_ = NULL; - gint _tmp9__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + GdkPixbuf** _tmp7_; + gint _tmp7__length1; + GdkPixbuf** _tmp8_; + gint _tmp8__length1; #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PICASA_SERVICE, PicasaService); #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -643,68 +648,66 @@ static void picasa_service_real_get_info (SpitPluggable* base, SpitPluggableInfo #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*info).authors = _tmp0_; #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp1_ = _ ("Copyright 2016 Software Freedom Conservancy Inc."); -#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp1_ = g_strdup (_ ("Copyright 2016 Software Freedom Conservancy Inc.")); #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 ((*info).copyright); #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - (*info).copyright = _tmp2_; + (*info).copyright = _tmp1_; #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp3_ = g_strdup (RESOURCES_TRANSLATORS); + _tmp2_ = g_strdup (RESOURCES_TRANSLATORS); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 ((*info).translators); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - (*info).translators = _tmp3_; + (*info).translators = _tmp2_; #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp4_ = g_strdup (_VERSION); + _tmp3_ = g_strdup (_VERSION); #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 ((*info).version); #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - (*info).version = _tmp4_; + (*info).version = _tmp3_; #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp5_ = g_strdup (RESOURCES_WEBSITE_NAME); + _tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 ((*info).website_name); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - (*info).website_name = _tmp5_; + (*info).website_name = _tmp4_; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp6_ = g_strdup (RESOURCES_WEBSITE_URL); + _tmp5_ = g_strdup (RESOURCES_WEBSITE_URL); #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 ((*info).website_url); #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - (*info).website_url = _tmp6_; + (*info).website_url = _tmp5_; #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*info).is_license_wordwrapped = FALSE; #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp7_ = g_strdup (RESOURCES_LICENSE); + _tmp6_ = g_strdup (RESOURCES_LICENSE); #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 ((*info).license); #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - (*info).license = _tmp7_; + (*info).license = _tmp6_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp8_ = picasa_service_icon_pixbuf_set; + _tmp7_ = picasa_service_icon_pixbuf_set; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp8__length1 = picasa_service_icon_pixbuf_set_length1; + _tmp7__length1 = picasa_service_icon_pixbuf_set_length1; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup4 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_); + _tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup4 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp9__length1 = _tmp8__length1; + _tmp8__length1 = _tmp7__length1; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - (*info).icons = _tmp9_; + (*info).icons = _tmp8_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - (*info).icons_length1 = _tmp9__length1; -#line 695 "PicasaPublishing.c" + (*info).icons_length1 = _tmp8__length1; +#line 698 "PicasaPublishing.c" } static SpitPublishingPublisher* picasa_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) { PicasaService * self; SpitPublishingPublisher* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - PublishingPicasaPicasaPublisher* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + PublishingPicasaPicasaPublisher* _tmp1_; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PICASA_SERVICE, PicasaService); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -717,7 +720,7 @@ static SpitPublishingPublisher* picasa_service_real_create_publisher (SpitPublis result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher); #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 716 "PicasaPublishing.c" +#line 719 "PicasaPublishing.c" } @@ -730,7 +733,7 @@ static SpitPublishingPublisherMediaType picasa_service_real_get_supported_media result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO; #line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 729 "PicasaPublishing.c" +#line 732 "PicasaPublishing.c" } @@ -738,7 +741,7 @@ static void picasa_service_real_activation (SpitPluggable* base, gboolean enable PicasaService * self; #line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PICASA_SERVICE, PicasaService); -#line 737 "PicasaPublishing.c" +#line 740 "PicasaPublishing.c" } @@ -747,7 +750,7 @@ static void picasa_service_class_init (PicasaServiceClass * klass) { picasa_service_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" G_OBJECT_CLASS (klass)->finalize = picasa_service_finalize; -#line 746 "PicasaPublishing.c" +#line 749 "PicasaPublishing.c" } @@ -755,16 +758,16 @@ static void picasa_service_spit_pluggable_interface_init (SpitPluggableIface * i #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" picasa_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) picasa_service_real_get_pluggable_interface; + iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) picasa_service_real_get_pluggable_interface; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - iface->get_id = (const gchar* (*)(SpitPluggable*)) picasa_service_real_get_id; + iface->get_id = (const gchar* (*) (SpitPluggable *)) picasa_service_real_get_id; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) picasa_service_real_get_pluggable_name; + iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) picasa_service_real_get_pluggable_name; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) picasa_service_real_get_info; + iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) picasa_service_real_get_info; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - iface->activation = (void (*)(SpitPluggable*, gboolean)) picasa_service_real_activation; -#line 763 "PicasaPublishing.c" + iface->activation = (void (*) (SpitPluggable *, gboolean)) picasa_service_real_activation; +#line 766 "PicasaPublishing.c" } @@ -772,10 +775,10 @@ static void picasa_service_spit_publishing_service_interface_init (SpitPublishin #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" picasa_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) picasa_service_real_create_publisher; + iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) picasa_service_real_create_publisher; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) picasa_service_real_get_supported_media; -#line 774 "PicasaPublishing.c" + iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) picasa_service_real_get_supported_media; +#line 777 "PicasaPublishing.c" } @@ -783,13 +786,13 @@ static void picasa_service_instance_init (PicasaService * self) { } -static void picasa_service_finalize (GObject* obj) { +static void picasa_service_finalize (GObject * obj) { PicasaService * self; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PICASA_SERVICE, PicasaService); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" G_OBJECT_CLASS (picasa_service_parent_class)->finalize (obj); -#line 788 "PicasaPublishing.c" +#line 791 "PicasaPublishing.c" } @@ -811,16 +814,16 @@ GType picasa_service_get_type (void) { PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) { PublishingPicasaPicasaPublisher * self = NULL; - SpitPublishingService* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; - PublishingPicasaPublishingParameters* _tmp2_ = NULL; - PublishingPicasaPublishingParameters* _tmp3_ = NULL; + SpitPublishingService* _tmp0_; + SpitPublishingPluginHost* _tmp1_; + PublishingPicasaPublishingParameters* _tmp2_; + PublishingPicasaPublishingParameters* _tmp3_; SpitPublishingPublisherMediaType media_type = 0; - SpitPublishingPluginHost* _tmp4_ = NULL; - gint _tmp5_ = 0; - SpitPublishingPublishable** _tmp6_ = NULL; - PublishingPicasaPublishingParameters* _tmp11_ = NULL; - SpitPublishingPublisherMediaType _tmp12_ = 0; + SpitPublishingPluginHost* _tmp4_; + gint _tmp5_; + SpitPublishingPublishable** _tmp6_; + PublishingPicasaPublishingParameters* _tmp11_; + SpitPublishingPublisherMediaType _tmp12_; #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL); #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -847,7 +850,7 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G _tmp4_ = host; #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp6_ = spit_publishing_plugin_host_get_publishables (_tmp4_, &_tmp5_); -#line 846 "PicasaPublishing.c" +#line 849 "PicasaPublishing.c" { SpitPublishingPublishable** p_collection = NULL; gint p_collection_length1 = 0; @@ -859,18 +862,18 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G p_collection_length1 = _tmp5_; #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" for (p_it = 0; p_it < _tmp5_; p_it = p_it + 1) { -#line 858 "PicasaPublishing.c" - SpitPublishingPublishable* _tmp7_ = NULL; +#line 861 "PicasaPublishing.c" + SpitPublishingPublishable* _tmp7_; SpitPublishingPublishable* p = NULL; #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp7_ = _g_object_ref0 (p_collection[p_it]); #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" p = _tmp7_; -#line 865 "PicasaPublishing.c" +#line 868 "PicasaPublishing.c" { - SpitPublishingPublisherMediaType _tmp8_ = 0; - SpitPublishingPublishable* _tmp9_ = NULL; - SpitPublishingPublisherMediaType _tmp10_ = 0; + SpitPublishingPublisherMediaType _tmp8_; + SpitPublishingPublishable* _tmp9_; + SpitPublishingPublisherMediaType _tmp10_; #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp8_ = media_type; #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -881,12 +884,12 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G media_type = _tmp8_ | _tmp10_; #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_object_unref0 (p); -#line 880 "PicasaPublishing.c" +#line 883 "PicasaPublishing.c" } } #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" p_collection = (_vala_array_free (p_collection, p_collection_length1, (GDestroyNotify) g_object_unref), NULL); -#line 885 "PicasaPublishing.c" +#line 888 "PicasaPublishing.c" } #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp11_ = self->priv->publishing_parameters; @@ -910,66 +913,65 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G self->priv->progress_reporter_target_destroy_notify = NULL; #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self; -#line 909 "PicasaPublishing.c" +#line 912 "PicasaPublishing.c" } PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) { #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return publishing_picasa_picasa_publisher_construct (PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, service, host); -#line 916 "PicasaPublishing.c" +#line 919 "PicasaPublishing.c" } -static void _vala_array_add12 (PublishingPicasaAlbum*** array, int* length, int* size, PublishingPicasaAlbum* value) { +static void _vala_array_add12 (PublishingPicasaAlbum** * array, int* length, int* size, PublishingPicasaAlbum* value) { #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if ((*length) == (*size)) { #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *array = g_renew (PublishingPicasaAlbum*, *array, (*size) + 1); -#line 927 "PicasaPublishing.c" +#line 930 "PicasaPublishing.c" } #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[(*length)++] = value; #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[*length] = NULL; -#line 933 "PicasaPublishing.c" +#line 936 "PicasaPublishing.c" } -static void _vala_array_add13 (PublishingPicasaAlbum*** array, int* length, int* size, PublishingPicasaAlbum* value) { +static void _vala_array_add13 (PublishingPicasaAlbum** * array, int* length, int* size, PublishingPicasaAlbum* value) { #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if ((*length) == (*size)) { #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *array = g_renew (PublishingPicasaAlbum*, *array, (*size) + 1); -#line 944 "PicasaPublishing.c" +#line 947 "PicasaPublishing.c" } #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[(*length)++] = value; #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[*length] = NULL; -#line 950 "PicasaPublishing.c" +#line 953 "PicasaPublishing.c" } static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums_helper (PublishingPicasaPicasaPublisher* self, xmlNode* document_root, int* result_length1, GError** error) { PublishingPicasaAlbum** result = NULL; PublishingPicasaAlbum** _result_ = NULL; - PublishingPicasaAlbum** _tmp0_ = NULL; - gint _result__length1 = 0; - gint __result__size_ = 0; + PublishingPicasaAlbum** _tmp0_; + gint _result__length1; + gint __result__size_; xmlNode* doc_node_iter = NULL; - xmlNode* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PublishingPicasaAlbum** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - const gchar* _tmp10_ = NULL; - PublishingPicasaAlbum* _tmp11_ = NULL; - PublishingPicasaAlbum** _tmp40_ = NULL; - gint _tmp40__length1 = 0; + xmlNode* _tmp1_; + const gchar* _tmp2_; + PublishingPicasaAlbum** _tmp9_; + gint _tmp9__length1; + PublishingPicasaAlbum* _tmp10_; + PublishingPicasaAlbum** _tmp39_; + gint _tmp39__length1; GError * _inner_error_ = NULL; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_val_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self), NULL); @@ -989,34 +991,34 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums _tmp2_ = _tmp1_->name; #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (g_strcmp0 (_tmp2_, "feed") == 0) { -#line 988 "PicasaPublishing.c" - xmlNode* _tmp3_ = NULL; - xmlNode* _tmp4_ = NULL; +#line 990 "PicasaPublishing.c" + xmlNode* _tmp3_; + xmlNode* _tmp4_; #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp3_ = document_root; #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp4_ = _tmp3_->children; #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" doc_node_iter = _tmp4_; -#line 997 "PicasaPublishing.c" +#line 999 "PicasaPublishing.c" } else { - xmlNode* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; + xmlNode* _tmp5_; + const gchar* _tmp6_; #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp5_ = document_root; #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp6_ = _tmp5_->name; #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (g_strcmp0 (_tmp6_, "entry") == 0) { -#line 1007 "PicasaPublishing.c" - xmlNode* _tmp7_ = NULL; +#line 1009 "PicasaPublishing.c" + xmlNode* _tmp7_; #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp7_ = document_root; #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" doc_node_iter = _tmp7_; -#line 1013 "PicasaPublishing.c" +#line 1015 "PicasaPublishing.c" } else { - GError* _tmp8_ = NULL; + GError* _tmp8_; #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "response root node " "isn't a <feed> or <entry>"); #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1029,7 +1031,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums _result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL); #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return NULL; -#line 1028 "PicasaPublishing.c" +#line 1030 "PicasaPublishing.c" } else { #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL); @@ -1039,7 +1041,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums g_clear_error (&_inner_error_); #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return NULL; -#line 1038 "PicasaPublishing.c" +#line 1040 "PicasaPublishing.c" } } } @@ -1048,62 +1050,60 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp9__length1 = _result__length1; #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp10_ = _ ("Default album"); -#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp11_ = publishing_picasa_album_new (_tmp10_, PUBLISHING_PICASA_PICASA_PUBLISHER_DEFAULT_ALBUM_FEED_URL); + _tmp10_ = publishing_picasa_album_new (_ ("Default album"), PUBLISHING_PICASA_PICASA_PUBLISHER_DEFAULT_ALBUM_FEED_URL); #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _vala_array_add12 (&_result_, &_result__length1, &__result__size_, _tmp11_); + _vala_array_add12 (&_result_, &_result__length1, &__result__size_, _tmp10_); #line 1052 "PicasaPublishing.c" { - gboolean _tmp12_ = FALSE; + gboolean _tmp11_ = FALSE; #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp12_ = TRUE; + _tmp11_ = TRUE; #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" while (TRUE) { #line 1059 "PicasaPublishing.c" - xmlNode* _tmp15_ = NULL; - xmlNode* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; + xmlNode* _tmp14_; + xmlNode* _tmp15_; + const gchar* _tmp16_; gchar* name_val = NULL; gchar* url_val = NULL; xmlNode* album_node_iter = NULL; - xmlNode* _tmp18_ = NULL; - xmlNode* _tmp19_ = NULL; - const gchar* _tmp35_ = NULL; - PublishingPicasaAlbum** _tmp36_ = NULL; - gint _tmp36__length1 = 0; - const gchar* _tmp37_ = NULL; - const gchar* _tmp38_ = NULL; - PublishingPicasaAlbum* _tmp39_ = NULL; + xmlNode* _tmp17_; + xmlNode* _tmp18_; + const gchar* _tmp34_; + PublishingPicasaAlbum** _tmp35_; + gint _tmp35__length1; + const gchar* _tmp36_; + const gchar* _tmp37_; + PublishingPicasaAlbum* _tmp38_; #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - if (!_tmp12_) { + if (!_tmp11_) { #line 1076 "PicasaPublishing.c" - xmlNode* _tmp13_ = NULL; - xmlNode* _tmp14_ = NULL; + xmlNode* _tmp12_; + xmlNode* _tmp13_; #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp13_ = doc_node_iter; + _tmp12_ = doc_node_iter; #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp14_ = _tmp13_->next; + _tmp13_ = _tmp12_->next; #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - doc_node_iter = _tmp14_; + doc_node_iter = _tmp13_; #line 1085 "PicasaPublishing.c" } #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp12_ = FALSE; + _tmp11_ = FALSE; #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp15_ = doc_node_iter; + _tmp14_ = doc_node_iter; #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - if (!(_tmp15_ != NULL)) { + if (!(_tmp14_ != NULL)) { #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" break; #line 1095 "PicasaPublishing.c" } #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp16_ = doc_node_iter; + _tmp15_ = doc_node_iter; #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp17_ = _tmp16_->name; + _tmp16_ = _tmp15_->name; #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - if (g_strcmp0 (_tmp17_, "entry") != 0) { + if (g_strcmp0 (_tmp16_, "entry") != 0) { #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" continue; #line 1105 "PicasaPublishing.c" @@ -1113,107 +1113,107 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums #line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" url_val = NULL; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp18_ = doc_node_iter; + _tmp17_ = doc_node_iter; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp19_ = _tmp18_->children; + _tmp18_ = _tmp17_->children; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - album_node_iter = _tmp19_; + album_node_iter = _tmp18_; #line 1117 "PicasaPublishing.c" { - gboolean _tmp20_ = FALSE; + gboolean _tmp19_ = FALSE; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp20_ = TRUE; + _tmp19_ = TRUE; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" while (TRUE) { #line 1124 "PicasaPublishing.c" - xmlNode* _tmp23_ = NULL; - xmlNode* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; + xmlNode* _tmp22_; + xmlNode* _tmp23_; + const gchar* _tmp24_; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - if (!_tmp20_) { + if (!_tmp19_) { #line 1130 "PicasaPublishing.c" - xmlNode* _tmp21_ = NULL; - xmlNode* _tmp22_ = NULL; + xmlNode* _tmp20_; + xmlNode* _tmp21_; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp21_ = album_node_iter; + _tmp20_ = album_node_iter; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp22_ = _tmp21_->next; + _tmp21_ = _tmp20_->next; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - album_node_iter = _tmp22_; + album_node_iter = _tmp21_; #line 1139 "PicasaPublishing.c" } #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp20_ = FALSE; + _tmp19_ = FALSE; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp23_ = album_node_iter; + _tmp22_ = album_node_iter; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - if (!(_tmp23_ != NULL)) { + if (!(_tmp22_ != NULL)) { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" break; #line 1149 "PicasaPublishing.c" } #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp24_ = album_node_iter; + _tmp23_ = album_node_iter; #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp25_ = _tmp24_->name; + _tmp24_ = _tmp23_->name; #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - if (g_strcmp0 (_tmp25_, "title") == 0) { + if (g_strcmp0 (_tmp24_, "title") == 0) { #line 1157 "PicasaPublishing.c" - xmlNode* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; + xmlNode* _tmp25_; + gchar* _tmp26_; #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp26_ = album_node_iter; + _tmp25_ = album_node_iter; #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp27_ = (gchar*) xmlNodeGetContent (_tmp26_); + _tmp26_ = (gchar*) xmlNodeGetContent (_tmp25_); #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 (name_val); #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - name_val = _tmp27_; + name_val = _tmp26_; #line 1168 "PicasaPublishing.c" } else { - xmlNode* _tmp28_ = NULL; - const gchar* _tmp29_ = NULL; + xmlNode* _tmp27_; + const gchar* _tmp28_; #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp28_ = album_node_iter; + _tmp27_ = album_node_iter; #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp29_ = _tmp28_->name; + _tmp28_ = _tmp27_->name; #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - if (g_strcmp0 (_tmp29_, "id") == 0) { + if (g_strcmp0 (_tmp28_, "id") == 0) { #line 1178 "PicasaPublishing.c" - xmlNode* _tmp30_ = NULL; - xmlNs* _tmp31_ = NULL; - const gchar* _tmp32_ = NULL; - xmlNode* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; + xmlNode* _tmp29_; + xmlNs* _tmp30_; + const gchar* _tmp31_; + xmlNode* _tmp32_; + gchar* _tmp33_; #line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp30_ = album_node_iter; + _tmp29_ = album_node_iter; #line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp31_ = _tmp30_->ns; + _tmp30_ = _tmp29_->ns; #line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp32_ = _tmp31_->prefix; + _tmp31_ = _tmp30_->prefix; #line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - if (_tmp32_ != NULL) { + if (_tmp31_ != NULL) { #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" continue; #line 1194 "PicasaPublishing.c" } #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp33_ = album_node_iter; + _tmp32_ = album_node_iter; #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp34_ = (gchar*) xmlNodeGetContent (_tmp33_); + _tmp33_ = (gchar*) xmlNodeGetContent (_tmp32_); #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 (url_val); #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - url_val = _tmp34_; + url_val = _tmp33_; #line 1204 "PicasaPublishing.c" } } } } #line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp35_ = url_val; + _tmp34_ = url_val; #line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - if (g_strcmp0 (_tmp35_, PUBLISHING_PICASA_PICASA_PUBLISHER_DEFAULT_ALBUM_FEED_URL) == 0) { + if (g_strcmp0 (_tmp34_, PUBLISHING_PICASA_PICASA_PUBLISHER_DEFAULT_ALBUM_FEED_URL) == 0) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 (url_val); #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1223,17 +1223,17 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums #line 1219 "PicasaPublishing.c" } #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp36_ = _result_; + _tmp35_ = _result_; #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp36__length1 = _result__length1; + _tmp35__length1 = _result__length1; #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp37_ = name_val; + _tmp36_ = name_val; #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp38_ = url_val; + _tmp37_ = url_val; #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp39_ = publishing_picasa_album_new (_tmp37_, _tmp38_); + _tmp38_ = publishing_picasa_album_new (_tmp36_, _tmp37_); #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp39_); + _vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp38_); #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 (url_val); #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1242,17 +1242,17 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums } } #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp40_ = _result_; + _tmp39_ = _result_; #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp40__length1 = _result__length1; + _tmp39__length1 = _result__length1; #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (result_length1) { #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - *result_length1 = _tmp40__length1; + *result_length1 = _tmp39__length1; #line 1248 "PicasaPublishing.c" } #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - result = _tmp40_; + result = _tmp39_; #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; #line 1254 "PicasaPublishing.c" @@ -1260,16 +1260,16 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums static void publishing_picasa_picasa_publisher_load_parameters_from_configuration_system (PublishingPicasaPicasaPublisher* self, PublishingPicasaPublishingParameters* parameters) { - PublishingPicasaPublishingParameters* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; - gint _tmp2_ = 0; - PublishingPicasaPublishingParameters* _tmp3_ = NULL; - SpitPublishingPluginHost* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - PublishingPicasaPublishingParameters* _tmp6_ = NULL; - SpitPublishingPluginHost* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; + PublishingPicasaPublishingParameters* _tmp0_; + SpitPublishingPluginHost* _tmp1_; + gint _tmp2_; + PublishingPicasaPublishingParameters* _tmp3_; + SpitPublishingPluginHost* _tmp4_; + gboolean _tmp5_; + PublishingPicasaPublishingParameters* _tmp6_; + SpitPublishingPluginHost* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self)); #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1307,16 +1307,16 @@ static void publishing_picasa_picasa_publisher_load_parameters_from_configuratio static void publishing_picasa_picasa_publisher_save_parameters_to_configuration_system (PublishingPicasaPicasaPublisher* self, PublishingPicasaPublishingParameters* parameters) { - SpitPublishingPluginHost* _tmp0_ = NULL; - PublishingPicasaPublishingParameters* _tmp1_ = NULL; - gint _tmp2_ = 0; - SpitPublishingPluginHost* _tmp3_ = NULL; - PublishingPicasaPublishingParameters* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - SpitPublishingPluginHost* _tmp6_ = NULL; - PublishingPicasaPublishingParameters* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; + SpitPublishingPluginHost* _tmp0_; + PublishingPicasaPublishingParameters* _tmp1_; + gint _tmp2_; + SpitPublishingPluginHost* _tmp3_; + PublishingPicasaPublishingParameters* _tmp4_; + gboolean _tmp5_; + SpitPublishingPluginHost* _tmp6_; + PublishingPicasaPublishingParameters* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self)); #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1355,11 +1355,11 @@ static void publishing_picasa_picasa_publisher_save_parameters_to_configuration_ static void publishing_picasa_picasa_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* base) { PublishingPicasaPicasaPublisher * self; - PublishingPicasaPublishingParameters* _tmp0_ = NULL; - PublishingRESTSupportGoogleSession* _tmp1_ = NULL; - PublishingRESTSupportGoogleSession* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + PublishingPicasaPublishingParameters* _tmp0_; + PublishingRESTSupportGoogleSession* _tmp1_; + PublishingRESTSupportGoogleSession* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher); #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1401,12 +1401,12 @@ static void _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_pub static void publishing_picasa_picasa_publisher_on_initial_album_fetch_complete (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingRESTSupportTransaction* _tmp5_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingRESTSupportTransaction* _tmp5_; #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self)); #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1443,17 +1443,17 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_complete ( static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingRESTSupportTransaction* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingRESTSupportTransaction* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; gboolean _tmp8_ = FALSE; - PublishingRESTSupportTransaction* _tmp9_ = NULL; - guint _tmp10_ = 0U; + PublishingRESTSupportTransaction* _tmp9_; + guint _tmp10_; #line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self)); #line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1499,8 +1499,8 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (Pub _tmp8_ = TRUE; #line 1494 "PicasaPublishing.c" } else { - PublishingRESTSupportTransaction* _tmp11_ = NULL; - guint _tmp12_ = 0U; + PublishingRESTSupportTransaction* _tmp11_; + guint _tmp12_; #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp11_ = bad_txn; #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1515,8 +1515,8 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (Pub publishing_rest_support_google_publisher_do_logout (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); #line 1510 "PicasaPublishing.c" } else { - SpitPublishingPluginHost* _tmp13_ = NULL; - GError* _tmp14_ = NULL; + SpitPublishingPluginHost* _tmp13_; + GError* _tmp14_; #line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp13_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); #line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1529,7 +1529,7 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (Pub static void publishing_picasa_picasa_publisher_on_publishing_options_logout (PublishingPicasaPicasaPublisher* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self)); #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1550,8 +1550,8 @@ static void publishing_picasa_picasa_publisher_on_publishing_options_logout (Pub static void publishing_picasa_picasa_publisher_on_publishing_options_publish (PublishingPicasaPicasaPublisher* self) { - gboolean _tmp0_ = FALSE; - PublishingPicasaPublishingParameters* _tmp1_ = NULL; + gboolean _tmp0_; + PublishingPicasaPublishingParameters* _tmp1_; #line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self)); #line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1576,14 +1576,14 @@ static void publishing_picasa_picasa_publisher_on_publishing_options_publish (Pu static void publishing_picasa_picasa_publisher_on_upload_status_updated (PublishingPicasaPicasaPublisher* self, gint file_number, gdouble completed_fraction) { - gboolean _tmp0_ = FALSE; - gdouble _tmp1_ = 0.0; - SpitPublishingProgressCallback _tmp2_ = NULL; - void* _tmp2__target = NULL; - SpitPublishingProgressCallback _tmp3_ = NULL; - void* _tmp3__target = NULL; - gint _tmp4_ = 0; - gdouble _tmp5_ = 0.0; + gboolean _tmp0_; + gdouble _tmp1_; + SpitPublishingProgressCallback _tmp2_; + void* _tmp2__target; + SpitPublishingProgressCallback _tmp3_; + void* _tmp3__target; + gint _tmp4_; + gdouble _tmp5_; #line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self)); #line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1634,12 +1634,12 @@ static void _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_ static void publishing_picasa_picasa_publisher_on_upload_complete (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) { - gboolean _tmp0_ = FALSE; - gint _tmp1_ = 0; - PublishingRESTSupportBatchUploader* _tmp2_ = NULL; - guint _tmp3_ = 0U; - PublishingRESTSupportBatchUploader* _tmp4_ = NULL; - guint _tmp5_ = 0U; + gboolean _tmp0_; + gint _tmp1_; + PublishingRESTSupportBatchUploader* _tmp2_; + guint _tmp3_; + PublishingRESTSupportBatchUploader* _tmp4_; + guint _tmp5_; #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self)); #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1676,15 +1676,15 @@ static void publishing_picasa_picasa_publisher_on_upload_complete (PublishingPic static void publishing_picasa_picasa_publisher_on_upload_error (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) { - gboolean _tmp0_ = FALSE; - GError* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PublishingRESTSupportBatchUploader* _tmp3_ = NULL; - guint _tmp4_ = 0U; - PublishingRESTSupportBatchUploader* _tmp5_ = NULL; - guint _tmp6_ = 0U; - SpitPublishingPluginHost* _tmp7_ = NULL; - GError* _tmp8_ = NULL; + gboolean _tmp0_; + GError* _tmp1_; + const gchar* _tmp2_; + PublishingRESTSupportBatchUploader* _tmp3_; + guint _tmp4_; + PublishingRESTSupportBatchUploader* _tmp5_; + guint _tmp6_; + SpitPublishingPluginHost* _tmp7_; + GError* _tmp8_; #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self)); #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1727,13 +1727,13 @@ static void publishing_picasa_picasa_publisher_on_upload_error (PublishingPicasa static void publishing_picasa_picasa_publisher_do_fetch_account_information (PublishingPicasaPicasaPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; PublishingPicasaAlbumDirectoryTransaction* directory_trans = NULL; - PublishingRESTSupportGoogleSession* _tmp2_ = NULL; - PublishingRESTSupportGoogleSession* _tmp3_ = NULL; - PublishingPicasaAlbumDirectoryTransaction* _tmp4_ = NULL; - PublishingPicasaAlbumDirectoryTransaction* _tmp5_ = NULL; + PublishingRESTSupportGoogleSession* _tmp2_; + PublishingRESTSupportGoogleSession* _tmp3_; + PublishingPicasaAlbumDirectoryTransaction* _tmp4_; + PublishingPicasaAlbumDirectoryTransaction* _tmp5_; GError * _inner_error_ = NULL; #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self)); @@ -1790,7 +1790,7 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub __catch6_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp6_ = NULL; + GError* _tmp6_; #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" err = _inner_error_; #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1844,12 +1844,12 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info #line 1831 "PicasaPublishing.c" { PublishingRESTSupportXmlDocument* _tmp0_ = NULL; - PublishingPicasaAlbumDirectoryTransaction* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - PublishingRESTSupportXmlDocument* _tmp4_ = NULL; - PublishingRESTSupportXmlDocument* _tmp5_ = NULL; - PublishingRESTSupportXmlDocument* _tmp6_ = NULL; + PublishingPicasaAlbumDirectoryTransaction* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + PublishingRESTSupportXmlDocument* _tmp4_; + PublishingRESTSupportXmlDocument* _tmp5_; + PublishingRESTSupportXmlDocument* _tmp6_; #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp1_ = transaction; #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1897,8 +1897,8 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info __catch7_spit_publishing_publishing_error: { GError* err = NULL; - SpitPublishingPluginHost* _tmp7_ = NULL; - GError* _tmp8_ = NULL; + SpitPublishingPluginHost* _tmp7_; + GError* _tmp8_; #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" err = _inner_error_; #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1932,13 +1932,13 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info } { PublishingPicasaAlbum** _tmp9_ = NULL; - PublishingRESTSupportXmlDocument* _tmp10_ = NULL; - xmlNode* _tmp11_ = NULL; - gint _tmp12_ = 0; - PublishingPicasaAlbum** _tmp13_ = NULL; - gint _tmp9__length1 = 0; - gint __tmp9__size_ = 0; - PublishingPicasaPublishingParameters* _tmp14_ = NULL; + PublishingRESTSupportXmlDocument* _tmp10_; + xmlNode* _tmp11_; + gint _tmp12_; + PublishingPicasaAlbum** _tmp13_; + gint _tmp9__length1; + gint __tmp9__size_; + PublishingPicasaPublishingParameters* _tmp14_; #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp10_ = response_doc; #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1980,8 +1980,8 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info __catch8_spit_publishing_publishing_error: { GError* err = NULL; - SpitPublishingPluginHost* _tmp15_ = NULL; - GError* _tmp16_ = NULL; + SpitPublishingPluginHost* _tmp15_; + GError* _tmp16_; #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" err = _inner_error_; #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2037,18 +2037,18 @@ static void _publishing_picasa_picasa_publisher_on_publishing_options_logout_pub static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (PublishingPicasaPicasaPublisher* self) { GtkBuilder* builder = NULL; - GtkBuilder* _tmp0_ = NULL; + GtkBuilder* _tmp0_; PublishingPicasaPublishingOptionsPane* opts_pane = NULL; - GtkBuilder* _tmp8_ = NULL; - PublishingPicasaPublishingParameters* _tmp9_ = NULL; - SpitPublishingAuthenticator* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; - PublishingPicasaPublishingOptionsPane* _tmp12_ = NULL; - PublishingPicasaPublishingOptionsPane* _tmp13_ = NULL; - PublishingPicasaPublishingOptionsPane* _tmp14_ = NULL; - SpitPublishingPluginHost* _tmp15_ = NULL; - PublishingPicasaPublishingOptionsPane* _tmp16_ = NULL; - SpitPublishingPluginHost* _tmp17_ = NULL; + GtkBuilder* _tmp7_; + PublishingPicasaPublishingParameters* _tmp8_; + SpitPublishingAuthenticator* _tmp9_; + gboolean _tmp10_; + PublishingPicasaPublishingOptionsPane* _tmp11_; + PublishingPicasaPublishingOptionsPane* _tmp12_; + PublishingPicasaPublishingOptionsPane* _tmp13_; + SpitPublishingPluginHost* _tmp14_; + PublishingPicasaPublishingOptionsPane* _tmp15_; + SpitPublishingPluginHost* _tmp16_; GError * _inner_error_ = NULL; #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self)); @@ -2060,7 +2060,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane ( builder = _tmp0_; #line 2048 "PicasaPublishing.c" { - GtkBuilder* _tmp1_ = NULL; + GtkBuilder* _tmp1_; #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp1_ = builder; #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2075,12 +2075,11 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane ( __catch9_g_error: { GError* e = NULL; - GError* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - SpitPublishingPluginHost* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - GError* _tmp6_ = NULL; - GError* _tmp7_ = NULL; + GError* _tmp2_; + const gchar* _tmp3_; + SpitPublishingPluginHost* _tmp4_; + GError* _tmp5_; + GError* _tmp6_; #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" e = _inner_error_; #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2094,23 +2093,21 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane ( #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp4_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp5_ = _ ("A file required for publishing is unavailable. Publishing to Picasa ca" \ -"n’t continue."); + _tmp5_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _ ("A file required for publishing is unavailable. Publishing to Picasa ca" \ +"n’t continue.")); #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp5_); + _tmp6_ = _tmp5_; #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp7_ = _tmp6_; -#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - spit_publishing_plugin_host_post_error (_tmp4_, _tmp7_); + spit_publishing_plugin_host_post_error (_tmp4_, _tmp6_); #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _g_error_free0 (_tmp7_); + _g_error_free0 (_tmp6_); #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_error_free0 (e); #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_object_unref0 (builder); #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 2099 "PicasaPublishing.c" +#line 2096 "PicasaPublishing.c" } __finally9: #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2123,81 +2120,81 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane ( g_clear_error (&_inner_error_); #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 2112 "PicasaPublishing.c" +#line 2109 "PicasaPublishing.c" } #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp8_ = builder; + _tmp7_ = builder; #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp9_ = self->priv->publishing_parameters; + _tmp8_ = self->priv->publishing_parameters; #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp10_ = self->priv->authenticator; + _tmp9_ = self->priv->authenticator; #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp11_ = spit_publishing_authenticator_can_logout (_tmp10_); + _tmp10_ = spit_publishing_authenticator_can_logout (_tmp9_); #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp12_ = publishing_picasa_publishing_options_pane_new (_tmp8_, _tmp9_, _tmp11_); + _tmp11_ = publishing_picasa_publishing_options_pane_new (_tmp7_, _tmp8_, _tmp10_); #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - opts_pane = _tmp12_; + opts_pane = _tmp11_; #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp13_ = opts_pane; + _tmp12_ = opts_pane; #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - g_signal_connect_object (_tmp13_, "publish", (GCallback) _publishing_picasa_picasa_publisher_on_publishing_options_publish_publishing_picasa_publishing_options_pane_publish, self, 0); + g_signal_connect_object (_tmp12_, "publish", (GCallback) _publishing_picasa_picasa_publisher_on_publishing_options_publish_publishing_picasa_publishing_options_pane_publish, self, 0); #line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp14_ = opts_pane; + _tmp13_ = opts_pane; #line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - g_signal_connect_object (_tmp14_, "logout", (GCallback) _publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout, self, 0); + g_signal_connect_object (_tmp13_, "logout", (GCallback) _publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout, self, 0); #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp15_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); + _tmp14_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp16_ = opts_pane; + _tmp15_ = opts_pane; #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - spit_publishing_plugin_host_install_dialog_pane (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); + spit_publishing_plugin_host_install_dialog_pane (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); #line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp17_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); + _tmp16_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); #line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - spit_publishing_plugin_host_set_service_locked (_tmp17_, FALSE); + spit_publishing_plugin_host_set_service_locked (_tmp16_, FALSE); #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_object_unref0 (opts_pane); #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_object_unref0 (builder); -#line 2148 "PicasaPublishing.c" +#line 2145 "PicasaPublishing.c" } static void _publishing_picasa_picasa_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) { #line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_picasa_publisher_on_upload_status_updated ((PublishingPicasaPicasaPublisher*) self, file_number, fraction_complete); -#line 2155 "PicasaPublishing.c" +#line 2152 "PicasaPublishing.c" } static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasaPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; - PublishingPicasaPublishingParameters* _tmp2_ = NULL; - gint _tmp3_ = 0; - PublishingPicasaPublishingParameters* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - void* _tmp6_ = NULL; - GDestroyNotify _tmp7_ = NULL; - SpitPublishingProgressCallback _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; + PublishingPicasaPublishingParameters* _tmp2_; + gint _tmp3_; + PublishingPicasaPublishingParameters* _tmp4_; + gboolean _tmp5_; + void* _tmp6_; + GDestroyNotify _tmp7_; + SpitPublishingProgressCallback _tmp8_; + gboolean _tmp9_; SpitPublishingPublishable** publishables = NULL; - SpitPublishingPluginHost* _tmp10_ = NULL; - gint _tmp11_ = 0; - SpitPublishingPublishable** _tmp12_ = NULL; - gint publishables_length1 = 0; - gint _publishables_size_ = 0; + SpitPublishingPluginHost* _tmp10_; + gint _tmp11_; + SpitPublishingPublishable** _tmp12_; + gint publishables_length1; + gint _publishables_size_; PublishingPicasaUploader* uploader = NULL; - PublishingRESTSupportGoogleSession* _tmp13_ = NULL; - PublishingRESTSupportGoogleSession* _tmp14_ = NULL; - SpitPublishingPublishable** _tmp15_ = NULL; - gint _tmp15__length1 = 0; - PublishingPicasaPublishingParameters* _tmp16_ = NULL; - PublishingPicasaUploader* _tmp17_ = NULL; - PublishingPicasaUploader* _tmp18_ = NULL; - PublishingPicasaUploader* _tmp19_ = NULL; - PublishingPicasaUploader* _tmp20_ = NULL; - PublishingPicasaUploader* _tmp21_ = NULL; + PublishingRESTSupportGoogleSession* _tmp13_; + PublishingRESTSupportGoogleSession* _tmp14_; + SpitPublishingPublishable** _tmp15_; + gint _tmp15__length1; + PublishingPicasaPublishingParameters* _tmp16_; + PublishingPicasaUploader* _tmp17_; + PublishingPicasaUploader* _tmp18_; + PublishingPicasaUploader* _tmp19_; + PublishingPicasaUploader* _tmp20_; + PublishingPicasaUploader* _tmp21_; #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self)); #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2239,7 +2236,7 @@ static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasa if (!_tmp9_) { #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 2227 "PicasaPublishing.c" +#line 2224 "PicasaPublishing.c" } #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp10_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); @@ -2285,13 +2282,13 @@ static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasa _publishing_rest_support_batch_uploader_unref0 (uploader); #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL); -#line 2273 "PicasaPublishing.c" +#line 2270 "PicasaPublishing.c" } static void publishing_picasa_picasa_publisher_do_show_success_pane (PublishingPicasaPicasaPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; #line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self)); #line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2304,16 +2301,16 @@ static void publishing_picasa_picasa_publisher_do_show_success_pane (PublishingP _tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" spit_publishing_plugin_host_install_success_pane (_tmp1_); -#line 2292 "PicasaPublishing.c" +#line 2289 "PicasaPublishing.c" } static void publishing_picasa_picasa_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* base) { PublishingPicasaPicasaPublisher * self; - PublishingRESTSupportGoogleSession* _tmp0_ = NULL; - PublishingRESTSupportGoogleSession* _tmp1_ = NULL; - SpitPublishingAuthenticator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + PublishingRESTSupportGoogleSession* _tmp0_; + PublishingRESTSupportGoogleSession* _tmp1_; + SpitPublishingAuthenticator* _tmp2_; + gboolean _tmp3_; #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher); #line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2332,9 +2329,9 @@ static void publishing_picasa_picasa_publisher_real_do_logout (PublishingRESTSup _tmp3_ = spit_publishing_authenticator_can_logout (_tmp2_); #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp3_) { -#line 2320 "PicasaPublishing.c" - SpitPublishingAuthenticator* _tmp4_ = NULL; - SpitPublishingAuthenticator* _tmp5_ = NULL; +#line 2317 "PicasaPublishing.c" + SpitPublishingAuthenticator* _tmp4_; + SpitPublishingAuthenticator* _tmp5_; #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp4_ = self->priv->authenticator; #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2343,7 +2340,7 @@ static void publishing_picasa_picasa_publisher_real_do_logout (PublishingRESTSup _tmp5_ = self->priv->authenticator; #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" spit_publishing_authenticator_authenticate (_tmp5_); -#line 2331 "PicasaPublishing.c" +#line 2328 "PicasaPublishing.c" } } @@ -2351,7 +2348,7 @@ static void publishing_picasa_picasa_publisher_real_do_logout (PublishingRESTSup static gboolean publishing_picasa_picasa_publisher_real_is_running (PublishingRESTSupportGooglePublisher* base) { PublishingPicasaPicasaPublisher * self; gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher); #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2360,14 +2357,14 @@ static gboolean publishing_picasa_picasa_publisher_real_is_running (PublishingRE result = _tmp0_; #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 2348 "PicasaPublishing.c" +#line 2345 "PicasaPublishing.c" } static void publishing_picasa_picasa_publisher_real_start (PublishingRESTSupportGooglePublisher* base) { PublishingPicasaPicasaPublisher * self; - gboolean _tmp0_ = FALSE; - SpitPublishingAuthenticator* _tmp1_ = NULL; + gboolean _tmp0_; + SpitPublishingAuthenticator* _tmp1_; #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher); #line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2378,7 +2375,7 @@ static void publishing_picasa_picasa_publisher_real_start (PublishingRESTSupport if (_tmp0_) { #line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 2366 "PicasaPublishing.c" +#line 2363 "PicasaPublishing.c" } #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->running = TRUE; @@ -2386,14 +2383,14 @@ static void publishing_picasa_picasa_publisher_real_start (PublishingRESTSupport _tmp1_ = self->priv->authenticator; #line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" spit_publishing_authenticator_authenticate (_tmp1_); -#line 2374 "PicasaPublishing.c" +#line 2371 "PicasaPublishing.c" } static void publishing_picasa_picasa_publisher_real_stop (PublishingRESTSupportGooglePublisher* base) { PublishingPicasaPicasaPublisher * self; - PublishingRESTSupportGoogleSession* _tmp0_ = NULL; - PublishingRESTSupportGoogleSession* _tmp1_ = NULL; + PublishingRESTSupportGoogleSession* _tmp0_; + PublishingRESTSupportGoogleSession* _tmp1_; #line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher); #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2408,27 +2405,27 @@ static void publishing_picasa_picasa_publisher_real_stop (PublishingRESTSupportG _publishing_rest_support_session_unref0 (_tmp1_); #line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->running = FALSE; -#line 2396 "PicasaPublishing.c" +#line 2393 "PicasaPublishing.c" } static SpitPublishingAuthenticator* publishing_picasa_picasa_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base) { PublishingPicasaPicasaPublisher * self; SpitPublishingAuthenticator* result = NULL; - SpitPublishingAuthenticator* _tmp0_ = NULL; - SpitPublishingAuthenticator* _tmp5_ = NULL; - SpitPublishingAuthenticator* _tmp6_ = NULL; + SpitPublishingAuthenticator* _tmp0_; + SpitPublishingAuthenticator* _tmp5_; + SpitPublishingAuthenticator* _tmp6_; #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher); #line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp0_ = self->priv->authenticator; #line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp0_ == NULL) { -#line 2412 "PicasaPublishing.c" - PublishingAuthenticatorFactory* _tmp1_ = NULL; - PublishingAuthenticatorFactory* _tmp2_ = NULL; - SpitPublishingPluginHost* _tmp3_ = NULL; - SpitPublishingAuthenticator* _tmp4_ = NULL; +#line 2409 "PicasaPublishing.c" + PublishingAuthenticatorFactory* _tmp1_; + PublishingAuthenticatorFactory* _tmp2_; + SpitPublishingPluginHost* _tmp3_; + SpitPublishingAuthenticator* _tmp4_; #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp1_ = publishing_authenticator_factory_get_instance (); #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2443,7 +2440,7 @@ static SpitPublishingAuthenticator* publishing_picasa_picasa_publisher_real_get_ self->priv->authenticator = _tmp4_; #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_object_unref0 (_tmp2_); -#line 2431 "PicasaPublishing.c" +#line 2428 "PicasaPublishing.c" } #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp5_ = self->priv->authenticator; @@ -2453,7 +2450,7 @@ static SpitPublishingAuthenticator* publishing_picasa_picasa_publisher_real_get_ result = _tmp6_; #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 2441 "PicasaPublishing.c" +#line 2438 "PicasaPublishing.c" } @@ -2463,31 +2460,31 @@ static void publishing_picasa_picasa_publisher_class_init (PublishingPicasaPicas #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingPicasaPicasaPublisherPrivate)); #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_picasa_picasa_publisher_real_on_login_flow_complete; + ((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_picasa_picasa_publisher_real_on_login_flow_complete; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_picasa_picasa_publisher_real_do_logout; + ((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_picasa_picasa_publisher_real_do_logout; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = (gboolean (*)(PublishingRESTSupportGooglePublisher*)) publishing_picasa_picasa_publisher_real_is_running; + ((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = (gboolean (*) (PublishingRESTSupportGooglePublisher *)) publishing_picasa_picasa_publisher_real_is_running; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->start = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_picasa_picasa_publisher_real_start; + ((PublishingRESTSupportGooglePublisherClass *) klass)->start = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_picasa_picasa_publisher_real_start; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->stop = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_picasa_picasa_publisher_real_stop; + ((PublishingRESTSupportGooglePublisherClass *) klass)->stop = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_picasa_picasa_publisher_real_stop; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = (SpitPublishingAuthenticator* (*)(PublishingRESTSupportGooglePublisher*)) publishing_picasa_picasa_publisher_real_get_authenticator; + ((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = (SpitPublishingAuthenticator* (*) (PublishingRESTSupportGooglePublisher *)) publishing_picasa_picasa_publisher_real_get_authenticator; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_picasa_picasa_publisher_finalize; -#line 2464 "PicasaPublishing.c" +#line 2461 "PicasaPublishing.c" } static void publishing_picasa_picasa_publisher_instance_init (PublishingPicasaPicasaPublisher * self) { #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv = PUBLISHING_PICASA_PICASA_PUBLISHER_GET_PRIVATE (self); -#line 2471 "PicasaPublishing.c" +#line 2468 "PicasaPublishing.c" } -static void publishing_picasa_picasa_publisher_finalize (GObject* obj) { +static void publishing_picasa_picasa_publisher_finalize (GObject * obj) { PublishingPicasaPicasaPublisher * self; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher); @@ -2505,7 +2502,7 @@ static void publishing_picasa_picasa_publisher_finalize (GObject* obj) { _g_object_unref0 (self->priv->authenticator); #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" G_OBJECT_CLASS (publishing_picasa_picasa_publisher_parent_class)->finalize (obj); -#line 2493 "PicasaPublishing.c" +#line 2490 "PicasaPublishing.c" } @@ -2523,10 +2520,10 @@ GType publishing_picasa_picasa_publisher_get_type (void) { PublishingPicasaAlbum* publishing_picasa_album_construct (GType object_type, const gchar* name, const gchar* url) { PublishingPicasaAlbum* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_val_if_fail (name != NULL, NULL); #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2551,21 +2548,21 @@ PublishingPicasaAlbum* publishing_picasa_album_construct (GType object_type, con self->url = _tmp3_; #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self; -#line 2539 "PicasaPublishing.c" +#line 2536 "PicasaPublishing.c" } PublishingPicasaAlbum* publishing_picasa_album_new (const gchar* name, const gchar* url) { #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return publishing_picasa_album_construct (PUBLISHING_PICASA_TYPE_ALBUM, name, url); -#line 2546 "PicasaPublishing.c" +#line 2543 "PicasaPublishing.c" } static void publishing_picasa_value_album_init (GValue* value) { #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 2553 "PicasaPublishing.c" +#line 2550 "PicasaPublishing.c" } @@ -2574,7 +2571,7 @@ static void publishing_picasa_value_album_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_album_unref (value->data[0].v_pointer); -#line 2562 "PicasaPublishing.c" +#line 2559 "PicasaPublishing.c" } } @@ -2584,11 +2581,11 @@ static void publishing_picasa_value_album_copy_value (const GValue* src_value, G if (src_value->data[0].v_pointer) { #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" dest_value->data[0].v_pointer = publishing_picasa_album_ref (src_value->data[0].v_pointer); -#line 2572 "PicasaPublishing.c" +#line 2569 "PicasaPublishing.c" } else { #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 2576 "PicasaPublishing.c" +#line 2573 "PicasaPublishing.c" } } @@ -2596,66 +2593,66 @@ static void publishing_picasa_value_album_copy_value (const GValue* src_value, G static gpointer publishing_picasa_value_album_peek_pointer (const GValue* value) { #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return value->data[0].v_pointer; -#line 2584 "PicasaPublishing.c" +#line 2581 "PicasaPublishing.c" } static gchar* publishing_picasa_value_album_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (collect_values[0].v_pointer) { -#line 2591 "PicasaPublishing.c" - PublishingPicasaAlbum* object; +#line 2588 "PicasaPublishing.c" + PublishingPicasaAlbum * object; object = collect_values[0].v_pointer; #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2598 "PicasaPublishing.c" +#line 2595 "PicasaPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2602 "PicasaPublishing.c" +#line 2599 "PicasaPublishing.c" } #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = publishing_picasa_album_ref (object); -#line 2606 "PicasaPublishing.c" +#line 2603 "PicasaPublishing.c" } else { #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 2610 "PicasaPublishing.c" +#line 2607 "PicasaPublishing.c" } #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return NULL; -#line 2614 "PicasaPublishing.c" +#line 2611 "PicasaPublishing.c" } static gchar* publishing_picasa_value_album_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingPicasaAlbum** object_p; + PublishingPicasaAlbum ** object_p; object_p = collect_values[0].v_pointer; #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (!object_p) { #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2625 "PicasaPublishing.c" +#line 2622 "PicasaPublishing.c" } #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (!value->data[0].v_pointer) { #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *object_p = NULL; -#line 2631 "PicasaPublishing.c" +#line 2628 "PicasaPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *object_p = value->data[0].v_pointer; -#line 2635 "PicasaPublishing.c" +#line 2632 "PicasaPublishing.c" } else { #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *object_p = publishing_picasa_album_ref (value->data[0].v_pointer); -#line 2639 "PicasaPublishing.c" +#line 2636 "PicasaPublishing.c" } #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return NULL; -#line 2643 "PicasaPublishing.c" +#line 2640 "PicasaPublishing.c" } @@ -2669,7 +2666,7 @@ GParamSpec* publishing_picasa_param_spec_album (const gchar* name, const gchar* G_PARAM_SPEC (spec)->value_type = object_type; #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return G_PARAM_SPEC (spec); -#line 2657 "PicasaPublishing.c" +#line 2654 "PicasaPublishing.c" } @@ -2678,12 +2675,12 @@ gpointer publishing_picasa_value_get_album (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_ALBUM), NULL); #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return value->data[0].v_pointer; -#line 2666 "PicasaPublishing.c" +#line 2663 "PicasaPublishing.c" } void publishing_picasa_value_set_album (GValue* value, gpointer v_object) { - PublishingPicasaAlbum* old; + PublishingPicasaAlbum * old; #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_ALBUM)); #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2698,23 +2695,23 @@ void publishing_picasa_value_set_album (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_album_ref (value->data[0].v_pointer); -#line 2686 "PicasaPublishing.c" +#line 2683 "PicasaPublishing.c" } else { #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 2690 "PicasaPublishing.c" +#line 2687 "PicasaPublishing.c" } #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (old) { #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_album_unref (old); -#line 2696 "PicasaPublishing.c" +#line 2693 "PicasaPublishing.c" } } void publishing_picasa_value_take_album (GValue* value, gpointer v_object) { - PublishingPicasaAlbum* old; + PublishingPicasaAlbum * old; #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_ALBUM)); #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2727,17 +2724,17 @@ void publishing_picasa_value_take_album (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = v_object; -#line 2715 "PicasaPublishing.c" +#line 2712 "PicasaPublishing.c" } else { #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 2719 "PicasaPublishing.c" +#line 2716 "PicasaPublishing.c" } #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (old) { #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_album_unref (old); -#line 2725 "PicasaPublishing.c" +#line 2722 "PicasaPublishing.c" } } @@ -2747,18 +2744,18 @@ static void publishing_picasa_album_class_init (PublishingPicasaAlbumClass * kla publishing_picasa_album_parent_class = g_type_class_peek_parent (klass); #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" ((PublishingPicasaAlbumClass *) klass)->finalize = publishing_picasa_album_finalize; -#line 2735 "PicasaPublishing.c" +#line 2732 "PicasaPublishing.c" } static void publishing_picasa_album_instance_init (PublishingPicasaAlbum * self) { #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->ref_count = 1; -#line 2742 "PicasaPublishing.c" +#line 2739 "PicasaPublishing.c" } -static void publishing_picasa_album_finalize (PublishingPicasaAlbum* obj) { +static void publishing_picasa_album_finalize (PublishingPicasaAlbum * obj) { PublishingPicasaAlbum * self; #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_ALBUM, PublishingPicasaAlbum); @@ -2768,7 +2765,7 @@ static void publishing_picasa_album_finalize (PublishingPicasaAlbum* obj) { _g_free0 (self->name); #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 (self->url); -#line 2756 "PicasaPublishing.c" +#line 2753 "PicasaPublishing.c" } @@ -2787,18 +2784,18 @@ GType publishing_picasa_album_get_type (void) { gpointer publishing_picasa_album_ref (gpointer instance) { - PublishingPicasaAlbum* self; + PublishingPicasaAlbum * self; self = instance; #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_atomic_int_inc (&self->ref_count); #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return instance; -#line 2781 "PicasaPublishing.c" +#line 2778 "PicasaPublishing.c" } void publishing_picasa_album_unref (gpointer instance) { - PublishingPicasaAlbum* self; + PublishingPicasaAlbum * self; self = instance; #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -2806,14 +2803,14 @@ void publishing_picasa_album_unref (gpointer instance) { PUBLISHING_PICASA_ALBUM_GET_CLASS (self)->finalize (self); #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2794 "PicasaPublishing.c" +#line 2791 "PicasaPublishing.c" } } PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session) { PublishingPicasaAlbumDirectoryTransaction* self = NULL; - PublishingRESTSupportGoogleSession* _tmp0_ = NULL; + PublishingRESTSupportGoogleSession* _tmp0_; #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL); #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2822,25 +2819,25 @@ PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_tra self = (PublishingPicasaAlbumDirectoryTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_PICASA_ALBUM_DIRECTORY_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET); #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self; -#line 2810 "PicasaPublishing.c" +#line 2807 "PicasaPublishing.c" } PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_new (PublishingRESTSupportGoogleSession* session) { #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return publishing_picasa_album_directory_transaction_construct (PUBLISHING_PICASA_TYPE_ALBUM_DIRECTORY_TRANSACTION, session); -#line 2817 "PicasaPublishing.c" +#line 2814 "PicasaPublishing.c" } gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc) { gchar* result = NULL; xmlNode* document_root = NULL; - PublishingRESTSupportXmlDocument* _tmp0_ = NULL; - xmlNode* _tmp1_ = NULL; + PublishingRESTSupportXmlDocument* _tmp0_; + xmlNode* _tmp1_; gboolean _tmp2_ = FALSE; - xmlNode* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; + xmlNode* _tmp3_; + const gchar* _tmp4_; #line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL); #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2857,17 +2854,17 @@ gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRES if (g_strcmp0 (_tmp4_, "feed") == 0) { #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp2_ = TRUE; -#line 2845 "PicasaPublishing.c" +#line 2842 "PicasaPublishing.c" } else { - xmlNode* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; + xmlNode* _tmp5_; + const gchar* _tmp6_; #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp5_ = document_root; #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp6_ = _tmp5_->name; #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp2_ = g_strcmp0 (_tmp6_, "entry") == 0; -#line 2855 "PicasaPublishing.c" +#line 2852 "PicasaPublishing.c" } #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp2_) { @@ -2875,16 +2872,16 @@ gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRES result = NULL; #line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 2863 "PicasaPublishing.c" +#line 2860 "PicasaPublishing.c" } else { - gchar* _tmp7_ = NULL; + gchar* _tmp7_; #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp7_ = g_strdup ("response root node isn't a <feed> or <entry>"); #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" result = _tmp7_; #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 2872 "PicasaPublishing.c" +#line 2869 "PicasaPublishing.c" } } @@ -2892,7 +2889,7 @@ gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRES static void publishing_picasa_album_directory_transaction_class_init (PublishingPicasaAlbumDirectoryTransactionClass * klass) { #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_album_directory_transaction_parent_class = g_type_class_peek_parent (klass); -#line 2880 "PicasaPublishing.c" +#line 2877 "PicasaPublishing.c" } @@ -2915,33 +2912,33 @@ GType publishing_picasa_album_directory_transaction_get_type (void) { static gpointer _publishing_rest_support_session_ref0 (gpointer self) { #line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self ? publishing_rest_support_session_ref (self) : NULL; -#line 2903 "PicasaPublishing.c" +#line 2900 "PicasaPublishing.c" } static gpointer _publishing_picasa_publishing_parameters_ref0 (gpointer self) { #line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self ? publishing_picasa_publishing_parameters_ref (self) : NULL; -#line 2910 "PicasaPublishing.c" +#line 2907 "PicasaPublishing.c" } PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters, SpitPublishingPublishable* publishable) { PublishingPicasaUploadTransaction* self = NULL; - PublishingRESTSupportGoogleSession* _tmp0_ = NULL; - PublishingPicasaPublishingParameters* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - PublishingRESTSupportGoogleSession* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - PublishingRESTSupportGoogleSession* _tmp6_ = NULL; - PublishingRESTSupportGoogleSession* _tmp7_ = NULL; - PublishingPicasaPublishingParameters* _tmp8_ = NULL; - PublishingPicasaPublishingParameters* _tmp9_ = NULL; - SpitPublishingPublishable* _tmp10_ = NULL; - SpitPublishingPublishable* _tmp11_ = NULL; - SpitPublishingPublishable* _tmp12_ = NULL; - SpitPublishingPublisherMediaType _tmp13_ = 0; + PublishingRESTSupportGoogleSession* _tmp0_; + PublishingPicasaPublishingParameters* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + PublishingRESTSupportGoogleSession* _tmp4_; + gboolean _tmp5_; + PublishingRESTSupportGoogleSession* _tmp6_; + PublishingRESTSupportGoogleSession* _tmp7_; + PublishingPicasaPublishingParameters* _tmp8_; + PublishingPicasaPublishingParameters* _tmp9_; + SpitPublishingPublishable* _tmp10_; + SpitPublishingPublishable* _tmp11_; + SpitPublishingPublishable* _tmp12_; + SpitPublishingPublisherMediaType _tmp13_; GError * _inner_error_ = NULL; #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL); @@ -2997,17 +2994,17 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construc _tmp13_ = spit_publishing_publishable_get_media_type (_tmp12_); #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp13_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { -#line 2985 "PicasaPublishing.c" +#line 2982 "PicasaPublishing.c" { GFileInfo* info = NULL; - SpitPublishingPublishable* _tmp14_ = NULL; - GFile* _tmp15_ = NULL; - GFile* _tmp16_ = NULL; - GFileInfo* _tmp17_ = NULL; - GFileInfo* _tmp18_ = NULL; - GFileInfo* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; + SpitPublishingPublishable* _tmp14_; + GFile* _tmp15_; + GFile* _tmp16_; + GFileInfo* _tmp17_; + GFileInfo* _tmp18_; + GFileInfo* _tmp19_; + const gchar* _tmp20_; + gchar* _tmp21_; #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp14_ = self->priv->publishable; #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -3024,7 +3021,7 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construc info = _tmp18_; #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3012 "PicasaPublishing.c" +#line 3009 "PicasaPublishing.c" goto __catch10_g_error; } #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -3039,13 +3036,13 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construc self->priv->mime_type = _tmp21_; #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_object_unref0 (info); -#line 3027 "PicasaPublishing.c" +#line 3024 "PicasaPublishing.c" } goto __finally10; __catch10_g_error: { GError* err = NULL; - gchar* _tmp22_ = NULL; + gchar* _tmp22_; #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" err = _inner_error_; #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -3058,7 +3055,7 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construc self->priv->mime_type = _tmp22_; #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_error_free0 (err); -#line 3046 "PicasaPublishing.c" +#line 3043 "PicasaPublishing.c" } __finally10: #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -3069,71 +3066,71 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construc g_clear_error (&_inner_error_); #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return NULL; -#line 3057 "PicasaPublishing.c" +#line 3054 "PicasaPublishing.c" } } else { - gchar* _tmp23_ = NULL; + gchar* _tmp23_; #line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp23_ = g_strdup ("image/jpeg"); #line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 (self->priv->mime_type); #line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->mime_type = _tmp23_; -#line 3067 "PicasaPublishing.c" +#line 3064 "PicasaPublishing.c" } #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self; -#line 3071 "PicasaPublishing.c" +#line 3068 "PicasaPublishing.c" } PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters, SpitPublishingPublishable* publishable) { #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return publishing_picasa_upload_transaction_construct (PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable); -#line 3078 "PicasaPublishing.c" +#line 3075 "PicasaPublishing.c" } static glong string_strnlen (gchar* str, glong maxlen) { glong result = 0L; gchar* end = NULL; - gchar* _tmp0_ = NULL; - glong _tmp1_ = 0L; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + glong _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = maxlen; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp2_; -#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = end; -#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { -#line 3101 "PicasaPublishing.c" - glong _tmp4_ = 0L; -#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3098 "PicasaPublishing.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 3109 "PicasaPublishing.c" +#line 3106 "PicasaPublishing.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 3121 "PicasaPublishing.c" +#line 3118 "PicasaPublishing.c" } } @@ -3142,532 +3139,532 @@ 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 3145 "PicasaPublishing.c" - glong _tmp2_ = 0L; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3142 "PicasaPublishing.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 3151 "PicasaPublishing.c" +#line 3148 "PicasaPublishing.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 3155 "PicasaPublishing.c" +#line 3152 "PicasaPublishing.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 3159 "PicasaPublishing.c" - glong _tmp3_ = 0L; - glong _tmp4_ = 0L; - glong _tmp5_ = 0L; -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3156 "PicasaPublishing.c" + glong _tmp3_; + glong _tmp4_; + glong _tmp5_; +#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = offset; -#line 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 3171 "PicasaPublishing.c" +#line 3168 "PicasaPublishing.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 3181 "PicasaPublishing.c" +#line 3178 "PicasaPublishing.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 3187 "PicasaPublishing.c" - glong _tmp9_ = 0L; - glong _tmp10_ = 0L; - glong _tmp11_ = 0L; -#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3184 "PicasaPublishing.c" + glong _tmp9_; + glong _tmp10_; + glong _tmp11_; +#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = string_length; -#line 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 3201 "PicasaPublishing.c" +#line 3198 "PicasaPublishing.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 3211 "PicasaPublishing.c" +#line 3208 "PicasaPublishing.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 3217 "PicasaPublishing.c" - glong _tmp15_ = 0L; - glong _tmp16_ = 0L; -#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3214 "PicasaPublishing.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 3226 "PicasaPublishing.c" +#line 3223 "PicasaPublishing.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 3246 "PicasaPublishing.c" +#line 3243 "PicasaPublishing.c" } static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; - gchar** _tmp3_ = NULL; - gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp3_; + gint _tmp3__length1; +#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" separator = ""; -#line 3263 "PicasaPublishing.c" +#line 3260 "PicasaPublishing.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = TRUE; -#line 3273 "PicasaPublishing.c" +#line 3270 "PicasaPublishing.c" } else { - gchar** _tmp4_ = NULL; - gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp4_; + gint _tmp4__length1; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; -#line 3283 "PicasaPublishing.c" +#line 3280 "PicasaPublishing.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 3289 "PicasaPublishing.c" +#line 3286 "PicasaPublishing.c" } else { gboolean _tmp5_ = FALSE; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp6_; + gint _tmp6__length1; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { -#line 3300 "PicasaPublishing.c" - gchar** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3297 "PicasaPublishing.c" + gchar** _tmp7_; + gint _tmp7__length1; + const gchar* _tmp8_; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; -#line 3312 "PicasaPublishing.c" +#line 3309 "PicasaPublishing.c" } else { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = FALSE; -#line 3316 "PicasaPublishing.c" +#line 3313 "PicasaPublishing.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; -#line 3320 "PicasaPublishing.c" +#line 3317 "PicasaPublishing.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 3324 "PicasaPublishing.c" +#line 3321 "PicasaPublishing.c" gint i = 0; gsize len = 0UL; - gint _tmp31_ = 0; - gint _tmp33_ = 0; - gint _tmp34_ = 0; - gsize _tmp35_ = 0UL; - const gchar* _tmp36_ = NULL; - gint _tmp37_ = 0; - gint _tmp38_ = 0; - gint _tmp39_ = 0; + gint _tmp31_; + gint _tmp33_; + gint _tmp34_; + gsize _tmp35_; + const gchar* _tmp36_; + gint _tmp37_; + gint _tmp38_; + gint _tmp39_; const gchar* res = NULL; - gsize _tmp40_ = 0UL; - void* _tmp41_ = NULL; + gsize _tmp40_; + void* _tmp41_; void* ptr = NULL; - const gchar* _tmp42_ = NULL; - gchar** _tmp43_ = NULL; - gint _tmp43__length1 = 0; - const gchar* _tmp44_ = NULL; - void* _tmp45_ = NULL; - const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp42_; + gchar** _tmp43_; + gint _tmp43__length1; + const gchar* _tmp44_; + void* _tmp45_; + const gchar* _tmp62_; +#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = (gsize) 1; -#line 3347 "PicasaPublishing.c" +#line 3344 "PicasaPublishing.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { -#line 3356 "PicasaPublishing.c" +#line 3353 "PicasaPublishing.c" gboolean _tmp11_ = FALSE; gboolean _tmp12_ = FALSE; - gchar** _tmp13_ = NULL; - gint _tmp13__length1 = 0; + gchar** _tmp13_; + gint _tmp13__length1; gint _tmp21_ = 0; - gchar** _tmp22_ = NULL; - gint _tmp22__length1 = 0; - gint _tmp23_ = 0; - const gchar* _tmp24_ = NULL; - gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp22_; + gint _tmp22__length1; + gint _tmp23_; + const gchar* _tmp24_; + gsize _tmp30_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp9_) { -#line 3369 "PicasaPublishing.c" - gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3366 "PicasaPublishing.c" + gint _tmp10_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp10_ + 1; -#line 3375 "PicasaPublishing.c" +#line 3372 "PicasaPublishing.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { -#line 3385 "PicasaPublishing.c" - gint _tmp14_ = 0; - gchar** _tmp15_ = NULL; - gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3382 "PicasaPublishing.c" + gint _tmp14_; + gchar** _tmp15_; + gint _tmp15__length1; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; -#line 3397 "PicasaPublishing.c" +#line 3394 "PicasaPublishing.c" } else { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 3401 "PicasaPublishing.c" +#line 3398 "PicasaPublishing.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = TRUE; -#line 3407 "PicasaPublishing.c" +#line 3404 "PicasaPublishing.c" } else { gboolean _tmp16_ = FALSE; - gchar** _tmp17_ = NULL; - gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp17_; + gint _tmp17__length1; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { -#line 3418 "PicasaPublishing.c" - gchar** _tmp18_ = NULL; - gint _tmp18__length1 = 0; - gint _tmp19_ = 0; - const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3415 "PicasaPublishing.c" + gchar** _tmp18_; + gint _tmp18__length1; + gint _tmp19_; + const gchar* _tmp20_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; -#line 3433 "PicasaPublishing.c" +#line 3430 "PicasaPublishing.c" } else { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = FALSE; -#line 3437 "PicasaPublishing.c" +#line 3434 "PicasaPublishing.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; -#line 3441 "PicasaPublishing.c" +#line 3438 "PicasaPublishing.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" break; -#line 3447 "PicasaPublishing.c" +#line 3444 "PicasaPublishing.c" } -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { -#line 3459 "PicasaPublishing.c" - gchar** _tmp25_ = NULL; - gint _tmp25__length1 = 0; - gint _tmp26_ = 0; - const gchar* _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3456 "PicasaPublishing.c" + gchar** _tmp25_; + gint _tmp25__length1; + gint _tmp26_; + const gchar* _tmp27_; + gint _tmp28_; + gint _tmp29_; +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; -#line 3480 "PicasaPublishing.c" +#line 3477 "PicasaPublishing.c" } else { -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = 0; -#line 3484 "PicasaPublishing.c" +#line 3481 "PicasaPublishing.c" } -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; -#line 3490 "PicasaPublishing.c" +#line 3487 "PicasaPublishing.c" } } -#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { -#line 3497 "PicasaPublishing.c" - gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3494 "PicasaPublishing.c" + gchar* _tmp32_; +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3505 "PicasaPublishing.c" +#line 3502 "PicasaPublishing.c" } -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp45_; -#line 3543 "PicasaPublishing.c" +#line 3540 "PicasaPublishing.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { -#line 3552 "PicasaPublishing.c" - gint _tmp48_ = 0; - gchar** _tmp49_ = NULL; - gint _tmp49__length1 = 0; - void* _tmp50_ = NULL; - const gchar* _tmp51_ = NULL; - void* _tmp52_ = NULL; +#line 3549 "PicasaPublishing.c" + gint _tmp48_; + gchar** _tmp49_; + gint _tmp49__length1; + void* _tmp50_; + const gchar* _tmp51_; + void* _tmp52_; const gchar* _tmp53_ = NULL; - gchar** _tmp54_ = NULL; - gint _tmp54__length1 = 0; - gint _tmp55_ = 0; - const gchar* _tmp56_ = NULL; - void* _tmp60_ = NULL; - void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp54_; + gint _tmp54__length1; + gint _tmp55_; + const gchar* _tmp56_; + void* _tmp60_; + void* _tmp61_; +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp46_) { -#line 3568 "PicasaPublishing.c" - gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3565 "PicasaPublishing.c" + gint _tmp47_; +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp47_ + 1; -#line 3574 "PicasaPublishing.c" +#line 3571 "PicasaPublishing.c" } -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" break; -#line 3588 "PicasaPublishing.c" +#line 3585 "PicasaPublishing.c" } -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { -#line 3608 "PicasaPublishing.c" - gchar** _tmp57_ = NULL; - gint _tmp57__length1 = 0; - gint _tmp58_ = 0; - const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3605 "PicasaPublishing.c" + gchar** _tmp57_; + gint _tmp57__length1; + gint _tmp58_; + const gchar* _tmp59_; +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; -#line 3623 "PicasaPublishing.c" +#line 3620 "PicasaPublishing.c" } else { -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = ""; -#line 3627 "PicasaPublishing.c" +#line 3624 "PicasaPublishing.c" } -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp61_; -#line 3635 "PicasaPublishing.c" +#line 3632 "PicasaPublishing.c" } } -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3646 "PicasaPublishing.c" +#line 3643 "PicasaPublishing.c" } else { - gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp63_; +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3655 "PicasaPublishing.c" +#line 3652 "PicasaPublishing.c" } } @@ -3675,135 +3672,135 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s static guint8* string_get_data (const gchar* self, int* result_length1) { guint8* result; guint8* res = NULL; - gint res_length1 = 0; - gint _res_size_ = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - guint8* _tmp3_ = NULL; - gint _tmp3__length1 = 0; - guint8* _tmp4_ = NULL; - gint _tmp4__length1 = 0; -#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint res_length1; + gint _res_size_; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; + guint8* _tmp3_; + gint _tmp3__length1; + guint8* _tmp4_; + gint _tmp4__length1; +#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = (guint8*) self; -#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res_length1 = -1; -#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _res_size_ = res_length1; -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res_length1 = (gint) _tmp1_; -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = res_length1; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = res; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = res_length1; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4__length1 = _tmp3__length1; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (result_length1) { -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" *result_length1 = _tmp4__length1; -#line 3700 "PicasaPublishing.c" +#line 3697 "PicasaPublishing.c" } -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3706 "PicasaPublishing.c" +#line 3703 "PicasaPublishing.c" } static void _vala_SoupBuffer_free (SoupBuffer* self) { #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_boxed_free (soup_buffer_get_type (), self); -#line 3713 "PicasaPublishing.c" +#line 3710 "PicasaPublishing.c" } static void _vala_SoupMultipart_free (SoupMultipart* self) { #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_boxed_free (soup_multipart_get_type (), self); -#line 3720 "PicasaPublishing.c" +#line 3717 "PicasaPublishing.c" } static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) { PublishingPicasaUploadTransaction * self; SoupMultipart* message_parts = NULL; - SoupMultipart* _tmp0_ = NULL; + SoupMultipart* _tmp0_; gchar* summary = NULL; - gchar* _tmp1_ = NULL; - SpitPublishingPublishable* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + gchar* _tmp1_; + SpitPublishingPublishable* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gboolean _tmp5_; gchar** keywords = NULL; - SpitPublishingPublishable* _tmp12_ = NULL; - gint _tmp13_ = 0; - gchar** _tmp14_ = NULL; - gint keywords_length1 = 0; - gint _keywords_size_ = 0; + SpitPublishingPublishable* _tmp12_; + gint _tmp13_; + gchar** _tmp14_; + gint keywords_length1; + gint _keywords_size_; gchar* keywords_string = NULL; - gchar* _tmp15_ = NULL; - gchar** _tmp16_ = NULL; - gint _tmp16__length1 = 0; + gchar* _tmp15_; + gchar** _tmp16_; + gint _tmp16__length1; gchar* metadata = NULL; - SpitPublishingPublishable* _tmp51_ = NULL; - gchar* _tmp52_ = NULL; - gchar* _tmp53_ = NULL; - gchar* _tmp54_ = NULL; - gchar* _tmp55_ = NULL; - const gchar* _tmp56_ = NULL; - const gchar* _tmp57_ = NULL; - gchar* _tmp58_ = NULL; - gchar* _tmp59_ = NULL; + SpitPublishingPublishable* _tmp51_; + gchar* _tmp52_; + gchar* _tmp53_; + gchar* _tmp54_; + gchar* _tmp55_; + const gchar* _tmp56_; + const gchar* _tmp57_; + gchar* _tmp58_; + gchar* _tmp59_; SoupBuffer* metadata_buffer = NULL; - const gchar* _tmp60_ = NULL; - guint8* _tmp61_ = NULL; - gint _tmp61__length1 = 0; - guint8* _tmp62_ = NULL; - gint _tmp62__length1 = 0; - SoupBuffer* _tmp63_ = NULL; - SoupMultipart* _tmp64_ = NULL; - SoupBuffer* _tmp65_ = NULL; + const gchar* _tmp60_; + guint8* _tmp61_; + gint _tmp61__length1; + guint8* _tmp62_; + gint _tmp62__length1; + SoupBuffer* _tmp63_; + SoupMultipart* _tmp64_; + SoupBuffer* _tmp65_; guint8* photo_data = NULL; - GMappedFile* _tmp87_ = NULL; - gchar* _tmp88_ = NULL; - gint photo_data_length1 = 0; - gint _photo_data_size_ = 0; - GMappedFile* _tmp89_ = NULL; - gsize _tmp90_ = 0UL; - gint _tmp91_ = 0; + GMappedFile* _tmp87_; + gchar* _tmp88_; + gint photo_data_length1; + gint _photo_data_size_; + GMappedFile* _tmp89_; + gsize _tmp90_; + gint _tmp91_; SoupBuffer* bindable_data = NULL; - SoupBuffer* _tmp92_ = NULL; - SoupMultipart* _tmp93_ = NULL; - SpitPublishingPublishable* _tmp94_ = NULL; - GFile* _tmp95_ = NULL; - GFile* _tmp96_ = NULL; - gchar* _tmp97_ = NULL; - gchar* _tmp98_ = NULL; - const gchar* _tmp99_ = NULL; + SoupBuffer* _tmp92_; + SoupMultipart* _tmp93_; + SpitPublishingPublishable* _tmp94_; + GFile* _tmp95_; + GFile* _tmp96_; + gchar* _tmp97_; + gchar* _tmp98_; + const gchar* _tmp99_; SoupMessage* outbound_message = NULL; - gchar* _tmp100_ = NULL; - gchar* _tmp101_ = NULL; - SoupMultipart* _tmp102_ = NULL; - SoupMessage* _tmp103_ = NULL; - SoupMessage* _tmp104_ = NULL; - SoupMessageHeaders* _tmp105_ = NULL; - PublishingRESTSupportGoogleSession* _tmp106_ = NULL; - gchar* _tmp107_ = NULL; - gchar* _tmp108_ = NULL; - gchar* _tmp109_ = NULL; - gchar* _tmp110_ = NULL; + gchar* _tmp100_; + gchar* _tmp101_; + SoupMultipart* _tmp102_; + SoupMessage* _tmp103_; + SoupMessage* _tmp104_; + SoupMessageHeaders* _tmp105_; + PublishingRESTSupportGoogleSession* _tmp106_; + gchar* _tmp107_; + gchar* _tmp108_; + gchar* _tmp109_; + gchar* _tmp110_; GError * _inner_error_ = NULL; #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, PublishingPicasaUploadTransaction); @@ -3827,13 +3824,13 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup _g_free0 (_tmp4_); #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp5_) { -#line 3815 "PicasaPublishing.c" - SpitPublishingPublishable* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; +#line 3812 "PicasaPublishing.c" + SpitPublishingPublishable* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; #line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp6_ = self->priv->publishable; #line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -3854,7 +3851,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup _g_free0 (_tmp10_); #line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 (_tmp8_); -#line 3842 "PicasaPublishing.c" +#line 3839 "PicasaPublishing.c" } #line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp12_ = self->priv->publishable; @@ -3876,46 +3873,46 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup _tmp16__length1 = keywords_length1; #line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp16__length1 > 0) { -#line 3864 "PicasaPublishing.c" - const gchar* _tmp47_ = NULL; - gchar* _tmp48_ = NULL; - const gchar* _tmp49_ = NULL; - gchar* _tmp50_ = NULL; +#line 3861 "PicasaPublishing.c" + const gchar* _tmp47_; + gchar* _tmp48_; + const gchar* _tmp49_; + gchar* _tmp50_; { gint i = 0; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" i = 0; -#line 3873 "PicasaPublishing.c" +#line 3870 "PicasaPublishing.c" { gboolean _tmp17_ = FALSE; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp17_ = TRUE; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" while (TRUE) { -#line 3880 "PicasaPublishing.c" - gint _tmp19_ = 0; - gchar** _tmp20_ = NULL; - gint _tmp20__length1 = 0; +#line 3877 "PicasaPublishing.c" + gint _tmp19_; + gchar** _tmp20_; + gint _tmp20__length1; gchar** tmp = NULL; gint tmp_length1 = 0; gint _tmp_size_ = 0; - gchar** _tmp21_ = NULL; - gint _tmp21__length1 = 0; - gint _tmp22_ = 0; - const gchar* _tmp23_ = NULL; - gboolean _tmp24_ = FALSE; - const gchar* _tmp37_ = NULL; - gint _tmp38_ = 0; - gint _tmp39_ = 0; + gchar** _tmp21_; + gint _tmp21__length1; + gint _tmp22_; + const gchar* _tmp23_; + gboolean _tmp24_; + const gchar* _tmp37_; + gint _tmp38_; + gint _tmp39_; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (!_tmp17_) { -#line 3897 "PicasaPublishing.c" - gint _tmp18_ = 0; +#line 3894 "PicasaPublishing.c" + gint _tmp18_; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp18_ = i; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" i = _tmp18_ + 1; -#line 3903 "PicasaPublishing.c" +#line 3900 "PicasaPublishing.c" } #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp17_ = FALSE; @@ -3929,7 +3926,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup if (!(_tmp19_ < _tmp20__length1)) { #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" break; -#line 3917 "PicasaPublishing.c" +#line 3914 "PicasaPublishing.c" } #line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp21_ = keywords; @@ -3943,15 +3940,15 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup _tmp24_ = g_str_has_prefix (_tmp23_, "/"); #line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp24_) { -#line 3931 "PicasaPublishing.c" - gchar** _tmp25_ = NULL; - gint _tmp25__length1 = 0; - gint _tmp26_ = 0; - const gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - gchar** _tmp30_ = NULL; - gchar** _tmp31_ = NULL; +#line 3928 "PicasaPublishing.c" + gchar** _tmp25_; + gint _tmp25__length1; + gint _tmp26_; + const gchar* _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; + gchar** _tmp30_; + gchar** _tmp31_; #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp25_ = keywords; #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -3976,14 +3973,14 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup _tmp_size_ = tmp_length1; #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 (_tmp29_); -#line 3964 "PicasaPublishing.c" +#line 3961 "PicasaPublishing.c" } else { - gchar** _tmp32_ = NULL; - gint _tmp32__length1 = 0; - gint _tmp33_ = 0; - const gchar* _tmp34_ = NULL; - gchar** _tmp35_ = NULL; - gchar** _tmp36_ = NULL; + gchar** _tmp32_; + gint _tmp32__length1; + gint _tmp33_; + const gchar* _tmp34_; + gchar** _tmp35_; + gchar** _tmp36_; #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp32_ = keywords; #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -4002,7 +3999,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup tmp_length1 = _vala_array_length (_tmp35_); #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp_size_ = tmp_length1; -#line 3990 "PicasaPublishing.c" +#line 3987 "PicasaPublishing.c" } #line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp37_ = keywords_string; @@ -4012,13 +4009,13 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup _tmp39_ = _tmp38_; #line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp39_ > 0) { -#line 4000 "PicasaPublishing.c" - const gchar* _tmp40_ = NULL; - gchar** _tmp41_ = NULL; - gint _tmp41__length1 = 0; - gchar* _tmp42_ = NULL; - gchar* _tmp43_ = NULL; - gchar* _tmp44_ = NULL; +#line 3997 "PicasaPublishing.c" + const gchar* _tmp40_; + gchar** _tmp41_; + gint _tmp41__length1; + gchar* _tmp42_; + gchar* _tmp43_; + gchar* _tmp44_; #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp40_ = keywords_string; #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -4037,11 +4034,11 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup keywords_string = _tmp44_; #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 (_tmp43_); -#line 4025 "PicasaPublishing.c" +#line 4022 "PicasaPublishing.c" } else { - gchar** _tmp45_ = NULL; - gint _tmp45__length1 = 0; - gchar* _tmp46_ = NULL; + gchar** _tmp45_; + gint _tmp45__length1; + gchar* _tmp46_; #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp45_ = tmp; #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -4052,11 +4049,11 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup _g_free0 (keywords_string); #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" keywords_string = _tmp46_; -#line 4040 "PicasaPublishing.c" +#line 4037 "PicasaPublishing.c" } #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" tmp = (_vala_array_free (tmp, tmp_length1, (GDestroyNotify) g_free), NULL); -#line 4044 "PicasaPublishing.c" +#line 4041 "PicasaPublishing.c" } } } @@ -4076,7 +4073,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup _g_free0 (keywords_string); #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" keywords_string = _tmp50_; -#line 4064 "PicasaPublishing.c" +#line 4061 "PicasaPublishing.c" } #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp51_ = self->priv->publishable; @@ -4120,17 +4117,17 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup _tmp65_ = metadata_buffer; #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" soup_multipart_append_form_file (_tmp64_, "", "", "application/atom+xml", _tmp65_); -#line 4108 "PicasaPublishing.c" +#line 4105 "PicasaPublishing.c" { GMappedFile* _tmp66_ = NULL; - SpitPublishingPublishable* _tmp67_ = NULL; - GFile* _tmp68_ = NULL; - GFile* _tmp69_ = NULL; - gchar* _tmp70_ = NULL; - gchar* _tmp71_ = NULL; - GMappedFile* _tmp72_ = NULL; - GMappedFile* _tmp73_ = NULL; - GMappedFile* _tmp74_ = NULL; + SpitPublishingPublishable* _tmp67_; + GFile* _tmp68_; + GFile* _tmp69_; + gchar* _tmp70_; + gchar* _tmp71_; + GMappedFile* _tmp72_; + GMappedFile* _tmp73_; + GMappedFile* _tmp74_; #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp67_ = self->priv->publishable; #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -4155,7 +4152,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup if (G_UNLIKELY (_inner_error_ != NULL)) { #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_inner_error_->domain == G_FILE_ERROR) { -#line 4143 "PicasaPublishing.c" +#line 4140 "PicasaPublishing.c" goto __catch11_g_file_error; } #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -4176,7 +4173,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup g_clear_error (&_inner_error_); #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 4164 "PicasaPublishing.c" +#line 4161 "PicasaPublishing.c" } #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp74_ = _tmp66_; @@ -4188,25 +4185,25 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup self->priv->mapped_file = _tmp74_; #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_mapped_file_unref0 (_tmp66_); -#line 4176 "PicasaPublishing.c" +#line 4173 "PicasaPublishing.c" } goto __finally11; __catch11_g_file_error: { GError* e = NULL; gchar* msg = NULL; - SpitPublishingPublishable* _tmp75_ = NULL; - GFile* _tmp76_ = NULL; - GFile* _tmp77_ = NULL; - gchar* _tmp78_ = NULL; - gchar* _tmp79_ = NULL; - GError* _tmp80_ = NULL; - const gchar* _tmp81_ = NULL; - gchar* _tmp82_ = NULL; - gchar* _tmp83_ = NULL; - const gchar* _tmp84_ = NULL; - const gchar* _tmp85_ = NULL; - GError* _tmp86_ = NULL; + SpitPublishingPublishable* _tmp75_; + GFile* _tmp76_; + GFile* _tmp77_; + gchar* _tmp78_; + gchar* _tmp79_; + GError* _tmp80_; + const gchar* _tmp81_; + gchar* _tmp82_; + gchar* _tmp83_; + const gchar* _tmp84_; + const gchar* _tmp85_; + GError* _tmp86_; #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" e = _inner_error_; #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -4249,7 +4246,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup _g_free0 (msg); #line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_error_free0 (e); -#line 4237 "PicasaPublishing.c" +#line 4234 "PicasaPublishing.c" goto __finally11; } __finally11: @@ -4273,7 +4270,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup __vala_SoupMultipart_free0 (message_parts); #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 4261 "PicasaPublishing.c" +#line 4258 "PicasaPublishing.c" } else { #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" __vala_SoupBuffer_free0 (metadata_buffer); @@ -4293,7 +4290,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup g_clear_error (&_inner_error_); #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 4281 "PicasaPublishing.c" +#line 4278 "PicasaPublishing.c" } } #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -4303,7 +4300,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" photo_data = (guint8*) _tmp88_; #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - photo_data_length1 = -1; + photo_data_length1 = sizeof (gchar) / sizeof (guint8); #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _photo_data_size_ = photo_data_length1; #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -4400,7 +4397,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup __vala_SoupMultipart_free0 (message_parts); #line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 4388 "PicasaPublishing.c" +#line 4385 "PicasaPublishing.c" } else { #line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_object_unref0 (outbound_message); @@ -4424,7 +4421,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup g_clear_error (&_inner_error_); #line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 4412 "PicasaPublishing.c" +#line 4409 "PicasaPublishing.c" } } #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -4443,7 +4440,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup _g_free0 (summary); #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" __vala_SoupMultipart_free0 (message_parts); -#line 4431 "PicasaPublishing.c" +#line 4428 "PicasaPublishing.c" } @@ -4455,19 +4452,19 @@ static void publishing_picasa_upload_transaction_class_init (PublishingPicasaUpl #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingPicasaUploadTransactionPrivate)); #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_picasa_upload_transaction_real_execute; -#line 4444 "PicasaPublishing.c" + ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_picasa_upload_transaction_real_execute; +#line 4441 "PicasaPublishing.c" } static void publishing_picasa_upload_transaction_instance_init (PublishingPicasaUploadTransaction * self) { #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv = PUBLISHING_PICASA_UPLOAD_TRANSACTION_GET_PRIVATE (self); -#line 4451 "PicasaPublishing.c" +#line 4448 "PicasaPublishing.c" } -static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) { +static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) { PublishingPicasaUploadTransaction * self; #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, PublishingPicasaUploadTransaction); @@ -4483,7 +4480,7 @@ static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupport _g_mapped_file_unref0 (self->priv->mapped_file); #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_picasa_upload_transaction_parent_class)->finalize (obj); -#line 4471 "PicasaPublishing.c" +#line 4468 "PicasaPublishing.c" } @@ -4502,79 +4499,78 @@ GType publishing_picasa_upload_transaction_get_type (void) { static gpointer _publishing_picasa_publishing_options_pane_size_description_ref0 (gpointer self) { #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self ? publishing_picasa_publishing_options_pane_size_description_ref (self) : NULL; -#line 4490 "PicasaPublishing.c" +#line 4487 "PicasaPublishing.c" } static void _publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_options_pane_on_logout_clicked ((PublishingPicasaPublishingOptionsPane*) self); -#line 4497 "PicasaPublishing.c" +#line 4494 "PicasaPublishing.c" } static void _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_options_pane_on_publish_clicked ((PublishingPicasaPublishingOptionsPane*) self); -#line 4504 "PicasaPublishing.c" +#line 4501 "PicasaPublishing.c" } PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_construct (GType object_type, GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters, gboolean can_logout) { PublishingPicasaPublishingOptionsPane * self = NULL; - gint _tmp0_ = 0; - PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp1_ = NULL; - GtkBuilder* _tmp2_ = NULL; - GtkBuilder* _tmp3_ = NULL; - GtkBuilder* _tmp4_ = NULL; - GtkBuilder* _tmp5_ = NULL; - GSList* _tmp6_ = NULL; - GSList* _tmp7_ = NULL; - guint _tmp8_ = 0U; - PublishingPicasaPublishingParameters* _tmp9_ = NULL; - PublishingPicasaPublishingParameters* _tmp10_ = NULL; - GtkBuilder* _tmp11_ = NULL; - GObject* _tmp12_ = NULL; - GtkBox* _tmp13_ = NULL; - GtkBuilder* _tmp14_ = NULL; - GObject* _tmp15_ = NULL; - GtkLabel* _tmp16_ = NULL; - GtkBuilder* _tmp17_ = NULL; - GObject* _tmp18_ = NULL; - GtkLabel* _tmp19_ = NULL; - GtkBuilder* _tmp20_ = NULL; - GObject* _tmp21_ = NULL; - GtkComboBoxText* _tmp22_ = NULL; - GtkBuilder* _tmp23_ = NULL; - GObject* _tmp24_ = NULL; - GtkCheckButton* _tmp25_ = NULL; - GtkBuilder* _tmp26_ = NULL; - GObject* _tmp27_ = NULL; - GtkComboBoxText* _tmp28_ = NULL; - GtkBuilder* _tmp29_ = NULL; - GObject* _tmp30_ = NULL; - GtkCheckButton* _tmp31_ = NULL; - GtkBuilder* _tmp32_ = NULL; - GObject* _tmp33_ = NULL; - GtkButton* _tmp34_ = NULL; - GtkBuilder* _tmp35_ = NULL; - GObject* _tmp36_ = NULL; - GtkButton* _tmp37_ = NULL; - gboolean _tmp38_ = FALSE; - GtkLabel* _tmp43_ = NULL; - const gchar* _tmp44_ = NULL; - PublishingPicasaPublishingParameters* _tmp45_ = NULL; - gchar* _tmp46_ = NULL; - gchar* _tmp47_ = NULL; - gchar* _tmp48_ = NULL; - gchar* _tmp49_ = NULL; - GtkCheckButton* _tmp50_ = NULL; - PublishingPicasaPublishingParameters* _tmp51_ = NULL; - gboolean _tmp52_ = FALSE; - PublishingPicasaPublishingParameters* _tmp53_ = NULL; - SpitPublishingPublisherMediaType _tmp54_ = 0; - GtkButton* _tmp71_ = NULL; - GtkButton* _tmp72_ = NULL; + gint _tmp0_; + PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp1_; + GtkBuilder* _tmp2_; + GtkBuilder* _tmp3_; + GtkBuilder* _tmp4_; + GtkBuilder* _tmp5_; + GSList* _tmp6_; + GSList* _tmp7_; + guint _tmp8_; + PublishingPicasaPublishingParameters* _tmp9_; + PublishingPicasaPublishingParameters* _tmp10_; + GtkBuilder* _tmp11_; + GObject* _tmp12_; + GtkBox* _tmp13_; + GtkBuilder* _tmp14_; + GObject* _tmp15_; + GtkLabel* _tmp16_; + GtkBuilder* _tmp17_; + GObject* _tmp18_; + GtkLabel* _tmp19_; + GtkBuilder* _tmp20_; + GObject* _tmp21_; + GtkComboBoxText* _tmp22_; + GtkBuilder* _tmp23_; + GObject* _tmp24_; + GtkCheckButton* _tmp25_; + GtkBuilder* _tmp26_; + GObject* _tmp27_; + GtkComboBoxText* _tmp28_; + GtkBuilder* _tmp29_; + GObject* _tmp30_; + GtkCheckButton* _tmp31_; + GtkBuilder* _tmp32_; + GObject* _tmp33_; + GtkButton* _tmp34_; + GtkBuilder* _tmp35_; + GObject* _tmp36_; + GtkButton* _tmp37_; + gboolean _tmp38_; + GtkLabel* _tmp43_; + PublishingPicasaPublishingParameters* _tmp44_; + gchar* _tmp45_; + gchar* _tmp46_; + gchar* _tmp47_; + gchar* _tmp48_; + GtkCheckButton* _tmp49_; + PublishingPicasaPublishingParameters* _tmp50_; + gboolean _tmp51_; + PublishingPicasaPublishingParameters* _tmp52_; + SpitPublishingPublisherMediaType _tmp53_; + GtkButton* _tmp68_; + GtkButton* _tmp69_; #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL); #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -4717,11 +4713,11 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane _tmp38_ = can_logout; #line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (!_tmp38_) { -#line 4705 "PicasaPublishing.c" - GtkButton* _tmp39_ = NULL; - GtkContainer* _tmp40_ = NULL; - GtkContainer* _tmp41_ = NULL; - GtkButton* _tmp42_ = NULL; +#line 4701 "PicasaPublishing.c" + GtkButton* _tmp39_; + GtkContainer* _tmp40_; + GtkContainer* _tmp41_; + GtkButton* _tmp42_; #line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp39_ = self->priv->logout_button; #line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -4732,189 +4728,181 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane _tmp42_ = self->priv->logout_button; #line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" gtk_container_remove (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget)); -#line 4720 "PicasaPublishing.c" +#line 4716 "PicasaPublishing.c" } #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp43_ = self->priv->login_identity_label; #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp44_ = _ ("You are logged into Picasa Web Albums as %s."); -#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp45_ = parameters; + _tmp44_ = parameters; #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp46_ = publishing_picasa_publishing_parameters_get_user_name (_tmp45_); + _tmp45_ = publishing_picasa_publishing_parameters_get_user_name (_tmp44_); #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp47_ = _tmp46_; + _tmp46_ = _tmp45_; #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp48_ = g_strdup_printf (_tmp44_, _tmp47_); + _tmp47_ = g_strdup_printf (_ ("You are logged into Picasa Web Albums as %s."), _tmp46_); #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp49_ = _tmp48_; + _tmp48_ = _tmp47_; #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - gtk_label_set_label (_tmp43_, _tmp49_); + gtk_label_set_label (_tmp43_, _tmp48_); #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _g_free0 (_tmp49_); + _g_free0 (_tmp48_); #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _g_free0 (_tmp47_); + _g_free0 (_tmp46_); #line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp50_ = self->priv->strip_metadata_check; + _tmp49_ = self->priv->strip_metadata_check; #line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp51_ = parameters; + _tmp50_ = parameters; #line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp52_ = publishing_picasa_publishing_parameters_get_strip_metadata (_tmp51_); + _tmp51_ = publishing_picasa_publishing_parameters_get_strip_metadata (_tmp50_); #line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp52_); + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp51_); #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp53_ = parameters; + _tmp52_ = parameters; #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp54_ = publishing_picasa_publishing_parameters_get_media_type (_tmp53_); + _tmp53_ = publishing_picasa_publishing_parameters_get_media_type (_tmp52_); #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - if ((_tmp54_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) == 0) { -#line 4756 "PicasaPublishing.c" - GtkLabel* _tmp55_ = NULL; - const gchar* _tmp56_ = NULL; - GtkComboBoxText* _tmp57_ = NULL; - GtkComboBoxText* _tmp58_ = NULL; + if ((_tmp53_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) == 0) { +#line 4750 "PicasaPublishing.c" + GtkLabel* _tmp54_; + GtkComboBoxText* _tmp55_; + GtkComboBoxText* _tmp56_; #line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp55_ = self->priv->publish_to_label; + _tmp54_ = self->priv->publish_to_label; #line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp56_ = _ ("Videos will appear in:"); -#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - gtk_label_set_label (_tmp55_, _tmp56_); + gtk_label_set_label (_tmp54_, _ ("Videos will appear in:")); #line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp57_ = self->priv->size_combo; + _tmp55_ = self->priv->size_combo; #line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget), FALSE); #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp58_ = self->priv->size_combo; + _tmp56_ = self->priv->size_combo; #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 4775 "PicasaPublishing.c" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_widget_get_type (), GtkWidget), FALSE); +#line 4766 "PicasaPublishing.c" } else { - GtkLabel* _tmp59_ = NULL; - const gchar* _tmp60_ = NULL; - PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp61_ = NULL; - gint _tmp61__length1 = 0; - GtkComboBoxText* _tmp66_ = NULL; - GtkComboBoxText* _tmp67_ = NULL; - GtkComboBoxText* _tmp68_ = NULL; - PublishingPicasaPublishingParameters* _tmp69_ = NULL; - gint _tmp70_ = 0; -#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp59_ = self->priv->publish_to_label; + GtkLabel* _tmp57_; + PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp58_; + gint _tmp58__length1; + GtkComboBoxText* _tmp63_; + GtkComboBoxText* _tmp64_; + GtkComboBoxText* _tmp65_; + PublishingPicasaPublishingParameters* _tmp66_; + gint _tmp67_; #line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp60_ = _ ("Photos will appear in:"); + _tmp57_ = self->priv->publish_to_label; #line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - gtk_label_set_label (_tmp59_, _tmp60_); + gtk_label_set_label (_tmp57_, _ ("Photos will appear in:")); #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp61_ = self->priv->size_descriptions; + _tmp58_ = self->priv->size_descriptions; #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp61__length1 = self->priv->size_descriptions_length1; -#line 4796 "PicasaPublishing.c" + _tmp58__length1 = self->priv->size_descriptions_length1; +#line 4784 "PicasaPublishing.c" { PublishingPicasaPublishingOptionsPaneSizeDescription** desc_collection = NULL; gint desc_collection_length1 = 0; gint _desc_collection_size_ = 0; gint desc_it = 0; #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - desc_collection = _tmp61_; + desc_collection = _tmp58_; #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - desc_collection_length1 = _tmp61__length1; + desc_collection_length1 = _tmp58__length1; #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - for (desc_it = 0; desc_it < _tmp61__length1; desc_it = desc_it + 1) { -#line 4808 "PicasaPublishing.c" - PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp62_ = NULL; + for (desc_it = 0; desc_it < _tmp58__length1; desc_it = desc_it + 1) { +#line 4796 "PicasaPublishing.c" + PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp59_; PublishingPicasaPublishingOptionsPaneSizeDescription* desc = NULL; #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp62_ = _publishing_picasa_publishing_options_pane_size_description_ref0 (desc_collection[desc_it]); + _tmp59_ = _publishing_picasa_publishing_options_pane_size_description_ref0 (desc_collection[desc_it]); #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - desc = _tmp62_; -#line 4815 "PicasaPublishing.c" + desc = _tmp59_; +#line 4803 "PicasaPublishing.c" { - GtkComboBoxText* _tmp63_ = NULL; - PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp64_ = NULL; - const gchar* _tmp65_ = NULL; + GtkComboBoxText* _tmp60_; + PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp61_; + const gchar* _tmp62_; #line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp63_ = self->priv->size_combo; + _tmp60_ = self->priv->size_combo; #line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp64_ = desc; + _tmp61_ = desc; #line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp65_ = _tmp64_->name; + _tmp62_ = _tmp61_->name; #line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - gtk_combo_box_text_append_text (_tmp63_, _tmp65_); + gtk_combo_box_text_append_text (_tmp60_, _tmp62_); #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _publishing_picasa_publishing_options_pane_size_description_unref0 (desc); -#line 4830 "PicasaPublishing.c" +#line 4818 "PicasaPublishing.c" } } } #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp66_ = self->priv->size_combo; + _tmp63_ = self->priv->size_combo; #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), TRUE); + gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget), TRUE); #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp67_ = self->priv->size_combo; + _tmp64_ = self->priv->size_combo; #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), TRUE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), TRUE); #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp68_ = self->priv->size_combo; + _tmp65_ = self->priv->size_combo; #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp69_ = parameters; + _tmp66_ = parameters; #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp70_ = publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (_tmp69_); + _tmp67_ = publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (_tmp66_); #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_combo_box_get_type (), GtkComboBox), _tmp70_); -#line 4850 "PicasaPublishing.c" + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_combo_box_get_type (), GtkComboBox), _tmp67_); +#line 4838 "PicasaPublishing.c" } #line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp71_ = self->priv->logout_button; + _tmp68_ = self->priv->logout_button; #line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - g_signal_connect_object (_tmp71_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp68_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0); #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp72_ = self->priv->publish_button; + _tmp69_ = self->priv->publish_button; #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - g_signal_connect_object (_tmp72_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp69_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0); #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self; -#line 4862 "PicasaPublishing.c" +#line 4850 "PicasaPublishing.c" } PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_new (GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters, gboolean can_logout) { #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return publishing_picasa_publishing_options_pane_construct (PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, builder, parameters, can_logout); -#line 4869 "PicasaPublishing.c" +#line 4857 "PicasaPublishing.c" } static void publishing_picasa_publishing_options_pane_on_publish_clicked (PublishingPicasaPublishingOptionsPane* self) { gint _tmp0_ = 0; - GtkComboBoxText* _tmp1_ = NULL; - gint _tmp2_ = 0; + GtkComboBoxText* _tmp1_; + gint _tmp2_; gint size_combo_last_active = 0; - PublishingPicasaPublishingParameters* _tmp5_ = NULL; - PublishingPicasaPublishingParameters* _tmp6_ = NULL; - PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp8_ = NULL; - gint _tmp9_ = 0; - PublishingPicasaPublishingParameters* _tmp10_ = NULL; - GtkCheckButton* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; + PublishingPicasaPublishingParameters* _tmp5_; + PublishingPicasaPublishingParameters* _tmp6_; + PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp7_; + gint _tmp7__length1; + PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp8_; + gint _tmp9_; + PublishingPicasaPublishingParameters* _tmp10_; + GtkCheckButton* _tmp11_; + gboolean _tmp12_; PublishingPicasaAlbum** albums = NULL; - PublishingPicasaPublishingParameters* _tmp13_ = NULL; - gint _tmp14_ = 0; - PublishingPicasaAlbum** _tmp15_ = NULL; - gint albums_length1 = 0; - gint _albums_size_ = 0; - PublishingPicasaPublishingParameters* _tmp16_ = NULL; - GtkComboBoxText* _tmp17_ = NULL; - gint _tmp18_ = 0; - PublishingPicasaAlbum* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - PublishingPicasaPublishingParameters* _tmp21_ = NULL; - GtkComboBoxText* _tmp22_ = NULL; - gint _tmp23_ = 0; - PublishingPicasaAlbum* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; + PublishingPicasaPublishingParameters* _tmp13_; + gint _tmp14_; + PublishingPicasaAlbum** _tmp15_; + gint albums_length1; + gint _albums_size_; + PublishingPicasaPublishingParameters* _tmp16_; + GtkComboBoxText* _tmp17_; + gint _tmp18_; + PublishingPicasaAlbum* _tmp19_; + const gchar* _tmp20_; + PublishingPicasaPublishingParameters* _tmp21_; + GtkComboBoxText* _tmp22_; + gint _tmp23_; + PublishingPicasaAlbum* _tmp24_; + const gchar* _tmp25_; #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self)); #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -4923,20 +4911,20 @@ static void publishing_picasa_publishing_options_pane_on_publish_clicked (Publis _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp2_ >= 0) { -#line 4911 "PicasaPublishing.c" - GtkComboBoxText* _tmp3_ = NULL; - gint _tmp4_ = 0; +#line 4899 "PicasaPublishing.c" + GtkComboBoxText* _tmp3_; + gint _tmp4_; #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp3_ = self->priv->size_combo; #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp4_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox)); #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp0_ = _tmp4_; -#line 4920 "PicasaPublishing.c" +#line 4908 "PicasaPublishing.c" } else { #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp0_ = 0; -#line 4924 "PicasaPublishing.c" +#line 4912 "PicasaPublishing.c" } #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" size_combo_last_active = _tmp0_; @@ -4999,10 +4987,10 @@ static void publishing_picasa_publishing_options_pane_on_publish_clicked (Publis #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_parameters_set_target_album_entry_url (_tmp21_, _tmp25_); #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - g_signal_emit_by_name (self, "publish"); + g_signal_emit (self, publishing_picasa_publishing_options_pane_signals[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0); #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" albums = (_vala_array_free (albums, albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL); -#line 4990 "PicasaPublishing.c" +#line 4978 "PicasaPublishing.c" } @@ -5010,124 +4998,119 @@ static void publishing_picasa_publishing_options_pane_on_logout_clicked (Publish #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self)); #line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - g_signal_emit_by_name (self, "logout"); -#line 4999 "PicasaPublishing.c" + g_signal_emit (self, publishing_picasa_publishing_options_pane_signals[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0); +#line 4987 "PicasaPublishing.c" } -static void _vala_array_add14 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) { +static void _vala_array_add14 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) { #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if ((*length) == (*size)) { #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1); -#line 5010 "PicasaPublishing.c" +#line 4998 "PicasaPublishing.c" } #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[(*length)++] = value; #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[*length] = NULL; -#line 5016 "PicasaPublishing.c" +#line 5004 "PicasaPublishing.c" } -static void _vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) { +static void _vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) { #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if ((*length) == (*size)) { #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1); -#line 5027 "PicasaPublishing.c" +#line 5015 "PicasaPublishing.c" } #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[(*length)++] = value; #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[*length] = NULL; -#line 5033 "PicasaPublishing.c" +#line 5021 "PicasaPublishing.c" } -static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) { +static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) { #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if ((*length) == (*size)) { #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1); -#line 5044 "PicasaPublishing.c" +#line 5032 "PicasaPublishing.c" } #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[(*length)++] = value; #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[*length] = NULL; -#line 5050 "PicasaPublishing.c" +#line 5038 "PicasaPublishing.c" } -static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) { +static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) { #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if ((*length) == (*size)) { #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1); -#line 5061 "PicasaPublishing.c" +#line 5049 "PicasaPublishing.c" } #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[(*length)++] = value; #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[*length] = NULL; -#line 5067 "PicasaPublishing.c" +#line 5055 "PicasaPublishing.c" } -static void _vala_array_add18 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) { +static void _vala_array_add18 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) { #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if ((*length) == (*size)) { #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1); -#line 5078 "PicasaPublishing.c" +#line 5066 "PicasaPublishing.c" } #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[(*length)++] = value; #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[*length] = NULL; -#line 5084 "PicasaPublishing.c" +#line 5072 "PicasaPublishing.c" } static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_publishing_options_pane_create_size_descriptions (PublishingPicasaPublishingOptionsPane* self, int* result_length1) { PublishingPicasaPublishingOptionsPaneSizeDescription** result = NULL; PublishingPicasaPublishingOptionsPaneSizeDescription** _result_ = NULL; - PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp0_ = NULL; - gint _result__length1 = 0; - gint __result__size_ = 0; - PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - const gchar* _tmp2_ = NULL; - PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp3_ = NULL; - PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - const gchar* _tmp5_ = NULL; - PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp6_ = NULL; - PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - const gchar* _tmp8_ = NULL; - PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp9_ = NULL; - PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp10_ = NULL; - gint _tmp10__length1 = 0; - const gchar* _tmp11_ = NULL; - PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp12_ = NULL; - PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp13_ = NULL; - gint _tmp13__length1 = 0; - const gchar* _tmp14_ = NULL; - PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp15_ = NULL; - PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp16_ = NULL; - gint _tmp16__length1 = 0; + PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp0_; + gint _result__length1; + gint __result__size_; + PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp1_; + gint _tmp1__length1; + PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp2_; + PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp3_; + gint _tmp3__length1; + PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp4_; + PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp5_; + gint _tmp5__length1; + PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp6_; + PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp7_; + gint _tmp7__length1; + PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp8_; + PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp9_; + gint _tmp9__length1; + PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp10_; + PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp11_; + gint _tmp11__length1; #line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self), NULL); #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -5143,81 +5126,71 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_ #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp1__length1 = _result__length1; #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp2_ = _ ("Small (640 × 480 pixels)"); -#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp3_ = publishing_picasa_publishing_options_pane_size_description_new (_tmp2_, 640); + _tmp2_ = publishing_picasa_publishing_options_pane_size_description_new (_ ("Small (640 × 480 pixels)"), 640); #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp3_); + _vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp2_); #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp4_ = _result_; + _tmp3_ = _result_; #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp4__length1 = _result__length1; + _tmp3__length1 = _result__length1; #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp5_ = _ ("Medium (1024 × 768 pixels)"); + _tmp4_ = publishing_picasa_publishing_options_pane_size_description_new (_ ("Medium (1024 × 768 pixels)"), 1024); #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp6_ = publishing_picasa_publishing_options_pane_size_description_new (_tmp5_, 1024); -#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _vala_array_add15 (&_result_, &_result__length1, &__result__size_, _tmp6_); + _vala_array_add15 (&_result_, &_result__length1, &__result__size_, _tmp4_); #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp7_ = _result_; + _tmp5_ = _result_; #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp7__length1 = _result__length1; + _tmp5__length1 = _result__length1; #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp8_ = _ ("Recommended (1600 × 1200 pixels)"); + _tmp6_ = publishing_picasa_publishing_options_pane_size_description_new (_ ("Recommended (1600 × 1200 pixels)"), 1600); #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp9_ = publishing_picasa_publishing_options_pane_size_description_new (_tmp8_, 1600); -#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _vala_array_add16 (&_result_, &_result__length1, &__result__size_, _tmp9_); -#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp10_ = _result_; + _vala_array_add16 (&_result_, &_result__length1, &__result__size_, _tmp6_); #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp10__length1 = _result__length1; + _tmp7_ = _result_; #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp11_ = _ ("Google+ (2048 × 1536 pixels)"); + _tmp7__length1 = _result__length1; #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp12_ = publishing_picasa_publishing_options_pane_size_description_new (_tmp11_, 2048); + _tmp8_ = publishing_picasa_publishing_options_pane_size_description_new (_ ("Google+ (2048 × 1536 pixels)"), 2048); #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _vala_array_add17 (&_result_, &_result__length1, &__result__size_, _tmp12_); + _vala_array_add17 (&_result_, &_result__length1, &__result__size_, _tmp8_); #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp13_ = _result_; -#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp13__length1 = _result__length1; + _tmp9_ = _result_; #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp14_ = _ ("Original Size"); + _tmp9__length1 = _result__length1; #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp15_ = publishing_picasa_publishing_options_pane_size_description_new (_tmp14_, PUBLISHING_PICASA_PUBLISHING_PARAMETERS_ORIGINAL_SIZE); + _tmp10_ = publishing_picasa_publishing_options_pane_size_description_new (_ ("Original Size"), PUBLISHING_PICASA_PUBLISHING_PARAMETERS_ORIGINAL_SIZE); #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp15_); + _vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp10_); #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp16_ = _result_; + _tmp11_ = _result_; #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp16__length1 = _result__length1; + _tmp11__length1 = _result__length1; #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (result_length1) { #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - *result_length1 = _tmp16__length1; -#line 5184 "PicasaPublishing.c" + *result_length1 = _tmp11__length1; +#line 5157 "PicasaPublishing.c" } #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - result = _tmp16_; + result = _tmp11_; #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 5190 "PicasaPublishing.c" +#line 5163 "PicasaPublishing.c" } void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublishingOptionsPane* self) { gint default_album_id = 0; gchar* last_album = NULL; - PublishingPicasaPublishingParameters* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + PublishingPicasaPublishingParameters* _tmp0_; + gchar* _tmp1_; PublishingPicasaAlbum** albums = NULL; - PublishingPicasaPublishingParameters* _tmp2_ = NULL; - gint _tmp3_ = 0; - PublishingPicasaAlbum** _tmp4_ = NULL; - gint albums_length1 = 0; - gint _albums_size_ = 0; - gint _tmp33_ = 0; + PublishingPicasaPublishingParameters* _tmp2_; + gint _tmp3_; + PublishingPicasaAlbum** _tmp4_; + gint albums_length1; + gint _albums_size_; + gint _tmp32_; #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self)); #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -5238,44 +5211,44 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis albums_length1 = _tmp3_; #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _albums_size_ = albums_length1; -#line 5226 "PicasaPublishing.c" +#line 5199 "PicasaPublishing.c" { gint i = 0; #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" i = 0; -#line 5231 "PicasaPublishing.c" +#line 5204 "PicasaPublishing.c" { gboolean _tmp5_ = FALSE; #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp5_ = TRUE; #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" while (TRUE) { -#line 5238 "PicasaPublishing.c" - gint _tmp7_ = 0; - PublishingPicasaAlbum** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - GtkComboBoxText* _tmp9_ = NULL; - PublishingPicasaAlbum** _tmp10_ = NULL; - gint _tmp10__length1 = 0; - gint _tmp11_ = 0; - PublishingPicasaAlbum* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; +#line 5211 "PicasaPublishing.c" + gint _tmp7_; + PublishingPicasaAlbum** _tmp8_; + gint _tmp8__length1; + GtkComboBoxText* _tmp9_; + PublishingPicasaAlbum** _tmp10_; + gint _tmp10__length1; + gint _tmp11_; + PublishingPicasaAlbum* _tmp12_; + const gchar* _tmp13_; gboolean _tmp14_ = FALSE; - PublishingPicasaAlbum** _tmp15_ = NULL; - gint _tmp15__length1 = 0; - gint _tmp16_ = 0; - PublishingPicasaAlbum* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; + PublishingPicasaAlbum** _tmp15_; + gint _tmp15__length1; + gint _tmp16_; + PublishingPicasaAlbum* _tmp17_; + const gchar* _tmp18_; + const gchar* _tmp19_; #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (!_tmp5_) { -#line 5257 "PicasaPublishing.c" - gint _tmp6_ = 0; +#line 5230 "PicasaPublishing.c" + gint _tmp6_; #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp6_ = i; #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" i = _tmp6_ + 1; -#line 5263 "PicasaPublishing.c" +#line 5236 "PicasaPublishing.c" } #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp5_ = FALSE; @@ -5289,7 +5262,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis if (!(_tmp7_ < _tmp8__length1)) { #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" break; -#line 5277 "PicasaPublishing.c" +#line 5250 "PicasaPublishing.c" } #line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp9_ = self->priv->existing_albums_combo; @@ -5321,15 +5294,15 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis if (g_strcmp0 (_tmp18_, _tmp19_) == 0) { #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp14_ = TRUE; -#line 5309 "PicasaPublishing.c" +#line 5282 "PicasaPublishing.c" } else { gboolean _tmp20_ = FALSE; gboolean _tmp21_ = FALSE; - PublishingPicasaAlbum** _tmp22_ = NULL; - gint _tmp22__length1 = 0; - gint _tmp23_ = 0; - PublishingPicasaAlbum* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; + PublishingPicasaAlbum** _tmp22_; + gint _tmp22__length1; + gint _tmp23_; + PublishingPicasaAlbum* _tmp24_; + const gchar* _tmp25_; #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp22_ = albums; #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -5344,14 +5317,13 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis if (g_strcmp0 (_tmp25_, PUBLISHING_PICASA_DEFAULT_ALBUM_NAME) == 0) { #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp21_ = TRUE; -#line 5332 "PicasaPublishing.c" +#line 5305 "PicasaPublishing.c" } else { - PublishingPicasaAlbum** _tmp26_ = NULL; - gint _tmp26__length1 = 0; - gint _tmp27_ = 0; - PublishingPicasaAlbum* _tmp28_ = NULL; - const gchar* _tmp29_ = NULL; - const gchar* _tmp30_ = NULL; + PublishingPicasaAlbum** _tmp26_; + gint _tmp26__length1; + gint _tmp27_; + PublishingPicasaAlbum* _tmp28_; + const gchar* _tmp29_; #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp26_ = albums; #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -5363,70 +5335,68 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp29_ = _tmp28_->name; #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp30_ = _ ("Default album"); -#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp21_ = g_strcmp0 (_tmp29_, _tmp30_) == 0; -#line 5354 "PicasaPublishing.c" + _tmp21_ = g_strcmp0 (_tmp29_, _ ("Default album")) == 0; +#line 5324 "PicasaPublishing.c" } #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp21_) { -#line 5358 "PicasaPublishing.c" - gint _tmp31_ = 0; +#line 5328 "PicasaPublishing.c" + gint _tmp30_; #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp31_ = default_album_id; + _tmp30_ = default_album_id; #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp20_ = _tmp31_ == -1; -#line 5364 "PicasaPublishing.c" + _tmp20_ = _tmp30_ == -1; +#line 5334 "PicasaPublishing.c" } else { #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp20_ = FALSE; -#line 5368 "PicasaPublishing.c" +#line 5338 "PicasaPublishing.c" } #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp14_ = _tmp20_; -#line 5372 "PicasaPublishing.c" +#line 5342 "PicasaPublishing.c" } #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp14_) { -#line 5376 "PicasaPublishing.c" - gint _tmp32_ = 0; +#line 5346 "PicasaPublishing.c" + gint _tmp31_; #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp32_ = i; + _tmp31_ = i; #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - default_album_id = _tmp32_; -#line 5382 "PicasaPublishing.c" + default_album_id = _tmp31_; +#line 5352 "PicasaPublishing.c" } } } } #line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp33_ = default_album_id; + _tmp32_ = default_album_id; #line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - if (_tmp33_ >= 0) { -#line 5391 "PicasaPublishing.c" - GtkComboBoxText* _tmp34_ = NULL; - gint _tmp35_ = 0; + if (_tmp32_ >= 0) { +#line 5361 "PicasaPublishing.c" + GtkComboBoxText* _tmp33_; + gint _tmp34_; #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp34_ = self->priv->existing_albums_combo; + _tmp33_ = self->priv->existing_albums_combo; #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp35_ = default_album_id; + _tmp34_ = default_album_id; #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_combo_box_get_type (), GtkComboBox), _tmp35_); -#line 5400 "PicasaPublishing.c" + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_combo_box_get_type (), GtkComboBox), _tmp34_); +#line 5370 "PicasaPublishing.c" } #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" albums = (_vala_array_free (albums, albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL); #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 (last_album); -#line 5406 "PicasaPublishing.c" +#line 5376 "PicasaPublishing.c" } static GtkWidget* publishing_picasa_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) { PublishingPicasaPublishingOptionsPane * self; GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane); #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -5437,7 +5407,7 @@ static GtkWidget* publishing_picasa_publishing_options_pane_real_get_widget (Spi result = _tmp1_; #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 5425 "PicasaPublishing.c" +#line 5395 "PicasaPublishing.c" } @@ -5450,7 +5420,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_picasa_publishing_opti result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; #line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 5438 "PicasaPublishing.c" +#line 5408 "PicasaPublishing.c" } @@ -5460,7 +5430,7 @@ static void publishing_picasa_publishing_options_pane_real_on_pane_installed (Sp self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane); #line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_options_pane_installed (self); -#line 5448 "PicasaPublishing.c" +#line 5418 "PicasaPublishing.c" } @@ -5468,15 +5438,15 @@ static void publishing_picasa_publishing_options_pane_real_on_pane_uninstalled ( PublishingPicasaPublishingOptionsPane * self; #line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane); -#line 5456 "PicasaPublishing.c" +#line 5426 "PicasaPublishing.c" } static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_construct (GType object_type, const gchar* name, gint major_axis_pixels) { PublishingPicasaPublishingOptionsPaneSizeDescription* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gint _tmp2_ = 0; + const gchar* _tmp0_; + gchar* _tmp1_; + gint _tmp2_; #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_val_if_fail (name != NULL, NULL); #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -5495,21 +5465,21 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_p self->major_axis_pixels = _tmp2_; #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self; -#line 5483 "PicasaPublishing.c" +#line 5453 "PicasaPublishing.c" } static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_new (const gchar* name, gint major_axis_pixels) { #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return publishing_picasa_publishing_options_pane_size_description_construct (PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION, name, major_axis_pixels); -#line 5490 "PicasaPublishing.c" +#line 5460 "PicasaPublishing.c" } static void publishing_picasa_publishing_options_pane_value_size_description_init (GValue* value) { #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 5497 "PicasaPublishing.c" +#line 5467 "PicasaPublishing.c" } @@ -5518,7 +5488,7 @@ static void publishing_picasa_publishing_options_pane_value_size_description_fre if (value->data[0].v_pointer) { #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_options_pane_size_description_unref (value->data[0].v_pointer); -#line 5506 "PicasaPublishing.c" +#line 5476 "PicasaPublishing.c" } } @@ -5528,11 +5498,11 @@ static void publishing_picasa_publishing_options_pane_value_size_description_cop if (src_value->data[0].v_pointer) { #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" dest_value->data[0].v_pointer = publishing_picasa_publishing_options_pane_size_description_ref (src_value->data[0].v_pointer); -#line 5516 "PicasaPublishing.c" +#line 5486 "PicasaPublishing.c" } else { #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 5520 "PicasaPublishing.c" +#line 5490 "PicasaPublishing.c" } } @@ -5540,66 +5510,66 @@ static void publishing_picasa_publishing_options_pane_value_size_description_cop static gpointer publishing_picasa_publishing_options_pane_value_size_description_peek_pointer (const GValue* value) { #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return value->data[0].v_pointer; -#line 5528 "PicasaPublishing.c" +#line 5498 "PicasaPublishing.c" } static gchar* publishing_picasa_publishing_options_pane_value_size_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (collect_values[0].v_pointer) { -#line 5535 "PicasaPublishing.c" - PublishingPicasaPublishingOptionsPaneSizeDescription* object; +#line 5505 "PicasaPublishing.c" + PublishingPicasaPublishingOptionsPaneSizeDescription * object; object = collect_values[0].v_pointer; #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 5542 "PicasaPublishing.c" +#line 5512 "PicasaPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 5546 "PicasaPublishing.c" +#line 5516 "PicasaPublishing.c" } #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = publishing_picasa_publishing_options_pane_size_description_ref (object); -#line 5550 "PicasaPublishing.c" +#line 5520 "PicasaPublishing.c" } else { #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 5554 "PicasaPublishing.c" +#line 5524 "PicasaPublishing.c" } #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return NULL; -#line 5558 "PicasaPublishing.c" +#line 5528 "PicasaPublishing.c" } static gchar* publishing_picasa_publishing_options_pane_value_size_description_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingPicasaPublishingOptionsPaneSizeDescription** object_p; + PublishingPicasaPublishingOptionsPaneSizeDescription ** object_p; object_p = collect_values[0].v_pointer; #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (!object_p) { #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 5569 "PicasaPublishing.c" +#line 5539 "PicasaPublishing.c" } #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (!value->data[0].v_pointer) { #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *object_p = NULL; -#line 5575 "PicasaPublishing.c" +#line 5545 "PicasaPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *object_p = value->data[0].v_pointer; -#line 5579 "PicasaPublishing.c" +#line 5549 "PicasaPublishing.c" } else { #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *object_p = publishing_picasa_publishing_options_pane_size_description_ref (value->data[0].v_pointer); -#line 5583 "PicasaPublishing.c" +#line 5553 "PicasaPublishing.c" } #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return NULL; -#line 5587 "PicasaPublishing.c" +#line 5557 "PicasaPublishing.c" } @@ -5613,7 +5583,7 @@ static GParamSpec* publishing_picasa_publishing_options_pane_param_spec_size_des G_PARAM_SPEC (spec)->value_type = object_type; #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return G_PARAM_SPEC (spec); -#line 5601 "PicasaPublishing.c" +#line 5571 "PicasaPublishing.c" } @@ -5622,12 +5592,12 @@ static gpointer publishing_picasa_publishing_options_pane_value_get_size_descrip g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION), NULL); #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return value->data[0].v_pointer; -#line 5610 "PicasaPublishing.c" +#line 5580 "PicasaPublishing.c" } static void publishing_picasa_publishing_options_pane_value_set_size_description (GValue* value, gpointer v_object) { - PublishingPicasaPublishingOptionsPaneSizeDescription* old; + PublishingPicasaPublishingOptionsPaneSizeDescription * old; #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION)); #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -5642,23 +5612,23 @@ static void publishing_picasa_publishing_options_pane_value_set_size_description value->data[0].v_pointer = v_object; #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_options_pane_size_description_ref (value->data[0].v_pointer); -#line 5630 "PicasaPublishing.c" +#line 5600 "PicasaPublishing.c" } else { #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 5634 "PicasaPublishing.c" +#line 5604 "PicasaPublishing.c" } #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (old) { #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_options_pane_size_description_unref (old); -#line 5640 "PicasaPublishing.c" +#line 5610 "PicasaPublishing.c" } } static void publishing_picasa_publishing_options_pane_value_take_size_description (GValue* value, gpointer v_object) { - PublishingPicasaPublishingOptionsPaneSizeDescription* old; + PublishingPicasaPublishingOptionsPaneSizeDescription * old; #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION)); #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -5671,17 +5641,17 @@ static void publishing_picasa_publishing_options_pane_value_take_size_descriptio g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = v_object; -#line 5659 "PicasaPublishing.c" +#line 5629 "PicasaPublishing.c" } else { #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 5663 "PicasaPublishing.c" +#line 5633 "PicasaPublishing.c" } #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (old) { #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_options_pane_size_description_unref (old); -#line 5669 "PicasaPublishing.c" +#line 5639 "PicasaPublishing.c" } } @@ -5691,18 +5661,18 @@ static void publishing_picasa_publishing_options_pane_size_description_class_ini publishing_picasa_publishing_options_pane_size_description_parent_class = g_type_class_peek_parent (klass); #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" ((PublishingPicasaPublishingOptionsPaneSizeDescriptionClass *) klass)->finalize = publishing_picasa_publishing_options_pane_size_description_finalize; -#line 5679 "PicasaPublishing.c" +#line 5649 "PicasaPublishing.c" } static void publishing_picasa_publishing_options_pane_size_description_instance_init (PublishingPicasaPublishingOptionsPaneSizeDescription * self) { #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->ref_count = 1; -#line 5686 "PicasaPublishing.c" +#line 5656 "PicasaPublishing.c" } -static void publishing_picasa_publishing_options_pane_size_description_finalize (PublishingPicasaPublishingOptionsPaneSizeDescription* obj) { +static void publishing_picasa_publishing_options_pane_size_description_finalize (PublishingPicasaPublishingOptionsPaneSizeDescription * obj) { PublishingPicasaPublishingOptionsPaneSizeDescription * self; #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION, PublishingPicasaPublishingOptionsPaneSizeDescription); @@ -5710,7 +5680,7 @@ static void publishing_picasa_publishing_options_pane_size_description_finalize g_signal_handlers_destroy (self); #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 (self->name); -#line 5698 "PicasaPublishing.c" +#line 5668 "PicasaPublishing.c" } @@ -5729,18 +5699,18 @@ static GType publishing_picasa_publishing_options_pane_size_description_get_type static gpointer publishing_picasa_publishing_options_pane_size_description_ref (gpointer instance) { - PublishingPicasaPublishingOptionsPaneSizeDescription* self; + PublishingPicasaPublishingOptionsPaneSizeDescription * self; self = instance; #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_atomic_int_inc (&self->ref_count); #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return instance; -#line 5723 "PicasaPublishing.c" +#line 5693 "PicasaPublishing.c" } static void publishing_picasa_publishing_options_pane_size_description_unref (gpointer instance) { - PublishingPicasaPublishingOptionsPaneSizeDescription* self; + PublishingPicasaPublishingOptionsPaneSizeDescription * self; self = instance; #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -5748,7 +5718,7 @@ static void publishing_picasa_publishing_options_pane_size_description_unref (gp PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_SIZE_DESCRIPTION_GET_CLASS (self)->finalize (self); #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 5736 "PicasaPublishing.c" +#line 5706 "PicasaPublishing.c" } } @@ -5761,10 +5731,10 @@ static void publishing_picasa_publishing_options_pane_class_init (PublishingPica #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_picasa_publishing_options_pane_finalize; #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - g_signal_new ("publish", PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + publishing_picasa_publishing_options_pane_signals[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - g_signal_new ("logout", PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 5752 "PicasaPublishing.c" + publishing_picasa_publishing_options_pane_signals[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 5722 "PicasaPublishing.c" } @@ -5772,14 +5742,14 @@ static void publishing_picasa_publishing_options_pane_spit_publishing_dialog_pan #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface); #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_picasa_publishing_options_pane_real_get_widget; + iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_picasa_publishing_options_pane_real_get_widget; #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_picasa_publishing_options_pane_real_get_preferred_geometry; + iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_picasa_publishing_options_pane_real_get_preferred_geometry; #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_picasa_publishing_options_pane_real_on_pane_installed; + iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_picasa_publishing_options_pane_real_on_pane_installed; #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_picasa_publishing_options_pane_real_on_pane_uninstalled; -#line 5767 "PicasaPublishing.c" + iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_picasa_publishing_options_pane_real_on_pane_uninstalled; +#line 5737 "PicasaPublishing.c" } @@ -5806,11 +5776,11 @@ static void publishing_picasa_publishing_options_pane_instance_init (PublishingP self->priv->publish_button = NULL; #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->logout_button = NULL; -#line 5794 "PicasaPublishing.c" +#line 5764 "PicasaPublishing.c" } -static void publishing_picasa_publishing_options_pane_finalize (GObject* obj) { +static void publishing_picasa_publishing_options_pane_finalize (GObject * obj) { PublishingPicasaPublishingOptionsPane * self; #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane); @@ -5840,7 +5810,7 @@ static void publishing_picasa_publishing_options_pane_finalize (GObject* obj) { _publishing_picasa_publishing_parameters_unref0 (self->priv->parameters); #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" G_OBJECT_CLASS (publishing_picasa_publishing_options_pane_parent_class)->finalize (obj); -#line 5828 "PicasaPublishing.c" +#line 5798 "PicasaPublishing.c" } @@ -5860,7 +5830,7 @@ GType publishing_picasa_publishing_options_pane_get_type (void) { PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_construct (GType object_type) { PublishingPicasaPublishingParameters* self = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = (PublishingPicasaPublishingParameters*) g_type_create_instance (object_type); #line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -5897,21 +5867,21 @@ PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_co self->priv->media_type = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO; #line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self; -#line 5885 "PicasaPublishing.c" +#line 5855 "PicasaPublishing.c" } PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_new (void) { #line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return publishing_picasa_publishing_parameters_construct (PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS); -#line 5892 "PicasaPublishing.c" +#line 5862 "PicasaPublishing.c" } gchar* publishing_picasa_publishing_parameters_get_target_album_name (PublishingPicasaPublishingParameters* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), NULL); #line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -5922,13 +5892,13 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_name (Publishing result = _tmp1_; #line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 5910 "PicasaPublishing.c" +#line 5880 "PicasaPublishing.c" } void publishing_picasa_publishing_parameters_set_target_album_name (PublishingPicasaPublishingParameters* self, const gchar* target_album_name) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self)); #line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -5941,13 +5911,13 @@ void publishing_picasa_publishing_parameters_set_target_album_name (PublishingPi _g_free0 (self->priv->target_album_name); #line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->target_album_name = _tmp1_; -#line 5929 "PicasaPublishing.c" +#line 5899 "PicasaPublishing.c" } void publishing_picasa_publishing_parameters_set_target_album_entry_url (PublishingPicasaPublishingParameters* self, const gchar* target_album_url) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self)); #line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -5960,14 +5930,14 @@ void publishing_picasa_publishing_parameters_set_target_album_entry_url (Publish _g_free0 (self->priv->target_album_url); #line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->target_album_url = _tmp1_; -#line 5948 "PicasaPublishing.c" +#line 5918 "PicasaPublishing.c" } gchar* publishing_picasa_publishing_parameters_get_target_album_entry_url (PublishingPicasaPublishingParameters* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), NULL); #line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -5978,126 +5948,168 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_entry_url (Publi result = _tmp1_; #line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 5966 "PicasaPublishing.c" +#line 5936 "PicasaPublishing.c" } static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 5979 "PicasaPublishing.c" +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if ((*((gchar*) self)) == '\0') { +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp1_ = TRUE; +#line 5955 "PicasaPublishing.c" + } else { + const gchar* _tmp2_; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp2_ = old; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; +#line 5962 "PicasaPublishing.c" + } +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if (_tmp1_) { +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp0_ = TRUE; +#line 5968 "PicasaPublishing.c" + } else { + const gchar* _tmp3_; + const gchar* _tmp4_; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp3_ = old; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp4_ = replacement; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; +#line 5978 "PicasaPublishing.c" + } +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if (_tmp0_) { +#line 5982 "PicasaPublishing.c" + gchar* _tmp5_; +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp5_ = g_strdup (self); +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp5_; +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + return result; +#line 5990 "PicasaPublishing.c" + } { GRegex* regex = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - GRegex* _tmp3_ = NULL; - GRegex* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - GRegex* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp0_ = old; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp2_ = _tmp1_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp4_ = _tmp3_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _g_free0 (_tmp2_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - regex = _tmp4_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + GRegex* _tmp9_; + GRegex* _tmp10_; + gchar* _tmp11_ = NULL; + GRegex* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp6_ = old; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp7_ = g_regex_escape_string (_tmp6_, -1); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp8_ = _tmp7_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp10_ = _tmp9_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp8_); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + regex = _tmp10_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 6010 "PicasaPublishing.c" +#line 6022 "PicasaPublishing.c" goto __catch12_g_regex_error; } -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 6019 "PicasaPublishing.c" +#line 6031 "PicasaPublishing.c" } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp6_ = regex; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp7_ = replacement; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp5_ = _tmp8_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp12_ = regex; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp13_ = replacement; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = _tmp14_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 6035 "PicasaPublishing.c" +#line 6047 "PicasaPublishing.c" goto __catch12_g_regex_error; } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 6046 "PicasaPublishing.c" +#line 6058 "PicasaPublishing.c" } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp9_ = _tmp5_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp5_ = NULL; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - result = _tmp9_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _g_free0 (_tmp5_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp15_ = _tmp11_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = NULL; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp15_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp11_); +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 6060 "PicasaPublishing.c" +#line 6072 "PicasaPublishing.c" } goto __finally12; __catch12_g_regex_error: { GError* e = NULL; -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 6074 "PicasaPublishing.c" +#line 6086 "PicasaPublishing.c" } __finally12: -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 6085 "PicasaPublishing.c" +#line 6097 "PicasaPublishing.c" } } @@ -6105,9 +6117,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* gchar* publishing_picasa_publishing_parameters_get_target_album_feed_url (PublishingPicasaPublishingParameters* self) { gchar* result = NULL; gchar* entry_url = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; gchar* feed_url = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp1_; #line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), NULL); #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -6124,14 +6136,14 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_feed_url (Publis _g_free0 (entry_url); #line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 6112 "PicasaPublishing.c" +#line 6124 "PicasaPublishing.c" } gchar* publishing_picasa_publishing_parameters_get_user_name (PublishingPicasaPublishingParameters* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), NULL); #line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -6142,13 +6154,13 @@ gchar* publishing_picasa_publishing_parameters_get_user_name (PublishingPicasaPu result = _tmp1_; #line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 6130 "PicasaPublishing.c" +#line 6142 "PicasaPublishing.c" } void publishing_picasa_publishing_parameters_set_user_name (PublishingPicasaPublishingParameters* self, const gchar* user_name) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self)); #line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -6161,14 +6173,14 @@ void publishing_picasa_publishing_parameters_set_user_name (PublishingPicasaPubl _g_free0 (self->priv->user_name); #line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->user_name = _tmp1_; -#line 6149 "PicasaPublishing.c" +#line 6161 "PicasaPublishing.c" } static gpointer _publishing_picasa_album_ref0 (gpointer self) { #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self ? publishing_picasa_album_ref (self) : NULL; -#line 6156 "PicasaPublishing.c" +#line 6168 "PicasaPublishing.c" } @@ -6179,28 +6191,28 @@ static PublishingPicasaAlbum** _vala_array_dup5 (PublishingPicasaAlbum** self, i result = g_new0 (PublishingPicasaAlbum*, length + 1); #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" for (i = 0; i < length; i++) { -#line 6167 "PicasaPublishing.c" - PublishingPicasaAlbum* _tmp0_ = NULL; +#line 6179 "PicasaPublishing.c" + PublishingPicasaAlbum* _tmp0_; #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp0_ = _publishing_picasa_album_ref0 (self[i]); #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" result[i] = _tmp0_; -#line 6173 "PicasaPublishing.c" +#line 6185 "PicasaPublishing.c" } #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 6177 "PicasaPublishing.c" +#line 6189 "PicasaPublishing.c" } PublishingPicasaAlbum** publishing_picasa_publishing_parameters_get_albums (PublishingPicasaPublishingParameters* self, int* result_length1) { PublishingPicasaAlbum** result = NULL; - PublishingPicasaAlbum** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - PublishingPicasaAlbum** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - PublishingPicasaAlbum** _tmp2_ = NULL; - gint _tmp2__length1 = 0; + PublishingPicasaAlbum** _tmp0_; + gint _tmp0__length1; + PublishingPicasaAlbum** _tmp1_; + gint _tmp1__length1; + PublishingPicasaAlbum** _tmp2_; + gint _tmp2__length1; #line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), NULL); #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -6219,13 +6231,13 @@ PublishingPicasaAlbum** publishing_picasa_publishing_parameters_get_albums (Publ if (result_length1) { #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *result_length1 = _tmp2__length1; -#line 6207 "PicasaPublishing.c" +#line 6219 "PicasaPublishing.c" } #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" result = _tmp2_; #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 6213 "PicasaPublishing.c" +#line 6225 "PicasaPublishing.c" } @@ -6236,25 +6248,25 @@ static PublishingPicasaAlbum** _vala_array_dup6 (PublishingPicasaAlbum** self, i result = g_new0 (PublishingPicasaAlbum*, length + 1); #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" for (i = 0; i < length; i++) { -#line 6224 "PicasaPublishing.c" - PublishingPicasaAlbum* _tmp0_ = NULL; +#line 6236 "PicasaPublishing.c" + PublishingPicasaAlbum* _tmp0_; #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp0_ = _publishing_picasa_album_ref0 (self[i]); #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" result[i] = _tmp0_; -#line 6230 "PicasaPublishing.c" +#line 6242 "PicasaPublishing.c" } #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 6234 "PicasaPublishing.c" +#line 6246 "PicasaPublishing.c" } void publishing_picasa_publishing_parameters_set_albums (PublishingPicasaPublishingParameters* self, PublishingPicasaAlbum** albums, int albums_length1) { - PublishingPicasaAlbum** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - PublishingPicasaAlbum** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + PublishingPicasaAlbum** _tmp0_; + gint _tmp0__length1; + PublishingPicasaAlbum** _tmp1_; + gint _tmp1__length1; #line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self)); #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -6273,25 +6285,25 @@ void publishing_picasa_publishing_parameters_set_albums (PublishingPicasaPublish self->priv->albums_length1 = _tmp1__length1; #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->_albums_size_ = self->priv->albums_length1; -#line 6261 "PicasaPublishing.c" +#line 6273 "PicasaPublishing.c" } void publishing_picasa_publishing_parameters_set_major_axis_size_pixels (PublishingPicasaPublishingParameters* self, gint pixels) { - gint _tmp0_ = 0; + gint _tmp0_; #line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self)); #line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp0_ = pixels; #line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->major_axis_size_pixels = _tmp0_; -#line 6273 "PicasaPublishing.c" +#line 6285 "PicasaPublishing.c" } gint publishing_picasa_publishing_parameters_get_major_axis_size_pixels (PublishingPicasaPublishingParameters* self) { gint result = 0; - gint _tmp0_ = 0; + gint _tmp0_; #line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), 0); #line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -6300,25 +6312,25 @@ gint publishing_picasa_publishing_parameters_get_major_axis_size_pixels (Publish result = _tmp0_; #line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 6288 "PicasaPublishing.c" +#line 6300 "PicasaPublishing.c" } void publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self, gint selection_id) { - gint _tmp0_ = 0; + gint _tmp0_; #line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self)); #line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp0_ = selection_id; #line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->major_axis_size_selection_id = _tmp0_; -#line 6300 "PicasaPublishing.c" +#line 6312 "PicasaPublishing.c" } gint publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self) { gint result = 0; - gint _tmp0_ = 0; + gint _tmp0_; #line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), 0); #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -6327,25 +6339,25 @@ gint publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (P result = _tmp0_; #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 6315 "PicasaPublishing.c" +#line 6327 "PicasaPublishing.c" } void publishing_picasa_publishing_parameters_set_strip_metadata (PublishingPicasaPublishingParameters* self, gboolean strip_metadata) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self)); #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp0_ = strip_metadata; #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->strip_metadata = _tmp0_; -#line 6327 "PicasaPublishing.c" +#line 6339 "PicasaPublishing.c" } gboolean publishing_picasa_publishing_parameters_get_strip_metadata (PublishingPicasaPublishingParameters* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), FALSE); #line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -6354,25 +6366,25 @@ gboolean publishing_picasa_publishing_parameters_get_strip_metadata (PublishingP result = _tmp0_; #line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 6342 "PicasaPublishing.c" +#line 6354 "PicasaPublishing.c" } void publishing_picasa_publishing_parameters_set_media_type (PublishingPicasaPublishingParameters* self, SpitPublishingPublisherMediaType media_type) { - SpitPublishingPublisherMediaType _tmp0_ = 0; + SpitPublishingPublisherMediaType _tmp0_; #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self)); #line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp0_ = media_type; #line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->media_type = _tmp0_; -#line 6354 "PicasaPublishing.c" +#line 6366 "PicasaPublishing.c" } SpitPublishingPublisherMediaType publishing_picasa_publishing_parameters_get_media_type (PublishingPicasaPublishingParameters* self) { SpitPublishingPublisherMediaType result = 0; - SpitPublishingPublisherMediaType _tmp0_ = 0; + SpitPublishingPublisherMediaType _tmp0_; #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), 0); #line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -6381,14 +6393,14 @@ SpitPublishingPublisherMediaType publishing_picasa_publishing_parameters_get_med result = _tmp0_; #line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 6369 "PicasaPublishing.c" +#line 6381 "PicasaPublishing.c" } static void publishing_picasa_value_publishing_parameters_init (GValue* value) { #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 6376 "PicasaPublishing.c" +#line 6388 "PicasaPublishing.c" } @@ -6397,7 +6409,7 @@ static void publishing_picasa_value_publishing_parameters_free_value (GValue* va if (value->data[0].v_pointer) { #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_parameters_unref (value->data[0].v_pointer); -#line 6385 "PicasaPublishing.c" +#line 6397 "PicasaPublishing.c" } } @@ -6407,11 +6419,11 @@ static void publishing_picasa_value_publishing_parameters_copy_value (const GVal if (src_value->data[0].v_pointer) { #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" dest_value->data[0].v_pointer = publishing_picasa_publishing_parameters_ref (src_value->data[0].v_pointer); -#line 6395 "PicasaPublishing.c" +#line 6407 "PicasaPublishing.c" } else { #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 6399 "PicasaPublishing.c" +#line 6411 "PicasaPublishing.c" } } @@ -6419,66 +6431,66 @@ static void publishing_picasa_value_publishing_parameters_copy_value (const GVal static gpointer publishing_picasa_value_publishing_parameters_peek_pointer (const GValue* value) { #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return value->data[0].v_pointer; -#line 6407 "PicasaPublishing.c" +#line 6419 "PicasaPublishing.c" } static gchar* publishing_picasa_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (collect_values[0].v_pointer) { -#line 6414 "PicasaPublishing.c" - PublishingPicasaPublishingParameters* object; +#line 6426 "PicasaPublishing.c" + PublishingPicasaPublishingParameters * object; object = collect_values[0].v_pointer; #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6421 "PicasaPublishing.c" +#line 6433 "PicasaPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6425 "PicasaPublishing.c" +#line 6437 "PicasaPublishing.c" } #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = publishing_picasa_publishing_parameters_ref (object); -#line 6429 "PicasaPublishing.c" +#line 6441 "PicasaPublishing.c" } else { #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 6433 "PicasaPublishing.c" +#line 6445 "PicasaPublishing.c" } #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return NULL; -#line 6437 "PicasaPublishing.c" +#line 6449 "PicasaPublishing.c" } static gchar* publishing_picasa_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingPicasaPublishingParameters** object_p; + PublishingPicasaPublishingParameters ** object_p; object_p = collect_values[0].v_pointer; #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (!object_p) { #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 6448 "PicasaPublishing.c" +#line 6460 "PicasaPublishing.c" } #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (!value->data[0].v_pointer) { #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *object_p = NULL; -#line 6454 "PicasaPublishing.c" +#line 6466 "PicasaPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *object_p = value->data[0].v_pointer; -#line 6458 "PicasaPublishing.c" +#line 6470 "PicasaPublishing.c" } else { #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *object_p = publishing_picasa_publishing_parameters_ref (value->data[0].v_pointer); -#line 6462 "PicasaPublishing.c" +#line 6474 "PicasaPublishing.c" } #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return NULL; -#line 6466 "PicasaPublishing.c" +#line 6478 "PicasaPublishing.c" } @@ -6492,7 +6504,7 @@ GParamSpec* publishing_picasa_param_spec_publishing_parameters (const gchar* nam G_PARAM_SPEC (spec)->value_type = object_type; #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return G_PARAM_SPEC (spec); -#line 6480 "PicasaPublishing.c" +#line 6492 "PicasaPublishing.c" } @@ -6501,12 +6513,12 @@ gpointer publishing_picasa_value_get_publishing_parameters (const GValue* value) g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS), NULL); #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return value->data[0].v_pointer; -#line 6489 "PicasaPublishing.c" +#line 6501 "PicasaPublishing.c" } void publishing_picasa_value_set_publishing_parameters (GValue* value, gpointer v_object) { - PublishingPicasaPublishingParameters* old; + PublishingPicasaPublishingParameters * old; #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS)); #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -6521,23 +6533,23 @@ void publishing_picasa_value_set_publishing_parameters (GValue* value, gpointer value->data[0].v_pointer = v_object; #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_parameters_ref (value->data[0].v_pointer); -#line 6509 "PicasaPublishing.c" +#line 6521 "PicasaPublishing.c" } else { #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 6513 "PicasaPublishing.c" +#line 6525 "PicasaPublishing.c" } #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (old) { #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_parameters_unref (old); -#line 6519 "PicasaPublishing.c" +#line 6531 "PicasaPublishing.c" } } void publishing_picasa_value_take_publishing_parameters (GValue* value, gpointer v_object) { - PublishingPicasaPublishingParameters* old; + PublishingPicasaPublishingParameters * old; #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS)); #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -6550,17 +6562,17 @@ void publishing_picasa_value_take_publishing_parameters (GValue* value, gpointer g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = v_object; -#line 6538 "PicasaPublishing.c" +#line 6550 "PicasaPublishing.c" } else { #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 6542 "PicasaPublishing.c" +#line 6554 "PicasaPublishing.c" } #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (old) { #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_parameters_unref (old); -#line 6548 "PicasaPublishing.c" +#line 6560 "PicasaPublishing.c" } } @@ -6572,7 +6584,7 @@ static void publishing_picasa_publishing_parameters_class_init (PublishingPicasa ((PublishingPicasaPublishingParametersClass *) klass)->finalize = publishing_picasa_publishing_parameters_finalize; #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingPicasaPublishingParametersPrivate)); -#line 6560 "PicasaPublishing.c" +#line 6572 "PicasaPublishing.c" } @@ -6581,11 +6593,11 @@ static void publishing_picasa_publishing_parameters_instance_init (PublishingPic self->priv = PUBLISHING_PICASA_PUBLISHING_PARAMETERS_GET_PRIVATE (self); #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->ref_count = 1; -#line 6569 "PicasaPublishing.c" +#line 6581 "PicasaPublishing.c" } -static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPublishingParameters* obj) { +static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPublishingParameters * obj) { PublishingPicasaPublishingParameters * self; #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS, PublishingPicasaPublishingParameters); @@ -6599,7 +6611,7 @@ static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPu _g_free0 (self->priv->user_name); #line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL); -#line 6587 "PicasaPublishing.c" +#line 6599 "PicasaPublishing.c" } @@ -6618,18 +6630,18 @@ GType publishing_picasa_publishing_parameters_get_type (void) { gpointer publishing_picasa_publishing_parameters_ref (gpointer instance) { - PublishingPicasaPublishingParameters* self; + PublishingPicasaPublishingParameters * self; self = instance; #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_atomic_int_inc (&self->ref_count); #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return instance; -#line 6612 "PicasaPublishing.c" +#line 6624 "PicasaPublishing.c" } void publishing_picasa_publishing_parameters_unref (gpointer instance) { - PublishingPicasaPublishingParameters* self; + PublishingPicasaPublishingParameters * self; self = instance; #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -6637,18 +6649,18 @@ void publishing_picasa_publishing_parameters_unref (gpointer instance) { PUBLISHING_PICASA_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self); #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 6625 "PicasaPublishing.c" +#line 6637 "PicasaPublishing.c" } } PublishingPicasaUploader* publishing_picasa_uploader_construct (GType object_type, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPicasaPublishingParameters* parameters) { PublishingPicasaUploader* self = NULL; - PublishingRESTSupportGoogleSession* _tmp0_ = NULL; - SpitPublishingPublishable** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - PublishingPicasaPublishingParameters* _tmp2_ = NULL; - PublishingPicasaPublishingParameters* _tmp3_ = NULL; + PublishingRESTSupportGoogleSession* _tmp0_; + SpitPublishingPublishable** _tmp1_; + gint _tmp1__length1; + PublishingPicasaPublishingParameters* _tmp2_; + PublishingPicasaPublishingParameters* _tmp3_; #line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL); #line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -6671,27 +6683,27 @@ PublishingPicasaUploader* publishing_picasa_uploader_construct (GType object_typ self->priv->parameters = _tmp3_; #line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self; -#line 6659 "PicasaPublishing.c" +#line 6671 "PicasaPublishing.c" } PublishingPicasaUploader* publishing_picasa_uploader_new (PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPicasaPublishingParameters* parameters) { #line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return publishing_picasa_uploader_construct (PUBLISHING_PICASA_TYPE_UPLOADER, session, publishables, publishables_length1, parameters); -#line 6666 "PicasaPublishing.c" +#line 6678 "PicasaPublishing.c" } static PublishingRESTSupportTransaction* publishing_picasa_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) { PublishingPicasaUploader * self; PublishingRESTSupportTransaction* result = NULL; - PublishingRESTSupportSession* _tmp0_ = NULL; - PublishingRESTSupportGoogleSession* _tmp1_ = NULL; - PublishingPicasaPublishingParameters* _tmp2_ = NULL; - SpitPublishingPublishable* _tmp3_ = NULL; - SpitPublishingPublishable* _tmp4_ = NULL; - PublishingPicasaUploadTransaction* _tmp5_ = NULL; - PublishingRESTSupportTransaction* _tmp6_ = NULL; + PublishingRESTSupportSession* _tmp0_; + PublishingRESTSupportGoogleSession* _tmp1_; + PublishingPicasaPublishingParameters* _tmp2_; + SpitPublishingPublishable* _tmp3_; + SpitPublishingPublishable* _tmp4_; + PublishingPicasaUploadTransaction* _tmp5_; + PublishingRESTSupportTransaction* _tmp6_; #line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_UPLOADER, PublishingPicasaUploader); #line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -6718,7 +6730,7 @@ static PublishingRESTSupportTransaction* publishing_picasa_uploader_real_create_ result = _tmp6_; #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 6706 "PicasaPublishing.c" +#line 6718 "PicasaPublishing.c" } @@ -6730,19 +6742,19 @@ static void publishing_picasa_uploader_class_init (PublishingPicasaUploaderClass #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingPicasaUploaderPrivate)); #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_picasa_uploader_real_create_transaction; -#line 6719 "PicasaPublishing.c" + ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_picasa_uploader_real_create_transaction; +#line 6731 "PicasaPublishing.c" } static void publishing_picasa_uploader_instance_init (PublishingPicasaUploader * self) { #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv = PUBLISHING_PICASA_UPLOADER_GET_PRIVATE (self); -#line 6726 "PicasaPublishing.c" +#line 6738 "PicasaPublishing.c" } -static void publishing_picasa_uploader_finalize (PublishingRESTSupportBatchUploader* obj) { +static void publishing_picasa_uploader_finalize (PublishingRESTSupportBatchUploader * obj) { PublishingPicasaUploader * self; #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_UPLOADER, PublishingPicasaUploader); @@ -6750,7 +6762,7 @@ static void publishing_picasa_uploader_finalize (PublishingRESTSupportBatchUploa _publishing_picasa_publishing_parameters_unref0 (self->priv->parameters); #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_picasa_uploader_parent_class)->finalize (obj); -#line 6738 "PicasaPublishing.c" +#line 6750 "PicasaPublishing.c" } diff --git a/plugins/shotwell-publishing/PiwigoPublishing.c b/plugins/shotwell-publishing/PiwigoPublishing.c index 3e50423..2323b7f 100644 --- a/plugins/shotwell-publishing/PiwigoPublishing.c +++ b/plugins/shotwell-publishing/PiwigoPublishing.c @@ -1,4 +1,4 @@ -/* PiwigoPublishing.c generated by valac 0.34.7, the Vala compiler +/* PiwigoPublishing.c generated by valac 0.36.6, the Vala compiler * generated from PiwigoPublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -236,8 +236,24 @@ typedef struct _PublishingPiwigoImagesAddTransaction PublishingPiwigoImagesAddTr typedef struct _PublishingPiwigoImagesAddTransactionClass PublishingPiwigoImagesAddTransactionClass; typedef struct _PublishingPiwigoSSLErrorPanePrivate PublishingPiwigoSSLErrorPanePrivate; #define _g_byte_array_unref0(var) ((var == NULL) ? NULL : (var = (g_byte_array_unref (var), NULL))) +enum { + PUBLISHING_PIWIGO_SSL_ERROR_PANE_PROCEED_SIGNAL, + PUBLISHING_PIWIGO_SSL_ERROR_PANE_LAST_SIGNAL +}; +static guint publishing_piwigo_ssl_error_pane_signals[PUBLISHING_PIWIGO_SSL_ERROR_PANE_LAST_SIGNAL] = {0}; typedef struct _PublishingPiwigoAuthenticationPanePrivate PublishingPiwigoAuthenticationPanePrivate; +enum { + PUBLISHING_PIWIGO_AUTHENTICATION_PANE_LOGIN_SIGNAL, + PUBLISHING_PIWIGO_AUTHENTICATION_PANE_LAST_SIGNAL +}; +static guint publishing_piwigo_authentication_pane_signals[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_LAST_SIGNAL] = {0}; typedef struct _PublishingPiwigoPublishingOptionsPanePrivate PublishingPiwigoPublishingOptionsPanePrivate; +enum { + PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL, + PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL, + PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL +}; +static guint publishing_piwigo_publishing_options_pane_signals[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0}; typedef struct _PublishingPiwigoSessionPrivate PublishingPiwigoSessionPrivate; typedef struct _PublishingPiwigoTransactionPrivate PublishingPiwigoTransactionPrivate; typedef struct _PublishingPiwigoSessionLoginTransactionPrivate PublishingPiwigoSessionLoginTransactionPrivate; @@ -543,14 +559,14 @@ static gint piwigo_service_icon_pixbuf_set_length1; static GdkPixbuf** piwigo_service_icon_pixbuf_set = NULL; static gint piwigo_service_icon_pixbuf_set_length1 = 0; static gint _piwigo_service_icon_pixbuf_set_size_ = 0; -static SpitPluggableIface* piwigo_service_spit_pluggable_parent_iface = NULL; -static SpitPublishingServiceIface* piwigo_service_spit_publishing_service_parent_iface = NULL; +static SpitPluggableIface * piwigo_service_spit_pluggable_parent_iface = NULL; +static SpitPublishingServiceIface * piwigo_service_spit_publishing_service_parent_iface = NULL; static gpointer publishing_piwigo_category_parent_class = NULL; static gpointer publishing_piwigo_permission_level_parent_class = NULL; static gpointer publishing_piwigo_size_entry_parent_class = NULL; static gpointer publishing_piwigo_publishing_parameters_parent_class = NULL; static gpointer publishing_piwigo_piwigo_publisher_parent_class = NULL; -static SpitPublishingPublisherIface* publishing_piwigo_piwigo_publisher_spit_publishing_publisher_parent_iface = NULL; +static SpitPublishingPublisherIface * publishing_piwigo_piwigo_publisher_spit_publishing_publisher_parent_iface = NULL; static gpointer publishing_piwigo_uploader_parent_class = NULL; static gpointer publishing_piwigo_ssl_error_pane_parent_class = NULL; static gpointer publishing_piwigo_authentication_pane_parent_class = NULL; @@ -590,7 +606,7 @@ PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_new (SpitPub PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host); GType publishing_piwigo_piwigo_publisher_get_type (void) G_GNUC_CONST; static SpitPublishingPublisherMediaType piwigo_service_real_get_supported_media (SpitPublishingService* base); -static void piwigo_service_finalize (GObject* obj); +static void piwigo_service_finalize (GObject * obj); #define PUBLISHING_PIWIGO_SERVICE_NAME "Piwigo" #define PUBLISHING_PIWIGO_PIWIGO_WS "ws.php" #define PUBLISHING_PIWIGO_ORIGINAL_SIZE -1 @@ -611,7 +627,7 @@ PublishingPiwigoCategory* publishing_piwigo_category_new_local (const gchar* nam PublishingPiwigoCategory* publishing_piwigo_category_construct_local (GType object_type, const gchar* name, gint parent_id, const gchar* comment); gboolean publishing_piwigo_category_is_local (PublishingPiwigoCategory* self); gboolean publishing_piwigo_category_equal (PublishingPiwigoCategory* _self_, PublishingPiwigoCategory* other); -static void publishing_piwigo_category_finalize (PublishingPiwigoCategory* obj); +static void publishing_piwigo_category_finalize (PublishingPiwigoCategory * obj); gpointer publishing_piwigo_permission_level_ref (gpointer instance); void publishing_piwigo_permission_level_unref (gpointer instance); GParamSpec* publishing_piwigo_param_spec_permission_level (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -624,7 +640,7 @@ enum { }; PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_new (gint id, const gchar* name); PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_construct (GType object_type, gint id, const gchar* name); -static void publishing_piwigo_permission_level_finalize (PublishingPiwigoPermissionLevel* obj); +static void publishing_piwigo_permission_level_finalize (PublishingPiwigoPermissionLevel * obj); gpointer publishing_piwigo_size_entry_ref (gpointer instance); void publishing_piwigo_size_entry_unref (gpointer instance); GParamSpec* publishing_piwigo_param_spec_size_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -637,7 +653,7 @@ enum { }; PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_new (gint id, const gchar* name); PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_construct (GType object_type, gint id, const gchar* name); -static void publishing_piwigo_size_entry_finalize (PublishingPiwigoSizeEntry* obj); +static void publishing_piwigo_size_entry_finalize (PublishingPiwigoSizeEntry * obj); gpointer publishing_piwigo_publishing_parameters_ref (gpointer instance); void publishing_piwigo_publishing_parameters_unref (gpointer instance); GParamSpec* publishing_piwigo_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -650,7 +666,7 @@ enum { }; PublishingPiwigoPublishingParameters* publishing_piwigo_publishing_parameters_new (void); PublishingPiwigoPublishingParameters* publishing_piwigo_publishing_parameters_construct (GType object_type); -static void publishing_piwigo_publishing_parameters_finalize (PublishingPiwigoPublishingParameters* obj); +static void publishing_piwigo_publishing_parameters_finalize (PublishingPiwigoPublishingParameters * obj); GType publishing_piwigo_session_get_type (void) G_GNUC_CONST; #define PUBLISHING_PIWIGO_PIWIGO_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisherPrivate)) enum { @@ -737,7 +753,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (Publishi static void _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self); static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn); static void _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self); -static void _vala_array_add35 (PublishingPiwigoCategory*** array, int* length, int* size, PublishingPiwigoCategory* value); +static void _vala_array_add35 (PublishingPiwigoCategory** * array, int* length, int* size, PublishingPiwigoCategory* value); static void publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (PublishingPiwigoPiwigoPublisher* self); GType publishing_piwigo_publishing_options_pane_get_type (void) G_GNUC_CONST; PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoCategory** categories, int categories_length1, gint last_category, gint last_permission_level, gint last_photo_size, gboolean last_title_as_comment, gboolean last_no_upload_tags, gboolean strip_metadata_enabled); @@ -778,7 +794,7 @@ static SoupCookie* _vala_SoupCookie_copy (SoupCookie* self); static void _vala_SoupCookie_free (SoupCookie* self); static void __vala_SoupCookie_free0_ (gpointer var); static void _g_slist_free___vala_SoupCookie_free0_ (GSList* self); -static void publishing_piwigo_piwigo_publisher_finalize (GObject* obj); +static void publishing_piwigo_piwigo_publisher_finalize (GObject * obj); #define PUBLISHING_PIWIGO_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_UPLOADER, PublishingPiwigoUploaderPrivate)) enum { PUBLISHING_PIWIGO_UPLOADER_DUMMY_PROPERTY @@ -787,13 +803,13 @@ static PublishingRESTSupportTransaction* publishing_piwigo_uploader_real_create_ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_new (PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable); PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_construct (GType object_type, PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable); GType publishing_piwigo_images_add_transaction_get_type (void) G_GNUC_CONST; -static void publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploader* obj); +static void publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploader * obj); #define PUBLISHING_PIWIGO_SSL_ERROR_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPanePrivate)) enum { PUBLISHING_PIWIGO_SSL_ERROR_PANE_DUMMY_PROPERTY, - PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST, - PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT, - PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT + PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST_PROPERTY, + PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT_PROPERTY, + PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT_PROPERTY }; static void publishing_piwigo_ssl_error_pane_real_constructed (GObject* base); gchar* publishing_piwigo_ssl_error_pane_get_host (PublishingPiwigoSSLErrorPane* self); @@ -806,14 +822,14 @@ static void ___lambda6__gtk_button_clicked (GtkButton* _sender, gpointer self); static void publishing_piwigo_ssl_error_pane_set_host (PublishingPiwigoSSLErrorPane* self, const gchar* value); static void publishing_piwigo_ssl_error_pane_set_cert (PublishingPiwigoSSLErrorPane* self, GTlsCertificate* value); static void publishing_piwigo_ssl_error_pane_set_error_text (PublishingPiwigoSSLErrorPane* self, const gchar* value); -static void publishing_piwigo_ssl_error_pane_finalize (GObject* obj); +static void publishing_piwigo_ssl_error_pane_finalize (GObject * obj); static void _vala_publishing_piwigo_ssl_error_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_publishing_piwigo_ssl_error_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); #define PUBLISHING_PIWIGO_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPanePrivate)) enum { PUBLISHING_PIWIGO_AUTHENTICATION_PANE_DUMMY_PROPERTY, - PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE, - PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER + PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_PROPERTY, + PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER_PROPERTY }; static void publishing_piwigo_authentication_pane_real_constructed (GObject* base); PublishingPiwigoAuthenticationPaneMode publishing_piwigo_authentication_pane_get_mode (PublishingPiwigoAuthenticationPane* self); @@ -831,20 +847,20 @@ static void publishing_piwigo_authentication_pane_real_on_pane_installed (Shotwe static void publishing_piwigo_authentication_pane_set_mode (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoAuthenticationPaneMode value); static void publishing_piwigo_authentication_pane_set_publisher (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoPiwigoPublisher* value); static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void publishing_piwigo_authentication_pane_finalize (GObject* obj); +static void publishing_piwigo_authentication_pane_finalize (GObject * obj); static void _vala_publishing_piwigo_authentication_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_publishing_piwigo_authentication_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); #define PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPanePrivate)) enum { PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY, - PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY, - PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL, - PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE, - PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT, - PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS, - PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED, - PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES, - PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT + PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY_PROPERTY, + PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL_PROPERTY, + PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE_PROPERTY, + PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT_PROPERTY, + PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS_PROPERTY, + PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED_PROPERTY, + PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES_PROPERTY, + PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT_PROPERTY }; static PublishingPiwigoCategory** _vala_array_dup11 (PublishingPiwigoCategory** self, int length); static gboolean _publishing_piwigo_category_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); @@ -868,16 +884,16 @@ static void _publishing_piwigo_publishing_options_pane_on_existing_combo_changed static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pane_create_perm_levels (PublishingPiwigoPublishingOptionsPane* self, int* result_length1); static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_create_sizes (PublishingPiwigoPublishingOptionsPane* self, int* result_length1); static const gchar* publishing_piwigo_publishing_options_pane_get_default_comment (PublishingPiwigoPublishingOptionsPane* self); -static void _vala_array_add36 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value); -static void _vala_array_add37 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value); -static void _vala_array_add38 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value); -static void _vala_array_add39 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value); -static void _vala_array_add40 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value); -static void _vala_array_add41 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value); -static void _vala_array_add42 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value); -static void _vala_array_add43 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value); -static void _vala_array_add44 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value); -static void _vala_array_add45 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value); +static void _vala_array_add36 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value); +static void _vala_array_add37 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value); +static void _vala_array_add38 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value); +static void _vala_array_add39 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value); +static void _vala_array_add40 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value); +static void _vala_array_add41 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value); +static void _vala_array_add42 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value); +static void _vala_array_add43 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value); +static void _vala_array_add44 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value); +static void _vala_array_add45 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value); static GeeList* publishing_piwigo_publishing_options_pane_get_existing_categories (PublishingPiwigoPublishingOptionsPane* self); static void publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (PublishingPiwigoPublishingOptionsPane* self); static gboolean publishing_piwigo_publishing_options_pane_category_already_exists (PublishingPiwigoPublishingOptionsPane* self, const gchar* category_name); @@ -901,7 +917,7 @@ static void publishing_piwigo_publishing_options_pane_set_strip_metadata_enabled static void publishing_piwigo_publishing_options_pane_set_existing_categories (PublishingPiwigoPublishingOptionsPane* self, GeeList* value); static void publishing_piwigo_publishing_options_pane_set_default_comment (PublishingPiwigoPublishingOptionsPane* self, const gchar* value); static void g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void publishing_piwigo_publishing_options_pane_finalize (GObject* obj); +static void publishing_piwigo_publishing_options_pane_finalize (GObject * obj); static void _vala_publishing_piwigo_publishing_options_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_publishing_piwigo_publishing_options_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); #define PUBLISHING_PIWIGO_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_SESSION, PublishingPiwigoSessionPrivate)) @@ -909,7 +925,7 @@ enum { PUBLISHING_PIWIGO_SESSION_DUMMY_PROPERTY }; static gboolean publishing_piwigo_session_real_is_authenticated (PublishingRESTSupportSession* base); -static void publishing_piwigo_session_finalize (PublishingRESTSupportSession* obj); +static void publishing_piwigo_session_finalize (PublishingRESTSupportSession * obj); enum { PUBLISHING_PIWIGO_TRANSACTION_DUMMY_PROPERTY }; @@ -939,7 +955,7 @@ enum { PUBLISHING_PIWIGO_IMAGES_ADD_TRANSACTION_DUMMY_PROPERTY }; static void _g_free0_ (gpointer var); -static void publishing_piwigo_images_add_transaction_finalize (PublishingRESTSupportTransaction* obj); +static void publishing_piwigo_images_add_transaction_finalize (PublishingRESTSupportTransaction * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); @@ -947,8 +963,8 @@ static gint _vala_array_length (gpointer array); PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_directory) { PiwigoService * self = NULL; - GdkPixbuf** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + GdkPixbuf** _tmp0_; + gint _tmp0__length1; #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (G_IS_FILE (resource_directory), NULL); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -959,9 +975,9 @@ PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_dire _tmp0__length1 = piwigo_service_icon_pixbuf_set_length1; #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp0_ == NULL) { -#line 963 "PiwigoPublishing.c" - gint _tmp1_ = 0; - GdkPixbuf** _tmp2_ = NULL; +#line 979 "PiwigoPublishing.c" + gint _tmp1_; + GdkPixbuf** _tmp2_; #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" PIWIGO_SERVICE_ICON_FILENAME, &_tmp1_); #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -972,27 +988,27 @@ PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_dire piwigo_service_icon_pixbuf_set_length1 = _tmp1_; #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _piwigo_service_icon_pixbuf_set_size_ = piwigo_service_icon_pixbuf_set_length1; -#line 976 "PiwigoPublishing.c" +#line 992 "PiwigoPublishing.c" } #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 980 "PiwigoPublishing.c" +#line 996 "PiwigoPublishing.c" } PiwigoService* piwigo_service_new (GFile* resource_directory) { #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return piwigo_service_construct (TYPE_PIWIGO_SERVICE, resource_directory); -#line 987 "PiwigoPublishing.c" +#line 1003 "PiwigoPublishing.c" } static gint piwigo_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) { PiwigoService * self; gint result = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PIWIGO_SERVICE, PiwigoService); #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -1005,7 +1021,7 @@ static gint piwigo_service_real_get_pluggable_interface (SpitPluggable* base, gi result = _tmp2_; #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 1009 "PiwigoPublishing.c" +#line 1025 "PiwigoPublishing.c" } @@ -1018,7 +1034,7 @@ static const gchar* piwigo_service_real_get_id (SpitPluggable* base) { result = "org.yorba.shotwell.publishing.piwigo"; #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 1022 "PiwigoPublishing.c" +#line 1038 "PiwigoPublishing.c" } @@ -1031,14 +1047,14 @@ static const gchar* piwigo_service_real_get_pluggable_name (SpitPluggable* base) result = "Piwigo"; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 1035 "PiwigoPublishing.c" +#line 1051 "PiwigoPublishing.c" } static gpointer _g_object_ref0 (gpointer self) { #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self ? g_object_ref (self) : NULL; -#line 1042 "PiwigoPublishing.c" +#line 1058 "PiwigoPublishing.c" } @@ -1049,34 +1065,33 @@ static GdkPixbuf** _vala_array_dup10 (GdkPixbuf** self, int length) { result = g_new0 (GdkPixbuf*, length + 1); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" for (i = 0; i < length; i++) { -#line 1053 "PiwigoPublishing.c" - GdkPixbuf* _tmp0_ = NULL; +#line 1069 "PiwigoPublishing.c" + GdkPixbuf* _tmp0_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" result[i] = _tmp0_; -#line 1059 "PiwigoPublishing.c" +#line 1075 "PiwigoPublishing.c" } #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 1063 "PiwigoPublishing.c" +#line 1079 "PiwigoPublishing.c" } static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) { PiwigoService * self; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GdkPixbuf** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - GdkPixbuf** _tmp9_ = NULL; - gint _tmp9__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + GdkPixbuf** _tmp7_; + gint _tmp7__length1; + GdkPixbuf** _tmp8_; + gint _tmp8__length1; #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PIWIGO_SERVICE, PiwigoService); #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -1088,60 +1103,58 @@ static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*info).authors = _tmp0_; #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp1_ = _ ("Copyright 2016 Software Freedom Conservancy Inc."); -#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp1_ = g_strdup (_ ("Copyright 2016 Software Freedom Conservancy Inc.")); #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 ((*info).copyright); #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - (*info).copyright = _tmp2_; + (*info).copyright = _tmp1_; #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp3_ = g_strdup (RESOURCES_TRANSLATORS); + _tmp2_ = g_strdup (RESOURCES_TRANSLATORS); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 ((*info).translators); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - (*info).translators = _tmp3_; + (*info).translators = _tmp2_; #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp4_ = g_strdup (_VERSION); + _tmp3_ = g_strdup (_VERSION); #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 ((*info).version); #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - (*info).version = _tmp4_; + (*info).version = _tmp3_; #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp5_ = g_strdup (RESOURCES_WEBSITE_NAME); + _tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 ((*info).website_name); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - (*info).website_name = _tmp5_; + (*info).website_name = _tmp4_; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp6_ = g_strdup (RESOURCES_WEBSITE_URL); + _tmp5_ = g_strdup (RESOURCES_WEBSITE_URL); #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 ((*info).website_url); #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - (*info).website_url = _tmp6_; + (*info).website_url = _tmp5_; #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*info).is_license_wordwrapped = FALSE; #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp7_ = g_strdup (RESOURCES_LICENSE); + _tmp6_ = g_strdup (RESOURCES_LICENSE); #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 ((*info).license); #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - (*info).license = _tmp7_; + (*info).license = _tmp6_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp8_ = piwigo_service_icon_pixbuf_set; + _tmp7_ = piwigo_service_icon_pixbuf_set; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp8__length1 = piwigo_service_icon_pixbuf_set_length1; + _tmp7__length1 = piwigo_service_icon_pixbuf_set_length1; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup10 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_); + _tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup10 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp9__length1 = _tmp8__length1; + _tmp8__length1 = _tmp7__length1; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - (*info).icons = _tmp9_; + (*info).icons = _tmp8_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - (*info).icons_length1 = _tmp9__length1; -#line 1145 "PiwigoPublishing.c" + (*info).icons_length1 = _tmp8__length1; +#line 1158 "PiwigoPublishing.c" } @@ -1149,15 +1162,15 @@ static void piwigo_service_real_activation (SpitPluggable* base, gboolean enable PiwigoService * self; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PIWIGO_SERVICE, PiwigoService); -#line 1153 "PiwigoPublishing.c" +#line 1166 "PiwigoPublishing.c" } static SpitPublishingPublisher* piwigo_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) { PiwigoService * self; SpitPublishingPublisher* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - PublishingPiwigoPiwigoPublisher* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + PublishingPiwigoPiwigoPublisher* _tmp1_; #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PIWIGO_SERVICE, PiwigoService); #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -1170,7 +1183,7 @@ static SpitPublishingPublisher* piwigo_service_real_create_publisher (SpitPublis result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 1174 "PiwigoPublishing.c" +#line 1187 "PiwigoPublishing.c" } @@ -1183,7 +1196,7 @@ static SpitPublishingPublisherMediaType piwigo_service_real_get_supported_media result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO; #line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 1187 "PiwigoPublishing.c" +#line 1200 "PiwigoPublishing.c" } @@ -1192,7 +1205,7 @@ static void piwigo_service_class_init (PiwigoServiceClass * klass) { piwigo_service_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" G_OBJECT_CLASS (klass)->finalize = piwigo_service_finalize; -#line 1196 "PiwigoPublishing.c" +#line 1209 "PiwigoPublishing.c" } @@ -1200,16 +1213,16 @@ static void piwigo_service_spit_pluggable_interface_init (SpitPluggableIface * i #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" piwigo_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) piwigo_service_real_get_pluggable_interface; + iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) piwigo_service_real_get_pluggable_interface; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - iface->get_id = (const gchar* (*)(SpitPluggable*)) piwigo_service_real_get_id; + iface->get_id = (const gchar* (*) (SpitPluggable *)) piwigo_service_real_get_id; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) piwigo_service_real_get_pluggable_name; + iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) piwigo_service_real_get_pluggable_name; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) piwigo_service_real_get_info; + iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) piwigo_service_real_get_info; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - iface->activation = (void (*)(SpitPluggable*, gboolean)) piwigo_service_real_activation; -#line 1213 "PiwigoPublishing.c" + iface->activation = (void (*) (SpitPluggable *, gboolean)) piwigo_service_real_activation; +#line 1226 "PiwigoPublishing.c" } @@ -1217,10 +1230,10 @@ static void piwigo_service_spit_publishing_service_interface_init (SpitPublishin #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" piwigo_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) piwigo_service_real_create_publisher; + iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) piwigo_service_real_create_publisher; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) piwigo_service_real_get_supported_media; -#line 1224 "PiwigoPublishing.c" + iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) piwigo_service_real_get_supported_media; +#line 1237 "PiwigoPublishing.c" } @@ -1228,13 +1241,13 @@ static void piwigo_service_instance_init (PiwigoService * self) { } -static void piwigo_service_finalize (GObject* obj) { +static void piwigo_service_finalize (GObject * obj) { PiwigoService * self; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIWIGO_SERVICE, PiwigoService); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" G_OBJECT_CLASS (piwigo_service_parent_class)->finalize (obj); -#line 1238 "PiwigoPublishing.c" +#line 1251 "PiwigoPublishing.c" } @@ -1256,13 +1269,13 @@ GType piwigo_service_get_type (void) { PublishingPiwigoCategory* publishing_piwigo_category_construct (GType object_type, gint id, const gchar* name, const gchar* uppercats, const gchar* comment) { PublishingPiwigoCategory* self = NULL; - gint _tmp0_ = 0; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + gint _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (name != NULL, NULL); #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -1299,25 +1312,25 @@ PublishingPiwigoCategory* publishing_piwigo_category_construct (GType object_typ self->comment = _tmp6_; #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 1303 "PiwigoPublishing.c" +#line 1316 "PiwigoPublishing.c" } PublishingPiwigoCategory* publishing_piwigo_category_new (gint id, const gchar* name, const gchar* uppercats, const gchar* comment) { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_category_construct (PUBLISHING_PIWIGO_TYPE_CATEGORY, id, name, uppercats, comment); -#line 1310 "PiwigoPublishing.c" +#line 1323 "PiwigoPublishing.c" } PublishingPiwigoCategory* publishing_piwigo_category_construct_local (GType object_type, const gchar* name, gint parent_id, const gchar* comment) { PublishingPiwigoCategory* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gint _tmp2_ = 0; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + gint _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (name != NULL, NULL); #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -1350,20 +1363,20 @@ PublishingPiwigoCategory* publishing_piwigo_category_construct_local (GType obje self->comment = _tmp5_; #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 1354 "PiwigoPublishing.c" +#line 1367 "PiwigoPublishing.c" } PublishingPiwigoCategory* publishing_piwigo_category_new_local (const gchar* name, gint parent_id, const gchar* comment) { #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_category_construct_local (PUBLISHING_PIWIGO_TYPE_CATEGORY, name, parent_id, comment); -#line 1361 "PiwigoPublishing.c" +#line 1374 "PiwigoPublishing.c" } gboolean publishing_piwigo_category_is_local (PublishingPiwigoCategory* self) { gboolean result = FALSE; - gint _tmp0_ = 0; + gint _tmp0_; #line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_CATEGORY (self), FALSE); #line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -1372,16 +1385,16 @@ gboolean publishing_piwigo_category_is_local (PublishingPiwigoCategory* self) { result = _tmp0_ == PUBLISHING_PIWIGO_CATEGORY_NO_ID; #line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 1376 "PiwigoPublishing.c" +#line 1389 "PiwigoPublishing.c" } gboolean publishing_piwigo_category_equal (PublishingPiwigoCategory* _self_, PublishingPiwigoCategory* other) { gboolean result = FALSE; - PublishingPiwigoCategory* _tmp0_ = NULL; - gint _tmp1_ = 0; - PublishingPiwigoCategory* _tmp2_ = NULL; - gint _tmp3_ = 0; + PublishingPiwigoCategory* _tmp0_; + gint _tmp1_; + PublishingPiwigoCategory* _tmp2_; + gint _tmp3_; #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_CATEGORY (_self_), FALSE); #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -1398,14 +1411,14 @@ gboolean publishing_piwigo_category_equal (PublishingPiwigoCategory* _self_, Pub result = _tmp1_ == _tmp3_; #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 1402 "PiwigoPublishing.c" +#line 1415 "PiwigoPublishing.c" } static void publishing_piwigo_value_category_init (GValue* value) { #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = NULL; -#line 1409 "PiwigoPublishing.c" +#line 1422 "PiwigoPublishing.c" } @@ -1414,7 +1427,7 @@ static void publishing_piwigo_value_category_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_category_unref (value->data[0].v_pointer); -#line 1418 "PiwigoPublishing.c" +#line 1431 "PiwigoPublishing.c" } } @@ -1424,11 +1437,11 @@ static void publishing_piwigo_value_category_copy_value (const GValue* src_value if (src_value->data[0].v_pointer) { #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" dest_value->data[0].v_pointer = publishing_piwigo_category_ref (src_value->data[0].v_pointer); -#line 1428 "PiwigoPublishing.c" +#line 1441 "PiwigoPublishing.c" } else { #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 1432 "PiwigoPublishing.c" +#line 1445 "PiwigoPublishing.c" } } @@ -1436,66 +1449,66 @@ static void publishing_piwigo_value_category_copy_value (const GValue* src_value static gpointer publishing_piwigo_value_category_peek_pointer (const GValue* value) { #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return value->data[0].v_pointer; -#line 1440 "PiwigoPublishing.c" +#line 1453 "PiwigoPublishing.c" } static gchar* publishing_piwigo_value_category_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (collect_values[0].v_pointer) { -#line 1447 "PiwigoPublishing.c" - PublishingPiwigoCategory* object; +#line 1460 "PiwigoPublishing.c" + PublishingPiwigoCategory * object; object = collect_values[0].v_pointer; #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1454 "PiwigoPublishing.c" +#line 1467 "PiwigoPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1458 "PiwigoPublishing.c" +#line 1471 "PiwigoPublishing.c" } #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = publishing_piwigo_category_ref (object); -#line 1462 "PiwigoPublishing.c" +#line 1475 "PiwigoPublishing.c" } else { #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = NULL; -#line 1466 "PiwigoPublishing.c" +#line 1479 "PiwigoPublishing.c" } #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return NULL; -#line 1470 "PiwigoPublishing.c" +#line 1483 "PiwigoPublishing.c" } static gchar* publishing_piwigo_value_category_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingPiwigoCategory** object_p; + PublishingPiwigoCategory ** object_p; object_p = collect_values[0].v_pointer; #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!object_p) { #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1481 "PiwigoPublishing.c" +#line 1494 "PiwigoPublishing.c" } #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!value->data[0].v_pointer) { #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *object_p = NULL; -#line 1487 "PiwigoPublishing.c" +#line 1500 "PiwigoPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *object_p = value->data[0].v_pointer; -#line 1491 "PiwigoPublishing.c" +#line 1504 "PiwigoPublishing.c" } else { #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *object_p = publishing_piwigo_category_ref (value->data[0].v_pointer); -#line 1495 "PiwigoPublishing.c" +#line 1508 "PiwigoPublishing.c" } #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return NULL; -#line 1499 "PiwigoPublishing.c" +#line 1512 "PiwigoPublishing.c" } @@ -1509,7 +1522,7 @@ GParamSpec* publishing_piwigo_param_spec_category (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return G_PARAM_SPEC (spec); -#line 1513 "PiwigoPublishing.c" +#line 1526 "PiwigoPublishing.c" } @@ -1518,12 +1531,12 @@ gpointer publishing_piwigo_value_get_category (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_CATEGORY), NULL); #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return value->data[0].v_pointer; -#line 1522 "PiwigoPublishing.c" +#line 1535 "PiwigoPublishing.c" } void publishing_piwigo_value_set_category (GValue* value, gpointer v_object) { - PublishingPiwigoCategory* old; + PublishingPiwigoCategory * old; #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_CATEGORY)); #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -1538,23 +1551,23 @@ void publishing_piwigo_value_set_category (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_category_ref (value->data[0].v_pointer); -#line 1542 "PiwigoPublishing.c" +#line 1555 "PiwigoPublishing.c" } else { #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = NULL; -#line 1546 "PiwigoPublishing.c" +#line 1559 "PiwigoPublishing.c" } #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (old) { #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_category_unref (old); -#line 1552 "PiwigoPublishing.c" +#line 1565 "PiwigoPublishing.c" } } void publishing_piwigo_value_take_category (GValue* value, gpointer v_object) { - PublishingPiwigoCategory* old; + PublishingPiwigoCategory * old; #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_CATEGORY)); #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -1567,17 +1580,17 @@ void publishing_piwigo_value_take_category (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = v_object; -#line 1571 "PiwigoPublishing.c" +#line 1584 "PiwigoPublishing.c" } else { #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = NULL; -#line 1575 "PiwigoPublishing.c" +#line 1588 "PiwigoPublishing.c" } #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (old) { #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_category_unref (old); -#line 1581 "PiwigoPublishing.c" +#line 1594 "PiwigoPublishing.c" } } @@ -1587,18 +1600,18 @@ static void publishing_piwigo_category_class_init (PublishingPiwigoCategoryClass publishing_piwigo_category_parent_class = g_type_class_peek_parent (klass); #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" ((PublishingPiwigoCategoryClass *) klass)->finalize = publishing_piwigo_category_finalize; -#line 1591 "PiwigoPublishing.c" +#line 1604 "PiwigoPublishing.c" } static void publishing_piwigo_category_instance_init (PublishingPiwigoCategory * self) { #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->ref_count = 1; -#line 1598 "PiwigoPublishing.c" +#line 1611 "PiwigoPublishing.c" } -static void publishing_piwigo_category_finalize (PublishingPiwigoCategory* obj) { +static void publishing_piwigo_category_finalize (PublishingPiwigoCategory * obj) { PublishingPiwigoCategory * self; #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_CATEGORY, PublishingPiwigoCategory); @@ -1612,7 +1625,7 @@ static void publishing_piwigo_category_finalize (PublishingPiwigoCategory* obj) _g_free0 (self->display_name); #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (self->uppercats); -#line 1616 "PiwigoPublishing.c" +#line 1629 "PiwigoPublishing.c" } @@ -1631,18 +1644,18 @@ GType publishing_piwigo_category_get_type (void) { gpointer publishing_piwigo_category_ref (gpointer instance) { - PublishingPiwigoCategory* self; + PublishingPiwigoCategory * self; self = instance; #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_atomic_int_inc (&self->ref_count); #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return instance; -#line 1641 "PiwigoPublishing.c" +#line 1654 "PiwigoPublishing.c" } void publishing_piwigo_category_unref (gpointer instance) { - PublishingPiwigoCategory* self; + PublishingPiwigoCategory * self; self = instance; #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1650,16 +1663,16 @@ void publishing_piwigo_category_unref (gpointer instance) { PUBLISHING_PIWIGO_CATEGORY_GET_CLASS (self)->finalize (self); #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1654 "PiwigoPublishing.c" +#line 1667 "PiwigoPublishing.c" } } PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_construct (GType object_type, gint id, const gchar* name) { PublishingPiwigoPermissionLevel* self = NULL; - gint _tmp0_ = 0; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + gint _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (name != NULL, NULL); #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -1678,21 +1691,21 @@ PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_construct (G self->name = _tmp2_; #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 1682 "PiwigoPublishing.c" +#line 1695 "PiwigoPublishing.c" } PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_new (gint id, const gchar* name) { #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_permission_level_construct (PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL, id, name); -#line 1689 "PiwigoPublishing.c" +#line 1702 "PiwigoPublishing.c" } static void publishing_piwigo_value_permission_level_init (GValue* value) { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = NULL; -#line 1696 "PiwigoPublishing.c" +#line 1709 "PiwigoPublishing.c" } @@ -1701,7 +1714,7 @@ static void publishing_piwigo_value_permission_level_free_value (GValue* value) if (value->data[0].v_pointer) { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_permission_level_unref (value->data[0].v_pointer); -#line 1705 "PiwigoPublishing.c" +#line 1718 "PiwigoPublishing.c" } } @@ -1711,11 +1724,11 @@ static void publishing_piwigo_value_permission_level_copy_value (const GValue* s if (src_value->data[0].v_pointer) { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" dest_value->data[0].v_pointer = publishing_piwigo_permission_level_ref (src_value->data[0].v_pointer); -#line 1715 "PiwigoPublishing.c" +#line 1728 "PiwigoPublishing.c" } else { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 1719 "PiwigoPublishing.c" +#line 1732 "PiwigoPublishing.c" } } @@ -1723,66 +1736,66 @@ static void publishing_piwigo_value_permission_level_copy_value (const GValue* s static gpointer publishing_piwigo_value_permission_level_peek_pointer (const GValue* value) { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return value->data[0].v_pointer; -#line 1727 "PiwigoPublishing.c" +#line 1740 "PiwigoPublishing.c" } static gchar* publishing_piwigo_value_permission_level_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (collect_values[0].v_pointer) { -#line 1734 "PiwigoPublishing.c" - PublishingPiwigoPermissionLevel* object; +#line 1747 "PiwigoPublishing.c" + PublishingPiwigoPermissionLevel * object; object = collect_values[0].v_pointer; #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1741 "PiwigoPublishing.c" +#line 1754 "PiwigoPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1745 "PiwigoPublishing.c" +#line 1758 "PiwigoPublishing.c" } #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = publishing_piwigo_permission_level_ref (object); -#line 1749 "PiwigoPublishing.c" +#line 1762 "PiwigoPublishing.c" } else { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = NULL; -#line 1753 "PiwigoPublishing.c" +#line 1766 "PiwigoPublishing.c" } #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return NULL; -#line 1757 "PiwigoPublishing.c" +#line 1770 "PiwigoPublishing.c" } static gchar* publishing_piwigo_value_permission_level_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingPiwigoPermissionLevel** object_p; + PublishingPiwigoPermissionLevel ** object_p; object_p = collect_values[0].v_pointer; #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!object_p) { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1768 "PiwigoPublishing.c" +#line 1781 "PiwigoPublishing.c" } #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!value->data[0].v_pointer) { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *object_p = NULL; -#line 1774 "PiwigoPublishing.c" +#line 1787 "PiwigoPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *object_p = value->data[0].v_pointer; -#line 1778 "PiwigoPublishing.c" +#line 1791 "PiwigoPublishing.c" } else { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *object_p = publishing_piwigo_permission_level_ref (value->data[0].v_pointer); -#line 1782 "PiwigoPublishing.c" +#line 1795 "PiwigoPublishing.c" } #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return NULL; -#line 1786 "PiwigoPublishing.c" +#line 1799 "PiwigoPublishing.c" } @@ -1796,7 +1809,7 @@ GParamSpec* publishing_piwigo_param_spec_permission_level (const gchar* name, co G_PARAM_SPEC (spec)->value_type = object_type; #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return G_PARAM_SPEC (spec); -#line 1800 "PiwigoPublishing.c" +#line 1813 "PiwigoPublishing.c" } @@ -1805,12 +1818,12 @@ gpointer publishing_piwigo_value_get_permission_level (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL), NULL); #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return value->data[0].v_pointer; -#line 1809 "PiwigoPublishing.c" +#line 1822 "PiwigoPublishing.c" } void publishing_piwigo_value_set_permission_level (GValue* value, gpointer v_object) { - PublishingPiwigoPermissionLevel* old; + PublishingPiwigoPermissionLevel * old; #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL)); #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -1825,23 +1838,23 @@ void publishing_piwigo_value_set_permission_level (GValue* value, gpointer v_obj value->data[0].v_pointer = v_object; #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_permission_level_ref (value->data[0].v_pointer); -#line 1829 "PiwigoPublishing.c" +#line 1842 "PiwigoPublishing.c" } else { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = NULL; -#line 1833 "PiwigoPublishing.c" +#line 1846 "PiwigoPublishing.c" } #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (old) { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_permission_level_unref (old); -#line 1839 "PiwigoPublishing.c" +#line 1852 "PiwigoPublishing.c" } } void publishing_piwigo_value_take_permission_level (GValue* value, gpointer v_object) { - PublishingPiwigoPermissionLevel* old; + PublishingPiwigoPermissionLevel * old; #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL)); #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -1854,17 +1867,17 @@ void publishing_piwigo_value_take_permission_level (GValue* value, gpointer v_ob g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = v_object; -#line 1858 "PiwigoPublishing.c" +#line 1871 "PiwigoPublishing.c" } else { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = NULL; -#line 1862 "PiwigoPublishing.c" +#line 1875 "PiwigoPublishing.c" } #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (old) { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_permission_level_unref (old); -#line 1868 "PiwigoPublishing.c" +#line 1881 "PiwigoPublishing.c" } } @@ -1874,18 +1887,18 @@ static void publishing_piwigo_permission_level_class_init (PublishingPiwigoPermi publishing_piwigo_permission_level_parent_class = g_type_class_peek_parent (klass); #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" ((PublishingPiwigoPermissionLevelClass *) klass)->finalize = publishing_piwigo_permission_level_finalize; -#line 1878 "PiwigoPublishing.c" +#line 1891 "PiwigoPublishing.c" } static void publishing_piwigo_permission_level_instance_init (PublishingPiwigoPermissionLevel * self) { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->ref_count = 1; -#line 1885 "PiwigoPublishing.c" +#line 1898 "PiwigoPublishing.c" } -static void publishing_piwigo_permission_level_finalize (PublishingPiwigoPermissionLevel* obj) { +static void publishing_piwigo_permission_level_finalize (PublishingPiwigoPermissionLevel * obj) { PublishingPiwigoPermissionLevel * self; #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL, PublishingPiwigoPermissionLevel); @@ -1893,7 +1906,7 @@ static void publishing_piwigo_permission_level_finalize (PublishingPiwigoPermiss g_signal_handlers_destroy (self); #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (self->name); -#line 1897 "PiwigoPublishing.c" +#line 1910 "PiwigoPublishing.c" } @@ -1912,18 +1925,18 @@ GType publishing_piwigo_permission_level_get_type (void) { gpointer publishing_piwigo_permission_level_ref (gpointer instance) { - PublishingPiwigoPermissionLevel* self; + PublishingPiwigoPermissionLevel * self; self = instance; #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_atomic_int_inc (&self->ref_count); #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return instance; -#line 1922 "PiwigoPublishing.c" +#line 1935 "PiwigoPublishing.c" } void publishing_piwigo_permission_level_unref (gpointer instance) { - PublishingPiwigoPermissionLevel* self; + PublishingPiwigoPermissionLevel * self; self = instance; #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1931,16 +1944,16 @@ void publishing_piwigo_permission_level_unref (gpointer instance) { PUBLISHING_PIWIGO_PERMISSION_LEVEL_GET_CLASS (self)->finalize (self); #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1935 "PiwigoPublishing.c" +#line 1948 "PiwigoPublishing.c" } } PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_construct (GType object_type, gint id, const gchar* name) { PublishingPiwigoSizeEntry* self = NULL; - gint _tmp0_ = 0; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + gint _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (name != NULL, NULL); #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -1959,21 +1972,21 @@ PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_construct (GType object_ self->name = _tmp2_; #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 1963 "PiwigoPublishing.c" +#line 1976 "PiwigoPublishing.c" } PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_new (gint id, const gchar* name) { #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_size_entry_construct (PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY, id, name); -#line 1970 "PiwigoPublishing.c" +#line 1983 "PiwigoPublishing.c" } static void publishing_piwigo_value_size_entry_init (GValue* value) { #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = NULL; -#line 1977 "PiwigoPublishing.c" +#line 1990 "PiwigoPublishing.c" } @@ -1982,7 +1995,7 @@ static void publishing_piwigo_value_size_entry_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_size_entry_unref (value->data[0].v_pointer); -#line 1986 "PiwigoPublishing.c" +#line 1999 "PiwigoPublishing.c" } } @@ -1992,11 +2005,11 @@ static void publishing_piwigo_value_size_entry_copy_value (const GValue* src_val if (src_value->data[0].v_pointer) { #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" dest_value->data[0].v_pointer = publishing_piwigo_size_entry_ref (src_value->data[0].v_pointer); -#line 1996 "PiwigoPublishing.c" +#line 2009 "PiwigoPublishing.c" } else { #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 2000 "PiwigoPublishing.c" +#line 2013 "PiwigoPublishing.c" } } @@ -2004,66 +2017,66 @@ static void publishing_piwigo_value_size_entry_copy_value (const GValue* src_val static gpointer publishing_piwigo_value_size_entry_peek_pointer (const GValue* value) { #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return value->data[0].v_pointer; -#line 2008 "PiwigoPublishing.c" +#line 2021 "PiwigoPublishing.c" } static gchar* publishing_piwigo_value_size_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (collect_values[0].v_pointer) { -#line 2015 "PiwigoPublishing.c" - PublishingPiwigoSizeEntry* object; +#line 2028 "PiwigoPublishing.c" + PublishingPiwigoSizeEntry * object; object = collect_values[0].v_pointer; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2022 "PiwigoPublishing.c" +#line 2035 "PiwigoPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2026 "PiwigoPublishing.c" +#line 2039 "PiwigoPublishing.c" } #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = publishing_piwigo_size_entry_ref (object); -#line 2030 "PiwigoPublishing.c" +#line 2043 "PiwigoPublishing.c" } else { #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = NULL; -#line 2034 "PiwigoPublishing.c" +#line 2047 "PiwigoPublishing.c" } #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return NULL; -#line 2038 "PiwigoPublishing.c" +#line 2051 "PiwigoPublishing.c" } static gchar* publishing_piwigo_value_size_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingPiwigoSizeEntry** object_p; + PublishingPiwigoSizeEntry ** object_p; object_p = collect_values[0].v_pointer; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!object_p) { #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2049 "PiwigoPublishing.c" +#line 2062 "PiwigoPublishing.c" } #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!value->data[0].v_pointer) { #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *object_p = NULL; -#line 2055 "PiwigoPublishing.c" +#line 2068 "PiwigoPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *object_p = value->data[0].v_pointer; -#line 2059 "PiwigoPublishing.c" +#line 2072 "PiwigoPublishing.c" } else { #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *object_p = publishing_piwigo_size_entry_ref (value->data[0].v_pointer); -#line 2063 "PiwigoPublishing.c" +#line 2076 "PiwigoPublishing.c" } #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return NULL; -#line 2067 "PiwigoPublishing.c" +#line 2080 "PiwigoPublishing.c" } @@ -2077,7 +2090,7 @@ GParamSpec* publishing_piwigo_param_spec_size_entry (const gchar* name, const gc G_PARAM_SPEC (spec)->value_type = object_type; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return G_PARAM_SPEC (spec); -#line 2081 "PiwigoPublishing.c" +#line 2094 "PiwigoPublishing.c" } @@ -2086,12 +2099,12 @@ gpointer publishing_piwigo_value_get_size_entry (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY), NULL); #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return value->data[0].v_pointer; -#line 2090 "PiwigoPublishing.c" +#line 2103 "PiwigoPublishing.c" } void publishing_piwigo_value_set_size_entry (GValue* value, gpointer v_object) { - PublishingPiwigoSizeEntry* old; + PublishingPiwigoSizeEntry * old; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY)); #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2106,23 +2119,23 @@ void publishing_piwigo_value_set_size_entry (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_size_entry_ref (value->data[0].v_pointer); -#line 2110 "PiwigoPublishing.c" +#line 2123 "PiwigoPublishing.c" } else { #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = NULL; -#line 2114 "PiwigoPublishing.c" +#line 2127 "PiwigoPublishing.c" } #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (old) { #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_size_entry_unref (old); -#line 2120 "PiwigoPublishing.c" +#line 2133 "PiwigoPublishing.c" } } void publishing_piwigo_value_take_size_entry (GValue* value, gpointer v_object) { - PublishingPiwigoSizeEntry* old; + PublishingPiwigoSizeEntry * old; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY)); #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2135,17 +2148,17 @@ void publishing_piwigo_value_take_size_entry (GValue* value, gpointer v_object) g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = v_object; -#line 2139 "PiwigoPublishing.c" +#line 2152 "PiwigoPublishing.c" } else { #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = NULL; -#line 2143 "PiwigoPublishing.c" +#line 2156 "PiwigoPublishing.c" } #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (old) { #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_size_entry_unref (old); -#line 2149 "PiwigoPublishing.c" +#line 2162 "PiwigoPublishing.c" } } @@ -2155,18 +2168,18 @@ static void publishing_piwigo_size_entry_class_init (PublishingPiwigoSizeEntryCl publishing_piwigo_size_entry_parent_class = g_type_class_peek_parent (klass); #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" ((PublishingPiwigoSizeEntryClass *) klass)->finalize = publishing_piwigo_size_entry_finalize; -#line 2159 "PiwigoPublishing.c" +#line 2172 "PiwigoPublishing.c" } static void publishing_piwigo_size_entry_instance_init (PublishingPiwigoSizeEntry * self) { #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->ref_count = 1; -#line 2166 "PiwigoPublishing.c" +#line 2179 "PiwigoPublishing.c" } -static void publishing_piwigo_size_entry_finalize (PublishingPiwigoSizeEntry* obj) { +static void publishing_piwigo_size_entry_finalize (PublishingPiwigoSizeEntry * obj) { PublishingPiwigoSizeEntry * self; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY, PublishingPiwigoSizeEntry); @@ -2174,7 +2187,7 @@ static void publishing_piwigo_size_entry_finalize (PublishingPiwigoSizeEntry* ob g_signal_handlers_destroy (self); #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (self->name); -#line 2178 "PiwigoPublishing.c" +#line 2191 "PiwigoPublishing.c" } @@ -2193,18 +2206,18 @@ GType publishing_piwigo_size_entry_get_type (void) { gpointer publishing_piwigo_size_entry_ref (gpointer instance) { - PublishingPiwigoSizeEntry* self; + PublishingPiwigoSizeEntry * self; self = instance; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_atomic_int_inc (&self->ref_count); #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return instance; -#line 2203 "PiwigoPublishing.c" +#line 2216 "PiwigoPublishing.c" } void publishing_piwigo_size_entry_unref (gpointer instance) { - PublishingPiwigoSizeEntry* self; + PublishingPiwigoSizeEntry * self; self = instance; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -2212,7 +2225,7 @@ void publishing_piwigo_size_entry_unref (gpointer instance) { PUBLISHING_PIWIGO_SIZE_ENTRY_GET_CLASS (self)->finalize (self); #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2216 "PiwigoPublishing.c" +#line 2229 "PiwigoPublishing.c" } } @@ -2223,21 +2236,21 @@ PublishingPiwigoPublishingParameters* publishing_piwigo_publishing_parameters_co self = (PublishingPiwigoPublishingParameters*) g_type_create_instance (object_type); #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 2227 "PiwigoPublishing.c" +#line 2240 "PiwigoPublishing.c" } PublishingPiwigoPublishingParameters* publishing_piwigo_publishing_parameters_new (void) { #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_publishing_parameters_construct (PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS); -#line 2234 "PiwigoPublishing.c" +#line 2247 "PiwigoPublishing.c" } static void publishing_piwigo_value_publishing_parameters_init (GValue* value) { #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = NULL; -#line 2241 "PiwigoPublishing.c" +#line 2254 "PiwigoPublishing.c" } @@ -2246,7 +2259,7 @@ static void publishing_piwigo_value_publishing_parameters_free_value (GValue* va if (value->data[0].v_pointer) { #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_parameters_unref (value->data[0].v_pointer); -#line 2250 "PiwigoPublishing.c" +#line 2263 "PiwigoPublishing.c" } } @@ -2256,11 +2269,11 @@ static void publishing_piwigo_value_publishing_parameters_copy_value (const GVal if (src_value->data[0].v_pointer) { #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" dest_value->data[0].v_pointer = publishing_piwigo_publishing_parameters_ref (src_value->data[0].v_pointer); -#line 2260 "PiwigoPublishing.c" +#line 2273 "PiwigoPublishing.c" } else { #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 2264 "PiwigoPublishing.c" +#line 2277 "PiwigoPublishing.c" } } @@ -2268,66 +2281,66 @@ static void publishing_piwigo_value_publishing_parameters_copy_value (const GVal static gpointer publishing_piwigo_value_publishing_parameters_peek_pointer (const GValue* value) { #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return value->data[0].v_pointer; -#line 2272 "PiwigoPublishing.c" +#line 2285 "PiwigoPublishing.c" } static gchar* publishing_piwigo_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (collect_values[0].v_pointer) { -#line 2279 "PiwigoPublishing.c" - PublishingPiwigoPublishingParameters* object; +#line 2292 "PiwigoPublishing.c" + PublishingPiwigoPublishingParameters * object; object = collect_values[0].v_pointer; #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2286 "PiwigoPublishing.c" +#line 2299 "PiwigoPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2290 "PiwigoPublishing.c" +#line 2303 "PiwigoPublishing.c" } #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = publishing_piwigo_publishing_parameters_ref (object); -#line 2294 "PiwigoPublishing.c" +#line 2307 "PiwigoPublishing.c" } else { #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = NULL; -#line 2298 "PiwigoPublishing.c" +#line 2311 "PiwigoPublishing.c" } #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return NULL; -#line 2302 "PiwigoPublishing.c" +#line 2315 "PiwigoPublishing.c" } static gchar* publishing_piwigo_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingPiwigoPublishingParameters** object_p; + PublishingPiwigoPublishingParameters ** object_p; object_p = collect_values[0].v_pointer; #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!object_p) { #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2313 "PiwigoPublishing.c" +#line 2326 "PiwigoPublishing.c" } #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!value->data[0].v_pointer) { #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *object_p = NULL; -#line 2319 "PiwigoPublishing.c" +#line 2332 "PiwigoPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *object_p = value->data[0].v_pointer; -#line 2323 "PiwigoPublishing.c" +#line 2336 "PiwigoPublishing.c" } else { #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *object_p = publishing_piwigo_publishing_parameters_ref (value->data[0].v_pointer); -#line 2327 "PiwigoPublishing.c" +#line 2340 "PiwigoPublishing.c" } #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return NULL; -#line 2331 "PiwigoPublishing.c" +#line 2344 "PiwigoPublishing.c" } @@ -2341,7 +2354,7 @@ GParamSpec* publishing_piwigo_param_spec_publishing_parameters (const gchar* nam G_PARAM_SPEC (spec)->value_type = object_type; #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return G_PARAM_SPEC (spec); -#line 2345 "PiwigoPublishing.c" +#line 2358 "PiwigoPublishing.c" } @@ -2350,12 +2363,12 @@ gpointer publishing_piwigo_value_get_publishing_parameters (const GValue* value) g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS), NULL); #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return value->data[0].v_pointer; -#line 2354 "PiwigoPublishing.c" +#line 2367 "PiwigoPublishing.c" } void publishing_piwigo_value_set_publishing_parameters (GValue* value, gpointer v_object) { - PublishingPiwigoPublishingParameters* old; + PublishingPiwigoPublishingParameters * old; #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS)); #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2370,23 +2383,23 @@ void publishing_piwigo_value_set_publishing_parameters (GValue* value, gpointer value->data[0].v_pointer = v_object; #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_parameters_ref (value->data[0].v_pointer); -#line 2374 "PiwigoPublishing.c" +#line 2387 "PiwigoPublishing.c" } else { #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = NULL; -#line 2378 "PiwigoPublishing.c" +#line 2391 "PiwigoPublishing.c" } #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (old) { #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_parameters_unref (old); -#line 2384 "PiwigoPublishing.c" +#line 2397 "PiwigoPublishing.c" } } void publishing_piwigo_value_take_publishing_parameters (GValue* value, gpointer v_object) { - PublishingPiwigoPublishingParameters* old; + PublishingPiwigoPublishingParameters * old; #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS)); #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2399,17 +2412,17 @@ void publishing_piwigo_value_take_publishing_parameters (GValue* value, gpointer g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = v_object; -#line 2403 "PiwigoPublishing.c" +#line 2416 "PiwigoPublishing.c" } else { #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" value->data[0].v_pointer = NULL; -#line 2407 "PiwigoPublishing.c" +#line 2420 "PiwigoPublishing.c" } #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (old) { #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_parameters_unref (old); -#line 2413 "PiwigoPublishing.c" +#line 2426 "PiwigoPublishing.c" } } @@ -2419,7 +2432,7 @@ static void publishing_piwigo_publishing_parameters_class_init (PublishingPiwigo publishing_piwigo_publishing_parameters_parent_class = g_type_class_peek_parent (klass); #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" ((PublishingPiwigoPublishingParametersClass *) klass)->finalize = publishing_piwigo_publishing_parameters_finalize; -#line 2423 "PiwigoPublishing.c" +#line 2436 "PiwigoPublishing.c" } @@ -2436,11 +2449,11 @@ static void publishing_piwigo_publishing_parameters_instance_init (PublishingPiw self->no_upload_tags = FALSE; #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->ref_count = 1; -#line 2440 "PiwigoPublishing.c" +#line 2453 "PiwigoPublishing.c" } -static void publishing_piwigo_publishing_parameters_finalize (PublishingPiwigoPublishingParameters* obj) { +static void publishing_piwigo_publishing_parameters_finalize (PublishingPiwigoPublishingParameters * obj) { PublishingPiwigoPublishingParameters * self; #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS, PublishingPiwigoPublishingParameters); @@ -2452,7 +2465,7 @@ static void publishing_piwigo_publishing_parameters_finalize (PublishingPiwigoPu _publishing_piwigo_permission_level_unref0 (self->perm_level); #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_piwigo_size_entry_unref0 (self->photo_size); -#line 2456 "PiwigoPublishing.c" +#line 2469 "PiwigoPublishing.c" } @@ -2471,18 +2484,18 @@ GType publishing_piwigo_publishing_parameters_get_type (void) { gpointer publishing_piwigo_publishing_parameters_ref (gpointer instance) { - PublishingPiwigoPublishingParameters* self; + PublishingPiwigoPublishingParameters * self; self = instance; #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_atomic_int_inc (&self->ref_count); #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return instance; -#line 2481 "PiwigoPublishing.c" +#line 2494 "PiwigoPublishing.c" } void publishing_piwigo_publishing_parameters_unref (gpointer instance) { - PublishingPiwigoPublishingParameters* self; + PublishingPiwigoPublishingParameters * self; self = instance; #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -2490,18 +2503,18 @@ void publishing_piwigo_publishing_parameters_unref (gpointer instance) { PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self); #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2494 "PiwigoPublishing.c" +#line 2507 "PiwigoPublishing.c" } } PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) { PublishingPiwigoPiwigoPublisher * self = NULL; - SpitPublishingService* _tmp0_ = NULL; - SpitPublishingService* _tmp1_ = NULL; - SpitPublishingPluginHost* _tmp2_ = NULL; - SpitPublishingPluginHost* _tmp3_ = NULL; - PublishingPiwigoSession* _tmp4_ = NULL; + SpitPublishingService* _tmp0_; + SpitPublishingService* _tmp1_; + SpitPublishingPluginHost* _tmp2_; + SpitPublishingPluginHost* _tmp3_; + PublishingPiwigoSession* _tmp4_; #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL); #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2534,22 +2547,22 @@ PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_construct (G self->priv->session = _tmp4_; #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 2538 "PiwigoPublishing.c" +#line 2551 "PiwigoPublishing.c" } PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) { #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_piwigo_publisher_construct (PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, service, host); -#line 2545 "PiwigoPublishing.c" +#line 2558 "PiwigoPublishing.c" } static SpitPublishingService* publishing_piwigo_piwigo_publisher_real_get_service (SpitPublishingPublisher* base) { PublishingPiwigoPiwigoPublisher * self; SpitPublishingService* result = NULL; - SpitPublishingService* _tmp0_ = NULL; - SpitPublishingService* _tmp1_ = NULL; + SpitPublishingService* _tmp0_; + SpitPublishingService* _tmp1_; #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher); #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2560,14 +2573,14 @@ static SpitPublishingService* publishing_piwigo_piwigo_publisher_real_get_servic result = _tmp1_; #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 2564 "PiwigoPublishing.c" +#line 2577 "PiwigoPublishing.c" } SpitPublishingPluginHost* publishing_piwigo_piwigo_publisher_get_host (PublishingPiwigoPiwigoPublisher* self) { SpitPublishingPluginHost* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; #line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), NULL); #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2578,14 +2591,14 @@ SpitPublishingPluginHost* publishing_piwigo_piwigo_publisher_get_host (Publishin result = _tmp1_; #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 2582 "PiwigoPublishing.c" +#line 2595 "PiwigoPublishing.c" } static gboolean publishing_piwigo_piwigo_publisher_real_is_running (SpitPublishingPublisher* base) { PublishingPiwigoPiwigoPublisher * self; gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher); #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2594,15 +2607,15 @@ static gboolean publishing_piwigo_piwigo_publisher_real_is_running (SpitPublishi result = _tmp0_; #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 2598 "PiwigoPublishing.c" +#line 2611 "PiwigoPublishing.c" } static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublisher* base) { PublishingPiwigoPiwigoPublisher * self; - gboolean _tmp0_ = FALSE; - PublishingPiwigoSession* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + gboolean _tmp0_; + PublishingPiwigoSession* _tmp1_; + gboolean _tmp2_; #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher); #line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2611,7 +2624,7 @@ static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublish if (_tmp0_) { #line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 2615 "PiwigoPublishing.c" +#line 2628 "PiwigoPublishing.c" } #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_debug ("PiwigoPublishing.vala:161: PiwigoPublisher: starting interaction."); @@ -2627,17 +2640,17 @@ static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublish g_debug ("PiwigoPublishing.vala:166: PiwigoPublisher: session is authenticated."); #line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_do_fetch_categories (self); -#line 2631 "PiwigoPublishing.c" +#line 2644 "PiwigoPublishing.c" } else { gchar* persistent_url = NULL; - gchar* _tmp3_ = NULL; + gchar* _tmp3_; gchar* persistent_username = NULL; - gchar* _tmp4_ = NULL; + gchar* _tmp4_; gchar* persistent_password = NULL; - gchar* _tmp5_ = NULL; + gchar* _tmp5_; gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; - const gchar* _tmp8_ = NULL; + const gchar* _tmp8_; #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_debug ("PiwigoPublishing.vala:169: PiwigoPublisher: session is not authenticat" \ "ed."); @@ -2657,39 +2670,39 @@ static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublish _tmp8_ = persistent_url; #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp8_ != NULL) { -#line 2660 "PiwigoPublishing.c" - const gchar* _tmp9_ = NULL; +#line 2673 "PiwigoPublishing.c" + const gchar* _tmp9_; #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp9_ = persistent_username; #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = _tmp9_ != NULL; -#line 2666 "PiwigoPublishing.c" +#line 2679 "PiwigoPublishing.c" } else { #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = FALSE; -#line 2670 "PiwigoPublishing.c" +#line 2683 "PiwigoPublishing.c" } #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp7_) { -#line 2674 "PiwigoPublishing.c" - const gchar* _tmp10_ = NULL; +#line 2687 "PiwigoPublishing.c" + const gchar* _tmp10_; #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp10_ = persistent_password; #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = _tmp10_ != NULL; -#line 2680 "PiwigoPublishing.c" +#line 2693 "PiwigoPublishing.c" } else { #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = FALSE; -#line 2684 "PiwigoPublishing.c" +#line 2697 "PiwigoPublishing.c" } #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp6_) { -#line 2688 "PiwigoPublishing.c" - const gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; +#line 2701 "PiwigoPublishing.c" + const gchar* _tmp11_; + const gchar* _tmp12_; + const gchar* _tmp13_; + gboolean _tmp14_; #line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp11_ = persistent_url; #line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2700,11 +2713,11 @@ static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublish _tmp14_ = publishing_piwigo_piwigo_publisher_get_remember_password (self); #line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_); -#line 2703 "PiwigoPublishing.c" +#line 2716 "PiwigoPublishing.c" } else { #line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO); -#line 2707 "PiwigoPublishing.c" +#line 2720 "PiwigoPublishing.c" } #line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (persistent_password); @@ -2712,7 +2725,7 @@ static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublish _g_free0 (persistent_username); #line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (persistent_url); -#line 2715 "PiwigoPublishing.c" +#line 2728 "PiwigoPublishing.c" } } @@ -2723,14 +2736,14 @@ static void publishing_piwigo_piwigo_publisher_real_stop (SpitPublishingPublishe self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher); #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->running = FALSE; -#line 2726 "PiwigoPublishing.c" +#line 2739 "PiwigoPublishing.c" } gchar* publishing_piwigo_piwigo_publisher_get_persistent_url (PublishingPiwigoPiwigoPublisher* self) { gchar* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gchar* _tmp1_; #line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), NULL); #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2741,13 +2754,13 @@ gchar* publishing_piwigo_piwigo_publisher_get_persistent_url (PublishingPiwigoPi result = _tmp1_; #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 2744 "PiwigoPublishing.c" +#line 2757 "PiwigoPublishing.c" } static void publishing_piwigo_piwigo_publisher_set_persistent_url (PublishingPiwigoPiwigoPublisher* self, const gchar* url) { - SpitPublishingPluginHost* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + const gchar* _tmp1_; #line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2758,14 +2771,14 @@ static void publishing_piwigo_piwigo_publisher_set_persistent_url (PublishingPiw _tmp1_ = url; #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "url", _tmp1_); -#line 2761 "PiwigoPublishing.c" +#line 2774 "PiwigoPublishing.c" } gchar* publishing_piwigo_piwigo_publisher_get_persistent_username (PublishingPiwigoPiwigoPublisher* self) { gchar* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gchar* _tmp1_; #line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), NULL); #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2776,13 +2789,13 @@ gchar* publishing_piwigo_piwigo_publisher_get_persistent_username (PublishingPiw result = _tmp1_; #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 2779 "PiwigoPublishing.c" +#line 2792 "PiwigoPublishing.c" } static void publishing_piwigo_piwigo_publisher_set_persistent_username (PublishingPiwigoPiwigoPublisher* self, const gchar* username) { - SpitPublishingPluginHost* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + const gchar* _tmp1_; #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2793,14 +2806,14 @@ static void publishing_piwigo_piwigo_publisher_set_persistent_username (Publishi _tmp1_ = username; #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "username", _tmp1_); -#line 2796 "PiwigoPublishing.c" +#line 2809 "PiwigoPublishing.c" } gchar* publishing_piwigo_piwigo_publisher_get_persistent_password (PublishingPiwigoPiwigoPublisher* self) { gchar* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gchar* _tmp1_; #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), NULL); #line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2811,13 +2824,13 @@ gchar* publishing_piwigo_piwigo_publisher_get_persistent_password (PublishingPiw result = _tmp1_; #line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 2814 "PiwigoPublishing.c" +#line 2827 "PiwigoPublishing.c" } static void publishing_piwigo_piwigo_publisher_set_persistent_password (PublishingPiwigoPiwigoPublisher* self, const gchar* password) { - SpitPublishingPluginHost* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + const gchar* _tmp1_; #line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2826,14 +2839,14 @@ static void publishing_piwigo_piwigo_publisher_set_persistent_password (Publishi _tmp1_ = password; #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "password", _tmp1_); -#line 2829 "PiwigoPublishing.c" +#line 2842 "PiwigoPublishing.c" } gboolean publishing_piwigo_piwigo_publisher_get_remember_password (PublishingPiwigoPiwigoPublisher* self) { gboolean result = FALSE; - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE); #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2844,13 +2857,13 @@ gboolean publishing_piwigo_piwigo_publisher_get_remember_password (PublishingPiw result = _tmp1_; #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 2847 "PiwigoPublishing.c" +#line 2860 "PiwigoPublishing.c" } static void publishing_piwigo_piwigo_publisher_set_remember_password (PublishingPiwigoPiwigoPublisher* self, gboolean remember_password) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; #line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2859,14 +2872,14 @@ static void publishing_piwigo_piwigo_publisher_set_remember_password (Publishing _tmp1_ = remember_password; #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember-password", _tmp1_); -#line 2862 "PiwigoPublishing.c" +#line 2875 "PiwigoPublishing.c" } gint publishing_piwigo_piwigo_publisher_get_last_category (PublishingPiwigoPiwigoPublisher* self) { gint result = 0; - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), 0); #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2877,13 +2890,13 @@ gint publishing_piwigo_piwigo_publisher_get_last_category (PublishingPiwigoPiwig result = _tmp1_; #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 2880 "PiwigoPublishing.c" +#line 2893 "PiwigoPublishing.c" } static void publishing_piwigo_piwigo_publisher_set_last_category (PublishingPiwigoPiwigoPublisher* self, gint last_category) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2892,14 +2905,14 @@ static void publishing_piwigo_piwigo_publisher_set_last_category (PublishingPiwi _tmp1_ = last_category; #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-category", _tmp1_); -#line 2895 "PiwigoPublishing.c" +#line 2908 "PiwigoPublishing.c" } gint publishing_piwigo_piwigo_publisher_get_last_permission_level (PublishingPiwigoPiwigoPublisher* self) { gint result = 0; - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), 0); #line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2910,13 +2923,13 @@ gint publishing_piwigo_piwigo_publisher_get_last_permission_level (PublishingPiw result = _tmp1_; #line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 2913 "PiwigoPublishing.c" +#line 2926 "PiwigoPublishing.c" } static void publishing_piwigo_piwigo_publisher_set_last_permission_level (PublishingPiwigoPiwigoPublisher* self, gint last_permission_level) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2925,14 +2938,14 @@ static void publishing_piwigo_piwigo_publisher_set_last_permission_level (Publis _tmp1_ = last_permission_level; #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-permission-level", _tmp1_); -#line 2928 "PiwigoPublishing.c" +#line 2941 "PiwigoPublishing.c" } gint publishing_piwigo_piwigo_publisher_get_last_photo_size (PublishingPiwigoPiwigoPublisher* self) { gint result = 0; - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), 0); #line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2943,13 +2956,13 @@ gint publishing_piwigo_piwigo_publisher_get_last_photo_size (PublishingPiwigoPiw result = _tmp1_; #line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 2946 "PiwigoPublishing.c" +#line 2959 "PiwigoPublishing.c" } static void publishing_piwigo_piwigo_publisher_set_last_photo_size (PublishingPiwigoPiwigoPublisher* self, gint last_photo_size) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2958,14 +2971,14 @@ static void publishing_piwigo_piwigo_publisher_set_last_photo_size (PublishingPi _tmp1_ = last_photo_size; #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-photo-size", _tmp1_); -#line 2961 "PiwigoPublishing.c" +#line 2974 "PiwigoPublishing.c" } static gboolean publishing_piwigo_piwigo_publisher_get_last_title_as_comment (PublishingPiwigoPiwigoPublisher* self) { gboolean result = FALSE; - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; #line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE); #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2976,13 +2989,13 @@ static gboolean publishing_piwigo_piwigo_publisher_get_last_title_as_comment (Pu result = _tmp1_; #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 2979 "PiwigoPublishing.c" +#line 2992 "PiwigoPublishing.c" } static void publishing_piwigo_piwigo_publisher_set_last_title_as_comment (PublishingPiwigoPiwigoPublisher* self, gboolean title_as_comment) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; #line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -2991,14 +3004,14 @@ static void publishing_piwigo_piwigo_publisher_set_last_title_as_comment (Publis _tmp1_ = title_as_comment; #line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-title-as-comment", _tmp1_); -#line 2994 "PiwigoPublishing.c" +#line 3007 "PiwigoPublishing.c" } static gboolean publishing_piwigo_piwigo_publisher_get_last_no_upload_tags (PublishingPiwigoPiwigoPublisher* self) { gboolean result = FALSE; - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; #line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE); #line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -3009,13 +3022,13 @@ static gboolean publishing_piwigo_piwigo_publisher_get_last_no_upload_tags (Publ result = _tmp1_; #line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 3012 "PiwigoPublishing.c" +#line 3025 "PiwigoPublishing.c" } static void publishing_piwigo_piwigo_publisher_set_last_no_upload_tags (PublishingPiwigoPiwigoPublisher* self, gboolean no_upload_tags) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; #line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -3024,14 +3037,14 @@ static void publishing_piwigo_piwigo_publisher_set_last_no_upload_tags (Publishi _tmp1_ = no_upload_tags; #line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-no-upload-tags", _tmp1_); -#line 3027 "PiwigoPublishing.c" +#line 3040 "PiwigoPublishing.c" } static gboolean publishing_piwigo_piwigo_publisher_get_metadata_removal_choice (PublishingPiwigoPiwigoPublisher* self) { gboolean result = FALSE; - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; #line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE); #line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -3042,13 +3055,13 @@ static gboolean publishing_piwigo_piwigo_publisher_get_metadata_removal_choice ( result = _tmp1_; #line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 3045 "PiwigoPublishing.c" +#line 3058 "PiwigoPublishing.c" } static void publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (PublishingPiwigoPiwigoPublisher* self, gboolean strip_metadata) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -3057,7 +3070,7 @@ static void publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (Publ _tmp1_ = strip_metadata; #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", _tmp1_); -#line 3060 "PiwigoPublishing.c" +#line 3073 "PiwigoPublishing.c" } @@ -3075,19 +3088,19 @@ static void publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (Publ static void _publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked_publishing_piwigo_authentication_pane_login (PublishingPiwigoAuthenticationPane* _sender, const gchar* url, const gchar* user, const gchar* password, gboolean remember_password, gpointer self) { #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked ((PublishingPiwigoPiwigoPublisher*) self, url, user, password, remember_password); -#line 3078 "PiwigoPublishing.c" +#line 3091 "PiwigoPublishing.c" } static void publishing_piwigo_piwigo_publisher_do_show_authentication_pane (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoAuthenticationPaneMode mode) { - SpitPublishingPluginHost* _tmp0_ = NULL; + SpitPublishingPluginHost* _tmp0_; PublishingPiwigoAuthenticationPane* authentication_pane = NULL; - PublishingPiwigoAuthenticationPaneMode _tmp1_ = 0; - PublishingPiwigoAuthenticationPane* _tmp2_ = NULL; - SpitPublishingPluginHost* _tmp3_ = NULL; - SpitPublishingPluginHost* _tmp4_ = NULL; - GtkWidget* _tmp5_ = NULL; - GtkWidget* _tmp6_ = NULL; + PublishingPiwigoAuthenticationPaneMode _tmp1_; + PublishingPiwigoAuthenticationPane* _tmp2_; + SpitPublishingPluginHost* _tmp3_; + SpitPublishingPluginHost* _tmp4_; + GtkWidget* _tmp5_; + GtkWidget* _tmp6_; #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -3120,22 +3133,22 @@ static void publishing_piwigo_piwigo_publisher_do_show_authentication_pane (Publ _g_object_unref0 (_tmp6_); #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_object_unref0 (authentication_pane); -#line 3123 "PiwigoPublishing.c" +#line 3136 "PiwigoPublishing.c" } static void __lambda7_ (PublishingPiwigoPiwigoPublisher* self) { - PublishingPiwigoSession* _tmp0_ = NULL; - PublishingPiwigoSession* _tmp1_ = NULL; + PublishingPiwigoSession* _tmp0_; + PublishingPiwigoSession* _tmp1_; gchar* persistent_url = NULL; - gchar* _tmp2_ = NULL; + gchar* _tmp2_; gchar* persistent_username = NULL; - gchar* _tmp3_ = NULL; + gchar* _tmp3_; gchar* persistent_password = NULL; - gchar* _tmp4_ = NULL; + gchar* _tmp4_; gboolean _tmp5_ = FALSE; gboolean _tmp6_ = FALSE; - const gchar* _tmp7_ = NULL; + const gchar* _tmp7_; #line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_debug ("PiwigoPublishing.vala:297: SSL: User wants us to retry with broken cer" \ "tificate"); @@ -3165,39 +3178,39 @@ static void __lambda7_ (PublishingPiwigoPiwigoPublisher* self) { _tmp7_ = persistent_url; #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp7_ != NULL) { -#line 3167 "PiwigoPublishing.c" - const gchar* _tmp8_ = NULL; +#line 3180 "PiwigoPublishing.c" + const gchar* _tmp8_; #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = persistent_username; #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = _tmp8_ != NULL; -#line 3173 "PiwigoPublishing.c" +#line 3186 "PiwigoPublishing.c" } else { #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = FALSE; -#line 3177 "PiwigoPublishing.c" +#line 3190 "PiwigoPublishing.c" } #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp6_) { -#line 3181 "PiwigoPublishing.c" - const gchar* _tmp9_ = NULL; +#line 3194 "PiwigoPublishing.c" + const gchar* _tmp9_; #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp9_ = persistent_password; #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = _tmp9_ != NULL; -#line 3187 "PiwigoPublishing.c" +#line 3200 "PiwigoPublishing.c" } else { #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = FALSE; -#line 3191 "PiwigoPublishing.c" +#line 3204 "PiwigoPublishing.c" } #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp5_) { -#line 3195 "PiwigoPublishing.c" - const gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; +#line 3208 "PiwigoPublishing.c" + const gchar* _tmp10_; + const gchar* _tmp11_; + const gchar* _tmp12_; + gboolean _tmp13_; #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp10_ = persistent_url; #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -3208,11 +3221,11 @@ static void __lambda7_ (PublishingPiwigoPiwigoPublisher* self) { _tmp13_ = publishing_piwigo_piwigo_publisher_get_remember_password (self); #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp10_, _tmp11_, _tmp12_, _tmp13_); -#line 3210 "PiwigoPublishing.c" +#line 3223 "PiwigoPublishing.c" } else { #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO); -#line 3214 "PiwigoPublishing.c" +#line 3227 "PiwigoPublishing.c" } #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (persistent_password); @@ -3220,37 +3233,37 @@ static void __lambda7_ (PublishingPiwigoPiwigoPublisher* self) { _g_free0 (persistent_username); #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (persistent_url); -#line 3222 "PiwigoPublishing.c" +#line 3235 "PiwigoPublishing.c" } static void ___lambda7__publishing_piwigo_ssl_error_pane_proceed (PublishingPiwigoSSLErrorPane* _sender, gpointer self) { #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" __lambda7_ ((PublishingPiwigoPiwigoPublisher*) self); -#line 3229 "PiwigoPublishing.c" +#line 3242 "PiwigoPublishing.c" } static void _vala_SoupURI_free (SoupURI* self) { #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_boxed_free (soup_uri_get_type (), self); -#line 3236 "PiwigoPublishing.c" +#line 3249 "PiwigoPublishing.c" } static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoSessionLoginTransaction* trans, const gchar* url) { SoupURI* uri = NULL; - const gchar* _tmp0_ = NULL; - SoupURI* _tmp1_ = NULL; - SpitPublishingPluginHost* _tmp2_ = NULL; + const gchar* _tmp0_; + SoupURI* _tmp1_; + SpitPublishingPluginHost* _tmp2_; PublishingPiwigoSSLErrorPane* ssl_pane = NULL; - PublishingPiwigoSessionLoginTransaction* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - PublishingPiwigoSSLErrorPane* _tmp5_ = NULL; - SpitPublishingPluginHost* _tmp6_ = NULL; - SpitPublishingPluginHost* _tmp7_ = NULL; - GtkWidget* _tmp8_ = NULL; - GtkWidget* _tmp9_ = NULL; + PublishingPiwigoSessionLoginTransaction* _tmp3_; + const gchar* _tmp4_; + PublishingPiwigoSSLErrorPane* _tmp5_; + SpitPublishingPluginHost* _tmp6_; + SpitPublishingPluginHost* _tmp7_; + GtkWidget* _tmp8_; + GtkWidget* _tmp9_; #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -3295,7 +3308,7 @@ static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (Publi _g_object_unref0 (ssl_pane); #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" __vala_SoupURI_free0 (uri); -#line 3297 "PiwigoPublishing.c" +#line 3310 "PiwigoPublishing.c" } @@ -3311,11 +3324,11 @@ static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (Publi * @param password the password of the Piwigo as entered in the dialog */ static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked (PublishingPiwigoPiwigoPublisher* self, const gchar* url, const gchar* username, const gchar* password, gboolean remember_password) { - gboolean _tmp0_ = FALSE; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + gboolean _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + gboolean _tmp4_; #line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -3332,7 +3345,7 @@ static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clic if (!_tmp0_) { #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 3334 "PiwigoPublishing.c" +#line 3347 "PiwigoPublishing.c" } #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = url; @@ -3344,7 +3357,7 @@ static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clic _tmp4_ = remember_password; #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp1_, _tmp2_, _tmp3_, _tmp4_); -#line 3346 "PiwigoPublishing.c" +#line 3359 "PiwigoPublishing.c" } @@ -3362,31 +3375,31 @@ static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clic static void _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_on_login_network_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err); -#line 3364 "PiwigoPublishing.c" +#line 3377 "PiwigoPublishing.c" } static void _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_on_login_network_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender); -#line 3371 "PiwigoPublishing.c" +#line 3384 "PiwigoPublishing.c" } static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwigoPiwigoPublisher* self, const gchar* url, const gchar* username, const gchar* password, gboolean remember_password) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; + gboolean _tmp2_; + gboolean _tmp3_; PublishingPiwigoSessionLoginTransaction* login_trans = NULL; - PublishingPiwigoSession* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - PublishingPiwigoSessionLoginTransaction* _tmp11_ = NULL; - PublishingPiwigoSessionLoginTransaction* _tmp12_ = NULL; + PublishingPiwigoSession* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + const gchar* _tmp9_; + const gchar* _tmp10_; + PublishingPiwigoSessionLoginTransaction* _tmp11_; + PublishingPiwigoSessionLoginTransaction* _tmp12_; GError * _inner_error_ = NULL; #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); @@ -3414,17 +3427,17 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig _tmp3_ = remember_password; #line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp3_) { -#line 3416 "PiwigoPublishing.c" - const gchar* _tmp4_ = NULL; +#line 3429 "PiwigoPublishing.c" + const gchar* _tmp4_; #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = password; #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_set_persistent_password (self, _tmp4_); -#line 3422 "PiwigoPublishing.c" +#line 3435 "PiwigoPublishing.c" } else { #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_set_persistent_password (self, NULL); -#line 3426 "PiwigoPublishing.c" +#line 3439 "PiwigoPublishing.c" } #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = self->priv->session; @@ -3450,7 +3463,7 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self, 0); #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self, 0); -#line 3452 "PiwigoPublishing.c" +#line 3465 "PiwigoPublishing.c" { #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -3458,7 +3471,7 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig if (G_UNLIKELY (_inner_error_ != NULL)) { #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3460 "PiwigoPublishing.c" +#line 3473 "PiwigoPublishing.c" goto __catch23_spit_publishing_publishing_error; } #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -3469,14 +3482,14 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig g_clear_error (&_inner_error_); #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 3471 "PiwigoPublishing.c" +#line 3484 "PiwigoPublishing.c" } } goto __finally23; __catch23_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp13_ = NULL; + GError* _tmp13_; #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" err = _inner_error_; #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -3485,28 +3498,28 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig _tmp13_ = err; #line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (g_error_matches (_tmp13_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED)) { -#line 3487 "PiwigoPublishing.c" - const gchar* _tmp14_ = NULL; +#line 3500 "PiwigoPublishing.c" + const gchar* _tmp14_; #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_debug ("PiwigoPublishing.vala:367: ERROR: SSL connection problems"); #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp14_ = url; #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (self, login_trans, _tmp14_); -#line 3495 "PiwigoPublishing.c" +#line 3508 "PiwigoPublishing.c" } else { - GError* _tmp15_ = NULL; + GError* _tmp15_; #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_debug ("PiwigoPublishing.vala:370: ERROR: do_network_login"); #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp15_ = err; #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp15_); -#line 3504 "PiwigoPublishing.c" +#line 3517 "PiwigoPublishing.c" } #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_error_free0 (err); -#line 3508 "PiwigoPublishing.c" +#line 3521 "PiwigoPublishing.c" } __finally23: #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -3519,24 +3532,24 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig g_clear_error (&_inner_error_); #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 3521 "PiwigoPublishing.c" +#line 3534 "PiwigoPublishing.c" } #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_rest_support_transaction_unref0 (login_trans); -#line 3525 "PiwigoPublishing.c" +#line 3538 "PiwigoPublishing.c" } gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url) { gchar* result = NULL; gchar* norm_url = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + gboolean _tmp3_; gboolean _tmp10_ = FALSE; - const gchar* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; + const gchar* _tmp11_; + gboolean _tmp12_; #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (url != NULL, NULL); #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -3551,20 +3564,20 @@ gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url) { _tmp3_ = g_str_has_suffix (_tmp2_, ".php"); #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!_tmp3_) { -#line 3553 "PiwigoPublishing.c" - const gchar* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - const gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; +#line 3566 "PiwigoPublishing.c" + const gchar* _tmp4_; + gboolean _tmp5_; + const gchar* _tmp8_; + gchar* _tmp9_; #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = norm_url; #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = g_str_has_suffix (_tmp4_, "/"); #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!_tmp5_) { -#line 3564 "PiwigoPublishing.c" - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; +#line 3577 "PiwigoPublishing.c" + const gchar* _tmp6_; + gchar* _tmp7_; #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = norm_url; #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -3573,7 +3586,7 @@ gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url) { _g_free0 (norm_url); #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" norm_url = _tmp7_; -#line 3575 "PiwigoPublishing.c" +#line 3588 "PiwigoPublishing.c" } #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = norm_url; @@ -3583,7 +3596,7 @@ gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url) { _g_free0 (norm_url); #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" norm_url = _tmp9_; -#line 3585 "PiwigoPublishing.c" +#line 3598 "PiwigoPublishing.c" } #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp11_ = norm_url; @@ -3591,26 +3604,26 @@ gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url) { _tmp12_ = g_str_has_prefix (_tmp11_, "http://"); #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!_tmp12_) { -#line 3593 "PiwigoPublishing.c" - const gchar* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; +#line 3606 "PiwigoPublishing.c" + const gchar* _tmp13_; + gboolean _tmp14_; #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp13_ = norm_url; #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp14_ = g_str_has_prefix (_tmp13_, "https://"); #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp10_ = !_tmp14_; -#line 3602 "PiwigoPublishing.c" +#line 3615 "PiwigoPublishing.c" } else { #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp10_ = FALSE; -#line 3606 "PiwigoPublishing.c" +#line 3619 "PiwigoPublishing.c" } #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp10_) { -#line 3610 "PiwigoPublishing.c" - const gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; +#line 3623 "PiwigoPublishing.c" + const gchar* _tmp15_; + gchar* _tmp16_; #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp15_ = norm_url; #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -3619,13 +3632,13 @@ gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url) { _g_free0 (norm_url); #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" norm_url = _tmp16_; -#line 3621 "PiwigoPublishing.c" +#line 3634 "PiwigoPublishing.c" } #line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" result = norm_url; #line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 3627 "PiwigoPublishing.c" +#line 3640 "PiwigoPublishing.c" } @@ -3647,7 +3660,7 @@ static gchar* _publishing_piwigo_transaction_validate_xml_publishing_rest_suppor result = publishing_piwigo_transaction_validate_xml (doc); #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 3649 "PiwigoPublishing.c" +#line 3662 "PiwigoPublishing.c" } @@ -3656,27 +3669,27 @@ static gchar* _publishing_piwigo_transaction_get_error_code_publishing_rest_supp result = publishing_piwigo_transaction_get_error_code (doc); #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 3658 "PiwigoPublishing.c" +#line 3671 "PiwigoPublishing.c" } static void publishing_piwigo_piwigo_publisher_on_login_network_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; gchar* endpoint_url = NULL; - PublishingRESTSupportTransaction* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; + PublishingRESTSupportTransaction* _tmp19_; + gchar* _tmp20_; + const gchar* _tmp21_; gchar* pwg_id = NULL; - PublishingRESTSupportTransaction* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - PublishingPiwigoSession* _tmp25_ = NULL; - const gchar* _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; - const gchar* _tmp28_ = NULL; + PublishingRESTSupportTransaction* _tmp22_; + gchar* _tmp23_; + const gchar* _tmp24_; + PublishingPiwigoSession* _tmp25_; + const gchar* _tmp26_; + const gchar* _tmp27_; + const gchar* _tmp28_; GError * _inner_error_ = NULL; #line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); @@ -3696,13 +3709,13 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE); #line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self); -#line 3698 "PiwigoPublishing.c" +#line 3711 "PiwigoPublishing.c" { - PublishingRESTSupportTransaction* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - PublishingRESTSupportXmlDocument* _tmp7_ = NULL; - PublishingRESTSupportXmlDocument* _tmp8_ = NULL; + PublishingRESTSupportTransaction* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + PublishingRESTSupportXmlDocument* _tmp7_; + PublishingRESTSupportXmlDocument* _tmp8_; #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = txn; #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -3721,7 +3734,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis if (G_UNLIKELY (_inner_error_ != NULL)) { #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3723 "PiwigoPublishing.c" +#line 3736 "PiwigoPublishing.c" goto __catch24_spit_publishing_publishing_error; } #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -3730,7 +3743,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis g_clear_error (&_inner_error_); #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 3732 "PiwigoPublishing.c" +#line 3745 "PiwigoPublishing.c" } } goto __finally24; @@ -3741,13 +3754,13 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis err = _inner_error_; #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _inner_error_ = NULL; -#line 3743 "PiwigoPublishing.c" +#line 3756 "PiwigoPublishing.c" { - PublishingRESTSupportTransaction* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - PublishingRESTSupportXmlDocument* _tmp12_ = NULL; - PublishingRESTSupportXmlDocument* _tmp13_ = NULL; + PublishingRESTSupportTransaction* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + PublishingRESTSupportXmlDocument* _tmp12_; + PublishingRESTSupportXmlDocument* _tmp13_; #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp9_ = txn; #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -3766,7 +3779,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis if (G_UNLIKELY (_inner_error_ != NULL)) { #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3768 "PiwigoPublishing.c" +#line 3781 "PiwigoPublishing.c" goto __catch25_spit_publishing_publishing_error; } #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -3777,7 +3790,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis g_clear_error (&_inner_error_); #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 3779 "PiwigoPublishing.c" +#line 3792 "PiwigoPublishing.c" } } goto __finally25; @@ -3785,10 +3798,10 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis { GError* code = NULL; gint code_int = 0; - GError* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - gint _tmp16_ = 0; - gint _tmp17_ = 0; + GError* _tmp14_; + const gchar* _tmp15_; + gint _tmp16_; + gint _tmp17_; #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" code = _inner_error_; #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -3809,20 +3822,20 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis g_debug ("PiwigoPublishing.vala:422: ERROR: on_login_network_complete, code 999"); #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER); -#line 3811 "PiwigoPublishing.c" +#line 3824 "PiwigoPublishing.c" } else { - GError* _tmp18_ = NULL; + GError* _tmp18_; #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_debug ("PiwigoPublishing.vala:425: ERROR: on_login_network_complete"); #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp18_ = err; #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp18_); -#line 3820 "PiwigoPublishing.c" +#line 3833 "PiwigoPublishing.c" } #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_error_free0 (code); -#line 3824 "PiwigoPublishing.c" +#line 3837 "PiwigoPublishing.c" } __finally25: #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -3837,13 +3850,13 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis g_clear_error (&_inner_error_); #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 3839 "PiwigoPublishing.c" +#line 3852 "PiwigoPublishing.c" } #line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_error_free0 (err); #line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 3845 "PiwigoPublishing.c" +#line 3858 "PiwigoPublishing.c" } __finally24: #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -3854,7 +3867,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis g_clear_error (&_inner_error_); #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 3856 "PiwigoPublishing.c" +#line 3869 "PiwigoPublishing.c" } #line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp19_ = txn; @@ -3892,7 +3905,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis _g_free0 (pwg_id); #line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (endpoint_url); -#line 3894 "PiwigoPublishing.c" +#line 3907 "PiwigoPublishing.c" } @@ -3908,12 +3921,12 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis * @param err the received error */ static void publishing_piwigo_piwigo_publisher_on_login_network_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - PublishingPiwigoSession* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + PublishingPiwigoSession* _tmp4_; + gboolean _tmp5_; #line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -3940,11 +3953,11 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_error (Publishin if (_tmp5_) { #line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 3942 "PiwigoPublishing.c" +#line 3955 "PiwigoPublishing.c" } #line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL); -#line 3946 "PiwigoPublishing.c" +#line 3959 "PiwigoPublishing.c" } @@ -3961,22 +3974,22 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_error (Publishin static void _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_on_session_get_status_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err); -#line 3963 "PiwigoPublishing.c" +#line 3976 "PiwigoPublishing.c" } static void _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_on_session_get_status_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender); -#line 3970 "PiwigoPublishing.c" +#line 3983 "PiwigoPublishing.c" } static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (PublishingPiwigoPiwigoPublisher* self, const gchar* url, const gchar* pwg_id) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; - PublishingPiwigoSession* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; + PublishingPiwigoSession* _tmp2_; + gboolean _tmp3_; GError * _inner_error_ = NULL; #line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); @@ -4000,14 +4013,14 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi _tmp3_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!_tmp3_) { -#line 4002 "PiwigoPublishing.c" +#line 4015 "PiwigoPublishing.c" PublishingPiwigoSessionGetStatusTransaction* status_txn = NULL; - PublishingPiwigoSession* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - PublishingPiwigoSessionGetStatusTransaction* _tmp7_ = NULL; - PublishingPiwigoSessionGetStatusTransaction* _tmp8_ = NULL; - PublishingPiwigoSessionGetStatusTransaction* _tmp9_ = NULL; + PublishingPiwigoSession* _tmp4_; + const gchar* _tmp5_; + const gchar* _tmp6_; + PublishingPiwigoSessionGetStatusTransaction* _tmp7_; + PublishingPiwigoSessionGetStatusTransaction* _tmp8_; + PublishingPiwigoSessionGetStatusTransaction* _tmp9_; #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = self->priv->session; #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4026,9 +4039,9 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi _tmp9_ = status_txn; #line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self, 0); -#line 4028 "PiwigoPublishing.c" +#line 4041 "PiwigoPublishing.c" { - PublishingPiwigoSessionGetStatusTransaction* _tmp10_ = NULL; + PublishingPiwigoSessionGetStatusTransaction* _tmp10_; #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp10_ = status_txn; #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4037,7 +4050,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi if (G_UNLIKELY (_inner_error_ != NULL)) { #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4039 "PiwigoPublishing.c" +#line 4052 "PiwigoPublishing.c" goto __catch26_spit_publishing_publishing_error; } #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4048,14 +4061,14 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi g_clear_error (&_inner_error_); #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 4050 "PiwigoPublishing.c" +#line 4063 "PiwigoPublishing.c" } } goto __finally26; __catch26_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp11_ = NULL; + GError* _tmp11_; #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" err = _inner_error_; #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4069,7 +4082,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp11_); #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_error_free0 (err); -#line 4070 "PiwigoPublishing.c" +#line 4083 "PiwigoPublishing.c" } __finally26: #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4082,17 +4095,17 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi g_clear_error (&_inner_error_); #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 4083 "PiwigoPublishing.c" +#line 4096 "PiwigoPublishing.c" } #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_rest_support_transaction_unref0 (status_txn); -#line 4087 "PiwigoPublishing.c" +#line 4100 "PiwigoPublishing.c" } else { PublishingPiwigoSessionGetStatusTransaction* status_txn = NULL; - PublishingPiwigoSession* _tmp12_ = NULL; - PublishingPiwigoSessionGetStatusTransaction* _tmp13_ = NULL; - PublishingPiwigoSessionGetStatusTransaction* _tmp14_ = NULL; - PublishingPiwigoSessionGetStatusTransaction* _tmp15_ = NULL; + PublishingPiwigoSession* _tmp12_; + PublishingPiwigoSessionGetStatusTransaction* _tmp13_; + PublishingPiwigoSessionGetStatusTransaction* _tmp14_; + PublishingPiwigoSessionGetStatusTransaction* _tmp15_; #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp12_ = self->priv->session; #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4107,9 +4120,9 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi _tmp15_ = status_txn; #line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self, 0); -#line 4108 "PiwigoPublishing.c" +#line 4121 "PiwigoPublishing.c" { - PublishingPiwigoSessionGetStatusTransaction* _tmp16_ = NULL; + PublishingPiwigoSessionGetStatusTransaction* _tmp16_; #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp16_ = status_txn; #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4118,7 +4131,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi if (G_UNLIKELY (_inner_error_ != NULL)) { #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4119 "PiwigoPublishing.c" +#line 4132 "PiwigoPublishing.c" goto __catch27_spit_publishing_publishing_error; } #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4129,14 +4142,14 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi g_clear_error (&_inner_error_); #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 4130 "PiwigoPublishing.c" +#line 4143 "PiwigoPublishing.c" } } goto __finally27; __catch27_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp17_ = NULL; + GError* _tmp17_; #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" err = _inner_error_; #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4150,7 +4163,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp17_); #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_error_free0 (err); -#line 4150 "PiwigoPublishing.c" +#line 4163 "PiwigoPublishing.c" } __finally27: #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4163,11 +4176,11 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi g_clear_error (&_inner_error_); #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 4163 "PiwigoPublishing.c" +#line 4176 "PiwigoPublishing.c" } #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_rest_support_transaction_unref0 (status_txn); -#line 4167 "PiwigoPublishing.c" +#line 4180 "PiwigoPublishing.c" } } @@ -4180,12 +4193,12 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi * session authentication. It then triggers the fetch categories action. */ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - PublishingPiwigoSession* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + PublishingPiwigoSession* _tmp4_; + gboolean _tmp5_; GError * _inner_error_ = NULL; #line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); @@ -4211,14 +4224,14 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P _tmp5_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); #line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!_tmp5_) { -#line 4211 "PiwigoPublishing.c" +#line 4224 "PiwigoPublishing.c" gchar* endpoint_url = NULL; - PublishingRESTSupportTransaction* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; + PublishingRESTSupportTransaction* _tmp6_; + gchar* _tmp7_; gchar* pwg_id = NULL; - PublishingPiwigoSession* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; + PublishingPiwigoSession* _tmp8_; + gchar* _tmp9_; + const gchar* _tmp10_; #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = txn; #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4235,17 +4248,17 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P _tmp10_ = pwg_id; #line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_debug ("PiwigoPublishing.vala:521: Fetching session status for pwg_id %s", _tmp10_); -#line 4235 "PiwigoPublishing.c" +#line 4248 "PiwigoPublishing.c" { PublishingRESTSupportXmlDocument* doc = NULL; - PublishingRESTSupportTransaction* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - PublishingRESTSupportXmlDocument* _tmp14_ = NULL; - PublishingRESTSupportXmlDocument* _tmp15_ = NULL; + PublishingRESTSupportTransaction* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + PublishingRESTSupportXmlDocument* _tmp14_; + PublishingRESTSupportXmlDocument* _tmp15_; xmlNode* root = NULL; - PublishingRESTSupportXmlDocument* _tmp16_ = NULL; - xmlNode* _tmp17_ = NULL; + PublishingRESTSupportXmlDocument* _tmp16_; + xmlNode* _tmp17_; xmlNode* username_node = NULL; #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp11_ = txn; @@ -4265,7 +4278,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P if (G_UNLIKELY (_inner_error_ != NULL)) { #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4265 "PiwigoPublishing.c" +#line 4278 "PiwigoPublishing.c" goto __catch28_spit_publishing_publishing_error; } #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4278,7 +4291,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P g_clear_error (&_inner_error_); #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 4278 "PiwigoPublishing.c" +#line 4291 "PiwigoPublishing.c" } #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp16_ = doc; @@ -4286,26 +4299,26 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P _tmp17_ = publishing_rest_support_xml_document_get_root_node (_tmp16_); #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" root = _tmp17_; -#line 4286 "PiwigoPublishing.c" +#line 4299 "PiwigoPublishing.c" { xmlNode* _tmp18_ = NULL; - PublishingRESTSupportXmlDocument* _tmp19_ = NULL; - xmlNode* _tmp20_ = NULL; - xmlNode* _tmp21_ = NULL; + PublishingRESTSupportXmlDocument* _tmp19_; + xmlNode* _tmp20_; + xmlNode* _tmp21_; gchar* username = NULL; - xmlNode* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - PublishingPiwigoSession* _tmp25_ = NULL; - const gchar* _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; - const gchar* _tmp28_ = NULL; - PublishingPiwigoSession* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; - PublishingPiwigoSession* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; + xmlNode* _tmp22_; + gchar* _tmp23_; + const gchar* _tmp24_; + PublishingPiwigoSession* _tmp25_; + const gchar* _tmp26_; + const gchar* _tmp27_; + const gchar* _tmp28_; + PublishingPiwigoSession* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; + PublishingPiwigoSession* _tmp32_; + gchar* _tmp33_; + gchar* _tmp34_; #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp19_ = doc; #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4318,7 +4331,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P if (G_UNLIKELY (_inner_error_ != NULL)) { #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4318 "PiwigoPublishing.c" +#line 4331 "PiwigoPublishing.c" goto __catch29_spit_publishing_publishing_error; } #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4333,7 +4346,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P g_clear_error (&_inner_error_); #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 4333 "PiwigoPublishing.c" +#line 4346 "PiwigoPublishing.c" } #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" username_node = _tmp18_; @@ -4381,13 +4394,13 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P publishing_piwigo_piwigo_publisher_do_fetch_categories (self); #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (username); -#line 4381 "PiwigoPublishing.c" +#line 4394 "PiwigoPublishing.c" } goto __finally29; __catch29_spit_publishing_publishing_error: { GError* err2 = NULL; - GError* _tmp35_ = NULL; + GError* _tmp35_; #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" err2 = _inner_error_; #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4409,7 +4422,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P _g_free0 (endpoint_url); #line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 4408 "PiwigoPublishing.c" +#line 4421 "PiwigoPublishing.c" } __finally29: #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4418,7 +4431,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P _publishing_rest_support_xml_document_unref0 (doc); #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4417 "PiwigoPublishing.c" +#line 4430 "PiwigoPublishing.c" goto __catch28_spit_publishing_publishing_error; } #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4433,17 +4446,17 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P g_clear_error (&_inner_error_); #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 4432 "PiwigoPublishing.c" +#line 4445 "PiwigoPublishing.c" } #line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_rest_support_xml_document_unref0 (doc); -#line 4436 "PiwigoPublishing.c" +#line 4449 "PiwigoPublishing.c" } goto __finally28; __catch28_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp36_ = NULL; + GError* _tmp36_; #line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" err = _inner_error_; #line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4463,7 +4476,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P _g_free0 (endpoint_url); #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 4461 "PiwigoPublishing.c" +#line 4474 "PiwigoPublishing.c" } __finally28: #line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4478,17 +4491,17 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P g_clear_error (&_inner_error_); #line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 4476 "PiwigoPublishing.c" +#line 4489 "PiwigoPublishing.c" } #line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (pwg_id); #line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (endpoint_url); -#line 4482 "PiwigoPublishing.c" +#line 4495 "PiwigoPublishing.c" } else { #line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_do_fetch_categories (self); -#line 4486 "PiwigoPublishing.c" +#line 4499 "PiwigoPublishing.c" } } @@ -4497,12 +4510,12 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P * Event triggered when the get session status fails due to a network error. */ static void publishing_piwigo_piwigo_publisher_on_session_get_status_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - PublishingRESTSupportTransaction* _tmp4_ = NULL; - GError* _tmp5_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + PublishingRESTSupportTransaction* _tmp4_; + GError* _tmp5_; #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4527,7 +4540,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_error (Publ _tmp5_ = err; #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_); -#line 4525 "PiwigoPublishing.c" +#line 4538 "PiwigoPublishing.c" } @@ -4540,23 +4553,23 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_error (Publ static void _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_on_category_fetch_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err); -#line 4538 "PiwigoPublishing.c" +#line 4551 "PiwigoPublishing.c" } static void _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_on_category_fetch_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender); -#line 4545 "PiwigoPublishing.c" +#line 4558 "PiwigoPublishing.c" } static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPiwigoPiwigoPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; PublishingPiwigoCategoriesGetListTransaction* cat_trans = NULL; - PublishingPiwigoSession* _tmp2_ = NULL; - PublishingPiwigoCategoriesGetListTransaction* _tmp3_ = NULL; + PublishingPiwigoSession* _tmp2_; + PublishingPiwigoCategoriesGetListTransaction* _tmp3_; GError * _inner_error_ = NULL; #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); @@ -4580,7 +4593,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (cat_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error, self, 0); #line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (cat_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed, self, 0); -#line 4578 "PiwigoPublishing.c" +#line 4591 "PiwigoPublishing.c" { #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (cat_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -4588,7 +4601,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi if (G_UNLIKELY (_inner_error_ != NULL)) { #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4586 "PiwigoPublishing.c" +#line 4599 "PiwigoPublishing.c" goto __catch30_spit_publishing_publishing_error; } #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4599,14 +4612,14 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi g_clear_error (&_inner_error_); #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 4597 "PiwigoPublishing.c" +#line 4610 "PiwigoPublishing.c" } } goto __finally30; __catch30_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp4_ = NULL; + GError* _tmp4_; #line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" err = _inner_error_; #line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4619,7 +4632,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp4_); #line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_error_free0 (err); -#line 4617 "PiwigoPublishing.c" +#line 4630 "PiwigoPublishing.c" } __finally30: #line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4632,11 +4645,11 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi g_clear_error (&_inner_error_); #line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 4630 "PiwigoPublishing.c" +#line 4643 "PiwigoPublishing.c" } #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_rest_support_transaction_unref0 (cat_trans); -#line 4634 "PiwigoPublishing.c" +#line 4647 "PiwigoPublishing.c" } @@ -4647,33 +4660,33 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi * populates the categories list. It then triggers the display of the * publishing options pane. */ -static void _vala_array_add35 (PublishingPiwigoCategory*** array, int* length, int* size, PublishingPiwigoCategory* value) { +static void _vala_array_add35 (PublishingPiwigoCategory** * array, int* length, int* size, PublishingPiwigoCategory* value) { #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if ((*length) == (*size)) { #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *array = g_renew (PublishingPiwigoCategory*, *array, (*size) + 1); -#line 4652 "PiwigoPublishing.c" +#line 4665 "PiwigoPublishing.c" } #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*array)[(*length)++] = value; #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*array)[*length] = NULL; -#line 4658 "PiwigoPublishing.c" +#line 4671 "PiwigoPublishing.c" } static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - PublishingRESTSupportTransaction* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - PublishingPiwigoCategory** _tmp7_ = NULL; - gint _tmp7__length1 = 0; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + PublishingRESTSupportTransaction* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + PublishingPiwigoCategory** _tmp7_; + gint _tmp7__length1; GError * _inner_error_ = NULL; #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); @@ -4717,34 +4730,34 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi self->priv->categories_length1 = 0; #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->_categories_size_ = self->priv->categories_length1; -#line 4715 "PiwigoPublishing.c" +#line 4728 "PiwigoPublishing.c" } { PublishingRESTSupportXmlDocument* doc = NULL; - PublishingRESTSupportTransaction* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - PublishingRESTSupportXmlDocument* _tmp11_ = NULL; - PublishingRESTSupportXmlDocument* _tmp12_ = NULL; + PublishingRESTSupportTransaction* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + PublishingRESTSupportXmlDocument* _tmp11_; + PublishingRESTSupportXmlDocument* _tmp12_; xmlNode* root = NULL; - PublishingRESTSupportXmlDocument* _tmp13_ = NULL; - xmlNode* _tmp14_ = NULL; + PublishingRESTSupportXmlDocument* _tmp13_; + xmlNode* _tmp14_; xmlNode* categories_node = NULL; - xmlNode* _tmp15_ = NULL; - xmlNode* _tmp16_ = NULL; + xmlNode* _tmp15_; + xmlNode* _tmp16_; xmlNode* category_node_iter = NULL; - xmlNode* _tmp17_ = NULL; - xmlNode* _tmp18_ = NULL; + xmlNode* _tmp17_; + xmlNode* _tmp18_; xmlNode* name_node = NULL; xmlNode* uppercats_node = NULL; gchar* name = NULL; - gchar* _tmp19_ = NULL; + gchar* _tmp19_; gchar* id_string = NULL; - gchar* _tmp20_ = NULL; + gchar* _tmp20_; gchar* uppercats = NULL; - gchar* _tmp21_ = NULL; + gchar* _tmp21_; GeeHashMap* id_map = NULL; - GeeHashMap* _tmp22_ = NULL; + GeeHashMap* _tmp22_; #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = txn; #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4763,7 +4776,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi if (G_UNLIKELY (_inner_error_ != NULL)) { #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4761 "PiwigoPublishing.c" +#line 4774 "PiwigoPublishing.c" goto __catch31_spit_publishing_publishing_error; } #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4772,7 +4785,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi g_clear_error (&_inner_error_); #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 4770 "PiwigoPublishing.c" +#line 4783 "PiwigoPublishing.c" } #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp13_ = doc; @@ -4808,53 +4821,53 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi _tmp22_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" id_map = _tmp22_; -#line 4806 "PiwigoPublishing.c" +#line 4819 "PiwigoPublishing.c" { gboolean _tmp23_ = FALSE; #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp23_ = TRUE; #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" while (TRUE) { -#line 4813 "PiwigoPublishing.c" - xmlNode* _tmp26_ = NULL; +#line 4826 "PiwigoPublishing.c" + xmlNode* _tmp26_; xmlNode* _tmp27_ = NULL; - PublishingRESTSupportXmlDocument* _tmp28_ = NULL; - xmlNode* _tmp29_ = NULL; - xmlNode* _tmp30_ = NULL; - xmlNode* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; + PublishingRESTSupportXmlDocument* _tmp28_; + xmlNode* _tmp29_; + xmlNode* _tmp30_; + xmlNode* _tmp31_; + gchar* _tmp32_; xmlNode* _tmp33_ = NULL; - PublishingRESTSupportXmlDocument* _tmp34_ = NULL; - xmlNode* _tmp35_ = NULL; - xmlNode* _tmp36_ = NULL; - xmlNode* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; - xmlNode* _tmp39_ = NULL; - gchar* _tmp40_ = NULL; - GeeHashMap* _tmp41_ = NULL; - const gchar* _tmp42_ = NULL; - const gchar* _tmp43_ = NULL; - PublishingPiwigoCategory** _tmp44_ = NULL; - gint _tmp44__length1 = 0; - PublishingPiwigoCategory** _tmp46_ = NULL; - gint _tmp46__length1 = 0; - const gchar* _tmp47_ = NULL; - gint _tmp48_ = 0; - const gchar* _tmp49_ = NULL; - const gchar* _tmp50_ = NULL; - PublishingPiwigoCategory* _tmp51_ = NULL; + PublishingRESTSupportXmlDocument* _tmp34_; + xmlNode* _tmp35_; + xmlNode* _tmp36_; + xmlNode* _tmp37_; + gchar* _tmp38_; + xmlNode* _tmp39_; + gchar* _tmp40_; + GeeHashMap* _tmp41_; + const gchar* _tmp42_; + const gchar* _tmp43_; + PublishingPiwigoCategory** _tmp44_; + gint _tmp44__length1; + PublishingPiwigoCategory** _tmp46_; + gint _tmp46__length1; + const gchar* _tmp47_; + gint _tmp48_; + const gchar* _tmp49_; + const gchar* _tmp50_; + PublishingPiwigoCategory* _tmp51_; #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!_tmp23_) { -#line 4843 "PiwigoPublishing.c" - xmlNode* _tmp24_ = NULL; - xmlNode* _tmp25_ = NULL; +#line 4856 "PiwigoPublishing.c" + xmlNode* _tmp24_; + xmlNode* _tmp25_; #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp24_ = category_node_iter; #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp25_ = _tmp24_->next; #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" category_node_iter = _tmp25_; -#line 4852 "PiwigoPublishing.c" +#line 4865 "PiwigoPublishing.c" } #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp23_ = FALSE; @@ -4864,7 +4877,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi if (!(_tmp26_ != NULL)) { #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 4862 "PiwigoPublishing.c" +#line 4875 "PiwigoPublishing.c" } #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp28_ = doc; @@ -4888,7 +4901,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi _publishing_rest_support_xml_document_unref0 (doc); #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4886 "PiwigoPublishing.c" +#line 4899 "PiwigoPublishing.c" goto __catch31_spit_publishing_publishing_error; } #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4907,7 +4920,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi g_clear_error (&_inner_error_); #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 4905 "PiwigoPublishing.c" +#line 4918 "PiwigoPublishing.c" } #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" name_node = _tmp27_; @@ -4941,7 +4954,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi _publishing_rest_support_xml_document_unref0 (doc); #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4939 "PiwigoPublishing.c" +#line 4952 "PiwigoPublishing.c" goto __catch31_spit_publishing_publishing_error; } #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -4960,7 +4973,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi g_clear_error (&_inner_error_); #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 4958 "PiwigoPublishing.c" +#line 4971 "PiwigoPublishing.c" } #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" uppercats_node = _tmp33_; @@ -4994,8 +5007,8 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi _tmp44__length1 = self->priv->categories_length1; #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp44_ == NULL) { -#line 4992 "PiwigoPublishing.c" - PublishingPiwigoCategory** _tmp45_ = NULL; +#line 5005 "PiwigoPublishing.c" + PublishingPiwigoCategory** _tmp45_; #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp45_ = g_new0 (PublishingPiwigoCategory*, 0 + 1); #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -5006,7 +5019,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi self->priv->categories_length1 = 0; #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->_categories_size_ = self->priv->categories_length1; -#line 5004 "PiwigoPublishing.c" +#line 5017 "PiwigoPublishing.c" } #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp46_ = self->priv->categories; @@ -5024,52 +5037,52 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi _tmp51_ = publishing_piwigo_category_new (_tmp48_, _tmp49_, _tmp50_, ""); #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _vala_array_add35 (&self->priv->categories, &self->priv->categories_length1, &self->priv->_categories_size_, _tmp51_); -#line 5022 "PiwigoPublishing.c" +#line 5035 "PiwigoPublishing.c" } } { gint i = 0; #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" i = 0; -#line 5029 "PiwigoPublishing.c" +#line 5042 "PiwigoPublishing.c" { gboolean _tmp52_ = FALSE; #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp52_ = TRUE; #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" while (TRUE) { -#line 5036 "PiwigoPublishing.c" - gint _tmp54_ = 0; - PublishingPiwigoCategory** _tmp55_ = NULL; - gint _tmp55__length1 = 0; +#line 5049 "PiwigoPublishing.c" + gint _tmp54_; + PublishingPiwigoCategory** _tmp55_; + gint _tmp55__length1; gchar** upcatids = NULL; - PublishingPiwigoCategory** _tmp56_ = NULL; - gint _tmp56__length1 = 0; - gint _tmp57_ = 0; - PublishingPiwigoCategory* _tmp58_ = NULL; - const gchar* _tmp59_ = NULL; - gchar** _tmp60_ = NULL; - gchar** _tmp61_ = NULL; - gint upcatids_length1 = 0; - gint _upcatids_size_ = 0; + PublishingPiwigoCategory** _tmp56_; + gint _tmp56__length1; + gint _tmp57_; + PublishingPiwigoCategory* _tmp58_; + const gchar* _tmp59_; + gchar** _tmp60_; + gchar** _tmp61_; + gint upcatids_length1; + gint _upcatids_size_; GString* builder = NULL; - GString* _tmp62_ = NULL; - PublishingPiwigoCategory** _tmp76_ = NULL; - gint _tmp76__length1 = 0; - gint _tmp77_ = 0; - PublishingPiwigoCategory* _tmp78_ = NULL; - GString* _tmp79_ = NULL; - const gchar* _tmp80_ = NULL; - gchar* _tmp81_ = NULL; + GString* _tmp62_; + PublishingPiwigoCategory** _tmp76_; + gint _tmp76__length1; + gint _tmp77_; + PublishingPiwigoCategory* _tmp78_; + GString* _tmp79_; + const gchar* _tmp80_; + gchar* _tmp81_; #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!_tmp52_) { -#line 5061 "PiwigoPublishing.c" - gint _tmp53_ = 0; +#line 5074 "PiwigoPublishing.c" + gint _tmp53_; #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp53_ = i; #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" i = _tmp53_ + 1; -#line 5067 "PiwigoPublishing.c" +#line 5080 "PiwigoPublishing.c" } #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp52_ = FALSE; @@ -5083,7 +5096,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi if (!(_tmp54_ < _tmp55__length1)) { #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 5081 "PiwigoPublishing.c" +#line 5094 "PiwigoPublishing.c" } #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp56_ = self->priv->categories; @@ -5107,41 +5120,41 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi _tmp62_ = g_string_new (""); #line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" builder = _tmp62_; -#line 5105 "PiwigoPublishing.c" +#line 5118 "PiwigoPublishing.c" { gint j = 0; #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" j = 0; -#line 5110 "PiwigoPublishing.c" +#line 5123 "PiwigoPublishing.c" { gboolean _tmp63_ = FALSE; #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp63_ = TRUE; #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" while (TRUE) { -#line 5117 "PiwigoPublishing.c" - gint _tmp65_ = 0; - gchar** _tmp66_ = NULL; - gint _tmp66__length1 = 0; - GString* _tmp67_ = NULL; - GString* _tmp68_ = NULL; - GeeHashMap* _tmp69_ = NULL; - gchar** _tmp70_ = NULL; - gint _tmp70__length1 = 0; - gint _tmp71_ = 0; - const gchar* _tmp72_ = NULL; - gpointer _tmp73_ = NULL; - gchar* _tmp74_ = NULL; - GString* _tmp75_ = NULL; +#line 5130 "PiwigoPublishing.c" + gint _tmp65_; + gchar** _tmp66_; + gint _tmp66__length1; + GString* _tmp67_; + GString* _tmp68_; + GeeHashMap* _tmp69_; + gchar** _tmp70_; + gint _tmp70__length1; + gint _tmp71_; + const gchar* _tmp72_; + gpointer _tmp73_; + gchar* _tmp74_; + GString* _tmp75_; #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!_tmp63_) { -#line 5133 "PiwigoPublishing.c" - gint _tmp64_ = 0; +#line 5146 "PiwigoPublishing.c" + gint _tmp64_; #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp64_ = j; #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" j = _tmp64_ + 1; -#line 5139 "PiwigoPublishing.c" +#line 5152 "PiwigoPublishing.c" } #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp63_ = FALSE; @@ -5155,7 +5168,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi if (!(_tmp65_ < _tmp66__length1)) { #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 5153 "PiwigoPublishing.c" +#line 5166 "PiwigoPublishing.c" } #line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp67_ = builder; @@ -5185,7 +5198,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi _tmp75_ = builder; #line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_string_append (_tmp75_, " "); -#line 5183 "PiwigoPublishing.c" +#line 5196 "PiwigoPublishing.c" } } } @@ -5211,7 +5224,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi _g_string_free0 (builder); #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" upcatids = (_vala_array_free (upcatids, upcatids_length1, (GDestroyNotify) g_free), NULL); -#line 5209 "PiwigoPublishing.c" +#line 5222 "PiwigoPublishing.c" } } } @@ -5225,13 +5238,13 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi _g_free0 (name); #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_rest_support_xml_document_unref0 (doc); -#line 5223 "PiwigoPublishing.c" +#line 5236 "PiwigoPublishing.c" } goto __finally31; __catch31_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp82_ = NULL; + GError* _tmp82_; #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" err = _inner_error_; #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -5246,7 +5259,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi _g_error_free0 (err); #line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 5244 "PiwigoPublishing.c" +#line 5257 "PiwigoPublishing.c" } __finally31: #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -5257,11 +5270,11 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi g_clear_error (&_inner_error_); #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 5255 "PiwigoPublishing.c" +#line 5268 "PiwigoPublishing.c" } #line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (self); -#line 5259 "PiwigoPublishing.c" +#line 5272 "PiwigoPublishing.c" } @@ -5270,12 +5283,12 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi * network error. */ static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - PublishingRESTSupportTransaction* _tmp4_ = NULL; - GError* _tmp5_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + PublishingRESTSupportTransaction* _tmp4_; + GError* _tmp5_; #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -5300,7 +5313,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (Publishi _tmp5_ = err; #line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_); -#line 5298 "PiwigoPublishing.c" +#line 5311 "PiwigoPublishing.c" } @@ -5312,33 +5325,33 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (Publishi static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked_publishing_piwigo_publishing_options_pane_logout (PublishingPiwigoPublishingOptionsPane* _sender, gpointer self) { #line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked ((PublishingPiwigoPiwigoPublisher*) self); -#line 5310 "PiwigoPublishing.c" +#line 5323 "PiwigoPublishing.c" } static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked_publishing_piwigo_publishing_options_pane_publish (PublishingPiwigoPublishingOptionsPane* _sender, PublishingPiwigoPublishingParameters* parameters, gboolean strip_metadata, gpointer self) { #line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked ((PublishingPiwigoPiwigoPublisher*) self, parameters, strip_metadata); -#line 5317 "PiwigoPublishing.c" +#line 5330 "PiwigoPublishing.c" } static void publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (PublishingPiwigoPiwigoPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; + SpitPublishingPluginHost* _tmp0_; PublishingPiwigoPublishingOptionsPane* opts_pane = NULL; - PublishingPiwigoCategory** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - gint _tmp4_ = 0; - gboolean _tmp5_ = FALSE; - gboolean _tmp6_ = FALSE; - gboolean _tmp7_ = FALSE; - PublishingPiwigoPublishingOptionsPane* _tmp8_ = NULL; - SpitPublishingPluginHost* _tmp9_ = NULL; - SpitPublishingPluginHost* _tmp10_ = NULL; - GtkWidget* _tmp11_ = NULL; - GtkWidget* _tmp12_ = NULL; + PublishingPiwigoCategory** _tmp1_; + gint _tmp1__length1; + gint _tmp2_; + gint _tmp3_; + gint _tmp4_; + gboolean _tmp5_; + gboolean _tmp6_; + gboolean _tmp7_; + PublishingPiwigoPublishingOptionsPane* _tmp8_; + SpitPublishingPluginHost* _tmp9_; + SpitPublishingPluginHost* _tmp10_; + GtkWidget* _tmp11_; + GtkWidget* _tmp12_; #line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -5387,7 +5400,7 @@ static void publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane ( _g_object_unref0 (_tmp12_); #line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_object_unref0 (opts_pane); -#line 5385 "PiwigoPublishing.c" +#line 5398 "PiwigoPublishing.c" } @@ -5397,21 +5410,21 @@ static void publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane ( static void _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_on_logout_network_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err); -#line 5395 "PiwigoPublishing.c" +#line 5408 "PiwigoPublishing.c" } static void _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_on_logout_network_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender); -#line 5402 "PiwigoPublishing.c" +#line 5415 "PiwigoPublishing.c" } static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked (PublishingPiwigoPiwigoPublisher* self) { PublishingPiwigoSessionLogoutTransaction* logout_trans = NULL; - PublishingPiwigoSession* _tmp0_ = NULL; - PublishingPiwigoSessionLogoutTransaction* _tmp1_ = NULL; + PublishingPiwigoSession* _tmp0_; + PublishingPiwigoSessionLogoutTransaction* _tmp1_; GError * _inner_error_ = NULL; #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); @@ -5428,7 +5441,7 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (logout_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error, self, 0); #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (logout_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed, self, 0); -#line 5425 "PiwigoPublishing.c" +#line 5438 "PiwigoPublishing.c" { #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (logout_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -5436,7 +5449,7 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout if (G_UNLIKELY (_inner_error_ != NULL)) { #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 5433 "PiwigoPublishing.c" +#line 5446 "PiwigoPublishing.c" goto __catch32_spit_publishing_publishing_error; } #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -5447,14 +5460,14 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout g_clear_error (&_inner_error_); #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 5444 "PiwigoPublishing.c" +#line 5457 "PiwigoPublishing.c" } } goto __finally32; __catch32_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp2_ = NULL; + GError* _tmp2_; #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" err = _inner_error_; #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -5468,7 +5481,7 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp2_); #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_error_free0 (err); -#line 5464 "PiwigoPublishing.c" +#line 5477 "PiwigoPublishing.c" } __finally32: #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -5481,11 +5494,11 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout g_clear_error (&_inner_error_); #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 5477 "PiwigoPublishing.c" +#line 5490 "PiwigoPublishing.c" } #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_rest_support_transaction_unref0 (logout_trans); -#line 5481 "PiwigoPublishing.c" +#line 5494 "PiwigoPublishing.c" } @@ -5496,11 +5509,11 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout * pane again. */ static void publishing_piwigo_piwigo_publisher_on_logout_network_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - PublishingPiwigoSession* _tmp4_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + PublishingPiwigoSession* _tmp4_; #line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -5525,7 +5538,7 @@ static void publishing_piwigo_piwigo_publisher_on_logout_network_complete (Publi publishing_piwigo_session_deauthenticate (_tmp4_); #line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO); -#line 5521 "PiwigoPublishing.c" +#line 5534 "PiwigoPublishing.c" } @@ -5533,12 +5546,12 @@ static void publishing_piwigo_piwigo_publisher_on_logout_network_complete (Publi * Event triggered when the logout action fails due to a network error. */ static void publishing_piwigo_piwigo_publisher_on_logout_network_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - PublishingRESTSupportTransaction* _tmp4_ = NULL; - GError* _tmp5_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + PublishingRESTSupportTransaction* _tmp4_; + GError* _tmp5_; #line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -5563,7 +5576,7 @@ static void publishing_piwigo_piwigo_publisher_on_logout_network_error (Publishi _tmp5_ = err; #line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_); -#line 5559 "PiwigoPublishing.c" +#line 5572 "PiwigoPublishing.c" } @@ -5580,17 +5593,17 @@ static void publishing_piwigo_piwigo_publisher_on_logout_network_error (Publishi static gpointer _publishing_piwigo_publishing_parameters_ref0 (gpointer self) { #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self ? publishing_piwigo_publishing_parameters_ref (self) : NULL; -#line 5576 "PiwigoPublishing.c" +#line 5589 "PiwigoPublishing.c" } static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoPublishingParameters* parameters, gboolean strip_metadata) { - PublishingPiwigoPublishingParameters* _tmp0_ = NULL; - PublishingPiwigoPublishingParameters* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - PublishingPiwigoPublishingParameters* _tmp3_ = NULL; - PublishingPiwigoCategory* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + PublishingPiwigoPublishingParameters* _tmp0_; + PublishingPiwigoPublishingParameters* _tmp1_; + gboolean _tmp2_; + PublishingPiwigoPublishingParameters* _tmp3_; + PublishingPiwigoCategory* _tmp4_; + gboolean _tmp5_; #line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -5618,23 +5631,23 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publis _tmp5_ = publishing_piwigo_category_is_local (_tmp4_); #line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp5_) { -#line 5613 "PiwigoPublishing.c" - PublishingPiwigoPublishingParameters* _tmp6_ = NULL; - PublishingPiwigoCategory* _tmp7_ = NULL; +#line 5626 "PiwigoPublishing.c" + PublishingPiwigoPublishingParameters* _tmp6_; + PublishingPiwigoCategory* _tmp7_; #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = parameters; #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = _tmp6_->category; #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_do_create_category (self, _tmp7_); -#line 5622 "PiwigoPublishing.c" +#line 5635 "PiwigoPublishing.c" } else { - gboolean _tmp8_ = FALSE; + gboolean _tmp8_; #line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = self->priv->strip_metadata; #line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_do_upload (self, _tmp8_); -#line 5629 "PiwigoPublishing.c" +#line 5642 "PiwigoPublishing.c" } } @@ -5653,67 +5666,66 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publis static gchar* string_strip (const gchar* self) { gchar* result = NULL; gchar* _result_ = NULL; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; -#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + const gchar* _tmp1_; +#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _result_; -#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 5664 "PiwigoPublishing.c" +#line 5677 "PiwigoPublishing.c" } static void _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_on_category_add_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err); -#line 5671 "PiwigoPublishing.c" +#line 5684 "PiwigoPublishing.c" } static void _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_on_category_add_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender); -#line 5678 "PiwigoPublishing.c" +#line 5691 "PiwigoPublishing.c" } static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoCategory* category) { - PublishingPiwigoCategory* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - PublishingPiwigoCategory* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - SpitPublishingPluginHost* _tmp6_ = NULL; - SpitPublishingPluginHost* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - PublishingPiwigoCategory* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; + PublishingPiwigoCategory* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + PublishingPiwigoCategory* _tmp4_; + gboolean _tmp5_; + SpitPublishingPluginHost* _tmp6_; + SpitPublishingPluginHost* _tmp7_; + PublishingPiwigoCategory* _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; PublishingPiwigoCategoriesAddTransaction* creation_trans = NULL; - PublishingPiwigoSession* _tmp13_ = NULL; - PublishingPiwigoCategory* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - PublishingPiwigoCategory* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - gint _tmp20_ = 0; - PublishingPiwigoCategory* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; - PublishingPiwigoCategoriesAddTransaction* _tmp23_ = NULL; - PublishingPiwigoCategoriesAddTransaction* _tmp24_ = NULL; + PublishingPiwigoSession* _tmp12_; + PublishingPiwigoCategory* _tmp13_; + const gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + PublishingPiwigoCategory* _tmp17_; + const gchar* _tmp18_; + gint _tmp19_; + PublishingPiwigoCategory* _tmp20_; + const gchar* _tmp21_; + PublishingPiwigoCategoriesAddTransaction* _tmp22_; + PublishingPiwigoCategoriesAddTransaction* _tmp23_; GError * _inner_error_ = NULL; #line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); @@ -5744,52 +5756,50 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = self->priv->host; #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp8_ = _ ("Creating album %s…"); -#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp9_ = category; + _tmp8_ = category; #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp10_ = _tmp9_->name; + _tmp9_ = _tmp8_->name; #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp11_ = g_strdup_printf (_tmp8_, _tmp10_); + _tmp10_ = g_strdup_printf (_ ("Creating album %s…"), _tmp9_); #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - spit_publishing_plugin_host_install_static_message_pane (_tmp7_, _tmp12_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); + spit_publishing_plugin_host_install_static_message_pane (_tmp7_, _tmp11_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp11_); #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp13_ = self->priv->session; + _tmp12_ = self->priv->session; #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp14_ = category; + _tmp13_ = category; #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp15_ = _tmp14_->name; + _tmp14_ = _tmp13_->name; #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp16_ = string_strip (_tmp15_); + _tmp15_ = string_strip (_tmp14_); #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp18_ = category; + _tmp17_ = category; #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp19_ = _tmp18_->uppercats; + _tmp18_ = _tmp17_->uppercats; #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp20_ = atoi (_tmp19_); + _tmp19_ = atoi (_tmp18_); #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp21_ = category; + _tmp20_ = category; #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp22_ = _tmp21_->comment; + _tmp21_ = _tmp20_->comment; #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp23_ = publishing_piwigo_categories_add_transaction_new (_tmp13_, _tmp17_, _tmp20_, _tmp22_); + _tmp22_ = publishing_piwigo_categories_add_transaction_new (_tmp12_, _tmp16_, _tmp19_, _tmp21_); #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp16_); #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - creation_trans = _tmp24_; + creation_trans = _tmp23_; #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error, self, 0); #line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed, self, 0); -#line 5784 "PiwigoPublishing.c" +#line 5794 "PiwigoPublishing.c" { #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -5797,7 +5807,7 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw if (G_UNLIKELY (_inner_error_ != NULL)) { #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 5792 "PiwigoPublishing.c" +#line 5802 "PiwigoPublishing.c" goto __catch33_spit_publishing_publishing_error; } #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -5808,14 +5818,14 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw g_clear_error (&_inner_error_); #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 5803 "PiwigoPublishing.c" +#line 5813 "PiwigoPublishing.c" } } goto __finally33; __catch33_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp25_ = NULL; + GError* _tmp24_; #line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" err = _inner_error_; #line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -5823,12 +5833,12 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw #line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_debug ("PiwigoPublishing.vala:783: ERROR: do_create_category"); #line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp25_ = err; + _tmp24_ = err; #line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp25_); + publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp24_); #line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_error_free0 (err); -#line 5823 "PiwigoPublishing.c" +#line 5833 "PiwigoPublishing.c" } __finally33: #line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -5841,11 +5851,11 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw g_clear_error (&_inner_error_); #line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 5836 "PiwigoPublishing.c" +#line 5846 "PiwigoPublishing.c" } #line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_rest_support_transaction_unref0 (creation_trans); -#line 5840 "PiwigoPublishing.c" +#line 5850 "PiwigoPublishing.c" } @@ -5857,10 +5867,10 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw * the publishing parameters. It then calls the upload action. */ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; GError * _inner_error_ = NULL; #line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); @@ -5880,32 +5890,32 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE); #line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error, self); -#line 5875 "PiwigoPublishing.c" +#line 5885 "PiwigoPublishing.c" { PublishingRESTSupportXmlDocument* doc = NULL; - PublishingRESTSupportTransaction* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - PublishingRESTSupportXmlDocument* _tmp7_ = NULL; - PublishingRESTSupportXmlDocument* _tmp8_ = NULL; + PublishingRESTSupportTransaction* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + PublishingRESTSupportXmlDocument* _tmp7_; + PublishingRESTSupportXmlDocument* _tmp8_; xmlNode* rsp = NULL; - PublishingRESTSupportXmlDocument* _tmp9_ = NULL; - xmlNode* _tmp10_ = NULL; + PublishingRESTSupportXmlDocument* _tmp9_; + xmlNode* _tmp10_; xmlNode* id_node = NULL; xmlNode* _tmp11_ = NULL; - PublishingRESTSupportXmlDocument* _tmp12_ = NULL; - xmlNode* _tmp13_ = NULL; - xmlNode* _tmp14_ = NULL; + PublishingRESTSupportXmlDocument* _tmp12_; + xmlNode* _tmp13_; + xmlNode* _tmp14_; gchar* id_string = NULL; - xmlNode* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; + xmlNode* _tmp15_; + gchar* _tmp16_; gint id = 0; - const gchar* _tmp17_ = NULL; - gint _tmp18_ = 0; - PublishingPiwigoPublishingParameters* _tmp19_ = NULL; - PublishingPiwigoCategory* _tmp20_ = NULL; - gint _tmp21_ = 0; - gboolean _tmp22_ = FALSE; + const gchar* _tmp17_; + gint _tmp18_; + PublishingPiwigoPublishingParameters* _tmp19_; + PublishingPiwigoCategory* _tmp20_; + gint _tmp21_; + gboolean _tmp22_; #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = txn; #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -5924,7 +5934,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish if (G_UNLIKELY (_inner_error_ != NULL)) { #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 5919 "PiwigoPublishing.c" +#line 5929 "PiwigoPublishing.c" goto __catch34_spit_publishing_publishing_error; } #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -5933,7 +5943,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish g_clear_error (&_inner_error_); #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 5928 "PiwigoPublishing.c" +#line 5938 "PiwigoPublishing.c" } #line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp9_ = doc; @@ -5955,7 +5965,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish _publishing_rest_support_xml_document_unref0 (doc); #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 5950 "PiwigoPublishing.c" +#line 5960 "PiwigoPublishing.c" goto __catch34_spit_publishing_publishing_error; } #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -5966,7 +5976,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish g_clear_error (&_inner_error_); #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 5961 "PiwigoPublishing.c" +#line 5971 "PiwigoPublishing.c" } #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" id_node = _tmp11_; @@ -5998,13 +6008,13 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish _g_free0 (id_string); #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_rest_support_xml_document_unref0 (doc); -#line 5993 "PiwigoPublishing.c" +#line 6003 "PiwigoPublishing.c" } goto __finally34; __catch34_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp23_ = NULL; + GError* _tmp23_; #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" err = _inner_error_; #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -6017,7 +6027,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp23_); #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_error_free0 (err); -#line 6012 "PiwigoPublishing.c" +#line 6022 "PiwigoPublishing.c" } __finally34: #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -6028,7 +6038,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish g_clear_error (&_inner_error_); #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 6023 "PiwigoPublishing.c" +#line 6033 "PiwigoPublishing.c" } } @@ -6037,12 +6047,12 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish * Event triggered when the add category action fails due to a network error. */ static void publishing_piwigo_piwigo_publisher_on_category_add_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - PublishingRESTSupportTransaction* _tmp4_ = NULL; - GError* _tmp5_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + PublishingRESTSupportTransaction* _tmp4_; + GError* _tmp5_; #line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -6067,7 +6077,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_error (Publishing _tmp5_ = err; #line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_); -#line 6062 "PiwigoPublishing.c" +#line 6072 "PiwigoPublishing.c" } @@ -6077,59 +6087,59 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_error (Publishing static void _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) { #line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_on_upload_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender, num_photos_published); -#line 6072 "PiwigoPublishing.c" +#line 6082 "PiwigoPublishing.c" } static void _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) { #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_on_upload_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err); -#line 6079 "PiwigoPublishing.c" +#line 6089 "PiwigoPublishing.c" } static void _publishing_piwigo_piwigo_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) { #line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_on_upload_status_updated ((PublishingPiwigoPiwigoPublisher*) self, file_number, fraction_complete); -#line 6086 "PiwigoPublishing.c" +#line 6096 "PiwigoPublishing.c" } static void publishing_piwigo_piwigo_publisher_do_upload (PublishingPiwigoPiwigoPublisher* self, gboolean strip_metadata) { - gboolean _tmp0_ = FALSE; - SpitPublishingPluginHost* _tmp1_ = NULL; - PublishingPiwigoPublishingParameters* _tmp2_ = NULL; - PublishingPiwigoCategory* _tmp3_ = NULL; - gint _tmp4_ = 0; - PublishingPiwigoPublishingParameters* _tmp5_ = NULL; - PublishingPiwigoPermissionLevel* _tmp6_ = NULL; - gint _tmp7_ = 0; - PublishingPiwigoPublishingParameters* _tmp8_ = NULL; - PublishingPiwigoSizeEntry* _tmp9_ = NULL; - gint _tmp10_ = 0; - PublishingPiwigoPublishingParameters* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - PublishingPiwigoPublishingParameters* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; - gboolean _tmp15_ = FALSE; - SpitPublishingPluginHost* _tmp16_ = NULL; - PublishingPiwigoPublishingParameters* _tmp17_ = NULL; - PublishingPiwigoSizeEntry* _tmp18_ = NULL; - gint _tmp19_ = 0; - gboolean _tmp20_ = FALSE; - void* _tmp21_ = NULL; - GDestroyNotify _tmp22_ = NULL; - SpitPublishingProgressCallback _tmp23_ = NULL; + gboolean _tmp0_; + SpitPublishingPluginHost* _tmp1_; + PublishingPiwigoPublishingParameters* _tmp2_; + PublishingPiwigoCategory* _tmp3_; + gint _tmp4_; + PublishingPiwigoPublishingParameters* _tmp5_; + PublishingPiwigoPermissionLevel* _tmp6_; + gint _tmp7_; + PublishingPiwigoPublishingParameters* _tmp8_; + PublishingPiwigoSizeEntry* _tmp9_; + gint _tmp10_; + PublishingPiwigoPublishingParameters* _tmp11_; + gboolean _tmp12_; + PublishingPiwigoPublishingParameters* _tmp13_; + gboolean _tmp14_; + gboolean _tmp15_; + SpitPublishingPluginHost* _tmp16_; + PublishingPiwigoPublishingParameters* _tmp17_; + PublishingPiwigoSizeEntry* _tmp18_; + gint _tmp19_; + gboolean _tmp20_; + void* _tmp21_; + GDestroyNotify _tmp22_; + SpitPublishingProgressCallback _tmp23_; SpitPublishingPublishable** publishables = NULL; - SpitPublishingPluginHost* _tmp24_ = NULL; - gint _tmp25_ = 0; - SpitPublishingPublishable** _tmp26_ = NULL; - gint publishables_length1 = 0; - gint _publishables_size_ = 0; + SpitPublishingPluginHost* _tmp24_; + gint _tmp25_; + SpitPublishingPublishable** _tmp26_; + gint publishables_length1; + gint _publishables_size_; PublishingPiwigoUploader* uploader = NULL; - PublishingPiwigoSession* _tmp27_ = NULL; - PublishingPiwigoPublishingParameters* _tmp28_ = NULL; - PublishingPiwigoUploader* _tmp29_ = NULL; + PublishingPiwigoSession* _tmp27_; + PublishingPiwigoPublishingParameters* _tmp28_; + PublishingPiwigoUploader* _tmp29_; #line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -6236,7 +6246,7 @@ static void publishing_piwigo_piwigo_publisher_do_upload (PublishingPiwigoPiwigo _publishing_rest_support_batch_uploader_unref0 (uploader); #line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL); -#line 6231 "PiwigoPublishing.c" +#line 6241 "PiwigoPublishing.c" } @@ -6245,10 +6255,10 @@ static void publishing_piwigo_piwigo_publisher_do_upload (PublishingPiwigoPiwigo * network transactions encapsulating uploads has completed successfully */ static void publishing_piwigo_piwigo_publisher_on_upload_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) { - PublishingRESTSupportBatchUploader* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportBatchUploader* _tmp2_ = NULL; - guint _tmp3_ = 0U; + PublishingRESTSupportBatchUploader* _tmp0_; + guint _tmp1_; + PublishingRESTSupportBatchUploader* _tmp2_; + guint _tmp3_; #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -6269,7 +6279,7 @@ static void publishing_piwigo_piwigo_publisher_on_upload_complete (PublishingPiw g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self); #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_do_show_success_pane (self); -#line 6264 "PiwigoPublishing.c" +#line 6274 "PiwigoPublishing.c" } @@ -6278,11 +6288,11 @@ static void publishing_piwigo_piwigo_publisher_on_upload_complete (PublishingPiw * network transactions encapsulating uploads has caused a network error */ static void publishing_piwigo_piwigo_publisher_on_upload_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) { - PublishingRESTSupportBatchUploader* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportBatchUploader* _tmp2_ = NULL; - guint _tmp3_ = 0U; - GError* _tmp4_ = NULL; + PublishingRESTSupportBatchUploader* _tmp0_; + guint _tmp1_; + PublishingRESTSupportBatchUploader* _tmp2_; + guint _tmp3_; + GError* _tmp4_; #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -6305,7 +6315,7 @@ static void publishing_piwigo_piwigo_publisher_on_upload_error (PublishingPiwigo _tmp4_ = err; #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp4_); -#line 6300 "PiwigoPublishing.c" +#line 6310 "PiwigoPublishing.c" } @@ -6313,14 +6323,14 @@ static void publishing_piwigo_piwigo_publisher_on_upload_error (PublishingPiwigo * Event triggered when upload progresses and the status needs to be updated. */ static void publishing_piwigo_piwigo_publisher_on_upload_status_updated (PublishingPiwigoPiwigoPublisher* self, gint file_number, gdouble completed_fraction) { - gboolean _tmp0_ = FALSE; - gdouble _tmp1_ = 0.0; - SpitPublishingProgressCallback _tmp2_ = NULL; - void* _tmp2__target = NULL; - SpitPublishingProgressCallback _tmp3_ = NULL; - void* _tmp3__target = NULL; - gint _tmp4_ = 0; - gdouble _tmp5_ = 0.0; + gboolean _tmp0_; + gdouble _tmp1_; + SpitPublishingProgressCallback _tmp2_; + void* _tmp2__target; + SpitPublishingProgressCallback _tmp3_; + void* _tmp3__target; + gint _tmp4_; + gdouble _tmp5_; #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -6329,7 +6339,7 @@ static void publishing_piwigo_piwigo_publisher_on_upload_status_updated (Publish if (!_tmp0_) { #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 6324 "PiwigoPublishing.c" +#line 6334 "PiwigoPublishing.c" } #line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = completed_fraction; @@ -6352,7 +6362,7 @@ static void publishing_piwigo_piwigo_publisher_on_upload_status_updated (Publish _tmp5_ = completed_fraction; #line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ (_tmp4_, _tmp5_, _tmp3__target); -#line 6346 "PiwigoPublishing.c" +#line 6356 "PiwigoPublishing.c" } @@ -6360,8 +6370,8 @@ static void publishing_piwigo_piwigo_publisher_on_upload_status_updated (Publish * Action to display the success pane in the publishing dialog. */ static void publishing_piwigo_piwigo_publisher_do_show_success_pane (PublishingPiwigoPiwigoPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; #line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -6374,7 +6384,7 @@ static void publishing_piwigo_piwigo_publisher_do_show_success_pane (PublishingP _tmp1_ = self->priv->host; #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" spit_publishing_plugin_host_install_success_pane (_tmp1_); -#line 6368 "PiwigoPublishing.c" +#line 6378 "PiwigoPublishing.c" } @@ -6382,7 +6392,7 @@ static void publishing_piwigo_piwigo_publisher_do_show_success_pane (PublishingP * Helper event to handle network errors. */ static void publishing_piwigo_piwigo_publisher_on_network_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - GError* _tmp0_ = NULL; + GError* _tmp0_; #line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -6393,7 +6403,7 @@ static void publishing_piwigo_piwigo_publisher_on_network_error (PublishingPiwig _tmp0_ = err; #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp0_); -#line 6387 "PiwigoPublishing.c" +#line 6397 "PiwigoPublishing.c" } @@ -6402,14 +6412,13 @@ static void publishing_piwigo_piwigo_publisher_on_network_error (PublishingPiwig */ static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPiwigoPublisher* self, GError* e) { gchar* error_type = NULL; - gchar* _tmp0_ = NULL; - GError* _tmp1_ = NULL; - const gchar* _tmp16_ = NULL; - GError* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; + gchar* _tmp0_; + GError* _tmp1_; + const gchar* _tmp16_; + GError* _tmp17_; + const gchar* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; #line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -6428,112 +6437,112 @@ static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPi _g_free0 (error_type); #line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return; -#line 6422 "PiwigoPublishing.c" +#line 6431 "PiwigoPublishing.c" } else { - GError* _tmp2_ = NULL; + GError* _tmp2_; #line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp2_ = e; #line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (g_error_matches (_tmp2_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_COMMUNICATION_FAILED)) { -#line 6429 "PiwigoPublishing.c" - gchar* _tmp3_ = NULL; +#line 6438 "PiwigoPublishing.c" + gchar* _tmp3_; #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ = g_strdup ("COMMUNICATION_FAILED"); #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (error_type); #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" error_type = _tmp3_; -#line 6437 "PiwigoPublishing.c" +#line 6446 "PiwigoPublishing.c" } else { - GError* _tmp4_ = NULL; + GError* _tmp4_; #line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = e; #line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (g_error_matches (_tmp4_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_PROTOCOL_ERROR)) { -#line 6444 "PiwigoPublishing.c" - gchar* _tmp5_ = NULL; +#line 6453 "PiwigoPublishing.c" + gchar* _tmp5_; #line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = g_strdup ("PROTOCOL_ERROR"); #line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (error_type); #line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" error_type = _tmp5_; -#line 6452 "PiwigoPublishing.c" +#line 6461 "PiwigoPublishing.c" } else { - GError* _tmp6_ = NULL; + GError* _tmp6_; #line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = e; #line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (g_error_matches (_tmp6_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SERVICE_ERROR)) { -#line 6459 "PiwigoPublishing.c" - gchar* _tmp7_ = NULL; +#line 6468 "PiwigoPublishing.c" + gchar* _tmp7_; #line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = g_strdup ("SERVICE_ERROR"); #line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (error_type); #line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" error_type = _tmp7_; -#line 6467 "PiwigoPublishing.c" +#line 6476 "PiwigoPublishing.c" } else { - GError* _tmp8_ = NULL; + GError* _tmp8_; #line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = e; #line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (g_error_matches (_tmp8_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE)) { -#line 6474 "PiwigoPublishing.c" - gchar* _tmp9_ = NULL; +#line 6483 "PiwigoPublishing.c" + gchar* _tmp9_; #line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp9_ = g_strdup ("MALFORMED_RESPONSE"); #line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (error_type); #line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" error_type = _tmp9_; -#line 6482 "PiwigoPublishing.c" +#line 6491 "PiwigoPublishing.c" } else { - GError* _tmp10_ = NULL; + GError* _tmp10_; #line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp10_ = e; #line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (g_error_matches (_tmp10_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR)) { -#line 6489 "PiwigoPublishing.c" - gchar* _tmp11_ = NULL; +#line 6498 "PiwigoPublishing.c" + gchar* _tmp11_; #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp11_ = g_strdup ("LOCAL_FILE_ERROR"); #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (error_type); #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" error_type = _tmp11_; -#line 6497 "PiwigoPublishing.c" +#line 6506 "PiwigoPublishing.c" } else { - GError* _tmp12_ = NULL; + GError* _tmp12_; #line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp12_ = e; #line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (g_error_matches (_tmp12_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) { -#line 6504 "PiwigoPublishing.c" - gchar* _tmp13_ = NULL; +#line 6513 "PiwigoPublishing.c" + gchar* _tmp13_; #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp13_ = g_strdup ("EXPIRED_SESSION"); #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (error_type); #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" error_type = _tmp13_; -#line 6512 "PiwigoPublishing.c" +#line 6521 "PiwigoPublishing.c" } else { - GError* _tmp14_ = NULL; + GError* _tmp14_; #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp14_ = e; #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (g_error_matches (_tmp14_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED)) { -#line 6519 "PiwigoPublishing.c" - gchar* _tmp15_ = NULL; +#line 6528 "PiwigoPublishing.c" + gchar* _tmp15_; #line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp15_ = g_strdup ("SECURE_CONNECTION_FAILED"); #line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (error_type); #line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" error_type = _tmp15_; -#line 6527 "PiwigoPublishing.c" +#line 6536 "PiwigoPublishing.c" } } } @@ -6557,12 +6566,10 @@ static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPi #line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp20_); #line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp21_ = _ ("An error message occurred when publishing to Piwigo. Please try again."); -#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_piwigo_piwigo_publisher_do_show_error_message (self, _tmp21_); + publishing_piwigo_piwigo_publisher_do_show_error_message (self, _ ("An error message occurred when publishing to Piwigo. Please try again.")); #line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (error_type); -#line 6556 "PiwigoPublishing.c" +#line 6563 "PiwigoPublishing.c" } @@ -6570,8 +6577,8 @@ static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPi * Action to display an error message to the user. */ static void publishing_piwigo_piwigo_publisher_do_show_error_message (PublishingPiwigoPiwigoPublisher* self, const gchar* message) { - SpitPublishingPluginHost* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + const gchar* _tmp1_; #line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self)); #line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -6584,7 +6591,7 @@ static void publishing_piwigo_piwigo_publisher_do_show_error_message (Publishing _tmp1_ = message; #line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" spit_publishing_plugin_host_install_static_message_pane (_tmp0_, _tmp1_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE); -#line 6578 "PiwigoPublishing.c" +#line 6585 "PiwigoPublishing.c" } @@ -6600,28 +6607,28 @@ static void publishing_piwigo_piwigo_publisher_do_show_error_message (Publishing static SoupCookie* _vala_SoupCookie_copy (SoupCookie* self) { #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return g_boxed_copy (soup_cookie_get_type (), self); -#line 6594 "PiwigoPublishing.c" +#line 6601 "PiwigoPublishing.c" } static gpointer __vala_SoupCookie_copy0 (gpointer self) { #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self ? _vala_SoupCookie_copy (self) : NULL; -#line 6601 "PiwigoPublishing.c" +#line 6608 "PiwigoPublishing.c" } static void _vala_SoupCookie_free (SoupCookie* self) { #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_boxed_free (soup_cookie_get_type (), self); -#line 6608 "PiwigoPublishing.c" +#line 6615 "PiwigoPublishing.c" } static void __vala_SoupCookie_free0_ (gpointer var) { #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (var == NULL) ? NULL : (var = (_vala_SoupCookie_free (var), NULL)); -#line 6615 "PiwigoPublishing.c" +#line 6622 "PiwigoPublishing.c" } @@ -6630,18 +6637,18 @@ static void _g_slist_free___vala_SoupCookie_free0_ (GSList* self) { g_slist_foreach (self, (GFunc) __vala_SoupCookie_free0_, NULL); #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_slist_free (self); -#line 6624 "PiwigoPublishing.c" +#line 6631 "PiwigoPublishing.c" } static gchar* publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) { gchar* result = NULL; gchar* pwg_id = NULL; - PublishingRESTSupportTransaction* _tmp0_ = NULL; - SoupMessage* _tmp1_ = NULL; - SoupMessage* _tmp2_ = NULL; - GSList* _tmp3_ = NULL; - GSList* _tmp4_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + SoupMessage* _tmp1_; + SoupMessage* _tmp2_; + GSList* _tmp3_; + GSList* _tmp4_; #line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), NULL); #line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -6660,7 +6667,7 @@ static gchar* publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (Pu _tmp4_ = _tmp3_; #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_object_unref0 (_tmp2_); -#line 6654 "PiwigoPublishing.c" +#line 6661 "PiwigoPublishing.c" { GSList* cookie_collection = NULL; GSList* cookie_it = NULL; @@ -6668,28 +6675,28 @@ static gchar* publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (Pu cookie_collection = _tmp4_; #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" for (cookie_it = cookie_collection; cookie_it != NULL; cookie_it = cookie_it->next) { -#line 6662 "PiwigoPublishing.c" - SoupCookie* _tmp5_ = NULL; +#line 6669 "PiwigoPublishing.c" + SoupCookie* _tmp5_; SoupCookie* cookie = NULL; #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = __vala_SoupCookie_copy0 ((SoupCookie*) cookie_it->data); #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" cookie = _tmp5_; -#line 6669 "PiwigoPublishing.c" +#line 6676 "PiwigoPublishing.c" { - SoupCookie* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; + SoupCookie* _tmp6_; + const gchar* _tmp7_; #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = cookie; #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = soup_cookie_get_name (_tmp6_); #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (g_strcmp0 (_tmp7_, "pwg_id") == 0) { -#line 6679 "PiwigoPublishing.c" - SoupCookie* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; +#line 6686 "PiwigoPublishing.c" + SoupCookie* _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; + const gchar* _tmp11_; #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = cookie; #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -6704,22 +6711,22 @@ static gchar* publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (Pu _tmp11_ = pwg_id; #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_debug ("PiwigoPublishing.vala:977: Found pwg_id %s", _tmp11_); -#line 6698 "PiwigoPublishing.c" +#line 6705 "PiwigoPublishing.c" } #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" __vala_SoupCookie_free0 (cookie); -#line 6702 "PiwigoPublishing.c" +#line 6709 "PiwigoPublishing.c" } } #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" __g_slist_free___vala_SoupCookie_free0_0 (cookie_collection); -#line 6707 "PiwigoPublishing.c" +#line 6714 "PiwigoPublishing.c" } #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" result = pwg_id; #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 6713 "PiwigoPublishing.c" +#line 6720 "PiwigoPublishing.c" } @@ -6730,7 +6737,7 @@ static void publishing_piwigo_piwigo_publisher_class_init (PublishingPiwigoPiwig g_type_class_add_private (klass, sizeof (PublishingPiwigoPiwigoPublisherPrivate)); #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_piwigo_publisher_finalize; -#line 6724 "PiwigoPublishing.c" +#line 6731 "PiwigoPublishing.c" } @@ -6738,14 +6745,14 @@ static void publishing_piwigo_piwigo_publisher_spit_publishing_publisher_interfa #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_piwigo_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface); #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_piwigo_piwigo_publisher_real_get_service; + iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_piwigo_piwigo_publisher_real_get_service; #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_piwigo_piwigo_publisher_real_is_running; + iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_piwigo_piwigo_publisher_real_is_running; #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - iface->start = (void (*)(SpitPublishingPublisher*)) publishing_piwigo_piwigo_publisher_real_start; + iface->start = (void (*) (SpitPublishingPublisher *)) publishing_piwigo_piwigo_publisher_real_start; #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_piwigo_piwigo_publisher_real_stop; -#line 6739 "PiwigoPublishing.c" + iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_piwigo_piwigo_publisher_real_stop; +#line 6746 "PiwigoPublishing.c" } @@ -6766,11 +6773,15 @@ static void publishing_piwigo_piwigo_publisher_instance_init (PublishingPiwigoPi self->priv->parameters = NULL; #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->progress_reporter = NULL; -#line 6760 "PiwigoPublishing.c" +#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + self->priv->progress_reporter_target = self; +#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + self->priv->progress_reporter_target_destroy_notify = NULL; +#line 6771 "PiwigoPublishing.c" } -static void publishing_piwigo_piwigo_publisher_finalize (GObject* obj) { +static void publishing_piwigo_piwigo_publisher_finalize (GObject * obj) { PublishingPiwigoPiwigoPublisher * self; #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher); @@ -6794,7 +6805,7 @@ static void publishing_piwigo_piwigo_publisher_finalize (GObject* obj) { self->priv->progress_reporter_target_destroy_notify = NULL; #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" G_OBJECT_CLASS (publishing_piwigo_piwigo_publisher_parent_class)->finalize (obj); -#line 6788 "PiwigoPublishing.c" +#line 6799 "PiwigoPublishing.c" } @@ -6814,11 +6825,11 @@ GType publishing_piwigo_piwigo_publisher_get_type (void) { PublishingPiwigoUploader* publishing_piwigo_uploader_construct (GType object_type, PublishingPiwigoSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPiwigoPublishingParameters* parameters) { PublishingPiwigoUploader* self = NULL; - PublishingPiwigoSession* _tmp0_ = NULL; - SpitPublishingPublishable** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - PublishingPiwigoPublishingParameters* _tmp2_ = NULL; - PublishingPiwigoPublishingParameters* _tmp3_ = NULL; + PublishingPiwigoSession* _tmp0_; + SpitPublishingPublishable** _tmp1_; + gint _tmp1__length1; + PublishingPiwigoPublishingParameters* _tmp2_; + PublishingPiwigoPublishingParameters* _tmp3_; #line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL); #line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -6841,26 +6852,26 @@ PublishingPiwigoUploader* publishing_piwigo_uploader_construct (GType object_typ self->priv->parameters = _tmp3_; #line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 6835 "PiwigoPublishing.c" +#line 6846 "PiwigoPublishing.c" } PublishingPiwigoUploader* publishing_piwigo_uploader_new (PublishingPiwigoSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPiwigoPublishingParameters* parameters) { #line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_uploader_construct (PUBLISHING_PIWIGO_TYPE_UPLOADER, session, publishables, publishables_length1, parameters); -#line 6842 "PiwigoPublishing.c" +#line 6853 "PiwigoPublishing.c" } static PublishingRESTSupportTransaction* publishing_piwigo_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) { PublishingPiwigoUploader * self; PublishingRESTSupportTransaction* result = NULL; - PublishingRESTSupportSession* _tmp0_ = NULL; - PublishingPiwigoSession* _tmp1_ = NULL; - PublishingPiwigoPublishingParameters* _tmp2_ = NULL; - SpitPublishingPublishable* _tmp3_ = NULL; - PublishingPiwigoImagesAddTransaction* _tmp4_ = NULL; - PublishingRESTSupportTransaction* _tmp5_ = NULL; + PublishingRESTSupportSession* _tmp0_; + PublishingPiwigoSession* _tmp1_; + PublishingPiwigoPublishingParameters* _tmp2_; + SpitPublishingPublishable* _tmp3_; + PublishingPiwigoImagesAddTransaction* _tmp4_; + PublishingRESTSupportTransaction* _tmp5_; #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_UPLOADER, PublishingPiwigoUploader); #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -6883,7 +6894,7 @@ static PublishingRESTSupportTransaction* publishing_piwigo_uploader_real_create_ result = _tmp5_; #line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 6877 "PiwigoPublishing.c" +#line 6888 "PiwigoPublishing.c" } @@ -6895,19 +6906,19 @@ static void publishing_piwigo_uploader_class_init (PublishingPiwigoUploaderClass #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingPiwigoUploaderPrivate)); #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_piwigo_uploader_real_create_transaction; -#line 6890 "PiwigoPublishing.c" + ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_piwigo_uploader_real_create_transaction; +#line 6901 "PiwigoPublishing.c" } static void publishing_piwigo_uploader_instance_init (PublishingPiwigoUploader * self) { #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv = PUBLISHING_PIWIGO_UPLOADER_GET_PRIVATE (self); -#line 6897 "PiwigoPublishing.c" +#line 6908 "PiwigoPublishing.c" } -static void publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploader* obj) { +static void publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploader * obj) { PublishingPiwigoUploader * self; #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_UPLOADER, PublishingPiwigoUploader); @@ -6915,7 +6926,7 @@ static void publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploa _publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters); #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_piwigo_uploader_parent_class)->finalize (obj); -#line 6909 "PiwigoPublishing.c" +#line 6920 "PiwigoPublishing.c" } @@ -6935,10 +6946,10 @@ PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_construct (GType PublishingPiwigoSSLErrorPane * self = NULL; GTlsCertificate* cert = NULL; gchar* text = NULL; - PublishingPiwigoSessionLoginTransaction* _tmp0_ = NULL; + PublishingPiwigoSessionLoginTransaction* _tmp0_; GTlsCertificate* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; + gchar* _tmp2_; + const gchar* _tmp3_; #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION_LOGIN_TRANSACTION (transaction), NULL); #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -6963,47 +6974,45 @@ PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_construct (GType _g_object_unref0 (cert); #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 6957 "PiwigoPublishing.c" +#line 6968 "PiwigoPublishing.c" } PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_new (PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host) { #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_ssl_error_pane_construct (PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, transaction, host); -#line 6964 "PiwigoPublishing.c" +#line 6975 "PiwigoPublishing.c" } static void __lambda5_ (PublishingPiwigoSSLErrorPane* self) { GcrSimpleCertificate* simple_cert = NULL; - GTlsCertificate* _tmp0_ = NULL; - GByteArray* _tmp1_ = NULL; - GByteArray* _tmp2_ = NULL; - GByteArray* _tmp3_ = NULL; - guint8* _tmp4_ = NULL; - gint _tmp4__length1 = 0; - GcrSimpleCertificate* _tmp5_ = NULL; - GcrSimpleCertificate* _tmp6_ = NULL; + GTlsCertificate* _tmp0_; + GByteArray* _tmp1_; + GByteArray* _tmp2_; + GByteArray* _tmp3_; + guint8* _tmp4_; + gint _tmp4__length1; + GcrSimpleCertificate* _tmp5_; + GcrSimpleCertificate* _tmp6_; GcrCertificateWidget* widget = NULL; - GcrSimpleCertificate* _tmp7_ = NULL; - GcrCertificateWidget* _tmp8_ = NULL; + GcrSimpleCertificate* _tmp7_; + GcrCertificateWidget* _tmp8_; gboolean use_header = FALSE; - GtkSettings* _tmp9_ = NULL; + GtkSettings* _tmp9_; GtkDialogFlags flags = 0; - gboolean _tmp10_ = FALSE; + gboolean _tmp10_; GtkDialog* dialog = NULL; - const gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - GtkDialogFlags _tmp18_ = 0; - const gchar* _tmp19_ = NULL; - GtkDialog* _tmp20_ = NULL; - GtkDialog* _tmp21_ = NULL; - GtkBox* _tmp22_ = NULL; - GcrCertificateWidget* _tmp23_ = NULL; + gchar* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + GtkDialogFlags _tmp17_; + GtkDialog* _tmp18_; + GtkDialog* _tmp19_; + GtkBox* _tmp20_; + GcrCertificateWidget* _tmp21_; #line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = self->priv->_cert; #line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -7044,48 +7053,44 @@ static void __lambda5_ (PublishingPiwigoSSLErrorPane* self) { _tmp10_ = use_header; #line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp10_) { -#line 7038 "PiwigoPublishing.c" - GtkDialogFlags _tmp11_ = 0; +#line 7047 "PiwigoPublishing.c" + GtkDialogFlags _tmp11_; #line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp11_ = flags; #line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" flags = _tmp11_ | GTK_DIALOG_USE_HEADER_BAR; -#line 7044 "PiwigoPublishing.c" +#line 7053 "PiwigoPublishing.c" } #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp12_ = _ ("Certificate of %s"); + _tmp12_ = publishing_piwigo_ssl_error_pane_get_host (self); #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp13_ = publishing_piwigo_ssl_error_pane_get_host (self); + _tmp13_ = _tmp12_; #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp14_ = _tmp13_; #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp15_ = _tmp14_; -#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp16_ = g_strdup_printf (_tmp12_, _tmp15_); + _tmp15_ = g_strdup_printf (_ ("Certificate of %s"), _tmp14_); #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp17_ = _tmp16_; -#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp18_ = flags; + _tmp16_ = _tmp15_; #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp19_ = _ ("_OK"); + _tmp17_ = flags; #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp20_ = (GtkDialog*) gtk_dialog_new_with_buttons (_tmp17_, NULL, _tmp18_, _tmp19_, GTK_RESPONSE_OK, NULL); + _tmp18_ = (GtkDialog*) gtk_dialog_new_with_buttons (_tmp16_, NULL, _tmp17_, _ ("_OK"), GTK_RESPONSE_OK, NULL); #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_ref_sink (_tmp20_); + g_object_ref_sink (_tmp18_); #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp21_ = _tmp20_; + _tmp19_ = _tmp18_; #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp16_); #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp14_); #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - dialog = _tmp21_; + dialog = _tmp19_; #line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp22_ = (GtkBox*) gtk_dialog_get_content_area (dialog); + _tmp20_ = (GtkBox*) gtk_dialog_get_content_area (dialog); #line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp23_ = widget; + _tmp21_ = widget; #line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget)); #line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_dialog_set_default_response (dialog, (gint) GTK_RESPONSE_OK); #line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -7102,67 +7107,66 @@ static void __lambda5_ (PublishingPiwigoSSLErrorPane* self) { _g_object_unref0 (widget); #line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_object_unref0 (simple_cert); -#line 7096 "PiwigoPublishing.c" +#line 7101 "PiwigoPublishing.c" } static void ___lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" __lambda5_ ((PublishingPiwigoSSLErrorPane*) self); -#line 7103 "PiwigoPublishing.c" +#line 7108 "PiwigoPublishing.c" } static void __lambda6_ (PublishingPiwigoSSLErrorPane* self) { #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_signal_emit_by_name (self, "proceed"); -#line 7110 "PiwigoPublishing.c" + g_signal_emit (self, publishing_piwigo_ssl_error_pane_signals[PUBLISHING_PIWIGO_SSL_ERROR_PANE_PROCEED_SIGNAL], 0); +#line 7115 "PiwigoPublishing.c" } static void ___lambda6__gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" __lambda6_ ((PublishingPiwigoSSLErrorPane*) self); -#line 7117 "PiwigoPublishing.c" +#line 7122 "PiwigoPublishing.c" } static void publishing_piwigo_ssl_error_pane_real_constructed (GObject* base) { PublishingPiwigoSSLErrorPane * self; GtkLabel* label = NULL; - GtkBuilder* _tmp0_ = NULL; - GtkBuilder* _tmp1_ = NULL; - GObject* _tmp2_ = NULL; - GtkLabel* _tmp3_ = NULL; - GtkLabel* _tmp4_ = NULL; - GtkLabel* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - GtkLabel* _tmp12_ = NULL; - GtkBuilder* _tmp13_ = NULL; - GtkBuilder* _tmp14_ = NULL; - GObject* _tmp15_ = NULL; - GtkLabel* _tmp16_ = NULL; - GtkLabel* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; + GtkBuilder* _tmp0_; + GtkBuilder* _tmp1_; + GObject* _tmp2_; + GtkLabel* _tmp3_; + GtkLabel* _tmp4_; + GtkLabel* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + GtkLabel* _tmp11_; + GtkBuilder* _tmp12_; + GtkBuilder* _tmp13_; + GObject* _tmp14_; + GtkLabel* _tmp15_; + GtkLabel* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; GtkButton* info = NULL; - GtkBuilder* _tmp21_ = NULL; - GtkBuilder* _tmp22_ = NULL; - GObject* _tmp23_ = NULL; - GtkButton* _tmp24_ = NULL; - GtkButton* _tmp25_ = NULL; + GtkBuilder* _tmp20_; + GtkBuilder* _tmp21_; + GObject* _tmp22_; + GtkButton* _tmp23_; + GtkButton* _tmp24_; GtkButton* proceed = NULL; - GtkBuilder* _tmp26_ = NULL; - GtkBuilder* _tmp27_ = NULL; - GObject* _tmp28_ = NULL; - GtkButton* _tmp29_ = NULL; - GtkButton* _tmp30_ = NULL; + GtkBuilder* _tmp25_; + GtkBuilder* _tmp26_; + GObject* _tmp27_; + GtkButton* _tmp28_; + GtkButton* _tmp29_; #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane); #line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -7184,85 +7188,83 @@ static void publishing_piwigo_ssl_error_pane_real_constructed (GObject* base) { #line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = label; #line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp6_ = _ ("This does not look like the real <b>%s</b>. Attackers might be trying " \ -"to steal or alter information going to or from this site (for example," \ -" private messages, credit card information, or passwords)."); + _tmp6_ = publishing_piwigo_ssl_error_pane_get_host (self); #line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp7_ = publishing_piwigo_ssl_error_pane_get_host (self); + _tmp7_ = _tmp6_; #line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = _tmp7_; #line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp9_ = _tmp8_; -#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp10_ = g_strdup_printf (_tmp6_, _tmp9_); + _tmp9_ = g_strdup_printf (_ ("This does not look like the real <b>%s</b>. Attackers might be trying " \ +"to steal or alter information going to or from this site (for example," \ +" private messages, credit card information, or passwords)."), _tmp8_); #line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - gtk_label_set_text (_tmp5_, _tmp11_); + gtk_label_set_text (_tmp5_, _tmp10_); #line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp10_); #line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp8_); #line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp12_ = label; + _tmp11_ = label; #line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - gtk_label_set_use_markup (_tmp12_, TRUE); + gtk_label_set_use_markup (_tmp11_, TRUE); #line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp13_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane)); + _tmp12_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane)); #line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp15_ = gtk_builder_get_object (_tmp14_, "ssl_errors"); + _tmp14_ = gtk_builder_get_object (_tmp13_, "ssl_errors"); #line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp15_) : NULL); + _tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp14_) : NULL); #line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_object_unref0 (label); #line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - label = _tmp16_; + label = _tmp15_; #line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp13_); #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp17_ = label; + _tmp16_ = label; #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp18_ = publishing_piwigo_ssl_error_pane_get_error_text (self); + _tmp17_ = publishing_piwigo_ssl_error_pane_get_error_text (self); #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - gtk_label_set_text (_tmp17_, _tmp20_); + gtk_label_set_text (_tmp16_, _tmp19_); #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp19_); #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp21_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane)); + _tmp20_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane)); #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp23_ = gtk_builder_get_object (_tmp22_, "default"); + _tmp22_ = gtk_builder_get_object (_tmp21_, "default"); #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, gtk_button_get_type ()) ? ((GtkButton*) _tmp23_) : NULL); + _tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, gtk_button_get_type ()) ? ((GtkButton*) _tmp22_) : NULL); #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp25_ = _tmp24_; + _tmp24_ = _tmp23_; #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_object_unref0 (_tmp22_); + _g_object_unref0 (_tmp21_); #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - info = _tmp25_; + info = _tmp24_; #line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_signal_connect_object (info, "clicked", (GCallback) ___lambda5__gtk_button_clicked, self, 0); #line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp26_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane)); + _tmp25_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane)); #line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp27_ = _tmp26_; + _tmp26_ = _tmp25_; #line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp28_ = gtk_builder_get_object (_tmp27_, "proceed_button"); + _tmp27_ = gtk_builder_get_object (_tmp26_, "proceed_button"); #line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, gtk_button_get_type ()) ? ((GtkButton*) _tmp28_) : NULL); + _tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, gtk_button_get_type ()) ? ((GtkButton*) _tmp27_) : NULL); #line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp30_ = _tmp29_; + _tmp29_ = _tmp28_; #line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_object_unref0 (_tmp27_); + _g_object_unref0 (_tmp26_); #line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - proceed = _tmp30_; + proceed = _tmp29_; #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_signal_connect_object (proceed, "clicked", (GCallback) ___lambda6__gtk_button_clicked, self, 0); #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -7271,14 +7273,14 @@ static void publishing_piwigo_ssl_error_pane_real_constructed (GObject* base) { _g_object_unref0 (info); #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_object_unref0 (label); -#line 7263 "PiwigoPublishing.c" +#line 7265 "PiwigoPublishing.c" } gchar* publishing_piwigo_ssl_error_pane_get_host (PublishingPiwigoSSLErrorPane* self) { gchar* result; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self), NULL); #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -7289,32 +7291,36 @@ gchar* publishing_piwigo_ssl_error_pane_get_host (PublishingPiwigoSSLErrorPane* result = _tmp1_; #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 7281 "PiwigoPublishing.c" +#line 7283 "PiwigoPublishing.c" } static void publishing_piwigo_ssl_error_pane_set_host (PublishingPiwigoSSLErrorPane* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self)); #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp0_ = value; + if (g_strcmp0 (value, publishing_piwigo_ssl_error_pane_get_host (self)) != 0) { +#line 7292 "PiwigoPublishing.c" + const gchar* _tmp0_; + gchar* _tmp1_; #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = value; #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_free0 (self->priv->_host); + _tmp1_ = g_strdup (_tmp0_); +#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + _g_free0 (self->priv->_host); #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - self->priv->_host = _tmp1_; + self->priv->_host = _tmp1_; #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_notify ((GObject *) self, "host"); -#line 7300 "PiwigoPublishing.c" + g_object_notify ((GObject *) self, "host"); +#line 7305 "PiwigoPublishing.c" + } } static GTlsCertificate* publishing_piwigo_ssl_error_pane_get_cert (PublishingPiwigoSSLErrorPane* self) { GTlsCertificate* result; - GTlsCertificate* _tmp0_ = NULL; + GTlsCertificate* _tmp0_; #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self), NULL); #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -7323,33 +7329,37 @@ static GTlsCertificate* publishing_piwigo_ssl_error_pane_get_cert (PublishingPiw result = _tmp0_; #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 7315 "PiwigoPublishing.c" +#line 7321 "PiwigoPublishing.c" } static void publishing_piwigo_ssl_error_pane_set_cert (PublishingPiwigoSSLErrorPane* self, GTlsCertificate* value) { - GTlsCertificate* _tmp0_ = NULL; - GTlsCertificate* _tmp1_ = NULL; #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self)); #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp0_ = value; + if (publishing_piwigo_ssl_error_pane_get_cert (self) != value) { +#line 7330 "PiwigoPublishing.c" + GTlsCertificate* _tmp0_; + GTlsCertificate* _tmp1_; #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_object_unref0 (self->priv->_cert); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + _g_object_unref0 (self->priv->_cert); #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - self->priv->_cert = _tmp1_; + self->priv->_cert = _tmp1_; #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_notify ((GObject *) self, "cert"); -#line 7334 "PiwigoPublishing.c" + g_object_notify ((GObject *) self, "cert"); +#line 7343 "PiwigoPublishing.c" + } } gchar* publishing_piwigo_ssl_error_pane_get_error_text (PublishingPiwigoSSLErrorPane* self) { gchar* result; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self), NULL); #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -7360,26 +7370,30 @@ gchar* publishing_piwigo_ssl_error_pane_get_error_text (PublishingPiwigoSSLError result = _tmp1_; #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 7352 "PiwigoPublishing.c" +#line 7362 "PiwigoPublishing.c" } static void publishing_piwigo_ssl_error_pane_set_error_text (PublishingPiwigoSSLErrorPane* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self)); #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp0_ = value; + if (g_strcmp0 (value, publishing_piwigo_ssl_error_pane_get_error_text (self)) != 0) { +#line 7371 "PiwigoPublishing.c" + const gchar* _tmp0_; + gchar* _tmp1_; #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = value; #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_free0 (self->priv->_error_text); + _tmp1_ = g_strdup (_tmp0_); #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - self->priv->_error_text = _tmp1_; + _g_free0 (self->priv->_error_text); #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_notify ((GObject *) self, "error-text"); -#line 7371 "PiwigoPublishing.c" + self->priv->_error_text = _tmp1_; +#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + g_object_notify ((GObject *) self, "error-text"); +#line 7384 "PiwigoPublishing.c" + } } @@ -7389,7 +7403,7 @@ static void publishing_piwigo_ssl_error_pane_class_init (PublishingPiwigoSSLErro #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingPiwigoSSLErrorPanePrivate)); #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - ((GObjectClass *) klass)->constructed = (void (*)(GObject*)) publishing_piwigo_ssl_error_pane_real_constructed; + ((GObjectClass *) klass)->constructed = (void (*) (GObject *)) publishing_piwigo_ssl_error_pane_real_constructed; #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" G_OBJECT_CLASS (klass)->get_property = _vala_publishing_piwigo_ssl_error_pane_get_property; #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -7397,25 +7411,25 @@ static void publishing_piwigo_ssl_error_pane_class_init (PublishingPiwigoSSLErro #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_ssl_error_pane_finalize; #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST, g_param_spec_string ("host", "host", "host", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST_PROPERTY, g_param_spec_string ("host", "host", "host", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT, g_param_spec_object ("cert", "cert", "cert", g_tls_certificate_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT_PROPERTY, g_param_spec_object ("cert", "cert", "cert", g_tls_certificate_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT, g_param_spec_string ("error-text", "error-text", "error-text", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT_PROPERTY, g_param_spec_string ("error-text", "error-text", "error-text", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_signal_new ("proceed", PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 7396 "PiwigoPublishing.c" + publishing_piwigo_ssl_error_pane_signals[PUBLISHING_PIWIGO_SSL_ERROR_PANE_PROCEED_SIGNAL] = g_signal_new ("proceed", PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 7410 "PiwigoPublishing.c" } static void publishing_piwigo_ssl_error_pane_instance_init (PublishingPiwigoSSLErrorPane * self) { #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv = PUBLISHING_PIWIGO_SSL_ERROR_PANE_GET_PRIVATE (self); -#line 7403 "PiwigoPublishing.c" +#line 7417 "PiwigoPublishing.c" } -static void publishing_piwigo_ssl_error_pane_finalize (GObject* obj) { +static void publishing_piwigo_ssl_error_pane_finalize (GObject * obj) { PublishingPiwigoSSLErrorPane * self; #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane); @@ -7427,7 +7441,7 @@ static void publishing_piwigo_ssl_error_pane_finalize (GObject* obj) { _g_free0 (self->priv->_error_text); #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" G_OBJECT_CLASS (publishing_piwigo_ssl_error_pane_parent_class)->finalize (obj); -#line 7419 "PiwigoPublishing.c" +#line 7433 "PiwigoPublishing.c" } @@ -7449,30 +7463,30 @@ static void _vala_publishing_piwigo_ssl_error_pane_get_property (GObject * objec #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" switch (property_id) { #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST: + case PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST_PROPERTY: #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_value_take_string (value, publishing_piwigo_ssl_error_pane_get_host (self)); #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT: + case PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT_PROPERTY: #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_value_set_object (value, publishing_piwigo_ssl_error_pane_get_cert (self)); #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT: + case PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT_PROPERTY: #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_value_take_string (value, publishing_piwigo_ssl_error_pane_get_error_text (self)); #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 7458 "PiwigoPublishing.c" +#line 7472 "PiwigoPublishing.c" default: #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 7464 "PiwigoPublishing.c" +#line 7478 "PiwigoPublishing.c" } } @@ -7483,30 +7497,30 @@ static void _vala_publishing_piwigo_ssl_error_pane_set_property (GObject * objec #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" switch (property_id) { #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST: + case PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST_PROPERTY: #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_ssl_error_pane_set_host (self, g_value_get_string (value)); #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT: + case PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT_PROPERTY: #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_ssl_error_pane_set_cert (self, g_value_get_object (value)); #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT: + case PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT_PROPERTY: #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_ssl_error_pane_set_error_text (self, g_value_get_string (value)); #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 7492 "PiwigoPublishing.c" +#line 7506 "PiwigoPublishing.c" default: #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 7498 "PiwigoPublishing.c" +#line 7512 "PiwigoPublishing.c" } } @@ -7525,8 +7539,8 @@ GType publishing_piwigo_authentication_pane_mode_get_type (void) { PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_construct (GType object_type, PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoAuthenticationPaneMode mode) { PublishingPiwigoAuthenticationPane * self = NULL; - PublishingPiwigoAuthenticationPaneMode _tmp0_ = 0; - PublishingPiwigoPiwigoPublisher* _tmp1_ = NULL; + PublishingPiwigoAuthenticationPaneMode _tmp0_; + PublishingPiwigoPiwigoPublisher* _tmp1_; #line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL); #line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -7537,92 +7551,92 @@ PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_constr self = (PublishingPiwigoAuthenticationPane*) g_object_new (object_type, "resource-path", PLUGIN_RESOURCE_PATH "/piwigo_authentication_pane.ui", "connect-signals", TRUE, "default-id", "login_button", "mode", _tmp0_, "publisher", _tmp1_, NULL); #line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 7529 "PiwigoPublishing.c" +#line 7543 "PiwigoPublishing.c" } PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoAuthenticationPaneMode mode) { #line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_authentication_pane_construct (PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, publisher, mode); -#line 7536 "PiwigoPublishing.c" +#line 7550 "PiwigoPublishing.c" } static void _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_authentication_pane_on_user_changed ((PublishingPiwigoAuthenticationPane*) self); -#line 7543 "PiwigoPublishing.c" +#line 7557 "PiwigoPublishing.c" } static void _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_authentication_pane_on_url_changed ((PublishingPiwigoAuthenticationPane*) self); -#line 7550 "PiwigoPublishing.c" +#line 7564 "PiwigoPublishing.c" } static void _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_authentication_pane_on_password_changed ((PublishingPiwigoAuthenticationPane*) self); -#line 7557 "PiwigoPublishing.c" +#line 7571 "PiwigoPublishing.c" } static void _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_authentication_pane_on_login_button_clicked ((PublishingPiwigoAuthenticationPane*) self); -#line 7564 "PiwigoPublishing.c" +#line 7578 "PiwigoPublishing.c" } static void publishing_piwigo_authentication_pane_real_constructed (GObject* base) { PublishingPiwigoAuthenticationPane * self; GtkBuilder* builder = NULL; - GtkBuilder* _tmp0_ = NULL; + GtkBuilder* _tmp0_; GtkLabel* message_label = NULL; - GtkBuilder* _tmp1_ = NULL; - GObject* _tmp2_ = NULL; - GtkLabel* _tmp3_ = NULL; - PublishingPiwigoAuthenticationPaneMode _tmp4_ = 0; - GtkBuilder* _tmp17_ = NULL; - GObject* _tmp18_ = NULL; - GtkEntry* _tmp19_ = NULL; + GtkBuilder* _tmp1_; + GObject* _tmp2_; + GtkLabel* _tmp3_; + PublishingPiwigoAuthenticationPaneMode _tmp4_; + GtkBuilder* _tmp15_; + GObject* _tmp16_; + GtkEntry* _tmp17_; gchar* persistent_url = NULL; - PublishingPiwigoPiwigoPublisher* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; - GtkBuilder* _tmp25_ = NULL; - GObject* _tmp26_ = NULL; - GtkEntry* _tmp27_ = NULL; + PublishingPiwigoPiwigoPublisher* _tmp18_; + gchar* _tmp19_; + const gchar* _tmp20_; + GtkBuilder* _tmp23_; + GObject* _tmp24_; + GtkEntry* _tmp25_; gchar* persistent_username = NULL; - PublishingPiwigoPiwigoPublisher* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - const gchar* _tmp30_ = NULL; - GtkBuilder* _tmp33_ = NULL; - GObject* _tmp34_ = NULL; - GtkEntry* _tmp35_ = NULL; + PublishingPiwigoPiwigoPublisher* _tmp26_; + gchar* _tmp27_; + const gchar* _tmp28_; + GtkBuilder* _tmp31_; + GObject* _tmp32_; + GtkEntry* _tmp33_; gchar* persistent_password = NULL; - PublishingPiwigoPiwigoPublisher* _tmp36_ = NULL; - gchar* _tmp37_ = NULL; - const gchar* _tmp38_ = NULL; - GtkBuilder* _tmp41_ = NULL; - GObject* _tmp42_ = NULL; - GtkSwitch* _tmp43_ = NULL; - GtkSwitch* _tmp44_ = NULL; - PublishingPiwigoPiwigoPublisher* _tmp45_ = NULL; - gboolean _tmp46_ = FALSE; - GtkBuilder* _tmp47_ = NULL; - GObject* _tmp48_ = NULL; - GtkButton* _tmp49_ = NULL; - GtkEntry* _tmp50_ = NULL; - GtkEntry* _tmp51_ = NULL; - GtkEntry* _tmp52_ = NULL; - GtkButton* _tmp53_ = NULL; - PublishingPiwigoPiwigoPublisher* _tmp54_ = NULL; - SpitPublishingPluginHost* _tmp55_ = NULL; - SpitPublishingPluginHost* _tmp56_ = NULL; - GtkButton* _tmp57_ = NULL; + PublishingPiwigoPiwigoPublisher* _tmp34_; + gchar* _tmp35_; + const gchar* _tmp36_; + GtkBuilder* _tmp39_; + GObject* _tmp40_; + GtkSwitch* _tmp41_; + GtkSwitch* _tmp42_; + PublishingPiwigoPiwigoPublisher* _tmp43_; + gboolean _tmp44_; + GtkBuilder* _tmp45_; + GObject* _tmp46_; + GtkButton* _tmp47_; + GtkEntry* _tmp48_; + GtkEntry* _tmp49_; + GtkEntry* _tmp50_; + GtkButton* _tmp51_; + PublishingPiwigoPiwigoPublisher* _tmp52_; + SpitPublishingPluginHost* _tmp53_; + SpitPublishingPluginHost* _tmp54_; + GtkButton* _tmp55_; #line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane); #line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -7645,10 +7659,10 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas switch (_tmp4_) { #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO: -#line 7637 "PiwigoPublishing.c" +#line 7651 "PiwigoPublishing.c" { - GtkLabel* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; + GtkLabel* _tmp5_; + const gchar* _tmp6_; #line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = message_label; #line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -7657,216 +7671,210 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas gtk_label_set_text (_tmp5_, _tmp6_); #line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 7649 "PiwigoPublishing.c" +#line 7663 "PiwigoPublishing.c" } #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL: -#line 7653 "PiwigoPublishing.c" +#line 7667 "PiwigoPublishing.c" { - GtkLabel* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; + GtkLabel* _tmp7_; + const gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = message_label; #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp8_ = _ ("Invalid URL"); + _tmp8_ = publishing_piwigo_authentication_pane_FAILED_RETRY_URL_MESSAGE; #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp9_ = publishing_piwigo_authentication_pane_FAILED_RETRY_URL_MESSAGE; + _tmp9_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Invalid URL"), _tmp8_); #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp10_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp8_, _tmp9_); -#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - gtk_label_set_markup (_tmp7_, _tmp11_); + gtk_label_set_markup (_tmp7_, _tmp10_); #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp10_); #line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 7676 "PiwigoPublishing.c" +#line 7687 "PiwigoPublishing.c" } #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER: -#line 7680 "PiwigoPublishing.c" +#line 7691 "PiwigoPublishing.c" { - GtkLabel* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; -#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp12_ = message_label; + GtkLabel* _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; #line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp13_ = _ ("Invalid User Name or Password"); + _tmp11_ = message_label; #line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp14_ = publishing_piwigo_authentication_pane_FAILED_RETRY_USER_MESSAGE; + _tmp12_ = publishing_piwigo_authentication_pane_FAILED_RETRY_USER_MESSAGE; #line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp15_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp13_, _tmp14_); + _tmp13_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Invalid User Name or Password"), _tmp12_); #line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp16_ = _tmp15_; + _tmp14_ = _tmp13_; #line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - gtk_label_set_markup (_tmp12_, _tmp16_); + gtk_label_set_markup (_tmp11_, _tmp14_); #line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp14_); #line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 7703 "PiwigoPublishing.c" +#line 7711 "PiwigoPublishing.c" } default: #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 7708 "PiwigoPublishing.c" +#line 7716 "PiwigoPublishing.c" } #line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp17_ = builder; + _tmp15_ = builder; #line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp18_ = gtk_builder_get_object (_tmp17_, "url_entry"); + _tmp16_ = gtk_builder_get_object (_tmp15_, "url_entry"); #line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp18_) : NULL); + _tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp16_) : NULL); #line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_object_unref0 (self->priv->url_entry); #line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - self->priv->url_entry = _tmp19_; + self->priv->url_entry = _tmp17_; #line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp20_ = self->priv->_publisher; + _tmp18_ = self->priv->_publisher; #line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp21_ = publishing_piwigo_piwigo_publisher_get_persistent_url (_tmp20_); + _tmp19_ = publishing_piwigo_piwigo_publisher_get_persistent_url (_tmp18_); #line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - persistent_url = _tmp21_; + persistent_url = _tmp19_; #line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp22_ = persistent_url; + _tmp20_ = persistent_url; #line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - if (_tmp22_ != NULL) { -#line 7730 "PiwigoPublishing.c" - GtkEntry* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; + if (_tmp20_ != NULL) { +#line 7738 "PiwigoPublishing.c" + GtkEntry* _tmp21_; + const gchar* _tmp22_; #line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp23_ = self->priv->url_entry; + _tmp21_ = self->priv->url_entry; #line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp24_ = persistent_url; + _tmp22_ = persistent_url; #line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - gtk_entry_set_text (_tmp23_, _tmp24_); -#line 7739 "PiwigoPublishing.c" + gtk_entry_set_text (_tmp21_, _tmp22_); +#line 7747 "PiwigoPublishing.c" } #line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp25_ = builder; + _tmp23_ = builder; #line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp26_ = gtk_builder_get_object (_tmp25_, "username_entry"); + _tmp24_ = gtk_builder_get_object (_tmp23_, "username_entry"); #line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp26_) : NULL); + _tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp24_) : NULL); #line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_object_unref0 (self->priv->username_entry); #line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - self->priv->username_entry = _tmp27_; + self->priv->username_entry = _tmp25_; #line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp28_ = self->priv->_publisher; + _tmp26_ = self->priv->_publisher; #line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp29_ = publishing_piwigo_piwigo_publisher_get_persistent_username (_tmp28_); + _tmp27_ = publishing_piwigo_piwigo_publisher_get_persistent_username (_tmp26_); #line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - persistent_username = _tmp29_; + persistent_username = _tmp27_; #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp30_ = persistent_username; + _tmp28_ = persistent_username; #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - if (_tmp30_ != NULL) { -#line 7761 "PiwigoPublishing.c" - GtkEntry* _tmp31_ = NULL; - const gchar* _tmp32_ = NULL; + if (_tmp28_ != NULL) { +#line 7769 "PiwigoPublishing.c" + GtkEntry* _tmp29_; + const gchar* _tmp30_; #line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp31_ = self->priv->username_entry; + _tmp29_ = self->priv->username_entry; #line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp32_ = persistent_username; + _tmp30_ = persistent_username; #line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - gtk_entry_set_text (_tmp31_, _tmp32_); -#line 7770 "PiwigoPublishing.c" + gtk_entry_set_text (_tmp29_, _tmp30_); +#line 7778 "PiwigoPublishing.c" } #line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp33_ = builder; + _tmp31_ = builder; #line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp34_ = gtk_builder_get_object (_tmp33_, "password_entry"); + _tmp32_ = gtk_builder_get_object (_tmp31_, "password_entry"); #line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp35_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp34_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp34_) : NULL); + _tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp32_) : NULL); #line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_object_unref0 (self->priv->password_entry); #line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - self->priv->password_entry = _tmp35_; + self->priv->password_entry = _tmp33_; #line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp36_ = self->priv->_publisher; + _tmp34_ = self->priv->_publisher; #line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp37_ = publishing_piwigo_piwigo_publisher_get_persistent_password (_tmp36_); + _tmp35_ = publishing_piwigo_piwigo_publisher_get_persistent_password (_tmp34_); #line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - persistent_password = _tmp37_; + persistent_password = _tmp35_; #line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp38_ = persistent_password; + _tmp36_ = persistent_password; #line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - if (_tmp38_ != NULL) { -#line 7792 "PiwigoPublishing.c" - GtkEntry* _tmp39_ = NULL; - const gchar* _tmp40_ = NULL; + if (_tmp36_ != NULL) { +#line 7800 "PiwigoPublishing.c" + GtkEntry* _tmp37_; + const gchar* _tmp38_; #line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp39_ = self->priv->password_entry; + _tmp37_ = self->priv->password_entry; #line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp40_ = persistent_password; + _tmp38_ = persistent_password; #line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - gtk_entry_set_text (_tmp39_, _tmp40_); -#line 7801 "PiwigoPublishing.c" + gtk_entry_set_text (_tmp37_, _tmp38_); +#line 7809 "PiwigoPublishing.c" } #line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp41_ = builder; + _tmp39_ = builder; #line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp42_ = gtk_builder_get_object (_tmp41_, "remember_password_checkbutton"); + _tmp40_ = gtk_builder_get_object (_tmp39_, "remember_password_checkbutton"); #line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp43_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp42_, gtk_switch_get_type ()) ? ((GtkSwitch*) _tmp42_) : NULL); + _tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, gtk_switch_get_type ()) ? ((GtkSwitch*) _tmp40_) : NULL); #line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_object_unref0 (self->priv->remember_password_checkbutton); #line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - self->priv->remember_password_checkbutton = _tmp43_; + self->priv->remember_password_checkbutton = _tmp41_; #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp44_ = self->priv->remember_password_checkbutton; + _tmp42_ = self->priv->remember_password_checkbutton; #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp45_ = self->priv->_publisher; + _tmp43_ = self->priv->_publisher; #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp46_ = publishing_piwigo_piwigo_publisher_get_remember_password (_tmp45_); + _tmp44_ = publishing_piwigo_piwigo_publisher_get_remember_password (_tmp43_); #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - gtk_switch_set_active (_tmp44_, _tmp46_); + gtk_switch_set_active (_tmp42_, _tmp44_); #line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp47_ = builder; + _tmp45_ = builder; #line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp48_ = gtk_builder_get_object (_tmp47_, "login_button"); + _tmp46_ = gtk_builder_get_object (_tmp45_, "login_button"); #line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp49_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp48_, gtk_button_get_type ()) ? ((GtkButton*) _tmp48_) : NULL); + _tmp47_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp46_, gtk_button_get_type ()) ? ((GtkButton*) _tmp46_) : NULL); #line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_object_unref0 (self->priv->login_button); #line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - self->priv->login_button = _tmp49_; + self->priv->login_button = _tmp47_; #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp50_ = self->priv->username_entry; + _tmp48_ = self->priv->username_entry; #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed, self, 0); #line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp51_ = self->priv->url_entry; + _tmp49_ = self->priv->url_entry; #line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed, self, 0); #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp52_ = self->priv->password_entry; + _tmp50_ = self->priv->password_entry; #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed, self, 0); #line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp53_ = self->priv->login_button; + _tmp51_ = self->priv->login_button; #line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_signal_connect_object (_tmp53_, "clicked", (GCallback) _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp51_, "clicked", (GCallback) _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0); #line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp54_ = self->priv->_publisher; + _tmp52_ = self->priv->_publisher; #line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp55_ = publishing_piwigo_piwigo_publisher_get_host (_tmp54_); + _tmp53_ = publishing_piwigo_piwigo_publisher_get_host (_tmp52_); #line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp56_ = _tmp55_; + _tmp54_ = _tmp53_; #line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp57_ = self->priv->login_button; + _tmp55_ = self->priv->login_button; #line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - spit_publishing_plugin_host_set_dialog_default_widget (_tmp56_, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget)); + spit_publishing_plugin_host_set_dialog_default_widget (_tmp54_, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget)); #line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_object_unref0 (_tmp56_); + _g_object_unref0 (_tmp54_); #line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (persistent_password); #line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -7877,19 +7885,19 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas _g_object_unref0 (message_label); #line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_object_unref0 (builder); -#line 7869 "PiwigoPublishing.c" +#line 7877 "PiwigoPublishing.c" } static void publishing_piwigo_authentication_pane_on_login_button_clicked (PublishingPiwigoAuthenticationPane* self) { - GtkEntry* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - GtkEntry* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - GtkEntry* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - GtkSwitch* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GtkEntry* _tmp0_; + const gchar* _tmp1_; + GtkEntry* _tmp2_; + const gchar* _tmp3_; + GtkEntry* _tmp4_; + const gchar* _tmp5_; + GtkSwitch* _tmp6_; + gboolean _tmp7_; #line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self)); #line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -7909,8 +7917,8 @@ static void publishing_piwigo_authentication_pane_on_login_button_clicked (Publi #line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = gtk_switch_get_active (_tmp6_); #line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_signal_emit_by_name (self, "login", _tmp1_, _tmp3_, _tmp5_, _tmp7_); -#line 7902 "PiwigoPublishing.c" + g_signal_emit (self, publishing_piwigo_authentication_pane_signals[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_LOGIN_SIGNAL], 0, _tmp1_, _tmp3_, _tmp5_, _tmp7_); +#line 7910 "PiwigoPublishing.c" } @@ -7919,7 +7927,7 @@ static void publishing_piwigo_authentication_pane_on_url_changed (PublishingPiwi g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self)); #line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_authentication_pane_update_login_button_sensitivity (self); -#line 7911 "PiwigoPublishing.c" +#line 7919 "PiwigoPublishing.c" } @@ -7928,7 +7936,7 @@ static void publishing_piwigo_authentication_pane_on_user_changed (PublishingPiw g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self)); #line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_authentication_pane_update_login_button_sensitivity (self); -#line 7920 "PiwigoPublishing.c" +#line 7928 "PiwigoPublishing.c" } @@ -7937,17 +7945,17 @@ static void publishing_piwigo_authentication_pane_on_password_changed (Publishin g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self)); #line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_authentication_pane_update_login_button_sensitivity (self); -#line 7929 "PiwigoPublishing.c" +#line 7937 "PiwigoPublishing.c" } static void publishing_piwigo_authentication_pane_update_login_button_sensitivity (PublishingPiwigoAuthenticationPane* self) { gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - GtkEntry* _tmp2_ = NULL; - guint _tmp3_ = 0U; - guint _tmp4_ = 0U; - GtkButton* _tmp11_ = NULL; + GtkEntry* _tmp2_; + guint _tmp3_; + guint _tmp4_; + GtkButton* _tmp11_; #line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self)); #line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -7958,10 +7966,10 @@ static void publishing_piwigo_authentication_pane_update_login_button_sensitivit _tmp4_ = _tmp3_; #line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp4_ != ((guint) 0)) { -#line 7950 "PiwigoPublishing.c" - GtkEntry* _tmp5_ = NULL; - guint _tmp6_ = 0U; - guint _tmp7_ = 0U; +#line 7958 "PiwigoPublishing.c" + GtkEntry* _tmp5_; + guint _tmp6_; + guint _tmp7_; #line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = self->priv->username_entry; #line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -7970,18 +7978,18 @@ static void publishing_piwigo_authentication_pane_update_login_button_sensitivit _tmp7_ = _tmp6_; #line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = _tmp7_ != ((guint) 0); -#line 7962 "PiwigoPublishing.c" +#line 7970 "PiwigoPublishing.c" } else { #line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = FALSE; -#line 7966 "PiwigoPublishing.c" +#line 7974 "PiwigoPublishing.c" } #line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp1_) { -#line 7970 "PiwigoPublishing.c" - GtkEntry* _tmp8_ = NULL; - guint _tmp9_ = 0U; - guint _tmp10_ = 0U; +#line 7978 "PiwigoPublishing.c" + GtkEntry* _tmp8_; + guint _tmp9_; + guint _tmp10_; #line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = self->priv->password_entry; #line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -7990,25 +7998,25 @@ static void publishing_piwigo_authentication_pane_update_login_button_sensitivit _tmp10_ = _tmp9_; #line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = _tmp10_ != ((guint) 0); -#line 7982 "PiwigoPublishing.c" +#line 7990 "PiwigoPublishing.c" } else { #line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = FALSE; -#line 7986 "PiwigoPublishing.c" +#line 7994 "PiwigoPublishing.c" } #line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp11_ = self->priv->login_button; #line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), _tmp0_); -#line 7992 "PiwigoPublishing.c" +#line 8000 "PiwigoPublishing.c" } static void publishing_piwigo_authentication_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base) { PublishingPiwigoAuthenticationPane * self; - GtkEntry* _tmp0_ = NULL; - GtkEntry* _tmp1_ = NULL; - GtkButton* _tmp2_ = NULL; + GtkEntry* _tmp0_; + GtkEntry* _tmp1_; + GtkButton* _tmp2_; #line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane); #line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -8027,13 +8035,13 @@ static void publishing_piwigo_authentication_pane_real_on_pane_installed (Shotwe gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE); #line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_authentication_pane_update_login_button_sensitivity (self); -#line 8019 "PiwigoPublishing.c" +#line 8027 "PiwigoPublishing.c" } PublishingPiwigoAuthenticationPaneMode publishing_piwigo_authentication_pane_get_mode (PublishingPiwigoAuthenticationPane* self) { PublishingPiwigoAuthenticationPaneMode result; - PublishingPiwigoAuthenticationPaneMode _tmp0_ = 0; + PublishingPiwigoAuthenticationPaneMode _tmp0_; #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self), 0); #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -8042,27 +8050,31 @@ PublishingPiwigoAuthenticationPaneMode publishing_piwigo_authentication_pane_get result = _tmp0_; #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 8034 "PiwigoPublishing.c" +#line 8042 "PiwigoPublishing.c" } static void publishing_piwigo_authentication_pane_set_mode (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoAuthenticationPaneMode value) { - PublishingPiwigoAuthenticationPaneMode _tmp0_ = 0; #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self)); #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp0_ = value; + if (publishing_piwigo_authentication_pane_get_mode (self) != value) { +#line 8051 "PiwigoPublishing.c" + PublishingPiwigoAuthenticationPaneMode _tmp0_; +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + _tmp0_ = value; #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - self->priv->_mode = _tmp0_; + self->priv->_mode = _tmp0_; #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_notify ((GObject *) self, "mode"); -#line 8048 "PiwigoPublishing.c" + g_object_notify ((GObject *) self, "mode"); +#line 8059 "PiwigoPublishing.c" + } } PublishingPiwigoPiwigoPublisher* publishing_piwigo_authentication_pane_get_publisher (PublishingPiwigoAuthenticationPane* self) { PublishingPiwigoPiwigoPublisher* result; - PublishingPiwigoPiwigoPublisher* _tmp0_ = NULL; + PublishingPiwigoPiwigoPublisher* _tmp0_; #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self), NULL); #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -8071,21 +8083,25 @@ PublishingPiwigoPiwigoPublisher* publishing_piwigo_authentication_pane_get_publi result = _tmp0_; #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 8063 "PiwigoPublishing.c" +#line 8075 "PiwigoPublishing.c" } static void publishing_piwigo_authentication_pane_set_publisher (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoPiwigoPublisher* value) { - PublishingPiwigoPiwigoPublisher* _tmp0_ = NULL; #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self)); #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp0_ = value; + if (publishing_piwigo_authentication_pane_get_publisher (self) != value) { +#line 8084 "PiwigoPublishing.c" + PublishingPiwigoPiwigoPublisher* _tmp0_; +#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + _tmp0_ = value; #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - self->priv->_publisher = _tmp0_; + self->priv->_publisher = _tmp0_; #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_notify ((GObject *) self, "publisher"); -#line 8077 "PiwigoPublishing.c" + g_object_notify ((GObject *) self, "publisher"); +#line 8092 "PiwigoPublishing.c" + } } @@ -8104,37 +8120,34 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN (GClosure data1 = closure->data; #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" data2 = param_values->data[0].v_pointer; -#line 8096 "PiwigoPublishing.c" +#line 8112 "PiwigoPublishing.c" } else { #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" data1 = param_values->data[0].v_pointer; #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" data2 = closure->data; -#line 8102 "PiwigoPublishing.c" +#line 8118 "PiwigoPublishing.c" } #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" callback = (GMarshalFunc_VOID__STRING_STRING_STRING_BOOLEAN) (marshal_data ? marshal_data : cc->callback); #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), g_value_get_string (param_values + 3), g_value_get_boolean (param_values + 4), data2); -#line 8108 "PiwigoPublishing.c" +#line 8124 "PiwigoPublishing.c" } static void publishing_piwigo_authentication_pane_class_init (PublishingPiwigoAuthenticationPaneClass * klass) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_authentication_pane_parent_class = g_type_class_peek_parent (klass); #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingPiwigoAuthenticationPanePrivate)); #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - ((GObjectClass *) klass)->constructed = (void (*)(GObject*)) publishing_piwigo_authentication_pane_real_constructed; + ((GObjectClass *) klass)->constructed = (void (*) (GObject *)) publishing_piwigo_authentication_pane_real_constructed; #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - ((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = (void (*)(ShotwellPluginsCommonBuilderPane*)) publishing_piwigo_authentication_pane_real_on_pane_installed; + ((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = (void (*) (ShotwellPluginsCommonBuilderPane *)) publishing_piwigo_authentication_pane_real_on_pane_installed; #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" G_OBJECT_CLASS (klass)->get_property = _vala_publishing_piwigo_authentication_pane_get_property; #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -8142,43 +8155,37 @@ static void publishing_piwigo_authentication_pane_class_init (PublishingPiwigoAu #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_authentication_pane_finalize; #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE, g_param_spec_enum ("mode", "mode", "mode", PUBLISHING_PIWIGO_AUTHENTICATION_PANE_TYPE_MODE, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_PROPERTY, g_param_spec_enum ("mode", "mode", "mode", PUBLISHING_PIWIGO_AUTHENTICATION_PANE_TYPE_MODE, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER, g_param_spec_object ("publisher", "publisher", "publisher", PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER_PROPERTY, g_param_spec_object ("publisher", "publisher", "publisher", PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_signal_new ("login", PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN); -#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp0_ = _ ("Enter the URL of your Piwigo photo library as well as the username and" \ -" password associated with your Piwigo account for that library."); + publishing_piwigo_authentication_pane_signals[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_LOGIN_SIGNAL] = g_signal_new ("login", PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN); #line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (_ ("Enter the URL of your Piwigo photo library as well as the username and" \ +" password associated with your Piwigo account for that library.")); #line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_piwigo_authentication_pane_INTRO_MESSAGE = _tmp1_; + publishing_piwigo_authentication_pane_INTRO_MESSAGE = _tmp0_; #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp2_ = _ ("Shotwell cannot contact your Piwigo photo library. Please verify the U" \ -"RL you entered"); -#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp1_ = g_strdup (_ ("Shotwell cannot contact your Piwigo photo library. Please verify the U" \ +"RL you entered")); #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_piwigo_authentication_pane_FAILED_RETRY_URL_MESSAGE = _tmp3_; + publishing_piwigo_authentication_pane_FAILED_RETRY_URL_MESSAGE = _tmp1_; #line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp4_ = _ ("Username and/or password invalid. Please try again"); + _tmp2_ = g_strdup (_ ("Username and/or password invalid. Please try again")); #line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp5_ = g_strdup (_tmp4_); -#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_piwigo_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp5_; -#line 8157 "PiwigoPublishing.c" + publishing_piwigo_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp2_; +#line 8164 "PiwigoPublishing.c" } static void publishing_piwigo_authentication_pane_instance_init (PublishingPiwigoAuthenticationPane * self) { #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv = PUBLISHING_PIWIGO_AUTHENTICATION_PANE_GET_PRIVATE (self); -#line 8164 "PiwigoPublishing.c" +#line 8171 "PiwigoPublishing.c" } -static void publishing_piwigo_authentication_pane_finalize (GObject* obj) { +static void publishing_piwigo_authentication_pane_finalize (GObject * obj) { PublishingPiwigoAuthenticationPane * self; #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane); @@ -8194,7 +8201,7 @@ static void publishing_piwigo_authentication_pane_finalize (GObject* obj) { _g_object_unref0 (self->priv->login_button); #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" G_OBJECT_CLASS (publishing_piwigo_authentication_pane_parent_class)->finalize (obj); -#line 8184 "PiwigoPublishing.c" +#line 8191 "PiwigoPublishing.c" } @@ -8220,24 +8227,24 @@ static void _vala_publishing_piwigo_authentication_pane_get_property (GObject * #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" switch (property_id) { #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE: + case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_PROPERTY: #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_value_set_enum (value, publishing_piwigo_authentication_pane_get_mode (self)); #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER: + case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER_PROPERTY: #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_value_set_object (value, publishing_piwigo_authentication_pane_get_publisher (self)); #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 8221 "PiwigoPublishing.c" +#line 8228 "PiwigoPublishing.c" default: #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 8227 "PiwigoPublishing.c" +#line 8234 "PiwigoPublishing.c" } } @@ -8248,24 +8255,24 @@ static void _vala_publishing_piwigo_authentication_pane_set_property (GObject * #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" switch (property_id) { #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE: + case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_PROPERTY: #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_authentication_pane_set_mode (self, g_value_get_enum (value)); #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER: + case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER_PROPERTY: #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_authentication_pane_set_publisher (self, g_value_get_object (value)); #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 8249 "PiwigoPublishing.c" +#line 8256 "PiwigoPublishing.c" default: #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 8255 "PiwigoPublishing.c" +#line 8262 "PiwigoPublishing.c" } } @@ -8273,7 +8280,7 @@ static void _vala_publishing_piwigo_authentication_pane_set_property (GObject * static gpointer _publishing_piwigo_category_ref0 (gpointer self) { #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self ? publishing_piwigo_category_ref (self) : NULL; -#line 8263 "PiwigoPublishing.c" +#line 8270 "PiwigoPublishing.c" } @@ -8284,17 +8291,17 @@ static PublishingPiwigoCategory** _vala_array_dup11 (PublishingPiwigoCategory** result = g_new0 (PublishingPiwigoCategory*, length + 1); #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" for (i = 0; i < length; i++) { -#line 8274 "PiwigoPublishing.c" - PublishingPiwigoCategory* _tmp0_ = NULL; +#line 8281 "PiwigoPublishing.c" + PublishingPiwigoCategory* _tmp0_; #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = _publishing_piwigo_category_ref0 (self[i]); #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" result[i] = _tmp0_; -#line 8280 "PiwigoPublishing.c" +#line 8287 "PiwigoPublishing.c" } #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 8284 "PiwigoPublishing.c" +#line 8291 "PiwigoPublishing.c" } @@ -8303,27 +8310,27 @@ static gboolean _publishing_piwigo_category_equal_gee_equal_data_func (gconstpoi result = publishing_piwigo_category_equal ((PublishingPiwigoCategory*) a, (PublishingPiwigoCategory*) b); #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 8293 "PiwigoPublishing.c" +#line 8300 "PiwigoPublishing.c" } PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_construct (GType object_type, PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoCategory** categories, int categories_length1, gint last_category, gint last_permission_level, gint last_photo_size, gboolean last_title_as_comment, gboolean last_no_upload_tags, gboolean strip_metadata_enabled) { PublishingPiwigoPublishingOptionsPane * self = NULL; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_ = FALSE; - PublishingPiwigoCategory** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - PublishingPiwigoCategory** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - GeeArrayList* _tmp8_ = NULL; - GeeArrayList* _tmp9_ = NULL; - PublishingPiwigoPiwigoPublisher* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; + gboolean _tmp3_; + gboolean _tmp4_; + gboolean _tmp5_; + PublishingPiwigoCategory** _tmp6_; + gint _tmp6__length1; + PublishingPiwigoCategory** _tmp7_; + gint _tmp7__length1; + GeeArrayList* _tmp8_; + GeeArrayList* _tmp9_; + PublishingPiwigoPiwigoPublisher* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; #line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL); #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -8364,116 +8371,116 @@ PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane _g_object_unref0 (_tmp9_); #line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 8354 "PiwigoPublishing.c" +#line 8361 "PiwigoPublishing.c" } PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoCategory** categories, int categories_length1, gint last_category, gint last_permission_level, gint last_photo_size, gboolean last_title_as_comment, gboolean last_no_upload_tags, gboolean strip_metadata_enabled) { #line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_publishing_options_pane_construct (PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, publisher, categories, categories_length1, last_category, last_permission_level, last_photo_size, last_title_as_comment, last_no_upload_tags, strip_metadata_enabled); -#line 8361 "PiwigoPublishing.c" +#line 8368 "PiwigoPublishing.c" } static void _publishing_piwigo_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_options_pane_on_logout_button_clicked ((PublishingPiwigoPublishingOptionsPane*) self); -#line 8368 "PiwigoPublishing.c" +#line 8375 "PiwigoPublishing.c" } static void _publishing_piwigo_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_options_pane_on_publish_button_clicked ((PublishingPiwigoPublishingOptionsPane*) self); -#line 8375 "PiwigoPublishing.c" +#line 8382 "PiwigoPublishing.c" } static void _publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked ((PublishingPiwigoPublishingOptionsPane*) self); -#line 8382 "PiwigoPublishing.c" +#line 8389 "PiwigoPublishing.c" } static void _publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked ((PublishingPiwigoPublishingOptionsPane*) self); -#line 8389 "PiwigoPublishing.c" +#line 8396 "PiwigoPublishing.c" } static void _publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_options_pane_on_new_category_entry_changed ((PublishingPiwigoPublishingOptionsPane*) self); -#line 8396 "PiwigoPublishing.c" +#line 8403 "PiwigoPublishing.c" } static void _publishing_piwigo_publishing_options_pane_on_existing_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_options_pane_on_existing_combo_changed ((PublishingPiwigoPublishingOptionsPane*) self); -#line 8403 "PiwigoPublishing.c" +#line 8410 "PiwigoPublishing.c" } static void publishing_piwigo_publishing_options_pane_real_constructed (GObject* base) { PublishingPiwigoPublishingOptionsPane * self; GtkBuilder* builder = NULL; - GtkBuilder* _tmp0_ = NULL; - GObject* _tmp1_ = NULL; - GtkRadioButton* _tmp2_ = NULL; - GObject* _tmp3_ = NULL; - GtkRadioButton* _tmp4_ = NULL; - GObject* _tmp5_ = NULL; - GtkComboBoxText* _tmp6_ = NULL; - GObject* _tmp7_ = NULL; - GtkEntry* _tmp8_ = NULL; - GObject* _tmp9_ = NULL; - GtkLabel* _tmp10_ = NULL; - GObject* _tmp11_ = NULL; - GtkComboBoxText* _tmp12_ = NULL; - GObject* _tmp13_ = NULL; - GtkTextView* _tmp14_ = NULL; - GtkTextView* _tmp15_ = NULL; - GtkTextBuffer* _tmp16_ = NULL; - GtkTextBuffer* _tmp17_ = NULL; - GObject* _tmp18_ = NULL; - GtkLabel* _tmp19_ = NULL; - GObject* _tmp20_ = NULL; - GtkComboBoxText* _tmp21_ = NULL; - GObject* _tmp22_ = NULL; - GtkComboBoxText* _tmp23_ = NULL; - GObject* _tmp24_ = NULL; - GtkCheckButton* _tmp25_ = NULL; - GtkCheckButton* _tmp26_ = NULL; - gboolean _tmp27_ = FALSE; - GObject* _tmp28_ = NULL; - GtkCheckButton* _tmp29_ = NULL; - GtkCheckButton* _tmp30_ = NULL; - gboolean _tmp31_ = FALSE; - GObject* _tmp32_ = NULL; - GtkCheckButton* _tmp33_ = NULL; - GtkCheckButton* _tmp34_ = NULL; - gboolean _tmp35_ = FALSE; - GObject* _tmp36_ = NULL; - GtkButton* _tmp37_ = NULL; - GtkButton* _tmp38_ = NULL; - GObject* _tmp39_ = NULL; - GtkButton* _tmp40_ = NULL; - GtkButton* _tmp41_ = NULL; - GtkRadioButton* _tmp42_ = NULL; - GtkRadioButton* _tmp43_ = NULL; - GtkEntry* _tmp44_ = NULL; - GtkComboBoxText* _tmp45_ = NULL; - gint _tmp46_ = 0; - PublishingPiwigoPermissionLevel** _tmp47_ = NULL; - gint _tmp48_ = 0; - PublishingPiwigoSizeEntry** _tmp49_ = NULL; - GtkTextView* _tmp50_ = NULL; - GtkTextBuffer* _tmp51_ = NULL; - GtkTextBuffer* _tmp52_ = NULL; - const gchar* _tmp53_ = NULL; + GtkBuilder* _tmp0_; + GObject* _tmp1_; + GtkRadioButton* _tmp2_; + GObject* _tmp3_; + GtkRadioButton* _tmp4_; + GObject* _tmp5_; + GtkComboBoxText* _tmp6_; + GObject* _tmp7_; + GtkEntry* _tmp8_; + GObject* _tmp9_; + GtkLabel* _tmp10_; + GObject* _tmp11_; + GtkComboBoxText* _tmp12_; + GObject* _tmp13_; + GtkTextView* _tmp14_; + GtkTextView* _tmp15_; + GtkTextBuffer* _tmp16_; + GtkTextBuffer* _tmp17_; + GObject* _tmp18_; + GtkLabel* _tmp19_; + GObject* _tmp20_; + GtkComboBoxText* _tmp21_; + GObject* _tmp22_; + GtkComboBoxText* _tmp23_; + GObject* _tmp24_; + GtkCheckButton* _tmp25_; + GtkCheckButton* _tmp26_; + gboolean _tmp27_; + GObject* _tmp28_; + GtkCheckButton* _tmp29_; + GtkCheckButton* _tmp30_; + gboolean _tmp31_; + GObject* _tmp32_; + GtkCheckButton* _tmp33_; + GtkCheckButton* _tmp34_; + gboolean _tmp35_; + GObject* _tmp36_; + GtkButton* _tmp37_; + GtkButton* _tmp38_; + GObject* _tmp39_; + GtkButton* _tmp40_; + GtkButton* _tmp41_; + GtkRadioButton* _tmp42_; + GtkRadioButton* _tmp43_; + GtkEntry* _tmp44_; + GtkComboBoxText* _tmp45_; + gint _tmp46_; + PublishingPiwigoPermissionLevel** _tmp47_; + gint _tmp48_; + PublishingPiwigoSizeEntry** _tmp49_; + GtkTextView* _tmp50_; + GtkTextBuffer* _tmp51_; + GtkTextBuffer* _tmp52_; + const gchar* _tmp53_; #line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane); #line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -8686,123 +8693,118 @@ static void publishing_piwigo_publishing_options_pane_real_constructed (GObject* gtk_text_buffer_set_text (_tmp52_, _tmp53_, -1); #line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_object_unref0 (builder); -#line 8676 "PiwigoPublishing.c" +#line 8683 "PiwigoPublishing.c" } -static void _vala_array_add36 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) { +static void _vala_array_add36 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) { #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if ((*length) == (*size)) { #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1); -#line 8687 "PiwigoPublishing.c" +#line 8694 "PiwigoPublishing.c" } #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*array)[(*length)++] = value; #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*array)[*length] = NULL; -#line 8693 "PiwigoPublishing.c" +#line 8700 "PiwigoPublishing.c" } -static void _vala_array_add37 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) { +static void _vala_array_add37 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) { #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if ((*length) == (*size)) { #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1); -#line 8704 "PiwigoPublishing.c" +#line 8711 "PiwigoPublishing.c" } #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*array)[(*length)++] = value; #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*array)[*length] = NULL; -#line 8710 "PiwigoPublishing.c" +#line 8717 "PiwigoPublishing.c" } -static void _vala_array_add38 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) { +static void _vala_array_add38 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) { #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if ((*length) == (*size)) { #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1); -#line 8721 "PiwigoPublishing.c" +#line 8728 "PiwigoPublishing.c" } #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*array)[(*length)++] = value; #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*array)[*length] = NULL; -#line 8727 "PiwigoPublishing.c" +#line 8734 "PiwigoPublishing.c" } -static void _vala_array_add39 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) { +static void _vala_array_add39 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) { #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if ((*length) == (*size)) { #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1); -#line 8738 "PiwigoPublishing.c" +#line 8745 "PiwigoPublishing.c" } #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*array)[(*length)++] = value; #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*array)[*length] = NULL; -#line 8744 "PiwigoPublishing.c" +#line 8751 "PiwigoPublishing.c" } -static void _vala_array_add40 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) { +static void _vala_array_add40 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) { #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if ((*length) == (*size)) { #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1); -#line 8755 "PiwigoPublishing.c" +#line 8762 "PiwigoPublishing.c" } #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*array)[(*length)++] = value; #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*array)[*length] = NULL; -#line 8761 "PiwigoPublishing.c" +#line 8768 "PiwigoPublishing.c" } static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pane_create_perm_levels (PublishingPiwigoPublishingOptionsPane* self, int* result_length1) { PublishingPiwigoPermissionLevel** result = NULL; PublishingPiwigoPermissionLevel** _result_ = NULL; - PublishingPiwigoPermissionLevel** _tmp0_ = NULL; - gint _result__length1 = 0; - gint __result__size_ = 0; - PublishingPiwigoPermissionLevel** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - const gchar* _tmp2_ = NULL; - PublishingPiwigoPermissionLevel* _tmp3_ = NULL; - PublishingPiwigoPermissionLevel** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - const gchar* _tmp5_ = NULL; - PublishingPiwigoPermissionLevel* _tmp6_ = NULL; - PublishingPiwigoPermissionLevel** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - const gchar* _tmp8_ = NULL; - PublishingPiwigoPermissionLevel* _tmp9_ = NULL; - PublishingPiwigoPermissionLevel** _tmp10_ = NULL; - gint _tmp10__length1 = 0; - const gchar* _tmp11_ = NULL; - PublishingPiwigoPermissionLevel* _tmp12_ = NULL; - PublishingPiwigoPermissionLevel** _tmp13_ = NULL; - gint _tmp13__length1 = 0; - const gchar* _tmp14_ = NULL; - PublishingPiwigoPermissionLevel* _tmp15_ = NULL; - PublishingPiwigoPermissionLevel** _tmp16_ = NULL; - gint _tmp16__length1 = 0; + PublishingPiwigoPermissionLevel** _tmp0_; + gint _result__length1; + gint __result__size_; + PublishingPiwigoPermissionLevel** _tmp1_; + gint _tmp1__length1; + PublishingPiwigoPermissionLevel* _tmp2_; + PublishingPiwigoPermissionLevel** _tmp3_; + gint _tmp3__length1; + PublishingPiwigoPermissionLevel* _tmp4_; + PublishingPiwigoPermissionLevel** _tmp5_; + gint _tmp5__length1; + PublishingPiwigoPermissionLevel* _tmp6_; + PublishingPiwigoPermissionLevel** _tmp7_; + gint _tmp7__length1; + PublishingPiwigoPermissionLevel* _tmp8_; + PublishingPiwigoPermissionLevel** _tmp9_; + gint _tmp9__length1; + PublishingPiwigoPermissionLevel* _tmp10_; + PublishingPiwigoPermissionLevel** _tmp11_; + gint _tmp11__length1; #line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL); #line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -8818,182 +8820,167 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1__length1 = _result__length1; #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp2_ = _ ("Everyone"); -#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp3_ = publishing_piwigo_permission_level_new (0, _tmp2_); + _tmp2_ = publishing_piwigo_permission_level_new (0, _ ("Everyone")); #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _vala_array_add36 (&_result_, &_result__length1, &__result__size_, _tmp3_); + _vala_array_add36 (&_result_, &_result__length1, &__result__size_, _tmp2_); #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp4_ = _result_; + _tmp3_ = _result_; #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp4__length1 = _result__length1; + _tmp3__length1 = _result__length1; #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp5_ = _ ("Admins, Family, Friends, Contacts"); + _tmp4_ = publishing_piwigo_permission_level_new (1, _ ("Admins, Family, Friends, Contacts")); #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp6_ = publishing_piwigo_permission_level_new (1, _tmp5_); -#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _vala_array_add37 (&_result_, &_result__length1, &__result__size_, _tmp6_); -#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp7_ = _result_; + _vala_array_add37 (&_result_, &_result__length1, &__result__size_, _tmp4_); #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp7__length1 = _result__length1; + _tmp5_ = _result_; #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp8_ = _ ("Admins, Family, Friends"); + _tmp5__length1 = _result__length1; #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp9_ = publishing_piwigo_permission_level_new (2, _tmp8_); + _tmp6_ = publishing_piwigo_permission_level_new (2, _ ("Admins, Family, Friends")); #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _vala_array_add38 (&_result_, &_result__length1, &__result__size_, _tmp9_); -#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp10_ = _result_; + _vala_array_add38 (&_result_, &_result__length1, &__result__size_, _tmp6_); #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp10__length1 = _result__length1; + _tmp7_ = _result_; #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp11_ = _ ("Admins, Family"); + _tmp7__length1 = _result__length1; #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp12_ = publishing_piwigo_permission_level_new (4, _tmp11_); + _tmp8_ = publishing_piwigo_permission_level_new (4, _ ("Admins, Family")); #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _vala_array_add39 (&_result_, &_result__length1, &__result__size_, _tmp12_); + _vala_array_add39 (&_result_, &_result__length1, &__result__size_, _tmp8_); #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp13_ = _result_; + _tmp9_ = _result_; #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp13__length1 = _result__length1; + _tmp9__length1 = _result__length1; #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp14_ = _ ("Admins"); + _tmp10_ = publishing_piwigo_permission_level_new (8, _ ("Admins")); #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp15_ = publishing_piwigo_permission_level_new (8, _tmp14_); -#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _vala_array_add40 (&_result_, &_result__length1, &__result__size_, _tmp15_); + _vala_array_add40 (&_result_, &_result__length1, &__result__size_, _tmp10_); #line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp16_ = _result_; + _tmp11_ = _result_; #line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp16__length1 = _result__length1; + _tmp11__length1 = _result__length1; #line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (result_length1) { #line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - *result_length1 = _tmp16__length1; -#line 8861 "PiwigoPublishing.c" + *result_length1 = _tmp11__length1; +#line 8853 "PiwigoPublishing.c" } #line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - result = _tmp16_; + result = _tmp11_; #line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 8867 "PiwigoPublishing.c" +#line 8859 "PiwigoPublishing.c" } -static void _vala_array_add41 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) { +static void _vala_array_add41 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) { #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if ((*length) == (*size)) { #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1); -#line 8878 "PiwigoPublishing.c" +#line 8870 "PiwigoPublishing.c" } #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*array)[(*length)++] = value; #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*array)[*length] = NULL; -#line 8884 "PiwigoPublishing.c" +#line 8876 "PiwigoPublishing.c" } -static void _vala_array_add42 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) { +static void _vala_array_add42 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) { #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if ((*length) == (*size)) { #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1); -#line 8895 "PiwigoPublishing.c" +#line 8887 "PiwigoPublishing.c" } #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*array)[(*length)++] = value; #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*array)[*length] = NULL; -#line 8901 "PiwigoPublishing.c" +#line 8893 "PiwigoPublishing.c" } -static void _vala_array_add43 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) { +static void _vala_array_add43 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) { #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if ((*length) == (*size)) { #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1); -#line 8912 "PiwigoPublishing.c" +#line 8904 "PiwigoPublishing.c" } #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*array)[(*length)++] = value; #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*array)[*length] = NULL; -#line 8918 "PiwigoPublishing.c" +#line 8910 "PiwigoPublishing.c" } -static void _vala_array_add44 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) { +static void _vala_array_add44 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) { #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if ((*length) == (*size)) { #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1); -#line 8929 "PiwigoPublishing.c" +#line 8921 "PiwigoPublishing.c" } #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*array)[(*length)++] = value; #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*array)[*length] = NULL; -#line 8935 "PiwigoPublishing.c" +#line 8927 "PiwigoPublishing.c" } -static void _vala_array_add45 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) { +static void _vala_array_add45 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) { #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if ((*length) == (*size)) { #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" *array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1); -#line 8946 "PiwigoPublishing.c" +#line 8938 "PiwigoPublishing.c" } #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*array)[(*length)++] = value; #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" (*array)[*length] = NULL; -#line 8952 "PiwigoPublishing.c" +#line 8944 "PiwigoPublishing.c" } static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_create_sizes (PublishingPiwigoPublishingOptionsPane* self, int* result_length1) { PublishingPiwigoSizeEntry** result = NULL; PublishingPiwigoSizeEntry** _result_ = NULL; - PublishingPiwigoSizeEntry** _tmp0_ = NULL; - gint _result__length1 = 0; - gint __result__size_ = 0; - PublishingPiwigoSizeEntry** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - const gchar* _tmp2_ = NULL; - PublishingPiwigoSizeEntry* _tmp3_ = NULL; - PublishingPiwigoSizeEntry** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - const gchar* _tmp5_ = NULL; - PublishingPiwigoSizeEntry* _tmp6_ = NULL; - PublishingPiwigoSizeEntry** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - const gchar* _tmp8_ = NULL; - PublishingPiwigoSizeEntry* _tmp9_ = NULL; - PublishingPiwigoSizeEntry** _tmp10_ = NULL; - gint _tmp10__length1 = 0; - const gchar* _tmp11_ = NULL; - PublishingPiwigoSizeEntry* _tmp12_ = NULL; - PublishingPiwigoSizeEntry** _tmp13_ = NULL; - gint _tmp13__length1 = 0; - const gchar* _tmp14_ = NULL; - PublishingPiwigoSizeEntry* _tmp15_ = NULL; - PublishingPiwigoSizeEntry** _tmp16_ = NULL; - gint _tmp16__length1 = 0; + PublishingPiwigoSizeEntry** _tmp0_; + gint _result__length1; + gint __result__size_; + PublishingPiwigoSizeEntry** _tmp1_; + gint _tmp1__length1; + PublishingPiwigoSizeEntry* _tmp2_; + PublishingPiwigoSizeEntry** _tmp3_; + gint _tmp3__length1; + PublishingPiwigoSizeEntry* _tmp4_; + PublishingPiwigoSizeEntry** _tmp5_; + gint _tmp5__length1; + PublishingPiwigoSizeEntry* _tmp6_; + PublishingPiwigoSizeEntry** _tmp7_; + gint _tmp7__length1; + PublishingPiwigoSizeEntry* _tmp8_; + PublishingPiwigoSizeEntry** _tmp9_; + gint _tmp9__length1; + PublishingPiwigoSizeEntry* _tmp10_; + PublishingPiwigoSizeEntry** _tmp11_; + gint _tmp11__length1; #line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL); #line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -9009,66 +8996,56 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1__length1 = _result__length1; #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp2_ = _ ("500 × 375 pixels"); -#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp3_ = publishing_piwigo_size_entry_new (500, _tmp2_); + _tmp2_ = publishing_piwigo_size_entry_new (500, _ ("500 × 375 pixels")); #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _vala_array_add41 (&_result_, &_result__length1, &__result__size_, _tmp3_); + _vala_array_add41 (&_result_, &_result__length1, &__result__size_, _tmp2_); #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp4_ = _result_; + _tmp3_ = _result_; #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp4__length1 = _result__length1; + _tmp3__length1 = _result__length1; #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp5_ = _ ("1024 × 768 pixels"); + _tmp4_ = publishing_piwigo_size_entry_new (1024, _ ("1024 × 768 pixels")); #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp6_ = publishing_piwigo_size_entry_new (1024, _tmp5_); -#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _vala_array_add42 (&_result_, &_result__length1, &__result__size_, _tmp6_); -#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp7_ = _result_; + _vala_array_add42 (&_result_, &_result__length1, &__result__size_, _tmp4_); #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp7__length1 = _result__length1; + _tmp5_ = _result_; #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp8_ = _ ("2048 × 1536 pixels"); + _tmp5__length1 = _result__length1; #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp9_ = publishing_piwigo_size_entry_new (2048, _tmp8_); + _tmp6_ = publishing_piwigo_size_entry_new (2048, _ ("2048 × 1536 pixels")); #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _vala_array_add43 (&_result_, &_result__length1, &__result__size_, _tmp9_); -#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp10_ = _result_; + _vala_array_add43 (&_result_, &_result__length1, &__result__size_, _tmp6_); #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp10__length1 = _result__length1; + _tmp7_ = _result_; #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp11_ = _ ("4096 × 3072 pixels"); + _tmp7__length1 = _result__length1; #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp12_ = publishing_piwigo_size_entry_new (4096, _tmp11_); + _tmp8_ = publishing_piwigo_size_entry_new (4096, _ ("4096 × 3072 pixels")); #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _vala_array_add44 (&_result_, &_result__length1, &__result__size_, _tmp12_); + _vala_array_add44 (&_result_, &_result__length1, &__result__size_, _tmp8_); #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp13_ = _result_; + _tmp9_ = _result_; #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp13__length1 = _result__length1; + _tmp9__length1 = _result__length1; #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp14_ = _ ("Original size"); + _tmp10_ = publishing_piwigo_size_entry_new (PUBLISHING_PIWIGO_ORIGINAL_SIZE, _ ("Original size")); #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp15_ = publishing_piwigo_size_entry_new (PUBLISHING_PIWIGO_ORIGINAL_SIZE, _tmp14_); -#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _vala_array_add45 (&_result_, &_result__length1, &__result__size_, _tmp15_); + _vala_array_add45 (&_result_, &_result__length1, &__result__size_, _tmp10_); #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp16_ = _result_; + _tmp11_ = _result_; #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp16__length1 = _result__length1; + _tmp11__length1 = _result__length1; #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (result_length1) { #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - *result_length1 = _tmp16__length1; -#line 9052 "PiwigoPublishing.c" + *result_length1 = _tmp11__length1; +#line 9029 "PiwigoPublishing.c" } #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - result = _tmp16_; + result = _tmp11_; #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 9058 "PiwigoPublishing.c" +#line 9035 "PiwigoPublishing.c" } @@ -9076,53 +9053,53 @@ static void publishing_piwigo_publishing_options_pane_on_logout_button_clicked ( #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_signal_emit_by_name (self, "logout"); -#line 9067 "PiwigoPublishing.c" + g_signal_emit (self, publishing_piwigo_publishing_options_pane_signals[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0); +#line 9044 "PiwigoPublishing.c" } static gpointer _publishing_piwigo_permission_level_ref0 (gpointer self) { #line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self ? publishing_piwigo_permission_level_ref (self) : NULL; -#line 9074 "PiwigoPublishing.c" +#line 9051 "PiwigoPublishing.c" } static gpointer _publishing_piwigo_size_entry_ref0 (gpointer self) { #line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self ? publishing_piwigo_size_entry_ref (self) : NULL; -#line 9081 "PiwigoPublishing.c" +#line 9058 "PiwigoPublishing.c" } static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked (PublishingPiwigoPublishingOptionsPane* self) { PublishingPiwigoPublishingParameters* params = NULL; - PublishingPiwigoPublishingParameters* _tmp0_ = NULL; - PublishingPiwigoPublishingParameters* _tmp1_ = NULL; - PublishingPiwigoPermissionLevel** _tmp2_ = NULL; - gint _tmp2__length1 = 0; - GtkComboBoxText* _tmp3_ = NULL; - gint _tmp4_ = 0; - PublishingPiwigoPermissionLevel* _tmp5_ = NULL; - PublishingPiwigoPermissionLevel* _tmp6_ = NULL; - PublishingPiwigoPublishingParameters* _tmp7_ = NULL; - PublishingPiwigoSizeEntry** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - GtkComboBoxText* _tmp9_ = NULL; - gint _tmp10_ = 0; - PublishingPiwigoSizeEntry* _tmp11_ = NULL; - PublishingPiwigoSizeEntry* _tmp12_ = NULL; - PublishingPiwigoPublishingParameters* _tmp13_ = NULL; - GtkCheckButton* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; - PublishingPiwigoPublishingParameters* _tmp16_ = NULL; - GtkCheckButton* _tmp17_ = NULL; - gboolean _tmp18_ = FALSE; - GtkRadioButton* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; - PublishingPiwigoPublishingParameters* _tmp53_ = NULL; - GtkCheckButton* _tmp54_ = NULL; - gboolean _tmp55_ = FALSE; + PublishingPiwigoPublishingParameters* _tmp0_; + PublishingPiwigoPublishingParameters* _tmp1_; + PublishingPiwigoPermissionLevel** _tmp2_; + gint _tmp2__length1; + GtkComboBoxText* _tmp3_; + gint _tmp4_; + PublishingPiwigoPermissionLevel* _tmp5_; + PublishingPiwigoPermissionLevel* _tmp6_; + PublishingPiwigoPublishingParameters* _tmp7_; + PublishingPiwigoSizeEntry** _tmp8_; + gint _tmp8__length1; + GtkComboBoxText* _tmp9_; + gint _tmp10_; + PublishingPiwigoSizeEntry* _tmp11_; + PublishingPiwigoSizeEntry* _tmp12_; + PublishingPiwigoPublishingParameters* _tmp13_; + GtkCheckButton* _tmp14_; + gboolean _tmp15_; + PublishingPiwigoPublishingParameters* _tmp16_; + GtkCheckButton* _tmp17_; + gboolean _tmp18_; + GtkRadioButton* _tmp19_; + gboolean _tmp20_; + PublishingPiwigoPublishingParameters* _tmp53_; + GtkCheckButton* _tmp54_; + gboolean _tmp55_; #line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -9187,20 +9164,20 @@ static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked _tmp20_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp20_) { -#line 9177 "PiwigoPublishing.c" +#line 9154 "PiwigoPublishing.c" gchar* uploadcomment = NULL; - GtkTextView* _tmp21_ = NULL; - GtkTextBuffer* _tmp22_ = NULL; - GtkTextBuffer* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; + GtkTextView* _tmp21_; + GtkTextBuffer* _tmp22_; + GtkTextBuffer* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; gint a = 0; - GtkComboBoxText* _tmp29_ = NULL; - gint _tmp30_ = 0; - gint _tmp31_ = 0; + GtkComboBoxText* _tmp29_; + gint _tmp30_; + gint _tmp31_; #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp21_ = self->priv->album_comment; #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -9231,12 +9208,12 @@ static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked _tmp31_ = a; #line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp31_ == 0) { -#line 9221 "PiwigoPublishing.c" - PublishingPiwigoPublishingParameters* _tmp32_ = NULL; - GtkEntry* _tmp33_ = NULL; - const gchar* _tmp34_ = NULL; - const gchar* _tmp35_ = NULL; - PublishingPiwigoCategory* _tmp36_ = NULL; +#line 9198 "PiwigoPublishing.c" + PublishingPiwigoPublishingParameters* _tmp32_; + GtkEntry* _tmp33_; + const gchar* _tmp34_; + const gchar* _tmp35_; + PublishingPiwigoCategory* _tmp36_; #line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp32_ = params; #line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -9251,19 +9228,19 @@ static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked _publishing_piwigo_category_unref0 (_tmp32_->category); #line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp32_->category = _tmp36_; -#line 9241 "PiwigoPublishing.c" +#line 9218 "PiwigoPublishing.c" } else { - gint _tmp37_ = 0; - PublishingPiwigoPublishingParameters* _tmp38_ = NULL; - GtkEntry* _tmp39_ = NULL; - const gchar* _tmp40_ = NULL; - GeeList* _tmp41_ = NULL; - gint _tmp42_ = 0; - gpointer _tmp43_ = NULL; - PublishingPiwigoCategory* _tmp44_ = NULL; - gint _tmp45_ = 0; - const gchar* _tmp46_ = NULL; - PublishingPiwigoCategory* _tmp47_ = NULL; + gint _tmp37_; + PublishingPiwigoPublishingParameters* _tmp38_; + GtkEntry* _tmp39_; + const gchar* _tmp40_; + GeeList* _tmp41_; + gint _tmp42_; + gpointer _tmp43_; + PublishingPiwigoCategory* _tmp44_; + gint _tmp45_; + const gchar* _tmp46_; + PublishingPiwigoCategory* _tmp47_; #line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp37_ = a; #line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -9294,17 +9271,17 @@ static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked _tmp38_->category = _tmp47_; #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_piwigo_category_unref0 (_tmp44_); -#line 9284 "PiwigoPublishing.c" +#line 9261 "PiwigoPublishing.c" } #line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (uploadcomment); -#line 9288 "PiwigoPublishing.c" +#line 9265 "PiwigoPublishing.c" } else { - PublishingPiwigoPublishingParameters* _tmp48_ = NULL; - GeeList* _tmp49_ = NULL; - GtkComboBoxText* _tmp50_ = NULL; - gint _tmp51_ = 0; - gpointer _tmp52_ = NULL; + PublishingPiwigoPublishingParameters* _tmp48_; + GeeList* _tmp49_; + GtkComboBoxText* _tmp50_; + gint _tmp51_; + gpointer _tmp52_; #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp48_ = params; #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -9319,7 +9296,7 @@ static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked _publishing_piwigo_category_unref0 (_tmp48_->category); #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp48_->category = (PublishingPiwigoCategory*) _tmp52_; -#line 9309 "PiwigoPublishing.c" +#line 9286 "PiwigoPublishing.c" } #line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp53_ = params; @@ -9328,21 +9305,21 @@ static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked #line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp55_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_signal_emit_by_name (self, "publish", _tmp53_, _tmp55_); + g_signal_emit (self, publishing_piwigo_publishing_options_pane_signals[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp53_, _tmp55_); #line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_piwigo_publishing_parameters_unref0 (params); -#line 9321 "PiwigoPublishing.c" +#line 9298 "PiwigoPublishing.c" } static void publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked (PublishingPiwigoPublishingOptionsPane* self) { - GtkComboBoxText* _tmp0_ = NULL; - GtkEntry* _tmp1_ = NULL; - GtkLabel* _tmp2_ = NULL; - GtkComboBoxText* _tmp3_ = NULL; - GtkComboBoxText* _tmp4_ = NULL; - GtkLabel* _tmp5_ = NULL; - GtkTextView* _tmp6_ = NULL; + GtkComboBoxText* _tmp0_; + GtkEntry* _tmp1_; + GtkLabel* _tmp2_; + GtkComboBoxText* _tmp3_; + GtkComboBoxText* _tmp4_; + GtkLabel* _tmp5_; + GtkTextView* _tmp6_; #line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -9375,18 +9352,18 @@ static void publishing_piwigo_publishing_options_pane_on_use_existing_radio_clic gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE); #line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self); -#line 9365 "PiwigoPublishing.c" +#line 9342 "PiwigoPublishing.c" } static void publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked (PublishingPiwigoPublishingOptionsPane* self) { - GtkEntry* _tmp0_ = NULL; - GtkLabel* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - GtkLabel* _tmp3_ = NULL; - GtkTextView* _tmp4_ = NULL; - GtkComboBoxText* _tmp5_ = NULL; - GtkEntry* _tmp6_ = NULL; + GtkEntry* _tmp0_; + GtkLabel* _tmp1_; + GtkComboBoxText* _tmp2_; + GtkLabel* _tmp3_; + GtkTextView* _tmp4_; + GtkComboBoxText* _tmp5_; + GtkEntry* _tmp6_; #line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -9419,7 +9396,7 @@ static void publishing_piwigo_publishing_options_pane_on_create_new_radio_clicke gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget)); #line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self); -#line 9409 "PiwigoPublishing.c" +#line 9386 "PiwigoPublishing.c" } @@ -9428,7 +9405,7 @@ static void publishing_piwigo_publishing_options_pane_on_new_category_entry_chan g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self); -#line 9418 "PiwigoPublishing.c" +#line 9395 "PiwigoPublishing.c" } @@ -9437,24 +9414,24 @@ static void publishing_piwigo_publishing_options_pane_on_existing_combo_changed g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self); -#line 9427 "PiwigoPublishing.c" +#line 9404 "PiwigoPublishing.c" } static void publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (PublishingPiwigoPublishingOptionsPane* self) { gchar* category_name = NULL; - GtkEntry* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + GtkEntry* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; gint a = 0; - GtkComboBoxText* _tmp3_ = NULL; - gint _tmp4_ = 0; + GtkComboBoxText* _tmp3_; + gint _tmp4_; gchar* search_name = NULL; - gint _tmp5_ = 0; + gint _tmp5_; gboolean _tmp18_ = FALSE; - GtkRadioButton* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; - GtkButton* _tmp25_ = NULL; + GtkRadioButton* _tmp19_; + gboolean _tmp20_; + GtkButton* _tmp25_; #line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -9475,9 +9452,9 @@ static void publishing_piwigo_publishing_options_pane_update_publish_button_sens _tmp5_ = a; #line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp5_ <= 0) { -#line 9465 "PiwigoPublishing.c" - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; +#line 9442 "PiwigoPublishing.c" + const gchar* _tmp6_; + gchar* _tmp7_; #line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = category_name; #line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -9486,18 +9463,18 @@ static void publishing_piwigo_publishing_options_pane_update_publish_button_sens _g_free0 (search_name); #line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" search_name = _tmp7_; -#line 9476 "PiwigoPublishing.c" +#line 9453 "PiwigoPublishing.c" } else { - gint _tmp8_ = 0; - GeeList* _tmp9_ = NULL; - gint _tmp10_ = 0; - gpointer _tmp11_ = NULL; - PublishingPiwigoCategory* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; + gint _tmp8_; + GeeList* _tmp9_; + gint _tmp10_; + gpointer _tmp11_; + PublishingPiwigoCategory* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; #line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = a; #line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -9528,7 +9505,7 @@ static void publishing_piwigo_publishing_options_pane_update_publish_button_sens _g_free0 (_tmp15_); #line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_piwigo_category_unref0 (_tmp12_); -#line 9518 "PiwigoPublishing.c" +#line 9495 "PiwigoPublishing.c" } #line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp19_ = self->priv->create_new_radio; @@ -9536,34 +9513,34 @@ static void publishing_piwigo_publishing_options_pane_update_publish_button_sens _tmp20_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp20_) { -#line 9526 "PiwigoPublishing.c" +#line 9503 "PiwigoPublishing.c" gboolean _tmp21_ = FALSE; - const gchar* _tmp22_ = NULL; + const gchar* _tmp22_; #line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp22_ = category_name; #line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (g_strcmp0 (_tmp22_, "") == 0) { #line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp21_ = TRUE; -#line 9535 "PiwigoPublishing.c" +#line 9512 "PiwigoPublishing.c" } else { - const gchar* _tmp23_ = NULL; - gboolean _tmp24_ = FALSE; + const gchar* _tmp23_; + gboolean _tmp24_; #line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp23_ = search_name; #line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp24_ = publishing_piwigo_publishing_options_pane_category_already_exists (self, _tmp23_); #line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp21_ = _tmp24_; -#line 9545 "PiwigoPublishing.c" +#line 9522 "PiwigoPublishing.c" } #line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp18_ = _tmp21_; -#line 9549 "PiwigoPublishing.c" +#line 9526 "PiwigoPublishing.c" } else { #line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp18_ = FALSE; -#line 9553 "PiwigoPublishing.c" +#line 9530 "PiwigoPublishing.c" } #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp25_ = self->priv->publish_button; @@ -9573,13 +9550,13 @@ static void publishing_piwigo_publishing_options_pane_update_publish_button_sens _g_free0 (search_name); #line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (category_name); -#line 9563 "PiwigoPublishing.c" +#line 9540 "PiwigoPublishing.c" } static void publishing_piwigo_publishing_options_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base) { PublishingPiwigoPublishingOptionsPane * self; - GtkButton* _tmp0_ = NULL; + GtkButton* _tmp0_; #line 1391 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane); #line 1392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -9598,28 +9575,28 @@ static void publishing_piwigo_publishing_options_pane_real_on_pane_installed (Sh gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE); #line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self); -#line 9588 "PiwigoPublishing.c" +#line 9565 "PiwigoPublishing.c" } static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (PublishingPiwigoPiwigoPublisher* publisher) { gchar* result = NULL; SpitPublishingPublishable** publishables = NULL; - PublishingPiwigoPiwigoPublisher* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; - SpitPublishingPluginHost* _tmp2_ = NULL; - gint _tmp3_ = 0; - SpitPublishingPublishable** _tmp4_ = NULL; - SpitPublishingPublishable** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - gint publishables_length1 = 0; - gint _publishables_size_ = 0; + PublishingPiwigoPiwigoPublisher* _tmp0_; + SpitPublishingPluginHost* _tmp1_; + SpitPublishingPluginHost* _tmp2_; + gint _tmp3_; + SpitPublishingPublishable** _tmp4_; + SpitPublishingPublishable** _tmp5_; + gint _tmp5__length1; + gint publishables_length1; + gint _publishables_size_; gchar* common = NULL; - gchar* _tmp6_ = NULL; + gchar* _tmp6_; gboolean isfirst = FALSE; - SpitPublishingPublishable** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - const gchar* _tmp19_ = NULL; + SpitPublishingPublishable** _tmp7_; + gint _tmp7__length1; + const gchar* _tmp19_; #line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL); #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -9654,14 +9631,14 @@ static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_po _tmp7__length1 = publishables_length1; #line 1409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp7_ != NULL) { -#line 9644 "PiwigoPublishing.c" - SpitPublishingPublishable** _tmp8_ = NULL; - gint _tmp8__length1 = 0; +#line 9621 "PiwigoPublishing.c" + SpitPublishingPublishable** _tmp8_; + gint _tmp8__length1; #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = publishables; #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8__length1 = publishables_length1; -#line 9651 "PiwigoPublishing.c" +#line 9628 "PiwigoPublishing.c" { SpitPublishingPublishable** pub_collection = NULL; gint pub_collection_length1 = 0; @@ -9673,20 +9650,20 @@ static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_po pub_collection_length1 = _tmp8__length1; #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" for (pub_it = 0; pub_it < _tmp8__length1; pub_it = pub_it + 1) { -#line 9663 "PiwigoPublishing.c" - SpitPublishingPublishable* _tmp9_ = NULL; +#line 9640 "PiwigoPublishing.c" + SpitPublishingPublishable* _tmp9_; SpitPublishingPublishable* pub = NULL; #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp9_ = _g_object_ref0 (pub_collection[pub_it]); #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" pub = _tmp9_; -#line 9670 "PiwigoPublishing.c" +#line 9647 "PiwigoPublishing.c" { gchar* cur = NULL; - SpitPublishingPublishable* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; + SpitPublishingPublishable* _tmp10_; + gchar* _tmp11_; + const gchar* _tmp12_; + gboolean _tmp13_; #line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp10_ = pub; #line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -9703,15 +9680,15 @@ static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_po _g_object_unref0 (pub); #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" continue; -#line 9693 "PiwigoPublishing.c" +#line 9670 "PiwigoPublishing.c" } #line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp13_ = isfirst; #line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp13_) { -#line 9699 "PiwigoPublishing.c" - const gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; +#line 9676 "PiwigoPublishing.c" + const gchar* _tmp14_; + gchar* _tmp15_; #line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp14_ = cur; #line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -9722,18 +9699,18 @@ static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_po common = _tmp15_; #line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" isfirst = FALSE; -#line 9712 "PiwigoPublishing.c" +#line 9689 "PiwigoPublishing.c" } else { - const gchar* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; + const gchar* _tmp16_; + const gchar* _tmp17_; #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp16_ = cur; #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp17_ = common; #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (g_strcmp0 (_tmp16_, _tmp17_) != 0) { -#line 9722 "PiwigoPublishing.c" - gchar* _tmp18_ = NULL; +#line 9699 "PiwigoPublishing.c" + gchar* _tmp18_; #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp18_ = g_strdup (""); #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -9746,14 +9723,14 @@ static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_po _g_object_unref0 (pub); #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 9736 "PiwigoPublishing.c" +#line 9713 "PiwigoPublishing.c" } } #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (cur); #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_object_unref0 (pub); -#line 9743 "PiwigoPublishing.c" +#line 9720 "PiwigoPublishing.c" } } } @@ -9769,27 +9746,27 @@ static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_po publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL); #line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 9758 "PiwigoPublishing.c" +#line 9735 "PiwigoPublishing.c" } static void publishing_piwigo_publishing_options_pane_create_categories_combo (PublishingPiwigoPublishingOptionsPane* self) { - GeeList* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; - gboolean _tmp16_ = FALSE; - const gchar* _tmp30_ = NULL; - gboolean _tmp31_ = FALSE; + GeeList* _tmp14_; + gboolean _tmp15_; + gboolean _tmp16_; + const gchar* _tmp30_; + gboolean _tmp31_; #line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 9770 "PiwigoPublishing.c" +#line 9747 "PiwigoPublishing.c" { GeeList* _cat_list = NULL; - GeeList* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; + GeeList* _tmp0_; + GeeList* _tmp1_; gint _cat_size = 0; - GeeList* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + GeeList* _tmp2_; + gint _tmp3_; + gint _tmp4_; gint _cat_index = 0; #line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = self->priv->_existing_categories; @@ -9809,17 +9786,17 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P _cat_index = -1; #line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" while (TRUE) { -#line 9798 "PiwigoPublishing.c" - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gint _tmp7_ = 0; +#line 9775 "PiwigoPublishing.c" + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; PublishingPiwigoCategory* cat = NULL; - GeeList* _tmp8_ = NULL; - gint _tmp9_ = 0; - gpointer _tmp10_ = NULL; - GtkComboBoxText* _tmp11_ = NULL; - PublishingPiwigoCategory* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; + GeeList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; + GtkComboBoxText* _tmp11_; + PublishingPiwigoCategory* _tmp12_; + const gchar* _tmp13_; #line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = _cat_index; #line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -9832,7 +9809,7 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P if (!(_tmp6_ < _tmp7_)) { #line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 9821 "PiwigoPublishing.c" +#line 9798 "PiwigoPublishing.c" } #line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = _cat_list; @@ -9852,11 +9829,11 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P gtk_combo_box_text_append_text (_tmp11_, _tmp13_); #line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_piwigo_category_unref0 (cat); -#line 9841 "PiwigoPublishing.c" +#line 9818 "PiwigoPublishing.c" } #line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_object_unref0 (_cat_list); -#line 9845 "PiwigoPublishing.c" +#line 9822 "PiwigoPublishing.c" } #line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp14_ = self->priv->_existing_categories; @@ -9866,13 +9843,13 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P _tmp16_ = _tmp15_; #line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp16_) { -#line 9855 "PiwigoPublishing.c" - GtkComboBoxText* _tmp17_ = NULL; - GtkRadioButton* _tmp18_ = NULL; - GtkRadioButton* _tmp19_ = NULL; - GtkTextView* _tmp20_ = NULL; - GtkLabel* _tmp21_ = NULL; - GtkEntry* _tmp22_ = NULL; +#line 9832 "PiwigoPublishing.c" + GtkComboBoxText* _tmp17_; + GtkRadioButton* _tmp18_; + GtkRadioButton* _tmp19_; + GtkTextView* _tmp20_; + GtkLabel* _tmp21_; + GtkEntry* _tmp22_; #line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp17_ = self->priv->existing_categories_combo; #line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -9897,16 +9874,16 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P _tmp22_ = self->priv->new_category_entry; #line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget)); -#line 9886 "PiwigoPublishing.c" +#line 9863 "PiwigoPublishing.c" } else { gint last_category_index = 0; - gint _tmp23_ = 0; - gint _tmp24_ = 0; - GtkComboBoxText* _tmp25_ = NULL; - gint _tmp26_ = 0; - GtkEntry* _tmp27_ = NULL; - GtkTextView* _tmp28_ = NULL; - GtkLabel* _tmp29_ = NULL; + gint _tmp23_; + gint _tmp24_; + GtkComboBoxText* _tmp25_; + gint _tmp26_; + GtkEntry* _tmp27_; + GtkTextView* _tmp28_; + GtkLabel* _tmp29_; #line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp23_ = self->priv->_last_category; #line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -9931,7 +9908,7 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P _tmp29_ = self->priv->album_comment_label; #line 1449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 9920 "PiwigoPublishing.c" +#line 9897 "PiwigoPublishing.c" } #line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp30_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME; @@ -9939,40 +9916,40 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P _tmp31_ = publishing_piwigo_publishing_options_pane_category_already_exists (self, _tmp30_); #line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!_tmp31_) { -#line 9928 "PiwigoPublishing.c" - GtkEntry* _tmp32_ = NULL; - const gchar* _tmp33_ = NULL; +#line 9905 "PiwigoPublishing.c" + GtkEntry* _tmp32_; + const gchar* _tmp33_; #line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp32_ = self->priv->new_category_entry; #line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp33_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME; #line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_entry_set_text (_tmp32_, _tmp33_); -#line 9937 "PiwigoPublishing.c" +#line 9914 "PiwigoPublishing.c" } } static void publishing_piwigo_publishing_options_pane_create_within_categories_combo (PublishingPiwigoPublishingOptionsPane* self) { - GtkComboBoxText* _tmp0_ = NULL; - GtkLabel* _tmp15_ = NULL; - GtkComboBoxText* _tmp16_ = NULL; - GtkComboBoxText* _tmp17_ = NULL; + GtkComboBoxText* _tmp0_; + GtkLabel* _tmp15_; + GtkComboBoxText* _tmp16_; + GtkComboBoxText* _tmp17_; #line 1455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = self->priv->within_existing_combo; #line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_combo_box_text_append_text (_tmp0_, "/ "); -#line 9953 "PiwigoPublishing.c" +#line 9930 "PiwigoPublishing.c" { GeeList* _cat_list = NULL; - GeeList* _tmp1_ = NULL; - GeeList* _tmp2_ = NULL; + GeeList* _tmp1_; + GeeList* _tmp2_; gint _cat_size = 0; - GeeList* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; + GeeList* _tmp3_; + gint _tmp4_; + gint _tmp5_; gint _cat_index = 0; #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = self->priv->_existing_categories; @@ -9992,17 +9969,17 @@ static void publishing_piwigo_publishing_options_pane_create_within_categories_c _cat_index = -1; #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" while (TRUE) { -#line 9981 "PiwigoPublishing.c" - gint _tmp6_ = 0; - gint _tmp7_ = 0; - gint _tmp8_ = 0; +#line 9958 "PiwigoPublishing.c" + gint _tmp6_; + gint _tmp7_; + gint _tmp8_; PublishingPiwigoCategory* cat = NULL; - GeeList* _tmp9_ = NULL; - gint _tmp10_ = 0; - gpointer _tmp11_ = NULL; - GtkComboBoxText* _tmp12_ = NULL; - PublishingPiwigoCategory* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; + GeeList* _tmp9_; + gint _tmp10_; + gpointer _tmp11_; + GtkComboBoxText* _tmp12_; + PublishingPiwigoCategory* _tmp13_; + const gchar* _tmp14_; #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = _cat_index; #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -10015,7 +9992,7 @@ static void publishing_piwigo_publishing_options_pane_create_within_categories_c if (!(_tmp7_ < _tmp8_)) { #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 10004 "PiwigoPublishing.c" +#line 9981 "PiwigoPublishing.c" } #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp9_ = _cat_list; @@ -10035,11 +10012,11 @@ static void publishing_piwigo_publishing_options_pane_create_within_categories_c gtk_combo_box_text_append_text (_tmp12_, _tmp14_); #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_piwigo_category_unref0 (cat); -#line 10024 "PiwigoPublishing.c" +#line 10001 "PiwigoPublishing.c" } #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_object_unref0 (_cat_list); -#line 10028 "PiwigoPublishing.c" +#line 10005 "PiwigoPublishing.c" } #line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp15_ = self->priv->within_existing_label; @@ -10053,24 +10030,24 @@ static void publishing_piwigo_publishing_options_pane_create_within_categories_c _tmp17_ = self->priv->within_existing_combo; #line 1464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 10042 "PiwigoPublishing.c" +#line 10019 "PiwigoPublishing.c" } static void publishing_piwigo_publishing_options_pane_create_permissions_combo (PublishingPiwigoPublishingOptionsPane* self) { - PublishingPiwigoPermissionLevel** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + PublishingPiwigoPermissionLevel** _tmp0_; + gint _tmp0__length1; gint last_permission_level_index = 0; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gint _tmp7_ = 0; + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; #line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = self->priv->perm_levels; #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0__length1 = self->priv->perm_levels_length1; -#line 10059 "PiwigoPublishing.c" +#line 10036 "PiwigoPublishing.c" { PublishingPiwigoPermissionLevel** perm_collection = NULL; gint perm_collection_length1 = 0; @@ -10082,18 +10059,18 @@ static void publishing_piwigo_publishing_options_pane_create_permissions_combo ( perm_collection_length1 = _tmp0__length1; #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" for (perm_it = 0; perm_it < _tmp0__length1; perm_it = perm_it + 1) { -#line 10071 "PiwigoPublishing.c" - PublishingPiwigoPermissionLevel* _tmp1_ = NULL; +#line 10048 "PiwigoPublishing.c" + PublishingPiwigoPermissionLevel* _tmp1_; PublishingPiwigoPermissionLevel* perm = NULL; #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = _publishing_piwigo_permission_level_ref0 (perm_collection[perm_it]); #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" perm = _tmp1_; -#line 10078 "PiwigoPublishing.c" +#line 10055 "PiwigoPublishing.c" { - GtkComboBoxText* _tmp2_ = NULL; - PublishingPiwigoPermissionLevel* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; + GtkComboBoxText* _tmp2_; + PublishingPiwigoPermissionLevel* _tmp3_; + const gchar* _tmp4_; #line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp2_ = self->priv->perms_combo; #line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -10104,7 +10081,7 @@ static void publishing_piwigo_publishing_options_pane_create_permissions_combo ( gtk_combo_box_text_append_text (_tmp2_, _tmp4_); #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_piwigo_permission_level_unref0 (perm); -#line 10093 "PiwigoPublishing.c" +#line 10070 "PiwigoPublishing.c" } } } @@ -10118,41 +10095,41 @@ static void publishing_piwigo_publishing_options_pane_create_permissions_combo ( _tmp7_ = last_permission_level_index; #line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp7_ < 0) { -#line 10107 "PiwigoPublishing.c" - GtkComboBoxText* _tmp8_ = NULL; +#line 10084 "PiwigoPublishing.c" + GtkComboBoxText* _tmp8_; #line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = self->priv->perms_combo; #line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), 0); -#line 10113 "PiwigoPublishing.c" +#line 10090 "PiwigoPublishing.c" } else { - GtkComboBoxText* _tmp9_ = NULL; - gint _tmp10_ = 0; + GtkComboBoxText* _tmp9_; + gint _tmp10_; #line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp9_ = self->priv->perms_combo; #line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp10_ = last_permission_level_index; #line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox), _tmp10_); -#line 10123 "PiwigoPublishing.c" +#line 10100 "PiwigoPublishing.c" } } static void publishing_piwigo_publishing_options_pane_create_size_combo (PublishingPiwigoPublishingOptionsPane* self) { - PublishingPiwigoSizeEntry** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + PublishingPiwigoSizeEntry** _tmp0_; + gint _tmp0__length1; gint last_size_index = 0; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gint _tmp7_ = 0; + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; #line 1479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = self->priv->photo_sizes; #line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0__length1 = self->priv->photo_sizes_length1; -#line 10141 "PiwigoPublishing.c" +#line 10118 "PiwigoPublishing.c" { PublishingPiwigoSizeEntry** size_collection = NULL; gint size_collection_length1 = 0; @@ -10164,18 +10141,18 @@ static void publishing_piwigo_publishing_options_pane_create_size_combo (Publish size_collection_length1 = _tmp0__length1; #line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" for (size_it = 0; size_it < _tmp0__length1; size_it = size_it + 1) { -#line 10153 "PiwigoPublishing.c" - PublishingPiwigoSizeEntry* _tmp1_ = NULL; +#line 10130 "PiwigoPublishing.c" + PublishingPiwigoSizeEntry* _tmp1_; PublishingPiwigoSizeEntry* size = NULL; #line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = _publishing_piwigo_size_entry_ref0 (size_collection[size_it]); #line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" size = _tmp1_; -#line 10160 "PiwigoPublishing.c" +#line 10137 "PiwigoPublishing.c" { - GtkComboBoxText* _tmp2_ = NULL; - PublishingPiwigoSizeEntry* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; + GtkComboBoxText* _tmp2_; + PublishingPiwigoSizeEntry* _tmp3_; + const gchar* _tmp4_; #line 1481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp2_ = self->priv->size_combo; #line 1481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -10186,7 +10163,7 @@ static void publishing_piwigo_publishing_options_pane_create_size_combo (Publish gtk_combo_box_text_append_text (_tmp2_, _tmp4_); #line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_piwigo_size_entry_unref0 (size); -#line 10175 "PiwigoPublishing.c" +#line 10152 "PiwigoPublishing.c" } } } @@ -10200,26 +10177,26 @@ static void publishing_piwigo_publishing_options_pane_create_size_combo (Publish _tmp7_ = last_size_index; #line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp7_ < 0) { -#line 10189 "PiwigoPublishing.c" - GtkComboBoxText* _tmp8_ = NULL; - gint _tmp9_ = 0; +#line 10166 "PiwigoPublishing.c" + GtkComboBoxText* _tmp8_; + gint _tmp9_; #line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = self->priv->size_combo; #line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp9_ = publishing_piwigo_publishing_options_pane_find_size_index (self, PUBLISHING_PIWIGO_ORIGINAL_SIZE); #line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp9_); -#line 10198 "PiwigoPublishing.c" +#line 10175 "PiwigoPublishing.c" } else { - GtkComboBoxText* _tmp10_ = NULL; - gint _tmp11_ = 0; + GtkComboBoxText* _tmp10_; + gint _tmp11_; #line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp10_ = self->priv->size_combo; #line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp11_ = last_size_index; #line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox), _tmp11_); -#line 10208 "PiwigoPublishing.c" +#line 10185 "PiwigoPublishing.c" } } @@ -10231,39 +10208,39 @@ static gint publishing_piwigo_publishing_options_pane_find_category_index (Publi g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0); #line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _result_ = 0; -#line 10220 "PiwigoPublishing.c" +#line 10197 "PiwigoPublishing.c" { gint i = 0; #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" i = 0; -#line 10225 "PiwigoPublishing.c" +#line 10202 "PiwigoPublishing.c" { gboolean _tmp0_ = FALSE; #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = TRUE; #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" while (TRUE) { -#line 10232 "PiwigoPublishing.c" - gint _tmp2_ = 0; - GeeList* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; - GeeList* _tmp6_ = NULL; - gint _tmp7_ = 0; - gpointer _tmp8_ = NULL; - PublishingPiwigoCategory* _tmp9_ = NULL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; - gboolean _tmp12_ = FALSE; +#line 10209 "PiwigoPublishing.c" + gint _tmp2_; + GeeList* _tmp3_; + gint _tmp4_; + gint _tmp5_; + GeeList* _tmp6_; + gint _tmp7_; + gpointer _tmp8_; + PublishingPiwigoCategory* _tmp9_; + gint _tmp10_; + gint _tmp11_; + gboolean _tmp12_; #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!_tmp0_) { -#line 10246 "PiwigoPublishing.c" - gint _tmp1_ = 0; +#line 10223 "PiwigoPublishing.c" + gint _tmp1_; #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = i; #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" i = _tmp1_ + 1; -#line 10252 "PiwigoPublishing.c" +#line 10229 "PiwigoPublishing.c" } #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = FALSE; @@ -10279,7 +10256,7 @@ static gint publishing_piwigo_publishing_options_pane_find_category_index (Publi if (!(_tmp2_ < _tmp5_)) { #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 10268 "PiwigoPublishing.c" +#line 10245 "PiwigoPublishing.c" } #line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = self->priv->_existing_categories; @@ -10299,15 +10276,15 @@ static gint publishing_piwigo_publishing_options_pane_find_category_index (Publi _publishing_piwigo_category_unref0 (_tmp9_); #line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp12_) { -#line 10288 "PiwigoPublishing.c" - gint _tmp13_ = 0; +#line 10265 "PiwigoPublishing.c" + gint _tmp13_; #line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp13_ = i; #line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _result_ = _tmp13_; #line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 10296 "PiwigoPublishing.c" +#line 10273 "PiwigoPublishing.c" } } } @@ -10316,7 +10293,7 @@ static gint publishing_piwigo_publishing_options_pane_find_category_index (Publi result = _result_; #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 10305 "PiwigoPublishing.c" +#line 10282 "PiwigoPublishing.c" } @@ -10327,37 +10304,37 @@ static gint publishing_piwigo_publishing_options_pane_find_permission_level_inde g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0); #line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _result_ = -1; -#line 10316 "PiwigoPublishing.c" +#line 10293 "PiwigoPublishing.c" { gint i = 0; #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" i = 0; -#line 10321 "PiwigoPublishing.c" +#line 10298 "PiwigoPublishing.c" { gboolean _tmp0_ = FALSE; #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = TRUE; #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" while (TRUE) { -#line 10328 "PiwigoPublishing.c" - gint _tmp2_ = 0; - PublishingPiwigoPermissionLevel** _tmp3_ = NULL; - gint _tmp3__length1 = 0; - PublishingPiwigoPermissionLevel** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - gint _tmp5_ = 0; - PublishingPiwigoPermissionLevel* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; +#line 10305 "PiwigoPublishing.c" + gint _tmp2_; + PublishingPiwigoPermissionLevel** _tmp3_; + gint _tmp3__length1; + PublishingPiwigoPermissionLevel** _tmp4_; + gint _tmp4__length1; + gint _tmp5_; + PublishingPiwigoPermissionLevel* _tmp6_; + gint _tmp7_; + gint _tmp8_; #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!_tmp0_) { -#line 10340 "PiwigoPublishing.c" - gint _tmp1_ = 0; +#line 10317 "PiwigoPublishing.c" + gint _tmp1_; #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = i; #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" i = _tmp1_ + 1; -#line 10346 "PiwigoPublishing.c" +#line 10323 "PiwigoPublishing.c" } #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = FALSE; @@ -10371,7 +10348,7 @@ static gint publishing_piwigo_publishing_options_pane_find_permission_level_inde if (!(_tmp2_ < _tmp3__length1)) { #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 10360 "PiwigoPublishing.c" +#line 10337 "PiwigoPublishing.c" } #line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = self->priv->perm_levels; @@ -10387,15 +10364,15 @@ static gint publishing_piwigo_publishing_options_pane_find_permission_level_inde _tmp8_ = permission_level_id; #line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp7_ == _tmp8_) { -#line 10376 "PiwigoPublishing.c" - gint _tmp9_ = 0; +#line 10353 "PiwigoPublishing.c" + gint _tmp9_; #line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp9_ = i; #line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _result_ = _tmp9_; #line 1507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 10384 "PiwigoPublishing.c" +#line 10361 "PiwigoPublishing.c" } } } @@ -10404,7 +10381,7 @@ static gint publishing_piwigo_publishing_options_pane_find_permission_level_inde result = _result_; #line 1510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 10393 "PiwigoPublishing.c" +#line 10370 "PiwigoPublishing.c" } @@ -10415,37 +10392,37 @@ static gint publishing_piwigo_publishing_options_pane_find_size_index (Publishin g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0); #line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _result_ = -1; -#line 10404 "PiwigoPublishing.c" +#line 10381 "PiwigoPublishing.c" { gint i = 0; #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" i = 0; -#line 10409 "PiwigoPublishing.c" +#line 10386 "PiwigoPublishing.c" { gboolean _tmp0_ = FALSE; #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = TRUE; #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" while (TRUE) { -#line 10416 "PiwigoPublishing.c" - gint _tmp2_ = 0; - PublishingPiwigoSizeEntry** _tmp3_ = NULL; - gint _tmp3__length1 = 0; - PublishingPiwigoSizeEntry** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - gint _tmp5_ = 0; - PublishingPiwigoSizeEntry* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; +#line 10393 "PiwigoPublishing.c" + gint _tmp2_; + PublishingPiwigoSizeEntry** _tmp3_; + gint _tmp3__length1; + PublishingPiwigoSizeEntry** _tmp4_; + gint _tmp4__length1; + gint _tmp5_; + PublishingPiwigoSizeEntry* _tmp6_; + gint _tmp7_; + gint _tmp8_; #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!_tmp0_) { -#line 10428 "PiwigoPublishing.c" - gint _tmp1_ = 0; +#line 10405 "PiwigoPublishing.c" + gint _tmp1_; #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = i; #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" i = _tmp1_ + 1; -#line 10434 "PiwigoPublishing.c" +#line 10411 "PiwigoPublishing.c" } #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = FALSE; @@ -10459,7 +10436,7 @@ static gint publishing_piwigo_publishing_options_pane_find_size_index (Publishin if (!(_tmp2_ < _tmp3__length1)) { #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 10448 "PiwigoPublishing.c" +#line 10425 "PiwigoPublishing.c" } #line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = self->priv->photo_sizes; @@ -10475,15 +10452,15 @@ static gint publishing_piwigo_publishing_options_pane_find_size_index (Publishin _tmp8_ = size_id; #line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp7_ == _tmp8_) { -#line 10464 "PiwigoPublishing.c" - gint _tmp9_ = 0; +#line 10441 "PiwigoPublishing.c" + gint _tmp9_; #line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp9_ = i; #line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _result_ = _tmp9_; #line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 10472 "PiwigoPublishing.c" +#line 10449 "PiwigoPublishing.c" } } } @@ -10492,7 +10469,7 @@ static gint publishing_piwigo_publishing_options_pane_find_size_index (Publishin result = _result_; #line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 10481 "PiwigoPublishing.c" +#line 10458 "PiwigoPublishing.c" } @@ -10505,15 +10482,15 @@ static gboolean publishing_piwigo_publishing_options_pane_category_already_exist g_return_val_if_fail (category_name != NULL, FALSE); #line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _result_ = FALSE; -#line 10494 "PiwigoPublishing.c" +#line 10471 "PiwigoPublishing.c" { GeeList* _category_list = NULL; - GeeList* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; + GeeList* _tmp0_; + GeeList* _tmp1_; gint _category_size = 0; - GeeList* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + GeeList* _tmp2_; + gint _tmp3_; + gint _tmp4_; gint _category_index = 0; #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = self->priv->_existing_categories; @@ -10533,20 +10510,20 @@ static gboolean publishing_piwigo_publishing_options_pane_category_already_exist _category_index = -1; #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" while (TRUE) { -#line 10522 "PiwigoPublishing.c" - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gint _tmp7_ = 0; +#line 10499 "PiwigoPublishing.c" + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; PublishingPiwigoCategory* category = NULL; - GeeList* _tmp8_ = NULL; - gint _tmp9_ = 0; - gpointer _tmp10_ = NULL; - PublishingPiwigoCategory* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; + GeeList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; + PublishingPiwigoCategory* _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + const gchar* _tmp15_; + gboolean _tmp16_; #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = _category_index; #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -10559,7 +10536,7 @@ static gboolean publishing_piwigo_publishing_options_pane_category_already_exist if (!(_tmp6_ < _tmp7_)) { #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 10548 "PiwigoPublishing.c" +#line 10525 "PiwigoPublishing.c" } #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = _category_list; @@ -10591,27 +10568,27 @@ static gboolean publishing_piwigo_publishing_options_pane_category_already_exist _publishing_piwigo_category_unref0 (category); #line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 10580 "PiwigoPublishing.c" +#line 10557 "PiwigoPublishing.c" } #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_piwigo_category_unref0 (category); -#line 10584 "PiwigoPublishing.c" +#line 10561 "PiwigoPublishing.c" } #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_object_unref0 (_category_list); -#line 10588 "PiwigoPublishing.c" +#line 10565 "PiwigoPublishing.c" } #line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" result = _result_; #line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 10594 "PiwigoPublishing.c" +#line 10571 "PiwigoPublishing.c" } static gint publishing_piwigo_publishing_options_pane_get_last_category (PublishingPiwigoPublishingOptionsPane* self) { gint result; - gint _tmp0_ = 0; + gint _tmp0_; #line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0); #line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -10620,27 +10597,31 @@ static gint publishing_piwigo_publishing_options_pane_get_last_category (Publish result = _tmp0_; #line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 10609 "PiwigoPublishing.c" +#line 10586 "PiwigoPublishing.c" } static void publishing_piwigo_publishing_options_pane_set_last_category (PublishingPiwigoPublishingOptionsPane* self, gint value) { - gint _tmp0_ = 0; #line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp0_ = value; + if (publishing_piwigo_publishing_options_pane_get_last_category (self) != value) { +#line 10595 "PiwigoPublishing.c" + gint _tmp0_; +#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + _tmp0_ = value; #line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - self->priv->_last_category = _tmp0_; + self->priv->_last_category = _tmp0_; #line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_notify ((GObject *) self, "last-category"); -#line 10623 "PiwigoPublishing.c" + g_object_notify ((GObject *) self, "last-category"); +#line 10603 "PiwigoPublishing.c" + } } static gint publishing_piwigo_publishing_options_pane_get_last_permission_level (PublishingPiwigoPublishingOptionsPane* self) { gint result; - gint _tmp0_ = 0; + gint _tmp0_; #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0); #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -10649,27 +10630,31 @@ static gint publishing_piwigo_publishing_options_pane_get_last_permission_level result = _tmp0_; #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 10638 "PiwigoPublishing.c" +#line 10619 "PiwigoPublishing.c" } static void publishing_piwigo_publishing_options_pane_set_last_permission_level (PublishingPiwigoPublishingOptionsPane* self, gint value) { - gint _tmp0_ = 0; #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp0_ = value; + if (publishing_piwigo_publishing_options_pane_get_last_permission_level (self) != value) { +#line 10628 "PiwigoPublishing.c" + gint _tmp0_; #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - self->priv->_last_permission_level = _tmp0_; + _tmp0_ = value; #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_notify ((GObject *) self, "last-permission-level"); -#line 10652 "PiwigoPublishing.c" + self->priv->_last_permission_level = _tmp0_; +#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + g_object_notify ((GObject *) self, "last-permission-level"); +#line 10636 "PiwigoPublishing.c" + } } static gint publishing_piwigo_publishing_options_pane_get_last_photo_size (PublishingPiwigoPublishingOptionsPane* self) { gint result; - gint _tmp0_ = 0; + gint _tmp0_; #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0); #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -10678,27 +10663,31 @@ static gint publishing_piwigo_publishing_options_pane_get_last_photo_size (Publi result = _tmp0_; #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 10667 "PiwigoPublishing.c" +#line 10652 "PiwigoPublishing.c" } static void publishing_piwigo_publishing_options_pane_set_last_photo_size (PublishingPiwigoPublishingOptionsPane* self, gint value) { - gint _tmp0_ = 0; #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp0_ = value; + if (publishing_piwigo_publishing_options_pane_get_last_photo_size (self) != value) { +#line 10661 "PiwigoPublishing.c" + gint _tmp0_; #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - self->priv->_last_photo_size = _tmp0_; + _tmp0_ = value; #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_notify ((GObject *) self, "last-photo-size"); -#line 10681 "PiwigoPublishing.c" + self->priv->_last_photo_size = _tmp0_; +#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + g_object_notify ((GObject *) self, "last-photo-size"); +#line 10669 "PiwigoPublishing.c" + } } static gboolean publishing_piwigo_publishing_options_pane_get_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self) { gboolean result; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), FALSE); #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -10707,27 +10696,31 @@ static gboolean publishing_piwigo_publishing_options_pane_get_last_title_as_comm result = _tmp0_; #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 10696 "PiwigoPublishing.c" +#line 10685 "PiwigoPublishing.c" } static void publishing_piwigo_publishing_options_pane_set_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp0_ = value; + if (publishing_piwigo_publishing_options_pane_get_last_title_as_comment (self) != value) { +#line 10694 "PiwigoPublishing.c" + gboolean _tmp0_; #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - self->priv->_last_title_as_comment = _tmp0_; + _tmp0_ = value; #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_notify ((GObject *) self, "last-title-as-comment"); -#line 10710 "PiwigoPublishing.c" + self->priv->_last_title_as_comment = _tmp0_; +#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + g_object_notify ((GObject *) self, "last-title-as-comment"); +#line 10702 "PiwigoPublishing.c" + } } static gboolean publishing_piwigo_publishing_options_pane_get_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self) { gboolean result; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), FALSE); #line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -10736,27 +10729,31 @@ static gboolean publishing_piwigo_publishing_options_pane_get_last_no_upload_tag result = _tmp0_; #line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 10725 "PiwigoPublishing.c" +#line 10718 "PiwigoPublishing.c" } static void publishing_piwigo_publishing_options_pane_set_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp0_ = value; + if (publishing_piwigo_publishing_options_pane_get_last_no_upload_tags (self) != value) { +#line 10727 "PiwigoPublishing.c" + gboolean _tmp0_; +#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + _tmp0_ = value; #line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - self->priv->_last_no_upload_tags = _tmp0_; + self->priv->_last_no_upload_tags = _tmp0_; #line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_notify ((GObject *) self, "last-no-upload-tags"); -#line 10739 "PiwigoPublishing.c" + g_object_notify ((GObject *) self, "last-no-upload-tags"); +#line 10735 "PiwigoPublishing.c" + } } static gboolean publishing_piwigo_publishing_options_pane_get_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self) { gboolean result; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), FALSE); #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -10765,27 +10762,31 @@ static gboolean publishing_piwigo_publishing_options_pane_get_strip_metadata_ena result = _tmp0_; #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 10754 "PiwigoPublishing.c" +#line 10751 "PiwigoPublishing.c" } static void publishing_piwigo_publishing_options_pane_set_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp0_ = value; + if (publishing_piwigo_publishing_options_pane_get_strip_metadata_enabled (self) != value) { +#line 10760 "PiwigoPublishing.c" + gboolean _tmp0_; +#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + _tmp0_ = value; #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - self->priv->_strip_metadata_enabled = _tmp0_; + self->priv->_strip_metadata_enabled = _tmp0_; #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_notify ((GObject *) self, "strip-metadata-enabled"); + g_object_notify ((GObject *) self, "strip-metadata-enabled"); #line 10768 "PiwigoPublishing.c" + } } static GeeList* publishing_piwigo_publishing_options_pane_get_existing_categories (PublishingPiwigoPublishingOptionsPane* self) { GeeList* result; - GeeList* _tmp0_ = NULL; + GeeList* _tmp0_; #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL); #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -10794,32 +10795,36 @@ static GeeList* publishing_piwigo_publishing_options_pane_get_existing_categorie result = _tmp0_; #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 10783 "PiwigoPublishing.c" +#line 10784 "PiwigoPublishing.c" } static void publishing_piwigo_publishing_options_pane_set_existing_categories (PublishingPiwigoPublishingOptionsPane* self, GeeList* value) { - GeeList* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp0_ = value; + if (publishing_piwigo_publishing_options_pane_get_existing_categories (self) != value) { +#line 10793 "PiwigoPublishing.c" + GeeList* _tmp0_; + GeeList* _tmp1_; #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_object_unref0 (self->priv->_existing_categories); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + _g_object_unref0 (self->priv->_existing_categories); #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - self->priv->_existing_categories = _tmp1_; + self->priv->_existing_categories = _tmp1_; #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_notify ((GObject *) self, "existing-categories"); -#line 10802 "PiwigoPublishing.c" + g_object_notify ((GObject *) self, "existing-categories"); +#line 10806 "PiwigoPublishing.c" + } } static const gchar* publishing_piwigo_publishing_options_pane_get_default_comment (PublishingPiwigoPublishingOptionsPane* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL); #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -10828,26 +10833,30 @@ static const gchar* publishing_piwigo_publishing_options_pane_get_default_commen result = _tmp0_; #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 10817 "PiwigoPublishing.c" +#line 10822 "PiwigoPublishing.c" } static void publishing_piwigo_publishing_options_pane_set_default_comment (PublishingPiwigoPublishingOptionsPane* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp0_ = value; + if (g_strcmp0 (value, publishing_piwigo_publishing_options_pane_get_default_comment (self)) != 0) { +#line 10831 "PiwigoPublishing.c" + const gchar* _tmp0_; + gchar* _tmp1_; #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = value; #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_free0 (self->priv->_default_comment); + _tmp1_ = g_strdup (_tmp0_); +#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + _g_free0 (self->priv->_default_comment); #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - self->priv->_default_comment = _tmp1_; + self->priv->_default_comment = _tmp1_; #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_notify ((GObject *) self, "default-comment"); -#line 10836 "PiwigoPublishing.c" + g_object_notify ((GObject *) self, "default-comment"); +#line 10844 "PiwigoPublishing.c" + } } @@ -10866,33 +10875,32 @@ static void g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETER data1 = closure->data; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" data2 = param_values->data[0].v_pointer; -#line 10855 "PiwigoPublishing.c" +#line 10864 "PiwigoPublishing.c" } else { #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" data1 = param_values->data[0].v_pointer; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" data2 = closure->data; -#line 10861 "PiwigoPublishing.c" +#line 10870 "PiwigoPublishing.c" } #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" callback = (GMarshalFunc_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN) (marshal_data ? marshal_data : cc->callback); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" callback (data1, publishing_piwigo_value_get_publishing_parameters (param_values + 1), g_value_get_boolean (param_values + 2), data2); -#line 10867 "PiwigoPublishing.c" +#line 10876 "PiwigoPublishing.c" } static void publishing_piwigo_publishing_options_pane_class_init (PublishingPiwigoPublishingOptionsPaneClass * klass) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_options_pane_parent_class = g_type_class_peek_parent (klass); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingPiwigoPublishingOptionsPanePrivate)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - ((GObjectClass *) klass)->constructed = (void (*)(GObject*)) publishing_piwigo_publishing_options_pane_real_constructed; + ((GObjectClass *) klass)->constructed = (void (*) (GObject *)) publishing_piwigo_publishing_options_pane_real_constructed; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - ((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = (void (*)(ShotwellPluginsCommonBuilderPane*)) publishing_piwigo_publishing_options_pane_real_on_pane_installed; + ((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = (void (*) (ShotwellPluginsCommonBuilderPane *)) publishing_piwigo_publishing_options_pane_real_on_pane_installed; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" G_OBJECT_CLASS (klass)->get_property = _vala_publishing_piwigo_publishing_options_pane_get_property; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -10900,32 +10908,30 @@ static void publishing_piwigo_publishing_options_pane_class_init (PublishingPiwi #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_publishing_options_pane_finalize; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY, g_param_spec_int ("last-category", "last-category", "last-category", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY_PROPERTY, g_param_spec_int ("last-category", "last-category", "last-category", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL, g_param_spec_int ("last-permission-level", "last-permission-level", "last-permission-level", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL_PROPERTY, g_param_spec_int ("last-permission-level", "last-permission-level", "last-permission-level", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE, g_param_spec_int ("last-photo-size", "last-photo-size", "last-photo-size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE_PROPERTY, g_param_spec_int ("last-photo-size", "last-photo-size", "last-photo-size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT, g_param_spec_boolean ("last-title-as-comment", "last-title-as-comment", "last-title-as-comment", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT_PROPERTY, g_param_spec_boolean ("last-title-as-comment", "last-title-as-comment", "last-title-as-comment", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS, g_param_spec_boolean ("last-no-upload-tags", "last-no-upload-tags", "last-no-upload-tags", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS_PROPERTY, g_param_spec_boolean ("last-no-upload-tags", "last-no-upload-tags", "last-no-upload-tags", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED, g_param_spec_boolean ("strip-metadata-enabled", "strip-metadata-enabled", "strip-metadata-enabled", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED_PROPERTY, g_param_spec_boolean ("strip-metadata-enabled", "strip-metadata-enabled", "strip-metadata-enabled", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES, g_param_spec_object ("existing-categories", "existing-categories", "existing-categories", GEE_TYPE_LIST, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES_PROPERTY, g_param_spec_object ("existing-categories", "existing-categories", "existing-categories", GEE_TYPE_LIST, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT, g_param_spec_string ("default-comment", "default-comment", "default-comment", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT_PROPERTY, g_param_spec_string ("default-comment", "default-comment", "default-comment", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_signal_new ("publish", PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN, G_TYPE_NONE, 2, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS, G_TYPE_BOOLEAN); + publishing_piwigo_publishing_options_pane_signals[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN, G_TYPE_NONE, 2, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS, G_TYPE_BOOLEAN); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_signal_new ("logout", PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp0_ = _ ("Shotwell Connect"); + publishing_piwigo_publishing_options_pane_signals[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (_ ("Shotwell Connect")); #line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME = _tmp1_; -#line 10914 "PiwigoPublishing.c" + publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME = _tmp0_; +#line 10920 "PiwigoPublishing.c" } @@ -10938,11 +10944,11 @@ static void publishing_piwigo_publishing_options_pane_instance_init (PublishingP self->priv->title_as_comment_check = NULL; #line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->no_upload_tags_check = NULL; -#line 10927 "PiwigoPublishing.c" +#line 10933 "PiwigoPublishing.c" } -static void publishing_piwigo_publishing_options_pane_finalize (GObject* obj) { +static void publishing_piwigo_publishing_options_pane_finalize (GObject * obj) { PublishingPiwigoPublishingOptionsPane * self; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane); @@ -10986,7 +10992,7 @@ static void publishing_piwigo_publishing_options_pane_finalize (GObject* obj) { _g_free0 (self->priv->_default_comment); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" G_OBJECT_CLASS (publishing_piwigo_publishing_options_pane_parent_class)->finalize (obj); -#line 10975 "PiwigoPublishing.c" +#line 10981 "PiwigoPublishing.c" } @@ -11011,60 +11017,60 @@ static void _vala_publishing_piwigo_publishing_options_pane_get_property (GObjec #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" switch (property_id) { #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY: + case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY_PROPERTY: #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_value_set_int (value, publishing_piwigo_publishing_options_pane_get_last_category (self)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL: + case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL_PROPERTY: #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_value_set_int (value, publishing_piwigo_publishing_options_pane_get_last_permission_level (self)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE: + case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE_PROPERTY: #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_value_set_int (value, publishing_piwigo_publishing_options_pane_get_last_photo_size (self)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT: + case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT_PROPERTY: #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_value_set_boolean (value, publishing_piwigo_publishing_options_pane_get_last_title_as_comment (self)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS: + case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS_PROPERTY: #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_value_set_boolean (value, publishing_piwigo_publishing_options_pane_get_last_no_upload_tags (self)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED: + case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED_PROPERTY: #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_value_set_boolean (value, publishing_piwigo_publishing_options_pane_get_strip_metadata_enabled (self)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES: + case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES_PROPERTY: #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_value_set_object (value, publishing_piwigo_publishing_options_pane_get_existing_categories (self)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT: + case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT_PROPERTY: #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_value_set_string (value, publishing_piwigo_publishing_options_pane_get_default_comment (self)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 11047 "PiwigoPublishing.c" +#line 11053 "PiwigoPublishing.c" default: #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 11053 "PiwigoPublishing.c" +#line 11059 "PiwigoPublishing.c" } } @@ -11075,60 +11081,60 @@ static void _vala_publishing_piwigo_publishing_options_pane_set_property (GObjec #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" switch (property_id) { #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY: + case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY_PROPERTY: #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_options_pane_set_last_category (self, g_value_get_int (value)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL: + case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL_PROPERTY: #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_options_pane_set_last_permission_level (self, g_value_get_int (value)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE: + case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE_PROPERTY: #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_options_pane_set_last_photo_size (self, g_value_get_int (value)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT: + case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT_PROPERTY: #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_options_pane_set_last_title_as_comment (self, g_value_get_boolean (value)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS: + case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS_PROPERTY: #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_options_pane_set_last_no_upload_tags (self, g_value_get_boolean (value)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED: + case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED_PROPERTY: #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_options_pane_set_strip_metadata_enabled (self, g_value_get_boolean (value)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES: + case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES_PROPERTY: #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_options_pane_set_existing_categories (self, g_value_get_object (value)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT: + case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT_PROPERTY: #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_options_pane_set_default_comment (self, g_value_get_string (value)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 11111 "PiwigoPublishing.c" +#line 11117 "PiwigoPublishing.c" default: #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 11117 "PiwigoPublishing.c" +#line 11123 "PiwigoPublishing.c" } } @@ -11139,14 +11145,14 @@ PublishingPiwigoSession* publishing_piwigo_session_construct (GType object_type) self = (PublishingPiwigoSession*) publishing_rest_support_session_construct (object_type, ""); #line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 11128 "PiwigoPublishing.c" +#line 11134 "PiwigoPublishing.c" } PublishingPiwigoSession* publishing_piwigo_session_new (void) { #line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_session_construct (PUBLISHING_PIWIGO_TYPE_SESSION); -#line 11135 "PiwigoPublishing.c" +#line 11141 "PiwigoPublishing.c" } @@ -11155,54 +11161,54 @@ static gboolean publishing_piwigo_session_real_is_authenticated (PublishingRESTS gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_SESSION, PublishingPiwigoSession); #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp2_ = self->priv->pwg_id; #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp2_ != NULL) { -#line 11151 "PiwigoPublishing.c" - const gchar* _tmp3_ = NULL; +#line 11157 "PiwigoPublishing.c" + const gchar* _tmp3_; #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ = self->priv->pwg_url; #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = _tmp3_ != NULL; -#line 11157 "PiwigoPublishing.c" +#line 11163 "PiwigoPublishing.c" } else { #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = FALSE; -#line 11161 "PiwigoPublishing.c" +#line 11167 "PiwigoPublishing.c" } #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp1_) { -#line 11165 "PiwigoPublishing.c" - const gchar* _tmp4_ = NULL; +#line 11171 "PiwigoPublishing.c" + const gchar* _tmp4_; #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = self->priv->username; #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = _tmp4_ != NULL; -#line 11171 "PiwigoPublishing.c" +#line 11177 "PiwigoPublishing.c" } else { #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = FALSE; -#line 11175 "PiwigoPublishing.c" +#line 11181 "PiwigoPublishing.c" } #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" result = _tmp0_; #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 11181 "PiwigoPublishing.c" +#line 11187 "PiwigoPublishing.c" } void publishing_piwigo_session_authenticate (PublishingPiwigoSession* self, const gchar* url, const gchar* username, const gchar* id) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; #line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self)); #line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -11235,7 +11241,7 @@ void publishing_piwigo_session_authenticate (PublishingPiwigoSession* self, cons _g_free0 (self->priv->pwg_id); #line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->pwg_id = _tmp5_; -#line 11224 "PiwigoPublishing.c" +#line 11230 "PiwigoPublishing.c" } @@ -11254,14 +11260,14 @@ void publishing_piwigo_session_deauthenticate (PublishingPiwigoSession* self) { _g_free0 (self->priv->username); #line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->username = NULL; -#line 11243 "PiwigoPublishing.c" +#line 11249 "PiwigoPublishing.c" } gchar* publishing_piwigo_session_get_username (PublishingPiwigoSession* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self), NULL); #line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -11272,14 +11278,14 @@ gchar* publishing_piwigo_session_get_username (PublishingPiwigoSession* self) { result = _tmp1_; #line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 11261 "PiwigoPublishing.c" +#line 11267 "PiwigoPublishing.c" } gchar* publishing_piwigo_session_get_pwg_url (PublishingPiwigoSession* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self), NULL); #line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -11290,14 +11296,14 @@ gchar* publishing_piwigo_session_get_pwg_url (PublishingPiwigoSession* self) { result = _tmp1_; #line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 11279 "PiwigoPublishing.c" +#line 11285 "PiwigoPublishing.c" } gchar* publishing_piwigo_session_get_pwg_id (PublishingPiwigoSession* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self), NULL); #line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -11308,13 +11314,13 @@ gchar* publishing_piwigo_session_get_pwg_id (PublishingPiwigoSession* self) { result = _tmp1_; #line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 11297 "PiwigoPublishing.c" +#line 11303 "PiwigoPublishing.c" } void publishing_piwigo_session_set_pwg_id (PublishingPiwigoSession* self, const gchar* id) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self)); #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -11327,7 +11333,7 @@ void publishing_piwigo_session_set_pwg_id (PublishingPiwigoSession* self, const _g_free0 (self->priv->pwg_id); #line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->pwg_id = _tmp1_; -#line 11316 "PiwigoPublishing.c" +#line 11322 "PiwigoPublishing.c" } @@ -11339,8 +11345,8 @@ static void publishing_piwigo_session_class_init (PublishingPiwigoSessionClass * #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingPiwigoSessionPrivate)); #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_piwigo_session_real_is_authenticated; -#line 11329 "PiwigoPublishing.c" + ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_piwigo_session_real_is_authenticated; +#line 11335 "PiwigoPublishing.c" } @@ -11353,11 +11359,11 @@ static void publishing_piwigo_session_instance_init (PublishingPiwigoSession * s self->priv->pwg_id = NULL; #line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->username = NULL; -#line 11342 "PiwigoPublishing.c" +#line 11348 "PiwigoPublishing.c" } -static void publishing_piwigo_session_finalize (PublishingRESTSupportSession* obj) { +static void publishing_piwigo_session_finalize (PublishingRESTSupportSession * obj) { PublishingPiwigoSession * self; #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_SESSION, PublishingPiwigoSession); @@ -11369,7 +11375,7 @@ static void publishing_piwigo_session_finalize (PublishingRESTSupportSession* ob _g_free0 (self->priv->username); #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_piwigo_session_parent_class)->finalize (obj); -#line 11358 "PiwigoPublishing.c" +#line 11364 "PiwigoPublishing.c" } @@ -11391,9 +11397,9 @@ GType publishing_piwigo_session_get_type (void) { PublishingPiwigoTransaction* publishing_piwigo_transaction_construct (GType object_type, PublishingPiwigoSession* session) { PublishingPiwigoTransaction* self = NULL; - PublishingPiwigoSession* _tmp0_ = NULL; - PublishingPiwigoSession* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + PublishingPiwigoSession* _tmp0_; + PublishingPiwigoSession* _tmp1_; + gboolean _tmp2_; #line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL); #line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -11406,12 +11412,12 @@ PublishingPiwigoTransaction* publishing_piwigo_transaction_construct (GType obje _tmp2_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); #line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp2_) { -#line 11395 "PiwigoPublishing.c" - PublishingPiwigoSession* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; +#line 11401 "PiwigoPublishing.c" + PublishingPiwigoSession* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; #line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ = session; #line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -11428,32 +11434,32 @@ PublishingPiwigoTransaction* publishing_piwigo_transaction_construct (GType obje _g_free0 (_tmp7_); #line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp5_); -#line 11417 "PiwigoPublishing.c" +#line 11423 "PiwigoPublishing.c" } #line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 11421 "PiwigoPublishing.c" +#line 11427 "PiwigoPublishing.c" } PublishingPiwigoTransaction* publishing_piwigo_transaction_new (PublishingPiwigoSession* session) { #line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_transaction_construct (PUBLISHING_PIWIGO_TYPE_TRANSACTION, session); -#line 11428 "PiwigoPublishing.c" +#line 11434 "PiwigoPublishing.c" } PublishingPiwigoTransaction* publishing_piwigo_transaction_construct_authenticated (GType object_type, PublishingPiwigoSession* session) { PublishingPiwigoTransaction* self = NULL; - PublishingPiwigoSession* _tmp0_ = NULL; - PublishingPiwigoSession* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - PublishingPiwigoSession* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + PublishingPiwigoSession* _tmp0_; + PublishingPiwigoSession* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + PublishingPiwigoSession* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; #line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL); #line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -11486,36 +11492,36 @@ PublishingPiwigoTransaction* publishing_piwigo_transaction_construct_authenticat _g_free0 (_tmp6_); #line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 11475 "PiwigoPublishing.c" +#line 11481 "PiwigoPublishing.c" } PublishingPiwigoTransaction* publishing_piwigo_transaction_new_authenticated (PublishingPiwigoSession* session) { #line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_transaction_construct_authenticated (PUBLISHING_PIWIGO_TYPE_TRANSACTION, session); -#line 11482 "PiwigoPublishing.c" +#line 11488 "PiwigoPublishing.c" } gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc) { gchar* result = NULL; xmlNode* root = NULL; - PublishingRESTSupportXmlDocument* _tmp0_ = NULL; - xmlNode* _tmp1_ = NULL; + PublishingRESTSupportXmlDocument* _tmp0_; + xmlNode* _tmp1_; gchar* status = NULL; - xmlNode* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - const gchar* _tmp6_ = NULL; + xmlNode* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp6_; xmlNode* errcode = NULL; - xmlNode* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - xmlNode* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; + xmlNode* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + xmlNode* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; GError * _inner_error_ = NULL; #line 1605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL); @@ -11535,8 +11541,8 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum _tmp4_ = status; #line 1610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp4_ == NULL) { -#line 11524 "PiwigoPublishing.c" - gchar* _tmp5_ = NULL; +#line 11530 "PiwigoPublishing.c" + gchar* _tmp5_; #line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = g_strdup ("No status property in root node"); #line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -11545,7 +11551,7 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum _g_free0 (status); #line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 11534 "PiwigoPublishing.c" +#line 11540 "PiwigoPublishing.c" } #line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = status; @@ -11557,13 +11563,13 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum _g_free0 (status); #line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 11546 "PiwigoPublishing.c" +#line 11552 "PiwigoPublishing.c" } { xmlNode* _tmp7_ = NULL; - PublishingRESTSupportXmlDocument* _tmp8_ = NULL; - xmlNode* _tmp9_ = NULL; - xmlNode* _tmp10_ = NULL; + PublishingRESTSupportXmlDocument* _tmp8_; + xmlNode* _tmp9_; + xmlNode* _tmp10_; #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = doc; #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -11576,7 +11582,7 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 11565 "PiwigoPublishing.c" +#line 11571 "PiwigoPublishing.c" goto __catch35_spit_publishing_publishing_error; } #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -11587,17 +11593,17 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum g_clear_error (&_inner_error_); #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return NULL; -#line 11576 "PiwigoPublishing.c" +#line 11582 "PiwigoPublishing.c" } #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" errcode = _tmp7_; -#line 11580 "PiwigoPublishing.c" +#line 11586 "PiwigoPublishing.c" } goto __finally35; __catch35_spit_publishing_publishing_error: { GError* err = NULL; - gchar* _tmp11_ = NULL; + gchar* _tmp11_; #line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" err = _inner_error_; #line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -11612,7 +11618,7 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum _g_free0 (status); #line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 11601 "PiwigoPublishing.c" +#line 11607 "PiwigoPublishing.c" } __finally35: #line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -11625,7 +11631,7 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum g_clear_error (&_inner_error_); #line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return NULL; -#line 11614 "PiwigoPublishing.c" +#line 11620 "PiwigoPublishing.c" } #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp12_ = errcode; @@ -11653,18 +11659,18 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum _g_free0 (status); #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 11642 "PiwigoPublishing.c" +#line 11648 "PiwigoPublishing.c" } gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDocument* doc) { gchar* result = NULL; xmlNode* root = NULL; - PublishingRESTSupportXmlDocument* _tmp0_ = NULL; - xmlNode* _tmp1_ = NULL; + PublishingRESTSupportXmlDocument* _tmp0_; + xmlNode* _tmp1_; xmlNode* errcode = NULL; - xmlNode* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + xmlNode* _tmp7_; + gchar* _tmp8_; GError * _inner_error_ = NULL; #line 1626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL); @@ -11674,12 +11680,12 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc _tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_); #line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" root = _tmp1_; -#line 11663 "PiwigoPublishing.c" +#line 11669 "PiwigoPublishing.c" { xmlNode* _tmp2_ = NULL; - PublishingRESTSupportXmlDocument* _tmp3_ = NULL; - xmlNode* _tmp4_ = NULL; - xmlNode* _tmp5_ = NULL; + PublishingRESTSupportXmlDocument* _tmp3_; + xmlNode* _tmp4_; + xmlNode* _tmp5_; #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ = doc; #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -11692,7 +11698,7 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 11681 "PiwigoPublishing.c" +#line 11687 "PiwigoPublishing.c" goto __catch36_spit_publishing_publishing_error; } #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -11701,17 +11707,17 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc g_clear_error (&_inner_error_); #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return NULL; -#line 11690 "PiwigoPublishing.c" +#line 11696 "PiwigoPublishing.c" } #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" errcode = _tmp2_; -#line 11694 "PiwigoPublishing.c" +#line 11700 "PiwigoPublishing.c" } goto __finally36; __catch36_spit_publishing_publishing_error: { GError* err = NULL; - gchar* _tmp6_ = NULL; + gchar* _tmp6_; #line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" err = _inner_error_; #line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -11724,7 +11730,7 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc _g_error_free0 (err); #line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 11713 "PiwigoPublishing.c" +#line 11719 "PiwigoPublishing.c" } __finally36: #line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -11735,7 +11741,7 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc g_clear_error (&_inner_error_); #line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return NULL; -#line 11724 "PiwigoPublishing.c" +#line 11730 "PiwigoPublishing.c" } #line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = errcode; @@ -11745,14 +11751,14 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc result = _tmp8_; #line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 11734 "PiwigoPublishing.c" +#line 11740 "PiwigoPublishing.c" } static void publishing_piwigo_transaction_class_init (PublishingPiwigoTransactionClass * klass) { #line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_transaction_parent_class = g_type_class_peek_parent (klass); -#line 11741 "PiwigoPublishing.c" +#line 11747 "PiwigoPublishing.c" } @@ -11782,10 +11788,10 @@ GType publishing_piwigo_transaction_get_type (void) { PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_construct (GType object_type, PublishingPiwigoSession* session, const gchar* url, const gchar* username, const gchar* password) { PublishingPiwigoSessionLoginTransaction* self = NULL; - PublishingPiwigoSession* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; + PublishingPiwigoSession* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; #line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL); #line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -11812,33 +11818,33 @@ PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transac publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "password", _tmp3_); #line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 11801 "PiwigoPublishing.c" +#line 11807 "PiwigoPublishing.c" } PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new (PublishingPiwigoSession* session, const gchar* url, const gchar* username, const gchar* password) { #line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_session_login_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_LOGIN_TRANSACTION, session, url, username, password); -#line 11808 "PiwigoPublishing.c" +#line 11814 "PiwigoPublishing.c" } static gpointer _publishing_rest_support_argument_ref0 (gpointer self) { #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self ? publishing_rest_support_argument_ref (self) : NULL; -#line 11815 "PiwigoPublishing.c" +#line 11821 "PiwigoPublishing.c" } PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_construct_from_other (GType object_type, PublishingPiwigoSession* session, PublishingPiwigoTransaction* other) { PublishingPiwigoSessionLoginTransaction* self = NULL; - PublishingPiwigoSession* _tmp0_ = NULL; - PublishingPiwigoTransaction* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - PublishingPiwigoTransaction* _tmp4_ = NULL; - gint _tmp5_ = 0; - PublishingRESTSupportArgument** _tmp6_ = NULL; + PublishingPiwigoSession* _tmp0_; + PublishingPiwigoTransaction* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + PublishingPiwigoTransaction* _tmp4_; + gint _tmp5_; + PublishingRESTSupportArgument** _tmp6_; #line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL); #line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -11859,7 +11865,7 @@ PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transac _tmp4_ = other; #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp5_); -#line 11848 "PiwigoPublishing.c" +#line 11854 "PiwigoPublishing.c" { PublishingRESTSupportArgument** argument_collection = NULL; gint argument_collection_length1 = 0; @@ -11871,19 +11877,19 @@ PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transac argument_collection_length1 = _tmp5_; #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" for (argument_it = 0; argument_it < _tmp5_; argument_it = argument_it + 1) { -#line 11860 "PiwigoPublishing.c" - PublishingRESTSupportArgument* _tmp7_ = NULL; +#line 11866 "PiwigoPublishing.c" + PublishingRESTSupportArgument* _tmp7_; PublishingRESTSupportArgument* argument = NULL; #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = _publishing_rest_support_argument_ref0 (argument_collection[argument_it]); #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" argument = _tmp7_; -#line 11867 "PiwigoPublishing.c" +#line 11873 "PiwigoPublishing.c" { - PublishingRESTSupportArgument* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - PublishingRESTSupportArgument* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; + PublishingRESTSupportArgument* _tmp8_; + const gchar* _tmp9_; + PublishingRESTSupportArgument* _tmp10_; + const gchar* _tmp11_; #line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = argument; #line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -11896,30 +11902,30 @@ PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transac publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp9_, _tmp11_); #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_rest_support_argument_unref0 (argument); -#line 11885 "PiwigoPublishing.c" +#line 11891 "PiwigoPublishing.c" } } #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" argument_collection = (_vala_array_free (argument_collection, argument_collection_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); -#line 11890 "PiwigoPublishing.c" +#line 11896 "PiwigoPublishing.c" } #line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 11894 "PiwigoPublishing.c" +#line 11900 "PiwigoPublishing.c" } PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new_from_other (PublishingPiwigoSession* session, PublishingPiwigoTransaction* other) { #line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_session_login_transaction_construct_from_other (PUBLISHING_PIWIGO_TYPE_SESSION_LOGIN_TRANSACTION, session, other); -#line 11901 "PiwigoPublishing.c" +#line 11907 "PiwigoPublishing.c" } static void publishing_piwigo_session_login_transaction_class_init (PublishingPiwigoSessionLoginTransactionClass * klass) { #line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_session_login_transaction_parent_class = g_type_class_peek_parent (klass); -#line 11908 "PiwigoPublishing.c" +#line 11914 "PiwigoPublishing.c" } @@ -11944,13 +11950,13 @@ GType publishing_piwigo_session_login_transaction_get_type (void) { PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_construct_unauthenticated (GType object_type, PublishingPiwigoSession* session, const gchar* url, const gchar* pwg_id) { PublishingPiwigoSessionGetStatusTransaction* self = NULL; - PublishingPiwigoSession* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - PublishingPiwigoSession* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + PublishingPiwigoSession* _tmp0_; + const gchar* _tmp1_; + PublishingPiwigoSession* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; #line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL); #line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -11983,20 +11989,20 @@ PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_statu publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.getStatus"); #line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 11972 "PiwigoPublishing.c" +#line 11978 "PiwigoPublishing.c" } PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new_unauthenticated (PublishingPiwigoSession* session, const gchar* url, const gchar* pwg_id) { #line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_session_get_status_transaction_construct_unauthenticated (PUBLISHING_PIWIGO_TYPE_SESSION_GET_STATUS_TRANSACTION, session, url, pwg_id); -#line 11979 "PiwigoPublishing.c" +#line 11985 "PiwigoPublishing.c" } PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_construct (GType object_type, PublishingPiwigoSession* session) { PublishingPiwigoSessionGetStatusTransaction* self = NULL; - PublishingPiwigoSession* _tmp0_ = NULL; + PublishingPiwigoSession* _tmp0_; #line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL); #line 1671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -12007,21 +12013,21 @@ PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_statu publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.getStatus"); #line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 11996 "PiwigoPublishing.c" +#line 12002 "PiwigoPublishing.c" } PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new (PublishingPiwigoSession* session) { #line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_session_get_status_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_GET_STATUS_TRANSACTION, session); -#line 12003 "PiwigoPublishing.c" +#line 12009 "PiwigoPublishing.c" } static void publishing_piwigo_session_get_status_transaction_class_init (PublishingPiwigoSessionGetStatusTransactionClass * klass) { #line 1662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_session_get_status_transaction_parent_class = g_type_class_peek_parent (klass); -#line 12010 "PiwigoPublishing.c" +#line 12016 "PiwigoPublishing.c" } @@ -12046,7 +12052,7 @@ GType publishing_piwigo_session_get_status_transaction_get_type (void) { PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_list_transaction_construct (GType object_type, PublishingPiwigoSession* session) { PublishingPiwigoCategoriesGetListTransaction* self = NULL; - PublishingPiwigoSession* _tmp0_ = NULL; + PublishingPiwigoSession* _tmp0_; #line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL); #line 1682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -12059,21 +12065,21 @@ PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_l publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "recursive", "true"); #line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 12048 "PiwigoPublishing.c" +#line 12054 "PiwigoPublishing.c" } PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_list_transaction_new (PublishingPiwigoSession* session) { #line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_categories_get_list_transaction_construct (PUBLISHING_PIWIGO_TYPE_CATEGORIES_GET_LIST_TRANSACTION, session); -#line 12055 "PiwigoPublishing.c" +#line 12061 "PiwigoPublishing.c" } static void publishing_piwigo_categories_get_list_transaction_class_init (PublishingPiwigoCategoriesGetListTransactionClass * klass) { #line 1680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_categories_get_list_transaction_parent_class = g_type_class_peek_parent (klass); -#line 12062 "PiwigoPublishing.c" +#line 12068 "PiwigoPublishing.c" } @@ -12098,7 +12104,7 @@ GType publishing_piwigo_categories_get_list_transaction_get_type (void) { PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_construct (GType object_type, PublishingPiwigoSession* session) { PublishingPiwigoSessionLogoutTransaction* self = NULL; - PublishingPiwigoSession* _tmp0_ = NULL; + PublishingPiwigoSession* _tmp0_; #line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL); #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -12109,21 +12115,21 @@ PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_trans publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.logout"); #line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 12098 "PiwigoPublishing.c" +#line 12104 "PiwigoPublishing.c" } PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_new (PublishingPiwigoSession* session) { #line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_session_logout_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_LOGOUT_TRANSACTION, session); -#line 12105 "PiwigoPublishing.c" +#line 12111 "PiwigoPublishing.c" } static void publishing_piwigo_session_logout_transaction_class_init (PublishingPiwigoSessionLogoutTransactionClass * klass) { #line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_session_logout_transaction_parent_class = g_type_class_peek_parent (klass); -#line 12112 "PiwigoPublishing.c" +#line 12118 "PiwigoPublishing.c" } @@ -12145,10 +12151,10 @@ GType publishing_piwigo_session_logout_transaction_get_type (void) { PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_transaction_construct (GType object_type, PublishingPiwigoSession* session, const gchar* category, gint parent_id, const gchar* comment) { PublishingPiwigoCategoriesAddTransaction* self = NULL; - PublishingPiwigoSession* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gint _tmp2_ = 0; - const gchar* _tmp6_ = NULL; + PublishingPiwigoSession* _tmp0_; + const gchar* _tmp1_; + gint _tmp2_; + const gchar* _tmp6_; #line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL); #line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -12167,10 +12173,10 @@ PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_trans _tmp2_ = parent_id; #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp2_ != 0) { -#line 12156 "PiwigoPublishing.c" - gint _tmp3_ = 0; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; +#line 12162 "PiwigoPublishing.c" + gint _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ = parent_id; #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -12181,37 +12187,37 @@ PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_trans publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "parent", _tmp5_); #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp5_); -#line 12170 "PiwigoPublishing.c" +#line 12176 "PiwigoPublishing.c" } #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = comment; #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (g_strcmp0 (_tmp6_, "") != 0) { -#line 12176 "PiwigoPublishing.c" - const gchar* _tmp7_ = NULL; +#line 12182 "PiwigoPublishing.c" + const gchar* _tmp7_; #line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = comment; #line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp7_); -#line 12182 "PiwigoPublishing.c" +#line 12188 "PiwigoPublishing.c" } #line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 12186 "PiwigoPublishing.c" +#line 12192 "PiwigoPublishing.c" } PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_transaction_new (PublishingPiwigoSession* session, const gchar* category, gint parent_id, const gchar* comment) { #line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_categories_add_transaction_construct (PUBLISHING_PIWIGO_TYPE_CATEGORIES_ADD_TRANSACTION, session, category, parent_id, comment); -#line 12193 "PiwigoPublishing.c" +#line 12199 "PiwigoPublishing.c" } static void publishing_piwigo_categories_add_transaction_class_init (PublishingPiwigoCategoriesAddTransactionClass * klass) { #line 1697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_categories_add_transaction_parent_class = g_type_class_peek_parent (klass); -#line 12200 "PiwigoPublishing.c" +#line 12206 "PiwigoPublishing.c" } @@ -12233,410 +12239,410 @@ GType publishing_piwigo_categories_add_transaction_get_type (void) { static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; - gchar** _tmp3_ = NULL; - gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp3_; + gint _tmp3__length1; +#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" separator = ""; -#line 12233 "PiwigoPublishing.c" +#line 12239 "PiwigoPublishing.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = TRUE; -#line 12243 "PiwigoPublishing.c" +#line 12249 "PiwigoPublishing.c" } else { - gchar** _tmp4_ = NULL; - gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp4_; + gint _tmp4__length1; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; -#line 12253 "PiwigoPublishing.c" +#line 12259 "PiwigoPublishing.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 12259 "PiwigoPublishing.c" +#line 12265 "PiwigoPublishing.c" } else { gboolean _tmp5_ = FALSE; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp6_; + gint _tmp6__length1; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { -#line 12270 "PiwigoPublishing.c" - gchar** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 12276 "PiwigoPublishing.c" + gchar** _tmp7_; + gint _tmp7__length1; + const gchar* _tmp8_; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; -#line 12282 "PiwigoPublishing.c" +#line 12288 "PiwigoPublishing.c" } else { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = FALSE; -#line 12286 "PiwigoPublishing.c" +#line 12292 "PiwigoPublishing.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; -#line 12290 "PiwigoPublishing.c" +#line 12296 "PiwigoPublishing.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 12294 "PiwigoPublishing.c" +#line 12300 "PiwigoPublishing.c" gint i = 0; gsize len = 0UL; - gint _tmp31_ = 0; - gint _tmp33_ = 0; - gint _tmp34_ = 0; - gsize _tmp35_ = 0UL; - const gchar* _tmp36_ = NULL; - gint _tmp37_ = 0; - gint _tmp38_ = 0; - gint _tmp39_ = 0; + gint _tmp31_; + gint _tmp33_; + gint _tmp34_; + gsize _tmp35_; + const gchar* _tmp36_; + gint _tmp37_; + gint _tmp38_; + gint _tmp39_; const gchar* res = NULL; - gsize _tmp40_ = 0UL; - void* _tmp41_ = NULL; + gsize _tmp40_; + void* _tmp41_; void* ptr = NULL; - const gchar* _tmp42_ = NULL; - gchar** _tmp43_ = NULL; - gint _tmp43__length1 = 0; - const gchar* _tmp44_ = NULL; - void* _tmp45_ = NULL; - const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp42_; + gchar** _tmp43_; + gint _tmp43__length1; + const gchar* _tmp44_; + void* _tmp45_; + const gchar* _tmp62_; +#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = (gsize) 1; -#line 12317 "PiwigoPublishing.c" +#line 12323 "PiwigoPublishing.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { -#line 12326 "PiwigoPublishing.c" +#line 12332 "PiwigoPublishing.c" gboolean _tmp11_ = FALSE; gboolean _tmp12_ = FALSE; - gchar** _tmp13_ = NULL; - gint _tmp13__length1 = 0; + gchar** _tmp13_; + gint _tmp13__length1; gint _tmp21_ = 0; - gchar** _tmp22_ = NULL; - gint _tmp22__length1 = 0; - gint _tmp23_ = 0; - const gchar* _tmp24_ = NULL; - gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp22_; + gint _tmp22__length1; + gint _tmp23_; + const gchar* _tmp24_; + gsize _tmp30_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp9_) { -#line 12339 "PiwigoPublishing.c" - gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 12345 "PiwigoPublishing.c" + gint _tmp10_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp10_ + 1; -#line 12345 "PiwigoPublishing.c" +#line 12351 "PiwigoPublishing.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { -#line 12355 "PiwigoPublishing.c" - gint _tmp14_ = 0; - gchar** _tmp15_ = NULL; - gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 12361 "PiwigoPublishing.c" + gint _tmp14_; + gchar** _tmp15_; + gint _tmp15__length1; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; -#line 12367 "PiwigoPublishing.c" +#line 12373 "PiwigoPublishing.c" } else { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 12371 "PiwigoPublishing.c" +#line 12377 "PiwigoPublishing.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = TRUE; -#line 12377 "PiwigoPublishing.c" +#line 12383 "PiwigoPublishing.c" } else { gboolean _tmp16_ = FALSE; - gchar** _tmp17_ = NULL; - gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp17_; + gint _tmp17__length1; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { -#line 12388 "PiwigoPublishing.c" - gchar** _tmp18_ = NULL; - gint _tmp18__length1 = 0; - gint _tmp19_ = 0; - const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 12394 "PiwigoPublishing.c" + gchar** _tmp18_; + gint _tmp18__length1; + gint _tmp19_; + const gchar* _tmp20_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; -#line 12403 "PiwigoPublishing.c" +#line 12409 "PiwigoPublishing.c" } else { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = FALSE; -#line 12407 "PiwigoPublishing.c" +#line 12413 "PiwigoPublishing.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; -#line 12411 "PiwigoPublishing.c" +#line 12417 "PiwigoPublishing.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" break; -#line 12417 "PiwigoPublishing.c" +#line 12423 "PiwigoPublishing.c" } -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { -#line 12429 "PiwigoPublishing.c" - gchar** _tmp25_ = NULL; - gint _tmp25__length1 = 0; - gint _tmp26_ = 0; - const gchar* _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 12435 "PiwigoPublishing.c" + gchar** _tmp25_; + gint _tmp25__length1; + gint _tmp26_; + const gchar* _tmp27_; + gint _tmp28_; + gint _tmp29_; +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; -#line 12450 "PiwigoPublishing.c" +#line 12456 "PiwigoPublishing.c" } else { -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = 0; -#line 12454 "PiwigoPublishing.c" +#line 12460 "PiwigoPublishing.c" } -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; -#line 12460 "PiwigoPublishing.c" +#line 12466 "PiwigoPublishing.c" } } -#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { -#line 12467 "PiwigoPublishing.c" - gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 12473 "PiwigoPublishing.c" + gchar* _tmp32_; +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 12475 "PiwigoPublishing.c" +#line 12481 "PiwigoPublishing.c" } -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp45_; -#line 12513 "PiwigoPublishing.c" +#line 12519 "PiwigoPublishing.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { -#line 12522 "PiwigoPublishing.c" - gint _tmp48_ = 0; - gchar** _tmp49_ = NULL; - gint _tmp49__length1 = 0; - void* _tmp50_ = NULL; - const gchar* _tmp51_ = NULL; - void* _tmp52_ = NULL; +#line 12528 "PiwigoPublishing.c" + gint _tmp48_; + gchar** _tmp49_; + gint _tmp49__length1; + void* _tmp50_; + const gchar* _tmp51_; + void* _tmp52_; const gchar* _tmp53_ = NULL; - gchar** _tmp54_ = NULL; - gint _tmp54__length1 = 0; - gint _tmp55_ = 0; - const gchar* _tmp56_ = NULL; - void* _tmp60_ = NULL; - void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp54_; + gint _tmp54__length1; + gint _tmp55_; + const gchar* _tmp56_; + void* _tmp60_; + void* _tmp61_; +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp46_) { -#line 12538 "PiwigoPublishing.c" - gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 12544 "PiwigoPublishing.c" + gint _tmp47_; +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp47_ + 1; -#line 12544 "PiwigoPublishing.c" +#line 12550 "PiwigoPublishing.c" } -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" break; -#line 12558 "PiwigoPublishing.c" +#line 12564 "PiwigoPublishing.c" } -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { -#line 12578 "PiwigoPublishing.c" - gchar** _tmp57_ = NULL; - gint _tmp57__length1 = 0; - gint _tmp58_ = 0; - const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 12584 "PiwigoPublishing.c" + gchar** _tmp57_; + gint _tmp57__length1; + gint _tmp58_; + const gchar* _tmp59_; +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; -#line 12593 "PiwigoPublishing.c" +#line 12599 "PiwigoPublishing.c" } else { -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = ""; -#line 12597 "PiwigoPublishing.c" +#line 12603 "PiwigoPublishing.c" } -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp61_; -#line 12605 "PiwigoPublishing.c" +#line 12611 "PiwigoPublishing.c" } } -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 12616 "PiwigoPublishing.c" +#line 12622 "PiwigoPublishing.c" } else { - gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp63_; +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 12625 "PiwigoPublishing.c" +#line 12631 "PiwigoPublishing.c" } } @@ -12644,83 +12650,83 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s static void _g_free0_ (gpointer var) { #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" var = (g_free (var), NULL); -#line 12633 "PiwigoPublishing.c" +#line 12639 "PiwigoPublishing.c" } PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_construct (GType object_type, PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable) { PublishingPiwigoImagesAddTransaction* self = NULL; - PublishingPiwigoSession* _tmp0_ = NULL; - SpitPublishingPublishable* _tmp1_ = NULL; - PublishingPiwigoSession* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - PublishingPiwigoSession* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - PublishingPiwigoPublishingParameters* _tmp12_ = NULL; - PublishingPiwigoPublishingParameters* _tmp13_ = NULL; + PublishingPiwigoSession* _tmp0_; + SpitPublishingPublishable* _tmp1_; + PublishingPiwigoSession* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + PublishingPiwigoSession* _tmp5_; + gboolean _tmp6_; + PublishingPiwigoPublishingParameters* _tmp12_; + PublishingPiwigoPublishingParameters* _tmp13_; gchar** keywords = NULL; - SpitPublishingPublishable* _tmp14_ = NULL; - gint _tmp15_ = 0; - gchar** _tmp16_ = NULL; - gint keywords_length1 = 0; - gint _keywords_size_ = 0; + SpitPublishingPublishable* _tmp14_; + gint _tmp15_; + gchar** _tmp16_; + gint keywords_length1; + gint _keywords_size_; gchar* tags = NULL; - gchar* _tmp17_ = NULL; - gchar** _tmp18_ = NULL; - gint _tmp18__length1 = 0; - SpitPublishingPublishable* _tmp21_ = NULL; - GFile* _tmp22_ = NULL; - GFile* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - PublishingPiwigoPublishingParameters* _tmp26_ = NULL; - PublishingPiwigoCategory* _tmp27_ = NULL; - gint _tmp28_ = 0; - PublishingPiwigoPublishingParameters* _tmp29_ = NULL; - PublishingPiwigoPermissionLevel* _tmp30_ = NULL; - gint _tmp31_ = 0; + gchar* _tmp17_; + gchar** _tmp18_; + gint _tmp18__length1; + SpitPublishingPublishable* _tmp21_; + GFile* _tmp22_; + GFile* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; + PublishingPiwigoPublishingParameters* _tmp26_; + PublishingPiwigoCategory* _tmp27_; + gint _tmp28_; + PublishingPiwigoPublishingParameters* _tmp29_; + PublishingPiwigoPermissionLevel* _tmp30_; + gint _tmp31_; gchar* name = NULL; - SpitPublishingPublishable* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; + SpitPublishingPublishable* _tmp32_; + gchar* _tmp33_; gchar* comment = NULL; - SpitPublishingPublishable* _tmp34_ = NULL; - gchar* _tmp35_ = NULL; + SpitPublishingPublishable* _tmp34_; + gchar* _tmp35_; gboolean _tmp36_ = FALSE; - const gchar* _tmp37_ = NULL; - PublishingPiwigoPublishingParameters* _tmp55_ = NULL; - PublishingPiwigoCategory* _tmp56_ = NULL; - gint _tmp57_ = 0; - gchar* _tmp58_ = NULL; - gchar* _tmp59_ = NULL; - PublishingPiwigoPublishingParameters* _tmp60_ = NULL; - PublishingPiwigoPermissionLevel* _tmp61_ = NULL; - gint _tmp62_ = 0; - gchar* _tmp63_ = NULL; - gchar* _tmp64_ = NULL; - PublishingPiwigoPublishingParameters* _tmp65_ = NULL; - gboolean _tmp66_ = FALSE; + const gchar* _tmp37_; + PublishingPiwigoPublishingParameters* _tmp55_; + PublishingPiwigoCategory* _tmp56_; + gint _tmp57_; + gchar* _tmp58_; + gchar* _tmp59_; + PublishingPiwigoPublishingParameters* _tmp60_; + PublishingPiwigoPermissionLevel* _tmp61_; + gint _tmp62_; + gchar* _tmp63_; + gchar* _tmp64_; + PublishingPiwigoPublishingParameters* _tmp65_; + gboolean _tmp66_; GHashTable* disposition_table = NULL; - GHashFunc _tmp69_ = NULL; - GEqualFunc _tmp70_ = NULL; - GHashTable* _tmp71_ = NULL; + GHashFunc _tmp69_; + GEqualFunc _tmp70_; + GHashTable* _tmp71_; gchar* basename = NULL; - SpitPublishingPublishable* _tmp72_ = NULL; - gchar* _tmp73_ = NULL; + SpitPublishingPublishable* _tmp72_; + gchar* _tmp73_; gboolean _tmp74_ = FALSE; - const gchar* _tmp75_ = NULL; - gchar* _tmp76_ = NULL; - gchar* _tmp77_ = NULL; - gboolean _tmp78_ = FALSE; - gboolean _tmp79_ = FALSE; - GHashTable* _tmp86_ = NULL; - gchar* _tmp87_ = NULL; - const gchar* _tmp88_ = NULL; - gchar* _tmp89_ = NULL; - GHashTable* _tmp90_ = NULL; - gchar* _tmp91_ = NULL; - gchar* _tmp92_ = NULL; - GHashTable* _tmp93_ = NULL; + const gchar* _tmp75_; + gchar* _tmp76_; + gchar* _tmp77_; + gboolean _tmp78_; + gboolean _tmp79_; + GHashTable* _tmp86_; + gchar* _tmp87_; + const gchar* _tmp88_; + gchar* _tmp89_; + GHashTable* _tmp90_; + gchar* _tmp91_; + gchar* _tmp92_; + GHashTable* _tmp93_; #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL); #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -12747,12 +12753,12 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c _tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); #line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp6_) { -#line 12736 "PiwigoPublishing.c" - PublishingPiwigoSession* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; +#line 12742 "PiwigoPublishing.c" + PublishingPiwigoSession* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; #line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = session; #line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -12769,7 +12775,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c _g_free0 (_tmp11_); #line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp9_); -#line 12758 "PiwigoPublishing.c" +#line 12764 "PiwigoPublishing.c" } #line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp12_ = parameters; @@ -12799,10 +12805,10 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c _tmp18__length1 = keywords_length1; #line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp18_ != NULL) { -#line 12788 "PiwigoPublishing.c" - gchar** _tmp19_ = NULL; - gint _tmp19__length1 = 0; - gchar* _tmp20_ = NULL; +#line 12794 "PiwigoPublishing.c" + gchar** _tmp19_; + gint _tmp19__length1; + gchar* _tmp20_; #line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp19_ = keywords; #line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -12813,7 +12819,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c _g_free0 (tags); #line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" tags = _tmp20_; -#line 12802 "PiwigoPublishing.c" +#line 12808 "PiwigoPublishing.c" } #line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp21_ = publishable; @@ -12862,23 +12868,23 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c if (_tmp37_ == NULL) { #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp36_ = TRUE; -#line 12850 "PiwigoPublishing.c" +#line 12856 "PiwigoPublishing.c" } else { - const gchar* _tmp38_ = NULL; + const gchar* _tmp38_; #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp38_ = name; #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp36_ = g_strcmp0 (_tmp38_, "") == 0; -#line 12857 "PiwigoPublishing.c" +#line 12863 "PiwigoPublishing.c" } #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp36_) { -#line 12861 "PiwigoPublishing.c" - SpitPublishingPublishable* _tmp39_ = NULL; - gchar* _tmp40_ = NULL; - const gchar* _tmp41_ = NULL; +#line 12867 "PiwigoPublishing.c" + SpitPublishingPublishable* _tmp39_; + gchar* _tmp40_; + const gchar* _tmp41_; gboolean _tmp42_ = FALSE; - const gchar* _tmp43_ = NULL; + const gchar* _tmp43_; #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp39_ = publishable; #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -12895,52 +12901,52 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c _tmp43_ = comment; #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp43_ != NULL) { -#line 12883 "PiwigoPublishing.c" - const gchar* _tmp44_ = NULL; +#line 12889 "PiwigoPublishing.c" + const gchar* _tmp44_; #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp44_ = comment; #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp42_ = g_strcmp0 (_tmp44_, "") != 0; -#line 12889 "PiwigoPublishing.c" +#line 12895 "PiwigoPublishing.c" } else { #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp42_ = FALSE; -#line 12893 "PiwigoPublishing.c" +#line 12899 "PiwigoPublishing.c" } #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp42_) { -#line 12897 "PiwigoPublishing.c" - const gchar* _tmp45_ = NULL; +#line 12903 "PiwigoPublishing.c" + const gchar* _tmp45_; #line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp45_ = comment; #line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp45_); -#line 12903 "PiwigoPublishing.c" +#line 12909 "PiwigoPublishing.c" } } else { gboolean _tmp46_ = FALSE; - const gchar* _tmp47_ = NULL; + const gchar* _tmp47_; #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp47_ = comment; #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp47_ != NULL) { -#line 12912 "PiwigoPublishing.c" - const gchar* _tmp48_ = NULL; +#line 12918 "PiwigoPublishing.c" + const gchar* _tmp48_; #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp48_ = comment; #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp46_ = g_strcmp0 (_tmp48_, "") != 0; -#line 12918 "PiwigoPublishing.c" +#line 12924 "PiwigoPublishing.c" } else { #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp46_ = FALSE; -#line 12922 "PiwigoPublishing.c" +#line 12928 "PiwigoPublishing.c" } #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp46_) { -#line 12926 "PiwigoPublishing.c" - const gchar* _tmp49_ = NULL; - const gchar* _tmp50_ = NULL; +#line 12932 "PiwigoPublishing.c" + const gchar* _tmp49_; + const gchar* _tmp50_; #line 1746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp49_ = name; #line 1746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -12949,30 +12955,30 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c _tmp50_ = comment; #line 1747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp50_); -#line 12937 "PiwigoPublishing.c" +#line 12943 "PiwigoPublishing.c" } else { - PublishingPiwigoPublishingParameters* _tmp51_ = NULL; - gboolean _tmp52_ = FALSE; + PublishingPiwigoPublishingParameters* _tmp51_; + gboolean _tmp52_; #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp51_ = parameters; #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp52_ = _tmp51_->title_as_comment; #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp52_) { -#line 12947 "PiwigoPublishing.c" - const gchar* _tmp53_ = NULL; +#line 12953 "PiwigoPublishing.c" + const gchar* _tmp53_; #line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp53_ = name; #line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp53_); -#line 12953 "PiwigoPublishing.c" +#line 12959 "PiwigoPublishing.c" } else { - const gchar* _tmp54_ = NULL; + const gchar* _tmp54_; #line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp54_ = name; #line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp54_); -#line 12960 "PiwigoPublishing.c" +#line 12966 "PiwigoPublishing.c" } } } @@ -13012,19 +13018,19 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c _tmp66_ = _tmp65_->no_upload_tags; #line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!_tmp66_) { -#line 13000 "PiwigoPublishing.c" - const gchar* _tmp67_ = NULL; +#line 13006 "PiwigoPublishing.c" + const gchar* _tmp67_; #line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp67_ = tags; #line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (g_strcmp0 (_tmp67_, "") != 0) { -#line 13006 "PiwigoPublishing.c" - const gchar* _tmp68_ = NULL; +#line 13012 "PiwigoPublishing.c" + const gchar* _tmp68_; #line 1764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp68_ = tags; #line 1764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "tags", _tmp68_); -#line 13012 "PiwigoPublishing.c" +#line 13018 "PiwigoPublishing.c" } } #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -13055,11 +13061,11 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c _g_free0 (_tmp77_); #line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp79_) { -#line 13043 "PiwigoPublishing.c" - const gchar* _tmp80_ = NULL; - gchar* _tmp81_ = NULL; - gchar* _tmp82_ = NULL; - gboolean _tmp83_ = FALSE; +#line 13049 "PiwigoPublishing.c" + const gchar* _tmp80_; + gchar* _tmp81_; + gchar* _tmp82_; + gboolean _tmp83_; #line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp80_ = basename; #line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -13072,17 +13078,17 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c _tmp74_ = !_tmp83_; #line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp82_); -#line 13060 "PiwigoPublishing.c" +#line 13066 "PiwigoPublishing.c" } else { #line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp74_ = FALSE; -#line 13064 "PiwigoPublishing.c" +#line 13070 "PiwigoPublishing.c" } #line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp74_) { -#line 13068 "PiwigoPublishing.c" - const gchar* _tmp84_ = NULL; - gchar* _tmp85_ = NULL; +#line 13074 "PiwigoPublishing.c" + const gchar* _tmp84_; + gchar* _tmp85_; #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp84_ = basename; #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -13091,7 +13097,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c _g_free0 (basename); #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" basename = _tmp85_; -#line 13079 "PiwigoPublishing.c" +#line 13085 "PiwigoPublishing.c" } #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp86_ = disposition_table; @@ -13129,14 +13135,14 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL); #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 13117 "PiwigoPublishing.c" +#line 13123 "PiwigoPublishing.c" } PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_new (PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable) { #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_images_add_transaction_construct (PUBLISHING_PIWIGO_TYPE_IMAGES_ADD_TRANSACTION, session, parameters, publishable); -#line 13124 "PiwigoPublishing.c" +#line 13130 "PiwigoPublishing.c" } @@ -13147,7 +13153,7 @@ static void publishing_piwigo_images_add_transaction_class_init (PublishingPiwig ((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_piwigo_images_add_transaction_finalize; #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingPiwigoImagesAddTransactionPrivate)); -#line 13135 "PiwigoPublishing.c" +#line 13141 "PiwigoPublishing.c" } @@ -13156,11 +13162,11 @@ static void publishing_piwigo_images_add_transaction_instance_init (PublishingPi self->priv = PUBLISHING_PIWIGO_IMAGES_ADD_TRANSACTION_GET_PRIVATE (self); #line 1715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->parameters = NULL; -#line 13144 "PiwigoPublishing.c" +#line 13150 "PiwigoPublishing.c" } -static void publishing_piwigo_images_add_transaction_finalize (PublishingRESTSupportTransaction* obj) { +static void publishing_piwigo_images_add_transaction_finalize (PublishingRESTSupportTransaction * obj) { PublishingPiwigoImagesAddTransaction * self; #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_IMAGES_ADD_TRANSACTION, PublishingPiwigoImagesAddTransaction); @@ -13168,7 +13174,7 @@ static void publishing_piwigo_images_add_transaction_finalize (PublishingRESTSup _publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters); #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_piwigo_images_add_transaction_parent_class)->finalize (obj); -#line 13156 "PiwigoPublishing.c" +#line 13162 "PiwigoPublishing.c" } diff --git a/plugins/shotwell-publishing/YouTubePublishing.c b/plugins/shotwell-publishing/YouTubePublishing.c index 188562b..4be28b4 100644 --- a/plugins/shotwell-publishing/YouTubePublishing.c +++ b/plugins/shotwell-publishing/YouTubePublishing.c @@ -1,4 +1,4 @@ -/* YouTubePublishing.c generated by valac 0.34.7, the Vala compiler +/* YouTubePublishing.c generated by valac 0.36.6, the Vala compiler * generated from YouTubePublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -112,6 +112,12 @@ typedef struct _PublishingYouTubePublishingOptionsPanePrivacyDescriptionClass Pu typedef struct _PublishingYouTubePublishingOptionsPanePrivacyDescriptionPrivate PublishingYouTubePublishingOptionsPanePrivacyDescriptionPrivate; #define _publishing_you_tube_publishing_options_pane_privacy_description_unref0(var) ((var == NULL) ? NULL : (var = (publishing_you_tube_publishing_options_pane_privacy_description_unref (var), NULL))) typedef struct _PublishingYouTubePublishingOptionsPaneParamSpecPrivacyDescription PublishingYouTubePublishingOptionsPaneParamSpecPrivacyDescription; +enum { + PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL, + PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL, + PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL +}; +static guint publishing_you_tube_publishing_options_pane_signals[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0}; #define PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION (publishing_you_tube_upload_transaction_get_type ()) #define PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, PublishingYouTubeUploadTransaction)) @@ -267,7 +273,9 @@ struct _PublishingYouTubeUploadTransactionSpliceWithProgressData { int _state_; GObject* _source_object_; GAsyncResult* _res_; - GSimpleAsyncResult* _async_result; + GTask* _async_result; + GAsyncReadyCallback _callback_; + gboolean _task_complete_; PublishingYouTubeUploadTransaction* self; GFileInfo* info; GInputStream* input; @@ -318,15 +326,15 @@ static gint you_tube_service_icon_pixbuf_set_length1; static GdkPixbuf** you_tube_service_icon_pixbuf_set = NULL; static gint you_tube_service_icon_pixbuf_set_length1 = 0; static gint _you_tube_service_icon_pixbuf_set_size_ = 0; -static SpitPluggableIface* you_tube_service_spit_pluggable_parent_iface = NULL; -static SpitPublishingServiceIface* you_tube_service_spit_publishing_service_parent_iface = NULL; +static SpitPluggableIface * you_tube_service_spit_pluggable_parent_iface = NULL; +static SpitPublishingServiceIface * you_tube_service_spit_publishing_service_parent_iface = NULL; static gpointer publishing_you_tube_publishing_parameters_parent_class = NULL; static gpointer publishing_you_tube_you_tube_authorizer_parent_class = NULL; -static GDataAuthorizerInterface* publishing_you_tube_you_tube_authorizer_gdata_authorizer_parent_iface = NULL; +static GDataAuthorizerInterface * publishing_you_tube_you_tube_authorizer_gdata_authorizer_parent_iface = NULL; static gpointer publishing_you_tube_you_tube_publisher_parent_class = NULL; static gpointer publishing_you_tube_publishing_options_pane_parent_class = NULL; static gpointer publishing_you_tube_publishing_options_pane_privacy_description_parent_class = NULL; -static SpitPublishingDialogPaneIface* publishing_you_tube_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL; +static SpitPublishingDialogPaneIface * publishing_you_tube_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL; static gpointer publishing_you_tube_upload_transaction_parent_class = NULL; static gpointer publishing_you_tube_uploader_parent_class = NULL; @@ -348,7 +356,7 @@ PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_constr GType publishing_you_tube_you_tube_publisher_get_type (void) G_GNUC_CONST; static SpitPublishingPublisherMediaType you_tube_service_real_get_supported_media (SpitPublishingService* base); static void you_tube_service_real_activation (SpitPluggable* base, gboolean enabled); -static void you_tube_service_finalize (GObject* obj); +static void you_tube_service_finalize (GObject * obj); #define PUBLISHING_YOU_TUBE_DEVELOPER_KEY "AIzaSyB6hLnm0n5j8Y6Bkvh9bz3i8ADM2bJdYeY" GType publishing_you_tube_privacy_setting_get_type (void) G_GNUC_CONST; gpointer publishing_you_tube_publishing_parameters_ref (gpointer instance); @@ -368,7 +376,7 @@ PublishingYouTubePrivacySetting publishing_you_tube_publishing_parameters_get_pr void publishing_you_tube_publishing_parameters_set_privacy (PublishingYouTubePublishingParameters* self, PublishingYouTubePrivacySetting privacy); gchar* publishing_you_tube_publishing_parameters_get_user_name (PublishingYouTubePublishingParameters* self); void publishing_you_tube_publishing_parameters_set_user_name (PublishingYouTubePublishingParameters* self, const gchar* user_name); -static void publishing_you_tube_publishing_parameters_finalize (PublishingYouTubePublishingParameters* obj); +static void publishing_you_tube_publishing_parameters_finalize (PublishingYouTubePublishingParameters * obj); GType publishing_you_tube_you_tube_authorizer_get_type (void) G_GNUC_CONST; #define PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizerPrivate)) enum { @@ -379,7 +387,7 @@ PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_cons static gboolean publishing_you_tube_you_tube_authorizer_real_is_authorized_for_domain (GDataAuthorizer* base, GDataAuthorizationDomain* domain); static void publishing_you_tube_you_tube_authorizer_real_process_request (GDataAuthorizer* base, GDataAuthorizationDomain* domain, SoupMessage* message); static gboolean publishing_you_tube_you_tube_authorizer_real_refresh_authorization (GDataAuthorizer* base, GCancellable* cancellable, GError** error); -static void publishing_you_tube_you_tube_authorizer_finalize (GObject* obj); +static void publishing_you_tube_you_tube_authorizer_finalize (GObject * obj); #define PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisherPrivate)) enum { PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_DUMMY_PROPERTY @@ -409,7 +417,7 @@ PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_ static void _publishing_you_tube_you_tube_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self); static void publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* base); static SpitPublishingAuthenticator* publishing_you_tube_you_tube_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base); -static void publishing_you_tube_you_tube_publisher_finalize (GObject* obj); +static void publishing_you_tube_you_tube_publisher_finalize (GObject * obj); static gpointer publishing_you_tube_publishing_options_pane_privacy_description_ref (gpointer instance); static void publishing_you_tube_publishing_options_pane_privacy_description_unref (gpointer instance); static GParamSpec* publishing_you_tube_publishing_options_pane_param_spec_privacy_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; @@ -429,9 +437,9 @@ static void _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_ static void publishing_you_tube_publishing_options_pane_update_publish_button_sensitivity (PublishingYouTubePublishingOptionsPane* self); static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_new (const gchar* description, PublishingYouTubePrivacySetting privacy_setting); static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_construct (GType object_type, const gchar* description, PublishingYouTubePrivacySetting privacy_setting); -static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value); -static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value); -static void _vala_array_add34 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value); +static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value); +static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value); +static void _vala_array_add34 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value); static GtkWidget* publishing_you_tube_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base); static SpitPublishingDialogPaneGeometryOptions publishing_you_tube_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base); static void publishing_you_tube_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base); @@ -439,8 +447,8 @@ static void publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled enum { PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_DUMMY_PROPERTY }; -static void publishing_you_tube_publishing_options_pane_privacy_description_finalize (PublishingYouTubePublishingOptionsPanePrivacyDescription* obj); -static void publishing_you_tube_publishing_options_pane_finalize (GObject* obj); +static void publishing_you_tube_publishing_options_pane_privacy_description_finalize (PublishingYouTubePublishingOptionsPanePrivacyDescription * obj); +static void publishing_you_tube_publishing_options_pane_finalize (GObject * obj); GType publishing_you_tube_upload_transaction_get_type (void) G_GNUC_CONST; #define PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, PublishingYouTubeUploadTransactionPrivate)) enum { @@ -457,23 +465,24 @@ static void publishing_you_tube_upload_transaction_splice_with_progress_finish ( static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res); static void ____lambda4__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); static void publishing_you_tube_upload_transaction_splice_with_progress_data_free (gpointer _data); +static void publishing_you_tube_upload_transaction_splice_with_progress_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data); static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_); static void publishing_you_tube_upload_transaction_splice_with_progress_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); -static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSupportTransaction* obj); +static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSupportTransaction * obj); #define PUBLISHING_YOU_TUBE_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploaderPrivate)) enum { PUBLISHING_YOU_TUBE_UPLOADER_DUMMY_PROPERTY }; static PublishingRESTSupportTransaction* publishing_you_tube_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable); -static void publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUploader* obj); +static void publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUploader * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_directory) { YouTubeService * self = NULL; - GdkPixbuf** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + GdkPixbuf** _tmp0_; + gint _tmp0__length1; #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_val_if_fail (G_IS_FILE (resource_directory), NULL); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -484,9 +493,9 @@ YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_d _tmp0__length1 = you_tube_service_icon_pixbuf_set_length1; #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (_tmp0_ == NULL) { -#line 488 "YouTubePublishing.c" - gint _tmp1_ = 0; - GdkPixbuf** _tmp2_ = NULL; +#line 497 "YouTubePublishing.c" + gint _tmp1_; + GdkPixbuf** _tmp2_; #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" YOU_TUBE_SERVICE_ICON_FILENAME, &_tmp1_); #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -497,27 +506,27 @@ YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_d you_tube_service_icon_pixbuf_set_length1 = _tmp1_; #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _you_tube_service_icon_pixbuf_set_size_ = you_tube_service_icon_pixbuf_set_length1; -#line 501 "YouTubePublishing.c" +#line 510 "YouTubePublishing.c" } #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self; -#line 505 "YouTubePublishing.c" +#line 514 "YouTubePublishing.c" } YouTubeService* you_tube_service_new (GFile* resource_directory) { #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return you_tube_service_construct (TYPE_YOU_TUBE_SERVICE, resource_directory); -#line 512 "YouTubePublishing.c" +#line 521 "YouTubePublishing.c" } static gint you_tube_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) { YouTubeService * self; gint result = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YOU_TUBE_SERVICE, YouTubeService); #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -530,7 +539,7 @@ static gint you_tube_service_real_get_pluggable_interface (SpitPluggable* base, result = _tmp2_; #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 534 "YouTubePublishing.c" +#line 543 "YouTubePublishing.c" } @@ -543,7 +552,7 @@ static const gchar* you_tube_service_real_get_id (SpitPluggable* base) { result = "org.yorba.shotwell.publishing.youtube"; #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 547 "YouTubePublishing.c" +#line 556 "YouTubePublishing.c" } @@ -556,14 +565,14 @@ static const gchar* you_tube_service_real_get_pluggable_name (SpitPluggable* bas result = "YouTube"; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 560 "YouTubePublishing.c" +#line 569 "YouTubePublishing.c" } static gpointer _g_object_ref0 (gpointer self) { #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self ? g_object_ref (self) : NULL; -#line 567 "YouTubePublishing.c" +#line 576 "YouTubePublishing.c" } @@ -574,34 +583,33 @@ static GdkPixbuf** _vala_array_dup9 (GdkPixbuf** self, int length) { result = g_new0 (GdkPixbuf*, length + 1); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" for (i = 0; i < length; i++) { -#line 578 "YouTubePublishing.c" - GdkPixbuf* _tmp0_ = NULL; +#line 587 "YouTubePublishing.c" + GdkPixbuf* _tmp0_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" result[i] = _tmp0_; -#line 584 "YouTubePublishing.c" +#line 593 "YouTubePublishing.c" } #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 588 "YouTubePublishing.c" +#line 597 "YouTubePublishing.c" } static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) { YouTubeService * self; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GdkPixbuf** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - GdkPixbuf** _tmp9_ = NULL; - gint _tmp9__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + GdkPixbuf** _tmp7_; + gint _tmp7__length1; + GdkPixbuf** _tmp8_; + gint _tmp8__length1; #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YOU_TUBE_SERVICE, YouTubeService); #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -613,68 +621,66 @@ static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableIn #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" (*info).authors = _tmp0_; #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp1_ = _ ("Copyright 2016 Software Freedom Conservancy Inc."); -#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp1_ = g_strdup (_ ("Copyright 2016 Software Freedom Conservancy Inc.")); #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 ((*info).copyright); #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - (*info).copyright = _tmp2_; + (*info).copyright = _tmp1_; #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp3_ = g_strdup (RESOURCES_TRANSLATORS); + _tmp2_ = g_strdup (RESOURCES_TRANSLATORS); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 ((*info).translators); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - (*info).translators = _tmp3_; + (*info).translators = _tmp2_; #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp4_ = g_strdup (_VERSION); + _tmp3_ = g_strdup (_VERSION); #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 ((*info).version); #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - (*info).version = _tmp4_; + (*info).version = _tmp3_; #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp5_ = g_strdup (RESOURCES_WEBSITE_NAME); + _tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 ((*info).website_name); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - (*info).website_name = _tmp5_; + (*info).website_name = _tmp4_; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp6_ = g_strdup (RESOURCES_WEBSITE_URL); + _tmp5_ = g_strdup (RESOURCES_WEBSITE_URL); #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 ((*info).website_url); #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - (*info).website_url = _tmp6_; + (*info).website_url = _tmp5_; #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" (*info).is_license_wordwrapped = FALSE; #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp7_ = g_strdup (RESOURCES_LICENSE); + _tmp6_ = g_strdup (RESOURCES_LICENSE); #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 ((*info).license); #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - (*info).license = _tmp7_; + (*info).license = _tmp6_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp8_ = you_tube_service_icon_pixbuf_set; + _tmp7_ = you_tube_service_icon_pixbuf_set; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp8__length1 = you_tube_service_icon_pixbuf_set_length1; + _tmp7__length1 = you_tube_service_icon_pixbuf_set_length1; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup9 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_); + _tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup9 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp9__length1 = _tmp8__length1; + _tmp8__length1 = _tmp7__length1; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" (*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - (*info).icons = _tmp9_; + (*info).icons = _tmp8_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - (*info).icons_length1 = _tmp9__length1; -#line 670 "YouTubePublishing.c" + (*info).icons_length1 = _tmp8__length1; +#line 676 "YouTubePublishing.c" } static SpitPublishingPublisher* you_tube_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) { YouTubeService * self; SpitPublishingPublisher* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - PublishingYouTubeYouTubePublisher* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + PublishingYouTubeYouTubePublisher* _tmp1_; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YOU_TUBE_SERVICE, YouTubeService); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -687,7 +693,7 @@ static SpitPublishingPublisher* you_tube_service_real_create_publisher (SpitPubl result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher); #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 691 "YouTubePublishing.c" +#line 697 "YouTubePublishing.c" } @@ -700,7 +706,7 @@ static SpitPublishingPublisherMediaType you_tube_service_real_get_supported_medi result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO; #line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 704 "YouTubePublishing.c" +#line 710 "YouTubePublishing.c" } @@ -708,7 +714,7 @@ static void you_tube_service_real_activation (SpitPluggable* base, gboolean enab YouTubeService * self; #line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YOU_TUBE_SERVICE, YouTubeService); -#line 712 "YouTubePublishing.c" +#line 718 "YouTubePublishing.c" } @@ -717,7 +723,7 @@ static void you_tube_service_class_init (YouTubeServiceClass * klass) { you_tube_service_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" G_OBJECT_CLASS (klass)->finalize = you_tube_service_finalize; -#line 721 "YouTubePublishing.c" +#line 727 "YouTubePublishing.c" } @@ -725,16 +731,16 @@ static void you_tube_service_spit_pluggable_interface_init (SpitPluggableIface * #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" you_tube_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) you_tube_service_real_get_pluggable_interface; + iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) you_tube_service_real_get_pluggable_interface; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - iface->get_id = (const gchar* (*)(SpitPluggable*)) you_tube_service_real_get_id; + iface->get_id = (const gchar* (*) (SpitPluggable *)) you_tube_service_real_get_id; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) you_tube_service_real_get_pluggable_name; + iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) you_tube_service_real_get_pluggable_name; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) you_tube_service_real_get_info; + iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) you_tube_service_real_get_info; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - iface->activation = (void (*)(SpitPluggable*, gboolean)) you_tube_service_real_activation; -#line 738 "YouTubePublishing.c" + iface->activation = (void (*) (SpitPluggable *, gboolean)) you_tube_service_real_activation; +#line 744 "YouTubePublishing.c" } @@ -742,10 +748,10 @@ static void you_tube_service_spit_publishing_service_interface_init (SpitPublish #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" you_tube_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) you_tube_service_real_create_publisher; + iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) you_tube_service_real_create_publisher; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) you_tube_service_real_get_supported_media; -#line 749 "YouTubePublishing.c" + iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) you_tube_service_real_get_supported_media; +#line 755 "YouTubePublishing.c" } @@ -753,13 +759,13 @@ static void you_tube_service_instance_init (YouTubeService * self) { } -static void you_tube_service_finalize (GObject* obj) { +static void you_tube_service_finalize (GObject * obj) { YouTubeService * self; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_YOU_TUBE_SERVICE, YouTubeService); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" G_OBJECT_CLASS (you_tube_service_parent_class)->finalize (obj); -#line 763 "YouTubePublishing.c" +#line 769 "YouTubePublishing.c" } @@ -803,20 +809,20 @@ PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters self->priv->user_name = NULL; #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self; -#line 807 "YouTubePublishing.c" +#line 813 "YouTubePublishing.c" } PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters_new (void) { #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return publishing_you_tube_publishing_parameters_construct (PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS); -#line 814 "YouTubePublishing.c" +#line 820 "YouTubePublishing.c" } PublishingYouTubePrivacySetting publishing_you_tube_publishing_parameters_get_privacy (PublishingYouTubePublishingParameters* self) { PublishingYouTubePrivacySetting result = 0; - PublishingYouTubePrivacySetting _tmp0_ = 0; + PublishingYouTubePrivacySetting _tmp0_; #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self), 0); #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -825,26 +831,26 @@ PublishingYouTubePrivacySetting publishing_you_tube_publishing_parameters_get_pr result = _tmp0_; #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 829 "YouTubePublishing.c" +#line 835 "YouTubePublishing.c" } void publishing_you_tube_publishing_parameters_set_privacy (PublishingYouTubePublishingParameters* self, PublishingYouTubePrivacySetting privacy) { - PublishingYouTubePrivacySetting _tmp0_ = 0; + PublishingYouTubePrivacySetting _tmp0_; #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self)); #line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp0_ = privacy; #line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self->priv->privacy = _tmp0_; -#line 841 "YouTubePublishing.c" +#line 847 "YouTubePublishing.c" } gchar* publishing_you_tube_publishing_parameters_get_user_name (PublishingYouTubePublishingParameters* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self), NULL); #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -855,13 +861,13 @@ gchar* publishing_you_tube_publishing_parameters_get_user_name (PublishingYouTub result = _tmp1_; #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 859 "YouTubePublishing.c" +#line 865 "YouTubePublishing.c" } void publishing_you_tube_publishing_parameters_set_user_name (PublishingYouTubePublishingParameters* self, const gchar* user_name) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self)); #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -872,14 +878,14 @@ void publishing_you_tube_publishing_parameters_set_user_name (PublishingYouTubeP _g_free0 (self->priv->user_name); #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self->priv->user_name = _tmp1_; -#line 876 "YouTubePublishing.c" +#line 882 "YouTubePublishing.c" } static void publishing_you_tube_value_publishing_parameters_init (GValue* value) { #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = NULL; -#line 883 "YouTubePublishing.c" +#line 889 "YouTubePublishing.c" } @@ -888,7 +894,7 @@ static void publishing_you_tube_value_publishing_parameters_free_value (GValue* if (value->data[0].v_pointer) { #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_parameters_unref (value->data[0].v_pointer); -#line 892 "YouTubePublishing.c" +#line 898 "YouTubePublishing.c" } } @@ -898,11 +904,11 @@ static void publishing_you_tube_value_publishing_parameters_copy_value (const GV if (src_value->data[0].v_pointer) { #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" dest_value->data[0].v_pointer = publishing_you_tube_publishing_parameters_ref (src_value->data[0].v_pointer); -#line 902 "YouTubePublishing.c" +#line 908 "YouTubePublishing.c" } else { #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 906 "YouTubePublishing.c" +#line 912 "YouTubePublishing.c" } } @@ -910,66 +916,66 @@ static void publishing_you_tube_value_publishing_parameters_copy_value (const GV static gpointer publishing_you_tube_value_publishing_parameters_peek_pointer (const GValue* value) { #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return value->data[0].v_pointer; -#line 914 "YouTubePublishing.c" +#line 920 "YouTubePublishing.c" } static gchar* publishing_you_tube_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (collect_values[0].v_pointer) { -#line 921 "YouTubePublishing.c" - PublishingYouTubePublishingParameters* object; +#line 927 "YouTubePublishing.c" + PublishingYouTubePublishingParameters * object; object = collect_values[0].v_pointer; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (object->parent_instance.g_class == NULL) { #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 928 "YouTubePublishing.c" +#line 934 "YouTubePublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 932 "YouTubePublishing.c" +#line 938 "YouTubePublishing.c" } #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = publishing_you_tube_publishing_parameters_ref (object); -#line 936 "YouTubePublishing.c" +#line 942 "YouTubePublishing.c" } else { #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = NULL; -#line 940 "YouTubePublishing.c" +#line 946 "YouTubePublishing.c" } #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return NULL; -#line 944 "YouTubePublishing.c" +#line 950 "YouTubePublishing.c" } static gchar* publishing_you_tube_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingYouTubePublishingParameters** object_p; + PublishingYouTubePublishingParameters ** object_p; object_p = collect_values[0].v_pointer; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (!object_p) { #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 955 "YouTubePublishing.c" +#line 961 "YouTubePublishing.c" } #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (!value->data[0].v_pointer) { #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" *object_p = NULL; -#line 961 "YouTubePublishing.c" +#line 967 "YouTubePublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" *object_p = value->data[0].v_pointer; -#line 965 "YouTubePublishing.c" +#line 971 "YouTubePublishing.c" } else { #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" *object_p = publishing_you_tube_publishing_parameters_ref (value->data[0].v_pointer); -#line 969 "YouTubePublishing.c" +#line 975 "YouTubePublishing.c" } #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return NULL; -#line 973 "YouTubePublishing.c" +#line 979 "YouTubePublishing.c" } @@ -983,7 +989,7 @@ GParamSpec* publishing_you_tube_param_spec_publishing_parameters (const gchar* n G_PARAM_SPEC (spec)->value_type = object_type; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return G_PARAM_SPEC (spec); -#line 987 "YouTubePublishing.c" +#line 993 "YouTubePublishing.c" } @@ -992,12 +998,12 @@ gpointer publishing_you_tube_value_get_publishing_parameters (const GValue* valu g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS), NULL); #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return value->data[0].v_pointer; -#line 996 "YouTubePublishing.c" +#line 1002 "YouTubePublishing.c" } void publishing_you_tube_value_set_publishing_parameters (GValue* value, gpointer v_object) { - PublishingYouTubePublishingParameters* old; + PublishingYouTubePublishingParameters * old; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS)); #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1012,23 +1018,23 @@ void publishing_you_tube_value_set_publishing_parameters (GValue* value, gpointe value->data[0].v_pointer = v_object; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_parameters_ref (value->data[0].v_pointer); -#line 1016 "YouTubePublishing.c" +#line 1022 "YouTubePublishing.c" } else { #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = NULL; -#line 1020 "YouTubePublishing.c" +#line 1026 "YouTubePublishing.c" } #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (old) { #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_parameters_unref (old); -#line 1026 "YouTubePublishing.c" +#line 1032 "YouTubePublishing.c" } } void publishing_you_tube_value_take_publishing_parameters (GValue* value, gpointer v_object) { - PublishingYouTubePublishingParameters* old; + PublishingYouTubePublishingParameters * old; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS)); #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1041,17 +1047,17 @@ void publishing_you_tube_value_take_publishing_parameters (GValue* value, gpoint g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = v_object; -#line 1045 "YouTubePublishing.c" +#line 1051 "YouTubePublishing.c" } else { #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = NULL; -#line 1049 "YouTubePublishing.c" +#line 1055 "YouTubePublishing.c" } #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (old) { #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_parameters_unref (old); -#line 1055 "YouTubePublishing.c" +#line 1061 "YouTubePublishing.c" } } @@ -1063,7 +1069,7 @@ static void publishing_you_tube_publishing_parameters_class_init (PublishingYouT ((PublishingYouTubePublishingParametersClass *) klass)->finalize = publishing_you_tube_publishing_parameters_finalize; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_type_class_add_private (klass, sizeof (PublishingYouTubePublishingParametersPrivate)); -#line 1067 "YouTubePublishing.c" +#line 1073 "YouTubePublishing.c" } @@ -1072,11 +1078,11 @@ static void publishing_you_tube_publishing_parameters_instance_init (PublishingY self->priv = PUBLISHING_YOU_TUBE_PUBLISHING_PARAMETERS_GET_PRIVATE (self); #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self->ref_count = 1; -#line 1076 "YouTubePublishing.c" +#line 1082 "YouTubePublishing.c" } -static void publishing_you_tube_publishing_parameters_finalize (PublishingYouTubePublishingParameters* obj) { +static void publishing_you_tube_publishing_parameters_finalize (PublishingYouTubePublishingParameters * obj) { PublishingYouTubePublishingParameters * self; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS, PublishingYouTubePublishingParameters); @@ -1084,7 +1090,7 @@ static void publishing_you_tube_publishing_parameters_finalize (PublishingYouTub g_signal_handlers_destroy (self); #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 (self->priv->user_name); -#line 1088 "YouTubePublishing.c" +#line 1094 "YouTubePublishing.c" } @@ -1103,18 +1109,18 @@ GType publishing_you_tube_publishing_parameters_get_type (void) { gpointer publishing_you_tube_publishing_parameters_ref (gpointer instance) { - PublishingYouTubePublishingParameters* self; + PublishingYouTubePublishingParameters * self; self = instance; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_atomic_int_inc (&self->ref_count); #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return instance; -#line 1113 "YouTubePublishing.c" +#line 1119 "YouTubePublishing.c" } void publishing_you_tube_publishing_parameters_unref (gpointer instance) { - PublishingYouTubePublishingParameters* self; + PublishingYouTubePublishingParameters * self; self = instance; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1122,7 +1128,7 @@ void publishing_you_tube_publishing_parameters_unref (gpointer instance) { PUBLISHING_YOU_TUBE_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self); #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1126 "YouTubePublishing.c" +#line 1132 "YouTubePublishing.c" } } @@ -1130,16 +1136,16 @@ void publishing_you_tube_publishing_parameters_unref (gpointer instance) { static gpointer _publishing_rest_support_session_ref0 (gpointer self) { #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self ? publishing_rest_support_session_ref (self) : NULL; -#line 1134 "YouTubePublishing.c" +#line 1140 "YouTubePublishing.c" } PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_construct (GType object_type, PublishingRESTSupportGoogleSession* session, SpitPublishingAuthenticator* authenticator) { PublishingYouTubeYouTubeAuthorizer * self = NULL; - PublishingRESTSupportGoogleSession* _tmp0_ = NULL; - PublishingRESTSupportGoogleSession* _tmp1_ = NULL; - SpitPublishingAuthenticator* _tmp2_ = NULL; - SpitPublishingAuthenticator* _tmp3_ = NULL; + PublishingRESTSupportGoogleSession* _tmp0_; + PublishingRESTSupportGoogleSession* _tmp1_; + SpitPublishingAuthenticator* _tmp2_; + SpitPublishingAuthenticator* _tmp3_; #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL); #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1164,14 +1170,14 @@ PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_cons self->priv->authenticator = _tmp3_; #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self; -#line 1168 "YouTubePublishing.c" +#line 1174 "YouTubePublishing.c" } PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_new (PublishingRESTSupportGoogleSession* session, SpitPublishingAuthenticator* authenticator) { #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return publishing_you_tube_you_tube_authorizer_construct (PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, session, authenticator); -#line 1175 "YouTubePublishing.c" +#line 1181 "YouTubePublishing.c" } @@ -1186,22 +1192,22 @@ static gboolean publishing_you_tube_you_tube_authorizer_real_is_authorized_for_d result = TRUE; #line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 1190 "YouTubePublishing.c" +#line 1196 "YouTubePublishing.c" } static void publishing_you_tube_you_tube_authorizer_real_process_request (GDataAuthorizer* base, GDataAuthorizationDomain* domain, SoupMessage* message) { PublishingYouTubeYouTubeAuthorizer * self; - GDataAuthorizationDomain* _tmp0_ = NULL; + GDataAuthorizationDomain* _tmp0_; gchar* header = NULL; - PublishingRESTSupportGoogleSession* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - SoupMessage* _tmp6_ = NULL; - SoupMessageHeaders* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; + PublishingRESTSupportGoogleSession* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + SoupMessage* _tmp6_; + SoupMessageHeaders* _tmp7_; + const gchar* _tmp8_; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizer); #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1214,7 +1220,7 @@ static void publishing_you_tube_you_tube_authorizer_real_process_request (GDataA if (_tmp0_ == NULL) { #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 1218 "YouTubePublishing.c" +#line 1224 "YouTubePublishing.c" } #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp1_ = self->priv->session; @@ -1240,14 +1246,14 @@ static void publishing_you_tube_you_tube_authorizer_real_process_request (GDataA soup_message_headers_replace (_tmp7_, "Authorization", _tmp8_); #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 (header); -#line 1244 "YouTubePublishing.c" +#line 1250 "YouTubePublishing.c" } static gboolean publishing_you_tube_you_tube_authorizer_real_refresh_authorization (GDataAuthorizer* base, GCancellable* cancellable, GError** error) { PublishingYouTubeYouTubeAuthorizer * self; gboolean result = FALSE; - SpitPublishingAuthenticator* _tmp0_ = NULL; + SpitPublishingAuthenticator* _tmp0_; #line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizer); #line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1260,7 +1266,7 @@ static gboolean publishing_you_tube_you_tube_authorizer_real_refresh_authorizati result = TRUE; #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 1264 "YouTubePublishing.c" +#line 1270 "YouTubePublishing.c" } @@ -1271,7 +1277,7 @@ static void publishing_you_tube_you_tube_authorizer_class_init (PublishingYouTub g_type_class_add_private (klass, sizeof (PublishingYouTubeYouTubeAuthorizerPrivate)); #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_you_tube_you_tube_authorizer_finalize; -#line 1275 "YouTubePublishing.c" +#line 1281 "YouTubePublishing.c" } @@ -1279,23 +1285,23 @@ static void publishing_you_tube_you_tube_authorizer_gdata_authorizer_interface_i #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_authorizer_gdata_authorizer_parent_iface = g_type_interface_peek_parent (iface); #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - iface->is_authorized_for_domain = (gboolean (*)(GDataAuthorizer*, GDataAuthorizationDomain*)) publishing_you_tube_you_tube_authorizer_real_is_authorized_for_domain; + iface->is_authorized_for_domain = (gboolean (*) (GDataAuthorizer *, GDataAuthorizationDomain*)) publishing_you_tube_you_tube_authorizer_real_is_authorized_for_domain; #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - iface->process_request = (void (*)(GDataAuthorizer*, GDataAuthorizationDomain*, SoupMessage*)) publishing_you_tube_you_tube_authorizer_real_process_request; + iface->process_request = (void (*) (GDataAuthorizer *, GDataAuthorizationDomain*, SoupMessage*)) publishing_you_tube_you_tube_authorizer_real_process_request; #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - iface->refresh_authorization = (gboolean (*)(GDataAuthorizer*, GCancellable*, GError**)) publishing_you_tube_you_tube_authorizer_real_refresh_authorization; -#line 1288 "YouTubePublishing.c" + iface->refresh_authorization = (gboolean (*) (GDataAuthorizer *, GCancellable*, GError**)) publishing_you_tube_you_tube_authorizer_real_refresh_authorization; +#line 1294 "YouTubePublishing.c" } static void publishing_you_tube_you_tube_authorizer_instance_init (PublishingYouTubeYouTubeAuthorizer * self) { #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self->priv = PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER_GET_PRIVATE (self); -#line 1295 "YouTubePublishing.c" +#line 1301 "YouTubePublishing.c" } -static void publishing_you_tube_you_tube_authorizer_finalize (GObject* obj) { +static void publishing_you_tube_you_tube_authorizer_finalize (GObject * obj) { PublishingYouTubeYouTubeAuthorizer * self; #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizer); @@ -1305,7 +1311,7 @@ static void publishing_you_tube_you_tube_authorizer_finalize (GObject* obj) { _g_object_unref0 (self->priv->authenticator); #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" G_OBJECT_CLASS (publishing_you_tube_you_tube_authorizer_parent_class)->finalize (obj); -#line 1309 "YouTubePublishing.c" +#line 1315 "YouTubePublishing.c" } @@ -1325,9 +1331,9 @@ GType publishing_you_tube_you_tube_authorizer_get_type (void) { PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) { PublishingYouTubeYouTubePublisher * self = NULL; - SpitPublishingService* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; - PublishingYouTubePublishingParameters* _tmp2_ = NULL; + SpitPublishingService* _tmp0_; + SpitPublishingPluginHost* _tmp1_; + PublishingYouTubePublishingParameters* _tmp2_; #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL); #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1362,21 +1368,21 @@ PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_constr self->priv->progress_reporter_target_destroy_notify = NULL; #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self; -#line 1366 "YouTubePublishing.c" +#line 1372 "YouTubePublishing.c" } PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) { #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return publishing_you_tube_you_tube_publisher_construct (PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, service, host); -#line 1373 "YouTubePublishing.c" +#line 1379 "YouTubePublishing.c" } static gboolean publishing_you_tube_you_tube_publisher_real_is_running (PublishingRESTSupportGooglePublisher* base) { PublishingYouTubeYouTubePublisher * self; gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher); #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1385,14 +1391,14 @@ static gboolean publishing_you_tube_you_tube_publisher_real_is_running (Publishi result = _tmp0_; #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 1389 "YouTubePublishing.c" +#line 1395 "YouTubePublishing.c" } static void publishing_you_tube_you_tube_publisher_real_start (PublishingRESTSupportGooglePublisher* base) { PublishingYouTubeYouTubePublisher * self; - gboolean _tmp0_ = FALSE; - SpitPublishingAuthenticator* _tmp1_ = NULL; + gboolean _tmp0_; + SpitPublishingAuthenticator* _tmp1_; #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher); #line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1403,7 +1409,7 @@ static void publishing_you_tube_you_tube_publisher_real_start (PublishingRESTSup if (_tmp0_) { #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 1407 "YouTubePublishing.c" +#line 1413 "YouTubePublishing.c" } #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self->priv->running = TRUE; @@ -1411,14 +1417,14 @@ static void publishing_you_tube_you_tube_publisher_real_start (PublishingRESTSup _tmp1_ = self->priv->authenticator; #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" spit_publishing_authenticator_authenticate (_tmp1_); -#line 1415 "YouTubePublishing.c" +#line 1421 "YouTubePublishing.c" } static void publishing_you_tube_you_tube_publisher_real_stop (PublishingRESTSupportGooglePublisher* base) { PublishingYouTubeYouTubePublisher * self; - PublishingRESTSupportGoogleSession* _tmp0_ = NULL; - PublishingRESTSupportGoogleSession* _tmp1_ = NULL; + PublishingRESTSupportGoogleSession* _tmp0_; + PublishingRESTSupportGoogleSession* _tmp1_; #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher); #line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1433,23 +1439,23 @@ static void publishing_you_tube_you_tube_publisher_real_stop (PublishingRESTSupp publishing_rest_support_session_stop_transactions (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); #line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _publishing_rest_support_session_unref0 (_tmp1_); -#line 1437 "YouTubePublishing.c" +#line 1443 "YouTubePublishing.c" } static void publishing_you_tube_you_tube_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* base) { PublishingYouTubeYouTubePublisher * self; - PublishingYouTubePublishingParameters* _tmp0_ = NULL; - PublishingRESTSupportGoogleSession* _tmp1_ = NULL; - PublishingRESTSupportGoogleSession* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - PublishingRESTSupportGoogleSession* _tmp5_ = NULL; - PublishingRESTSupportGoogleSession* _tmp6_ = NULL; - SpitPublishingAuthenticator* _tmp7_ = NULL; - PublishingYouTubeYouTubeAuthorizer* _tmp8_ = NULL; - PublishingYouTubeYouTubeAuthorizer* _tmp9_ = NULL; - GDataYouTubeService* _tmp10_ = NULL; + PublishingYouTubePublishingParameters* _tmp0_; + PublishingRESTSupportGoogleSession* _tmp1_; + PublishingRESTSupportGoogleSession* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + PublishingRESTSupportGoogleSession* _tmp5_; + PublishingRESTSupportGoogleSession* _tmp6_; + SpitPublishingAuthenticator* _tmp7_; + PublishingYouTubeYouTubeAuthorizer* _tmp8_; + PublishingYouTubeYouTubeAuthorizer* _tmp9_; + GDataYouTubeService* _tmp10_; #line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher); #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1492,12 +1498,12 @@ static void publishing_you_tube_you_tube_publisher_real_on_login_flow_complete ( _publishing_rest_support_session_unref0 (_tmp6_); #line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_do_show_publishing_options_pane (self); -#line 1496 "YouTubePublishing.c" +#line 1502 "YouTubePublishing.c" } static void publishing_you_tube_you_tube_publisher_on_publishing_options_logout (PublishingYouTubeYouTubePublisher* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self)); #line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1509,16 +1515,16 @@ static void publishing_you_tube_you_tube_publisher_on_publishing_options_logout if (!_tmp0_) { #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 1512 "YouTubePublishing.c" +#line 1518 "YouTubePublishing.c" } #line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_rest_support_google_publisher_do_logout (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); -#line 1516 "YouTubePublishing.c" +#line 1522 "YouTubePublishing.c" } static void publishing_you_tube_you_tube_publisher_on_publishing_options_publish (PublishingYouTubeYouTubePublisher* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self)); #line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1530,23 +1536,23 @@ static void publishing_you_tube_you_tube_publisher_on_publishing_options_publish if (!_tmp0_) { #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 1532 "YouTubePublishing.c" +#line 1538 "YouTubePublishing.c" } #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_do_upload (self); -#line 1536 "YouTubePublishing.c" +#line 1542 "YouTubePublishing.c" } static void publishing_you_tube_you_tube_publisher_on_upload_status_updated (PublishingYouTubeYouTubePublisher* self, gint file_number, gdouble completed_fraction) { - gdouble _tmp0_ = 0.0; - SpitPublishingProgressCallback _tmp1_ = NULL; - void* _tmp1__target = NULL; - gboolean _tmp2_ = FALSE; - SpitPublishingProgressCallback _tmp3_ = NULL; - void* _tmp3__target = NULL; - gint _tmp4_ = 0; - gdouble _tmp5_ = 0.0; + gdouble _tmp0_; + SpitPublishingProgressCallback _tmp1_; + void* _tmp1__target; + gboolean _tmp2_; + SpitPublishingProgressCallback _tmp3_; + void* _tmp3__target; + gint _tmp4_; + gdouble _tmp5_; #line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self)); #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1566,7 +1572,7 @@ static void publishing_you_tube_you_tube_publisher_on_upload_status_updated (Pub if (!_tmp2_) { #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 1567 "YouTubePublishing.c" +#line 1573 "YouTubePublishing.c" } #line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp3_ = self->priv->progress_reporter; @@ -1578,31 +1584,31 @@ static void publishing_you_tube_you_tube_publisher_on_upload_status_updated (Pub _tmp5_ = completed_fraction; #line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp3_ (_tmp4_, _tmp5_, _tmp3__target); -#line 1579 "YouTubePublishing.c" +#line 1585 "YouTubePublishing.c" } static void _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) { #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_on_upload_complete ((PublishingYouTubeYouTubePublisher*) self, _sender, num_photos_published); -#line 1586 "YouTubePublishing.c" +#line 1592 "YouTubePublishing.c" } static void _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) { #line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_on_upload_error ((PublishingYouTubeYouTubePublisher*) self, _sender, err); -#line 1593 "YouTubePublishing.c" +#line 1599 "YouTubePublishing.c" } static void publishing_you_tube_you_tube_publisher_on_upload_complete (PublishingYouTubeYouTubePublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) { - PublishingRESTSupportBatchUploader* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportBatchUploader* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gint _tmp4_ = 0; - gboolean _tmp5_ = FALSE; + PublishingRESTSupportBatchUploader* _tmp0_; + guint _tmp1_; + PublishingRESTSupportBatchUploader* _tmp2_; + guint _tmp3_; + gint _tmp4_; + gboolean _tmp5_; #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self)); #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1630,24 +1636,24 @@ static void publishing_you_tube_you_tube_publisher_on_upload_complete (Publishin if (!_tmp5_) { #line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 1630 "YouTubePublishing.c" +#line 1636 "YouTubePublishing.c" } #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_do_show_success_pane (self); -#line 1634 "YouTubePublishing.c" +#line 1640 "YouTubePublishing.c" } static void publishing_you_tube_you_tube_publisher_on_upload_error (PublishingYouTubeYouTubePublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) { - PublishingRESTSupportBatchUploader* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportBatchUploader* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - GError* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - SpitPublishingPluginHost* _tmp7_ = NULL; - GError* _tmp8_ = NULL; + PublishingRESTSupportBatchUploader* _tmp0_; + guint _tmp1_; + PublishingRESTSupportBatchUploader* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + GError* _tmp5_; + const gchar* _tmp6_; + SpitPublishingPluginHost* _tmp7_; + GError* _tmp8_; #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self)); #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1670,7 +1676,7 @@ static void publishing_you_tube_you_tube_publisher_on_upload_error (PublishingYo if (!_tmp4_) { #line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 1670 "YouTubePublishing.c" +#line 1676 "YouTubePublishing.c" } #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp5_ = err; @@ -1685,38 +1691,38 @@ static void publishing_you_tube_you_tube_publisher_on_upload_error (PublishingYo _tmp8_ = err; #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_); -#line 1684 "YouTubePublishing.c" +#line 1690 "YouTubePublishing.c" } static void _publishing_you_tube_you_tube_publisher_on_publishing_options_publish_publishing_you_tube_publishing_options_pane_publish (PublishingYouTubePublishingOptionsPane* _sender, gpointer self) { #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_on_publishing_options_publish ((PublishingYouTubeYouTubePublisher*) self); -#line 1691 "YouTubePublishing.c" +#line 1697 "YouTubePublishing.c" } static void _publishing_you_tube_you_tube_publisher_on_publishing_options_logout_publishing_you_tube_publishing_options_pane_logout (PublishingYouTubePublishingOptionsPane* _sender, gpointer self) { #line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_on_publishing_options_logout ((PublishingYouTubeYouTubePublisher*) self); -#line 1698 "YouTubePublishing.c" +#line 1704 "YouTubePublishing.c" } static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pane (PublishingYouTubeYouTubePublisher* self) { GtkBuilder* builder = NULL; - GtkBuilder* _tmp0_ = NULL; + GtkBuilder* _tmp0_; PublishingYouTubePublishingOptionsPane* opts_pane = NULL; - SpitPublishingAuthenticator* _tmp8_ = NULL; - SpitPublishingPluginHost* _tmp9_ = NULL; - GtkBuilder* _tmp10_ = NULL; - PublishingYouTubePublishingParameters* _tmp11_ = NULL; - PublishingYouTubePublishingOptionsPane* _tmp12_ = NULL; - PublishingYouTubePublishingOptionsPane* _tmp13_ = NULL; - PublishingYouTubePublishingOptionsPane* _tmp14_ = NULL; - SpitPublishingPluginHost* _tmp15_ = NULL; - PublishingYouTubePublishingOptionsPane* _tmp16_ = NULL; - SpitPublishingPluginHost* _tmp17_ = NULL; + SpitPublishingAuthenticator* _tmp7_; + SpitPublishingPluginHost* _tmp8_; + GtkBuilder* _tmp9_; + PublishingYouTubePublishingParameters* _tmp10_; + PublishingYouTubePublishingOptionsPane* _tmp11_; + PublishingYouTubePublishingOptionsPane* _tmp12_; + PublishingYouTubePublishingOptionsPane* _tmp13_; + SpitPublishingPluginHost* _tmp14_; + PublishingYouTubePublishingOptionsPane* _tmp15_; + SpitPublishingPluginHost* _tmp16_; GError * _inner_error_ = NULL; #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self)); @@ -1726,16 +1732,16 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa _tmp0_ = gtk_builder_new (); #line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" builder = _tmp0_; -#line 1725 "YouTubePublishing.c" +#line 1731 "YouTubePublishing.c" { - GtkBuilder* _tmp1_ = NULL; + GtkBuilder* _tmp1_; #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp1_ = builder; #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/youtube_publishing_options_pane.ui", &_inner_error_); #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1734 "YouTubePublishing.c" +#line 1740 "YouTubePublishing.c" goto __catch20_g_error; } } @@ -1743,12 +1749,11 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa __catch20_g_error: { GError* e = NULL; - GError* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - SpitPublishingPluginHost* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - GError* _tmp6_ = NULL; - GError* _tmp7_ = NULL; + GError* _tmp2_; + const gchar* _tmp3_; + SpitPublishingPluginHost* _tmp4_; + GError* _tmp5_; + GError* _tmp6_; #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" e = _inner_error_; #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1762,23 +1767,21 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa #line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp4_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); #line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp5_ = _ ("A file required for publishing is unavailable. Publishing to YouTube c" \ -"an’t continue."); + _tmp5_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _ ("A file required for publishing is unavailable. Publishing to YouTube c" \ +"an’t continue.")); #line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp5_); + _tmp6_ = _tmp5_; #line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp7_ = _tmp6_; + spit_publishing_plugin_host_post_error (_tmp4_, _tmp6_); #line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - spit_publishing_plugin_host_post_error (_tmp4_, _tmp7_); -#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _g_error_free0 (_tmp7_); + _g_error_free0 (_tmp6_); #line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_error_free0 (e); #line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_object_unref0 (builder); #line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 1776 "YouTubePublishing.c" +#line 1779 "YouTubePublishing.c" } __finally20: #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1791,79 +1794,79 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa g_clear_error (&_inner_error_); #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 1789 "YouTubePublishing.c" +#line 1792 "YouTubePublishing.c" } #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp8_ = self->priv->authenticator; + _tmp7_ = self->priv->authenticator; #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp9_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); + _tmp8_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp10_ = builder; + _tmp9_ = builder; #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp11_ = self->priv->publishing_parameters; + _tmp10_ = self->priv->publishing_parameters; #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp12_ = publishing_you_tube_publishing_options_pane_new (_tmp8_, _tmp9_, _tmp10_, _tmp11_); + _tmp11_ = publishing_you_tube_publishing_options_pane_new (_tmp7_, _tmp8_, _tmp9_, _tmp10_); #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - opts_pane = _tmp12_; + opts_pane = _tmp11_; #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp13_ = opts_pane; + _tmp12_ = opts_pane; #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_signal_connect_object (_tmp13_, "publish", (GCallback) _publishing_you_tube_you_tube_publisher_on_publishing_options_publish_publishing_you_tube_publishing_options_pane_publish, self, 0); + g_signal_connect_object (_tmp12_, "publish", (GCallback) _publishing_you_tube_you_tube_publisher_on_publishing_options_publish_publishing_you_tube_publishing_options_pane_publish, self, 0); #line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp14_ = opts_pane; + _tmp13_ = opts_pane; #line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_signal_connect_object (_tmp14_, "logout", (GCallback) _publishing_you_tube_you_tube_publisher_on_publishing_options_logout_publishing_you_tube_publishing_options_pane_logout, self, 0); + g_signal_connect_object (_tmp13_, "logout", (GCallback) _publishing_you_tube_you_tube_publisher_on_publishing_options_logout_publishing_you_tube_publishing_options_pane_logout, self, 0); #line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp15_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); + _tmp14_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); #line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp16_ = opts_pane; + _tmp15_ = opts_pane; #line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - spit_publishing_plugin_host_install_dialog_pane (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); + spit_publishing_plugin_host_install_dialog_pane (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); #line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp17_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); + _tmp16_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); #line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - spit_publishing_plugin_host_set_service_locked (_tmp17_, FALSE); + spit_publishing_plugin_host_set_service_locked (_tmp16_, FALSE); #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_object_unref0 (opts_pane); #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_object_unref0 (builder); -#line 1825 "YouTubePublishing.c" +#line 1828 "YouTubePublishing.c" } static void _publishing_you_tube_you_tube_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) { #line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_on_upload_status_updated ((PublishingYouTubeYouTubePublisher*) self, file_number, fraction_complete); -#line 1832 "YouTubePublishing.c" +#line 1835 "YouTubePublishing.c" } static void publishing_you_tube_you_tube_publisher_do_upload (PublishingYouTubeYouTubePublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; - SpitPublishingPluginHost* _tmp2_ = NULL; - void* _tmp3_ = NULL; - GDestroyNotify _tmp4_ = NULL; - SpitPublishingProgressCallback _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; + SpitPublishingPluginHost* _tmp2_; + void* _tmp3_; + GDestroyNotify _tmp4_; + SpitPublishingProgressCallback _tmp5_; + gboolean _tmp6_; SpitPublishingPublishable** publishables = NULL; - SpitPublishingPluginHost* _tmp7_ = NULL; - gint _tmp8_ = 0; - SpitPublishingPublishable** _tmp9_ = NULL; - gint publishables_length1 = 0; - gint _publishables_size_ = 0; + SpitPublishingPluginHost* _tmp7_; + gint _tmp8_; + SpitPublishingPublishable** _tmp9_; + gint publishables_length1; + gint _publishables_size_; PublishingYouTubeUploader* uploader = NULL; - GDataYouTubeService* _tmp10_ = NULL; - PublishingRESTSupportGoogleSession* _tmp11_ = NULL; - PublishingRESTSupportGoogleSession* _tmp12_ = NULL; - SpitPublishingPublishable** _tmp13_ = NULL; - gint _tmp13__length1 = 0; - PublishingYouTubePublishingParameters* _tmp14_ = NULL; - PublishingYouTubeUploader* _tmp15_ = NULL; - PublishingYouTubeUploader* _tmp16_ = NULL; - PublishingYouTubeUploader* _tmp17_ = NULL; - PublishingYouTubeUploader* _tmp18_ = NULL; - PublishingYouTubeUploader* _tmp19_ = NULL; + GDataYouTubeService* _tmp10_; + PublishingRESTSupportGoogleSession* _tmp11_; + PublishingRESTSupportGoogleSession* _tmp12_; + SpitPublishingPublishable** _tmp13_; + gint _tmp13__length1; + PublishingYouTubePublishingParameters* _tmp14_; + PublishingYouTubeUploader* _tmp15_; + PublishingYouTubeUploader* _tmp16_; + PublishingYouTubeUploader* _tmp17_; + PublishingYouTubeUploader* _tmp18_; + PublishingYouTubeUploader* _tmp19_; #line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self)); #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1901,7 +1904,7 @@ static void publishing_you_tube_you_tube_publisher_do_upload (PublishingYouTubeY if (!_tmp6_) { #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 1898 "YouTubePublishing.c" +#line 1901 "YouTubePublishing.c" } #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); @@ -1949,13 +1952,13 @@ static void publishing_you_tube_you_tube_publisher_do_upload (PublishingYouTubeY _publishing_rest_support_batch_uploader_unref0 (uploader); #line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL); -#line 1946 "YouTubePublishing.c" +#line 1949 "YouTubePublishing.c" } static void publishing_you_tube_you_tube_publisher_do_show_success_pane (PublishingYouTubeYouTubePublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self)); #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1968,14 +1971,14 @@ static void publishing_you_tube_you_tube_publisher_do_show_success_pane (Publish _tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" spit_publishing_plugin_host_install_success_pane (_tmp1_); -#line 1965 "YouTubePublishing.c" +#line 1968 "YouTubePublishing.c" } static void publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* base) { PublishingYouTubeYouTubePublisher * self; - SpitPublishingAuthenticator* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingAuthenticator* _tmp0_; + gboolean _tmp1_; #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher); #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1986,9 +1989,9 @@ static void publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRES _tmp1_ = spit_publishing_authenticator_can_logout (_tmp0_); #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (_tmp1_) { -#line 1983 "YouTubePublishing.c" - SpitPublishingAuthenticator* _tmp2_ = NULL; - SpitPublishingAuthenticator* _tmp3_ = NULL; +#line 1986 "YouTubePublishing.c" + SpitPublishingAuthenticator* _tmp2_; + SpitPublishingAuthenticator* _tmp3_; #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp2_ = self->priv->authenticator; #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1997,7 +2000,7 @@ static void publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRES _tmp3_ = self->priv->authenticator; #line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" spit_publishing_authenticator_authenticate (_tmp3_); -#line 1994 "YouTubePublishing.c" +#line 1997 "YouTubePublishing.c" } } @@ -2005,20 +2008,20 @@ static void publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRES static SpitPublishingAuthenticator* publishing_you_tube_you_tube_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base) { PublishingYouTubeYouTubePublisher * self; SpitPublishingAuthenticator* result = NULL; - SpitPublishingAuthenticator* _tmp0_ = NULL; - SpitPublishingAuthenticator* _tmp5_ = NULL; - SpitPublishingAuthenticator* _tmp6_ = NULL; + SpitPublishingAuthenticator* _tmp0_; + SpitPublishingAuthenticator* _tmp5_; + SpitPublishingAuthenticator* _tmp6_; #line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher); #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp0_ = self->priv->authenticator; #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (_tmp0_ == NULL) { -#line 2011 "YouTubePublishing.c" - PublishingAuthenticatorFactory* _tmp1_ = NULL; - PublishingAuthenticatorFactory* _tmp2_ = NULL; - SpitPublishingPluginHost* _tmp3_ = NULL; - SpitPublishingAuthenticator* _tmp4_ = NULL; +#line 2014 "YouTubePublishing.c" + PublishingAuthenticatorFactory* _tmp1_; + PublishingAuthenticatorFactory* _tmp2_; + SpitPublishingPluginHost* _tmp3_; + SpitPublishingAuthenticator* _tmp4_; #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp1_ = publishing_authenticator_factory_get_instance (); #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -2033,7 +2036,7 @@ static SpitPublishingAuthenticator* publishing_you_tube_you_tube_publisher_real_ self->priv->authenticator = _tmp4_; #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_object_unref0 (_tmp2_); -#line 2030 "YouTubePublishing.c" +#line 2033 "YouTubePublishing.c" } #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp5_ = self->priv->authenticator; @@ -2043,7 +2046,7 @@ static SpitPublishingAuthenticator* publishing_you_tube_you_tube_publisher_real_ result = _tmp6_; #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 2040 "YouTubePublishing.c" +#line 2043 "YouTubePublishing.c" } @@ -2053,31 +2056,31 @@ static void publishing_you_tube_you_tube_publisher_class_init (PublishingYouTube #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_type_class_add_private (klass, sizeof (PublishingYouTubeYouTubePublisherPrivate)); #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = (gboolean (*)(PublishingRESTSupportGooglePublisher*)) publishing_you_tube_you_tube_publisher_real_is_running; + ((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = (gboolean (*) (PublishingRESTSupportGooglePublisher *)) publishing_you_tube_you_tube_publisher_real_is_running; #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->start = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_you_tube_you_tube_publisher_real_start; + ((PublishingRESTSupportGooglePublisherClass *) klass)->start = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_you_tube_you_tube_publisher_real_start; #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->stop = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_you_tube_you_tube_publisher_real_stop; + ((PublishingRESTSupportGooglePublisherClass *) klass)->stop = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_you_tube_you_tube_publisher_real_stop; #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_you_tube_you_tube_publisher_real_on_login_flow_complete; + ((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_you_tube_you_tube_publisher_real_on_login_flow_complete; #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_you_tube_you_tube_publisher_real_do_logout; + ((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_you_tube_you_tube_publisher_real_do_logout; #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = (SpitPublishingAuthenticator* (*)(PublishingRESTSupportGooglePublisher*)) publishing_you_tube_you_tube_publisher_real_get_authenticator; + ((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = (SpitPublishingAuthenticator* (*) (PublishingRESTSupportGooglePublisher *)) publishing_you_tube_you_tube_publisher_real_get_authenticator; #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_you_tube_you_tube_publisher_finalize; -#line 2063 "YouTubePublishing.c" +#line 2066 "YouTubePublishing.c" } static void publishing_you_tube_you_tube_publisher_instance_init (PublishingYouTubeYouTubePublisher * self) { #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self->priv = PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_GET_PRIVATE (self); -#line 2070 "YouTubePublishing.c" +#line 2073 "YouTubePublishing.c" } -static void publishing_you_tube_you_tube_publisher_finalize (GObject* obj) { +static void publishing_you_tube_you_tube_publisher_finalize (GObject * obj) { PublishingYouTubeYouTubePublisher * self; #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher); @@ -2097,7 +2100,7 @@ static void publishing_you_tube_you_tube_publisher_finalize (GObject* obj) { _g_object_unref0 (self->priv->youtube_service); #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" G_OBJECT_CLASS (publishing_you_tube_you_tube_publisher_parent_class)->finalize (obj); -#line 2094 "YouTubePublishing.c" +#line 2097 "YouTubePublishing.c" } @@ -2116,78 +2119,77 @@ GType publishing_you_tube_you_tube_publisher_get_type (void) { static gpointer _publishing_you_tube_publishing_parameters_ref0 (gpointer self) { #line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self ? publishing_you_tube_publishing_parameters_ref (self) : NULL; -#line 2113 "YouTubePublishing.c" +#line 2116 "YouTubePublishing.c" } static gpointer _publishing_you_tube_publishing_options_pane_privacy_description_ref0 (gpointer self) { #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self ? publishing_you_tube_publishing_options_pane_privacy_description_ref (self) : NULL; -#line 2120 "YouTubePublishing.c" +#line 2123 "YouTubePublishing.c" } static void _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_options_pane_on_logout_clicked ((PublishingYouTubePublishingOptionsPane*) self); -#line 2127 "YouTubePublishing.c" +#line 2130 "YouTubePublishing.c" } static void _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_options_pane_on_publish_clicked ((PublishingYouTubePublishingOptionsPane*) self); -#line 2134 "YouTubePublishing.c" +#line 2137 "YouTubePublishing.c" } PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_construct (GType object_type, SpitPublishingAuthenticator* authenticator, SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters) { PublishingYouTubePublishingOptionsPane * self = NULL; - gint _tmp0_ = 0; - PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp1_ = NULL; - PublishingYouTubePublishingParameters* _tmp2_ = NULL; - PublishingYouTubePublishingParameters* _tmp3_ = NULL; - GtkBuilder* _tmp4_ = NULL; - GtkBuilder* _tmp5_ = NULL; - GtkBuilder* _tmp6_ = NULL; - GtkBuilder* _tmp7_ = NULL; - GSList* _tmp8_ = NULL; - GSList* _tmp9_ = NULL; - guint _tmp10_ = 0U; - GtkBuilder* _tmp11_ = NULL; - GObject* _tmp12_ = NULL; - GtkLabel* _tmp13_ = NULL; - GtkBuilder* _tmp14_ = NULL; - GObject* _tmp15_ = NULL; - GtkComboBoxText* _tmp16_ = NULL; - GtkBuilder* _tmp17_ = NULL; - GObject* _tmp18_ = NULL; - GtkButton* _tmp19_ = NULL; - GtkBuilder* _tmp20_ = NULL; - GObject* _tmp21_ = NULL; - GtkButton* _tmp22_ = NULL; - GtkBuilder* _tmp23_ = NULL; - GObject* _tmp24_ = NULL; - GtkBox* _tmp25_ = NULL; - GtkBuilder* _tmp26_ = NULL; - GObject* _tmp27_ = NULL; - GtkLabel* _tmp28_ = NULL; - SpitPublishingAuthenticator* _tmp29_ = NULL; - gboolean _tmp30_ = FALSE; - GtkLabel* _tmp35_ = NULL; - const gchar* _tmp36_ = NULL; - PublishingYouTubePublishingParameters* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; - gchar* _tmp39_ = NULL; - gchar* _tmp40_ = NULL; - gchar* _tmp41_ = NULL; - PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp42_ = NULL; - gint _tmp42__length1 = 0; - GtkComboBoxText* _tmp47_ = NULL; - GtkLabel* _tmp48_ = NULL; - GtkComboBoxText* _tmp49_ = NULL; - GtkButton* _tmp50_ = NULL; - GtkButton* _tmp51_ = NULL; + gint _tmp0_; + PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp1_; + PublishingYouTubePublishingParameters* _tmp2_; + PublishingYouTubePublishingParameters* _tmp3_; + GtkBuilder* _tmp4_; + GtkBuilder* _tmp5_; + GtkBuilder* _tmp6_; + GtkBuilder* _tmp7_; + GSList* _tmp8_; + GSList* _tmp9_; + guint _tmp10_; + GtkBuilder* _tmp11_; + GObject* _tmp12_; + GtkLabel* _tmp13_; + GtkBuilder* _tmp14_; + GObject* _tmp15_; + GtkComboBoxText* _tmp16_; + GtkBuilder* _tmp17_; + GObject* _tmp18_; + GtkButton* _tmp19_; + GtkBuilder* _tmp20_; + GObject* _tmp21_; + GtkButton* _tmp22_; + GtkBuilder* _tmp23_; + GObject* _tmp24_; + GtkBox* _tmp25_; + GtkBuilder* _tmp26_; + GObject* _tmp27_; + GtkLabel* _tmp28_; + SpitPublishingAuthenticator* _tmp29_; + gboolean _tmp30_; + GtkLabel* _tmp35_; + PublishingYouTubePublishingParameters* _tmp36_; + gchar* _tmp37_; + gchar* _tmp38_; + gchar* _tmp39_; + gchar* _tmp40_; + PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp41_; + gint _tmp41__length1; + GtkComboBoxText* _tmp46_; + GtkLabel* _tmp47_; + GtkComboBoxText* _tmp48_; + GtkButton* _tmp49_; + GtkButton* _tmp50_; #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (authenticator), NULL); #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -2306,11 +2308,11 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p _tmp30_ = spit_publishing_authenticator_can_logout (_tmp29_); #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (!_tmp30_) { -#line 2303 "YouTubePublishing.c" - GtkButton* _tmp31_ = NULL; - GtkContainer* _tmp32_ = NULL; - GtkContainer* _tmp33_ = NULL; - GtkButton* _tmp34_ = NULL; +#line 2305 "YouTubePublishing.c" + GtkButton* _tmp31_; + GtkContainer* _tmp32_; + GtkContainer* _tmp33_; + GtkButton* _tmp34_; #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp31_ = self->priv->logout_button; #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -2321,32 +2323,30 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p _tmp34_ = self->priv->logout_button; #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" gtk_container_remove (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget)); -#line 2318 "YouTubePublishing.c" +#line 2320 "YouTubePublishing.c" } #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp35_ = self->priv->login_identity_label; #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp36_ = _ ("You are logged into YouTube as %s."); -#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp37_ = publishing_parameters; + _tmp36_ = publishing_parameters; #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp38_ = publishing_you_tube_publishing_parameters_get_user_name (_tmp37_); + _tmp37_ = publishing_you_tube_publishing_parameters_get_user_name (_tmp36_); #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp39_ = _tmp38_; + _tmp38_ = _tmp37_; #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp40_ = g_strdup_printf (_tmp36_, _tmp39_); + _tmp39_ = g_strdup_printf (_ ("You are logged into YouTube as %s."), _tmp38_); #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp41_ = _tmp40_; + _tmp40_ = _tmp39_; #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - gtk_label_set_label (_tmp35_, _tmp41_); + gtk_label_set_label (_tmp35_, _tmp40_); #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _g_free0 (_tmp41_); + _g_free0 (_tmp40_); #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _g_free0 (_tmp39_); + _g_free0 (_tmp38_); #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp42_ = self->priv->privacy_descriptions; + _tmp41_ = self->priv->privacy_descriptions; #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp42__length1 = self->priv->privacy_descriptions_length1; + _tmp41__length1 = self->priv->privacy_descriptions_length1; #line 2344 "YouTubePublishing.c" { PublishingYouTubePublishingOptionsPanePrivacyDescription** desc_collection = NULL; @@ -2354,31 +2354,31 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p gint _desc_collection_size_ = 0; gint desc_it = 0; #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - desc_collection = _tmp42_; + desc_collection = _tmp41_; #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - desc_collection_length1 = _tmp42__length1; + desc_collection_length1 = _tmp41__length1; #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - for (desc_it = 0; desc_it < _tmp42__length1; desc_it = desc_it + 1) { + for (desc_it = 0; desc_it < _tmp41__length1; desc_it = desc_it + 1) { #line 2356 "YouTubePublishing.c" - PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp43_ = NULL; + PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp42_; PublishingYouTubePublishingOptionsPanePrivacyDescription* desc = NULL; #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp43_ = _publishing_you_tube_publishing_options_pane_privacy_description_ref0 (desc_collection[desc_it]); + _tmp42_ = _publishing_you_tube_publishing_options_pane_privacy_description_ref0 (desc_collection[desc_it]); #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - desc = _tmp43_; + desc = _tmp42_; #line 2363 "YouTubePublishing.c" { - GtkComboBoxText* _tmp44_ = NULL; - PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp45_ = NULL; - const gchar* _tmp46_ = NULL; + GtkComboBoxText* _tmp43_; + PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp44_; + const gchar* _tmp45_; #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp44_ = self->priv->privacy_combo; + _tmp43_ = self->priv->privacy_combo; #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp45_ = desc; + _tmp44_ = desc; #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp46_ = _tmp45_->description; + _tmp45_ = _tmp44_->description; #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - gtk_combo_box_text_append_text (_tmp44_, _tmp46_); + gtk_combo_box_text_append_text (_tmp43_, _tmp45_); #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _publishing_you_tube_publishing_options_pane_privacy_description_unref0 (desc); #line 2378 "YouTubePublishing.c" @@ -2386,23 +2386,23 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p } } #line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp47_ = self->priv->privacy_combo; + _tmp46_ = self->priv->privacy_combo; #line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_combo_box_get_type (), GtkComboBox), (gint) PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_combo_box_get_type (), GtkComboBox), (gint) PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC); #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp48_ = self->priv->privacy_label; + _tmp47_ = self->priv->privacy_label; #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp49_ = self->priv->privacy_combo; + _tmp48_ = self->priv->privacy_combo; #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - gtk_label_set_mnemonic_widget (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget)); + gtk_label_set_mnemonic_widget (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget)); #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp50_ = self->priv->logout_button; + _tmp49_ = self->priv->logout_button; #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_signal_connect_object (_tmp50_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp49_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0); #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp51_ = self->priv->publish_button; + _tmp50_ = self->priv->publish_button; #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_signal_connect_object (_tmp51_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp50_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0); #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self; #line 2402 "YouTubePublishing.c" @@ -2417,13 +2417,13 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p static void publishing_you_tube_publishing_options_pane_on_publish_clicked (PublishingYouTubePublishingOptionsPane* self) { - PublishingYouTubePublishingParameters* _tmp0_ = NULL; - PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - GtkComboBoxText* _tmp2_ = NULL; - gint _tmp3_ = 0; - PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp4_ = NULL; - PublishingYouTubePrivacySetting _tmp5_ = 0; + PublishingYouTubePublishingParameters* _tmp0_; + PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp1_; + gint _tmp1__length1; + GtkComboBoxText* _tmp2_; + gint _tmp3_; + PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp4_; + PublishingYouTubePrivacySetting _tmp5_; #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self)); #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -2443,7 +2443,7 @@ static void publishing_you_tube_publishing_options_pane_on_publish_clicked (Publ #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_parameters_set_privacy (_tmp0_, _tmp5_); #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_signal_emit_by_name (self, "publish"); + g_signal_emit (self, publishing_you_tube_publishing_options_pane_signals[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0); #line 2441 "YouTubePublishing.c" } @@ -2452,13 +2452,13 @@ static void publishing_you_tube_publishing_options_pane_on_logout_clicked (Publi #line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self)); #line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_signal_emit_by_name (self, "logout"); + g_signal_emit (self, publishing_you_tube_publishing_options_pane_signals[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0); #line 2450 "YouTubePublishing.c" } static void publishing_you_tube_publishing_options_pane_update_publish_button_sensitivity (PublishingYouTubePublishingOptionsPane* self) { - GtkButton* _tmp0_ = NULL; + GtkButton* _tmp0_; #line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self)); #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -2469,7 +2469,7 @@ static void publishing_you_tube_publishing_options_pane_update_publish_button_se } -static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) { +static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) { #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if ((*length) == (*size)) { #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -2486,7 +2486,7 @@ static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDesc } -static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) { +static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) { #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if ((*length) == (*size)) { #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -2503,7 +2503,7 @@ static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDesc } -static void _vala_array_add34 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) { +static void _vala_array_add34 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) { #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if ((*length) == (*size)) { #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -2523,23 +2523,20 @@ static void _vala_array_add34 (PublishingYouTubePublishingOptionsPanePrivacyDesc static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you_tube_publishing_options_pane_create_privacy_descriptions (PublishingYouTubePublishingOptionsPane* self, int* result_length1) { PublishingYouTubePublishingOptionsPanePrivacyDescription** result = NULL; PublishingYouTubePublishingOptionsPanePrivacyDescription** _result_ = NULL; - PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp0_ = NULL; - gint _result__length1 = 0; - gint __result__size_ = 0; - PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - const gchar* _tmp2_ = NULL; - PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp3_ = NULL; - PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - const gchar* _tmp5_ = NULL; - PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp6_ = NULL; - PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - const gchar* _tmp8_ = NULL; - PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp9_ = NULL; - PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp10_ = NULL; - gint _tmp10__length1 = 0; + PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp0_; + gint _result__length1; + gint __result__size_; + PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp1_; + gint _tmp1__length1; + PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp2_; + PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp3_; + gint _tmp3__length1; + PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp4_; + PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp5_; + gint _tmp5__length1; + PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp6_; + PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp7_; + gint _tmp7__length1; #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self), NULL); #line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -2555,55 +2552,49 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp1__length1 = _result__length1; #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp2_ = _ ("Public listed"); + _tmp2_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_ ("Public listed"), PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC); #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp3_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_tmp2_, PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC); -#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp3_); -#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp4_ = _result_; + _vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp2_); #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp4__length1 = _result__length1; + _tmp3_ = _result_; #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp5_ = _ ("Public unlisted"); + _tmp3__length1 = _result__length1; #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp6_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_tmp5_, PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED); + _tmp4_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_ ("Public unlisted"), PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED); #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _vala_array_add33 (&_result_, &_result__length1, &__result__size_, _tmp6_); + _vala_array_add33 (&_result_, &_result__length1, &__result__size_, _tmp4_); #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp7_ = _result_; -#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp7__length1 = _result__length1; + _tmp5_ = _result_; #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp8_ = _ ("Private"); + _tmp5__length1 = _result__length1; #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp9_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_tmp8_, PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE); + _tmp6_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_ ("Private"), PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE); #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _vala_array_add34 (&_result_, &_result__length1, &__result__size_, _tmp9_); + _vala_array_add34 (&_result_, &_result__length1, &__result__size_, _tmp6_); #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp10_ = _result_; + _tmp7_ = _result_; #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp10__length1 = _result__length1; + _tmp7__length1 = _result__length1; #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (result_length1) { #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - *result_length1 = _tmp10__length1; -#line 2585 "YouTubePublishing.c" + *result_length1 = _tmp7__length1; +#line 2576 "YouTubePublishing.c" } #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - result = _tmp10_; + result = _tmp7_; #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 2591 "YouTubePublishing.c" +#line 2582 "YouTubePublishing.c" } static GtkWidget* publishing_you_tube_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) { PublishingYouTubePublishingOptionsPane * self; GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkBox* _tmp1_ = NULL; - GtkWidget* _tmp2_ = NULL; + GtkBox* _tmp0_; + GtkBox* _tmp1_; + GtkWidget* _tmp2_; #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane); #line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -2618,7 +2609,7 @@ static GtkWidget* publishing_you_tube_publishing_options_pane_real_get_widget (S result = _tmp2_; #line 385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 2615 "YouTubePublishing.c" +#line 2606 "YouTubePublishing.c" } @@ -2631,7 +2622,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_you_tube_publishing_op result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; #line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 2628 "YouTubePublishing.c" +#line 2619 "YouTubePublishing.c" } @@ -2641,7 +2632,7 @@ static void publishing_you_tube_publishing_options_pane_real_on_pane_installed ( self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane); #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_options_pane_update_publish_button_sensitivity (self); -#line 2638 "YouTubePublishing.c" +#line 2629 "YouTubePublishing.c" } @@ -2649,15 +2640,15 @@ static void publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled PublishingYouTubePublishingOptionsPane * self; #line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane); -#line 2646 "YouTubePublishing.c" +#line 2637 "YouTubePublishing.c" } static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_construct (GType object_type, const gchar* description, PublishingYouTubePrivacySetting privacy_setting) { PublishingYouTubePublishingOptionsPanePrivacyDescription* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - PublishingYouTubePrivacySetting _tmp2_ = 0; + const gchar* _tmp0_; + gchar* _tmp1_; + PublishingYouTubePrivacySetting _tmp2_; #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_val_if_fail (description != NULL, NULL); #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -2676,21 +2667,21 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_ self->privacy_setting = _tmp2_; #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self; -#line 2673 "YouTubePublishing.c" +#line 2664 "YouTubePublishing.c" } static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_new (const gchar* description, PublishingYouTubePrivacySetting privacy_setting) { #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return publishing_you_tube_publishing_options_pane_privacy_description_construct (PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION, description, privacy_setting); -#line 2680 "YouTubePublishing.c" +#line 2671 "YouTubePublishing.c" } static void publishing_you_tube_publishing_options_pane_value_privacy_description_init (GValue* value) { #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = NULL; -#line 2687 "YouTubePublishing.c" +#line 2678 "YouTubePublishing.c" } @@ -2699,7 +2690,7 @@ static void publishing_you_tube_publishing_options_pane_value_privacy_descriptio if (value->data[0].v_pointer) { #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_options_pane_privacy_description_unref (value->data[0].v_pointer); -#line 2696 "YouTubePublishing.c" +#line 2687 "YouTubePublishing.c" } } @@ -2709,11 +2700,11 @@ static void publishing_you_tube_publishing_options_pane_value_privacy_descriptio if (src_value->data[0].v_pointer) { #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" dest_value->data[0].v_pointer = publishing_you_tube_publishing_options_pane_privacy_description_ref (src_value->data[0].v_pointer); -#line 2706 "YouTubePublishing.c" +#line 2697 "YouTubePublishing.c" } else { #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 2710 "YouTubePublishing.c" +#line 2701 "YouTubePublishing.c" } } @@ -2721,66 +2712,66 @@ static void publishing_you_tube_publishing_options_pane_value_privacy_descriptio static gpointer publishing_you_tube_publishing_options_pane_value_privacy_description_peek_pointer (const GValue* value) { #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return value->data[0].v_pointer; -#line 2718 "YouTubePublishing.c" +#line 2709 "YouTubePublishing.c" } static gchar* publishing_you_tube_publishing_options_pane_value_privacy_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (collect_values[0].v_pointer) { -#line 2725 "YouTubePublishing.c" - PublishingYouTubePublishingOptionsPanePrivacyDescription* object; +#line 2716 "YouTubePublishing.c" + PublishingYouTubePublishingOptionsPanePrivacyDescription * object; object = collect_values[0].v_pointer; #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (object->parent_instance.g_class == NULL) { #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2732 "YouTubePublishing.c" +#line 2723 "YouTubePublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2736 "YouTubePublishing.c" +#line 2727 "YouTubePublishing.c" } #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = publishing_you_tube_publishing_options_pane_privacy_description_ref (object); -#line 2740 "YouTubePublishing.c" +#line 2731 "YouTubePublishing.c" } else { #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = NULL; -#line 2744 "YouTubePublishing.c" +#line 2735 "YouTubePublishing.c" } #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return NULL; -#line 2748 "YouTubePublishing.c" +#line 2739 "YouTubePublishing.c" } static gchar* publishing_you_tube_publishing_options_pane_value_privacy_description_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingYouTubePublishingOptionsPanePrivacyDescription** object_p; + PublishingYouTubePublishingOptionsPanePrivacyDescription ** object_p; object_p = collect_values[0].v_pointer; #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (!object_p) { #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2759 "YouTubePublishing.c" +#line 2750 "YouTubePublishing.c" } #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (!value->data[0].v_pointer) { #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" *object_p = NULL; -#line 2765 "YouTubePublishing.c" +#line 2756 "YouTubePublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" *object_p = value->data[0].v_pointer; -#line 2769 "YouTubePublishing.c" +#line 2760 "YouTubePublishing.c" } else { #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" *object_p = publishing_you_tube_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer); -#line 2773 "YouTubePublishing.c" +#line 2764 "YouTubePublishing.c" } #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return NULL; -#line 2777 "YouTubePublishing.c" +#line 2768 "YouTubePublishing.c" } @@ -2794,7 +2785,7 @@ static GParamSpec* publishing_you_tube_publishing_options_pane_param_spec_privac G_PARAM_SPEC (spec)->value_type = object_type; #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return G_PARAM_SPEC (spec); -#line 2791 "YouTubePublishing.c" +#line 2782 "YouTubePublishing.c" } @@ -2803,12 +2794,12 @@ static gpointer publishing_you_tube_publishing_options_pane_value_get_privacy_de g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION), NULL); #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return value->data[0].v_pointer; -#line 2800 "YouTubePublishing.c" +#line 2791 "YouTubePublishing.c" } static void publishing_you_tube_publishing_options_pane_value_set_privacy_description (GValue* value, gpointer v_object) { - PublishingYouTubePublishingOptionsPanePrivacyDescription* old; + PublishingYouTubePublishingOptionsPanePrivacyDescription * old; #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION)); #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -2823,23 +2814,23 @@ static void publishing_you_tube_publishing_options_pane_value_set_privacy_descri value->data[0].v_pointer = v_object; #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer); -#line 2820 "YouTubePublishing.c" +#line 2811 "YouTubePublishing.c" } else { #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = NULL; -#line 2824 "YouTubePublishing.c" +#line 2815 "YouTubePublishing.c" } #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (old) { #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_options_pane_privacy_description_unref (old); -#line 2830 "YouTubePublishing.c" +#line 2821 "YouTubePublishing.c" } } static void publishing_you_tube_publishing_options_pane_value_take_privacy_description (GValue* value, gpointer v_object) { - PublishingYouTubePublishingOptionsPanePrivacyDescription* old; + PublishingYouTubePublishingOptionsPanePrivacyDescription * old; #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION)); #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -2852,17 +2843,17 @@ static void publishing_you_tube_publishing_options_pane_value_take_privacy_descr g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = v_object; -#line 2849 "YouTubePublishing.c" +#line 2840 "YouTubePublishing.c" } else { #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = NULL; -#line 2853 "YouTubePublishing.c" +#line 2844 "YouTubePublishing.c" } #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (old) { #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_options_pane_privacy_description_unref (old); -#line 2859 "YouTubePublishing.c" +#line 2850 "YouTubePublishing.c" } } @@ -2872,18 +2863,18 @@ static void publishing_you_tube_publishing_options_pane_privacy_description_clas publishing_you_tube_publishing_options_pane_privacy_description_parent_class = g_type_class_peek_parent (klass); #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" ((PublishingYouTubePublishingOptionsPanePrivacyDescriptionClass *) klass)->finalize = publishing_you_tube_publishing_options_pane_privacy_description_finalize; -#line 2869 "YouTubePublishing.c" +#line 2860 "YouTubePublishing.c" } static void publishing_you_tube_publishing_options_pane_privacy_description_instance_init (PublishingYouTubePublishingOptionsPanePrivacyDescription * self) { #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self->ref_count = 1; -#line 2876 "YouTubePublishing.c" +#line 2867 "YouTubePublishing.c" } -static void publishing_you_tube_publishing_options_pane_privacy_description_finalize (PublishingYouTubePublishingOptionsPanePrivacyDescription* obj) { +static void publishing_you_tube_publishing_options_pane_privacy_description_finalize (PublishingYouTubePublishingOptionsPanePrivacyDescription * obj) { PublishingYouTubePublishingOptionsPanePrivacyDescription * self; #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION, PublishingYouTubePublishingOptionsPanePrivacyDescription); @@ -2891,7 +2882,7 @@ static void publishing_you_tube_publishing_options_pane_privacy_description_fina g_signal_handlers_destroy (self); #line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 (self->description); -#line 2888 "YouTubePublishing.c" +#line 2879 "YouTubePublishing.c" } @@ -2910,18 +2901,18 @@ static GType publishing_you_tube_publishing_options_pane_privacy_description_get static gpointer publishing_you_tube_publishing_options_pane_privacy_description_ref (gpointer instance) { - PublishingYouTubePublishingOptionsPanePrivacyDescription* self; + PublishingYouTubePublishingOptionsPanePrivacyDescription * self; self = instance; #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_atomic_int_inc (&self->ref_count); #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return instance; -#line 2913 "YouTubePublishing.c" +#line 2904 "YouTubePublishing.c" } static void publishing_you_tube_publishing_options_pane_privacy_description_unref (gpointer instance) { - PublishingYouTubePublishingOptionsPanePrivacyDescription* self; + PublishingYouTubePublishingOptionsPanePrivacyDescription * self; self = instance; #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -2929,7 +2920,7 @@ static void publishing_you_tube_publishing_options_pane_privacy_description_unre PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_GET_CLASS (self)->finalize (self); #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2926 "YouTubePublishing.c" +#line 2917 "YouTubePublishing.c" } } @@ -2942,10 +2933,10 @@ static void publishing_you_tube_publishing_options_pane_class_init (PublishingYo #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_you_tube_publishing_options_pane_finalize; #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_signal_new ("publish", PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + publishing_you_tube_publishing_options_pane_signals[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_signal_new ("logout", PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 2942 "YouTubePublishing.c" + publishing_you_tube_publishing_options_pane_signals[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 2933 "YouTubePublishing.c" } @@ -2953,14 +2944,14 @@ static void publishing_you_tube_publishing_options_pane_spit_publishing_dialog_p #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface); #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_you_tube_publishing_options_pane_real_get_widget; + iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_you_tube_publishing_options_pane_real_get_widget; #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_you_tube_publishing_options_pane_real_get_preferred_geometry; + iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_you_tube_publishing_options_pane_real_get_preferred_geometry; #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_you_tube_publishing_options_pane_real_on_pane_installed; + iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_you_tube_publishing_options_pane_real_on_pane_installed; #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled; -#line 2957 "YouTubePublishing.c" + iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled; +#line 2948 "YouTubePublishing.c" } @@ -2981,11 +2972,11 @@ static void publishing_you_tube_publishing_options_pane_instance_init (Publishin self->priv->builder = NULL; #line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self->priv->privacy_label = NULL; -#line 2978 "YouTubePublishing.c" +#line 2969 "YouTubePublishing.c" } -static void publishing_you_tube_publishing_options_pane_finalize (GObject* obj) { +static void publishing_you_tube_publishing_options_pane_finalize (GObject * obj) { PublishingYouTubePublishingOptionsPane * self; #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane); @@ -3009,7 +3000,7 @@ static void publishing_you_tube_publishing_options_pane_finalize (GObject* obj) _publishing_you_tube_publishing_parameters_unref0 (self->priv->publishing_parameters); #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" G_OBJECT_CLASS (publishing_you_tube_publishing_options_pane_parent_class)->finalize (obj); -#line 3006 "YouTubePublishing.c" +#line 2997 "YouTubePublishing.c" } @@ -3029,17 +3020,17 @@ GType publishing_you_tube_publishing_options_pane_get_type (void) { PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_construct (GType object_type, GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable) { PublishingYouTubeUploadTransaction* self = NULL; - PublishingRESTSupportGoogleSession* _tmp0_ = NULL; - PublishingRESTSupportGoogleSession* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - PublishingRESTSupportGoogleSession* _tmp3_ = NULL; - PublishingRESTSupportGoogleSession* _tmp4_ = NULL; - PublishingYouTubePublishingParameters* _tmp5_ = NULL; - PublishingYouTubePublishingParameters* _tmp6_ = NULL; - SpitPublishingPublishable* _tmp7_ = NULL; - SpitPublishingPublishable* _tmp8_ = NULL; - GDataYouTubeService* _tmp9_ = NULL; - GDataYouTubeService* _tmp10_ = NULL; + PublishingRESTSupportGoogleSession* _tmp0_; + PublishingRESTSupportGoogleSession* _tmp1_; + gboolean _tmp2_; + PublishingRESTSupportGoogleSession* _tmp3_; + PublishingRESTSupportGoogleSession* _tmp4_; + PublishingYouTubePublishingParameters* _tmp5_; + PublishingYouTubePublishingParameters* _tmp6_; + SpitPublishingPublishable* _tmp7_; + SpitPublishingPublishable* _tmp8_; + GDataYouTubeService* _tmp9_; + GDataYouTubeService* _tmp10_; #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_val_if_fail (GDATA_IS_YOUTUBE_SERVICE (youtube_service), NULL); #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -3092,14 +3083,14 @@ PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_const self->priv->youtube_service = _tmp10_; #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self; -#line 3089 "YouTubePublishing.c" +#line 3080 "YouTubePublishing.c" } PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_new (GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable) { #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return publishing_you_tube_upload_transaction_construct (PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, youtube_service, session, parameters, publishable); -#line 3096 "YouTubePublishing.c" +#line 3087 "YouTubePublishing.c" } @@ -3108,7 +3099,7 @@ static Block1Data* block1_data_ref (Block1Data* _data1_) { g_atomic_int_inc (&_data1_->_ref_count_); #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return _data1_; -#line 3105 "YouTubePublishing.c" +#line 3096 "YouTubePublishing.c" } @@ -3117,7 +3108,7 @@ static void block1_data_unref (void * _userdata_) { _data1_ = (Block1Data*) _userdata_; #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { -#line 3114 "YouTubePublishing.c" +#line 3105 "YouTubePublishing.c" PublishingYouTubeUploadTransaction* self; #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = _data1_->self; @@ -3127,14 +3118,14 @@ static void block1_data_unref (void * _userdata_) { _publishing_rest_support_transaction_unref0 (self); #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_slice_free (Block1Data, _data1_); -#line 3124 "YouTubePublishing.c" +#line 3115 "YouTubePublishing.c" } } static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) { PublishingYouTubeUploadTransaction* self; - GMainLoop* _tmp3_ = NULL; + GMainLoop* _tmp3_; GError * _inner_error_ = NULL; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = _data1_->self; @@ -3142,16 +3133,16 @@ static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) { g_return_if_fail ((obj == NULL) || G_IS_OBJECT (obj)); #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_if_fail (G_IS_ASYNC_RESULT (res)); -#line 3139 "YouTubePublishing.c" +#line 3130 "YouTubePublishing.c" { - GAsyncResult* _tmp0_ = NULL; + GAsyncResult* _tmp0_; #line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp0_ = res; #line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_upload_transaction_splice_with_progress_finish (self, _tmp0_, &_inner_error_); #line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3148 "YouTubePublishing.c" +#line 3139 "YouTubePublishing.c" goto __catch22_g_error; } } @@ -3159,8 +3150,8 @@ static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) { __catch22_g_error: { GError* _error_ = NULL; - GError* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + GError* _tmp1_; + const gchar* _tmp2_; #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _error_ = _inner_error_; #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -3173,7 +3164,7 @@ static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) { g_critical ("YouTubePublishing.vala:451: Failed to upload: %s", _tmp2_); #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_error_free0 (_error_); -#line 3170 "YouTubePublishing.c" +#line 3161 "YouTubePublishing.c" } __finally22: #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -3184,13 +3175,13 @@ static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) { g_clear_error (&_inner_error_); #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 3181 "YouTubePublishing.c" +#line 3172 "YouTubePublishing.c" } #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp3_ = _data1_->loop; #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_main_loop_quit (_tmp3_); -#line 3187 "YouTubePublishing.c" +#line 3178 "YouTubePublishing.c" } @@ -3199,31 +3190,31 @@ static void ____lambda4__gasync_ready_callback (GObject* source_object, GAsyncRe ___lambda4_ (self, source_object, res); #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" block1_data_unref (self); -#line 3196 "YouTubePublishing.c" +#line 3187 "YouTubePublishing.c" } static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) { PublishingYouTubeUploadTransaction * self; GDataYouTubeVideo* video = NULL; - GDataYouTubeVideo* _tmp0_ = NULL; + GDataYouTubeVideo* _tmp0_; gchar* slug = NULL; - SpitPublishingPublishable* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + SpitPublishingPublishable* _tmp1_; + gchar* _tmp2_; gchar* title = NULL; - SpitPublishingPublishable* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - GDataYouTubeVideo* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - GDataYouTubeVideo* _tmp10_ = NULL; - PublishingYouTubePublishingParameters* _tmp11_ = NULL; - PublishingYouTubePrivacySetting _tmp12_ = 0; - PublishingYouTubePublishingParameters* _tmp13_ = NULL; - PublishingYouTubePrivacySetting _tmp14_ = 0; + SpitPublishingPublishable* _tmp3_; + gchar* _tmp4_; + const gchar* _tmp5_; + GDataYouTubeVideo* _tmp8_; + const gchar* _tmp9_; + GDataYouTubeVideo* _tmp10_; + PublishingYouTubePublishingParameters* _tmp11_; + PublishingYouTubePrivacySetting _tmp12_; + PublishingYouTubePublishingParameters* _tmp13_; + PublishingYouTubePrivacySetting _tmp14_; GFile* file = NULL; - SpitPublishingPublishable* _tmp20_ = NULL; - GFile* _tmp21_ = NULL; + SpitPublishingPublishable* _tmp20_; + GFile* _tmp21_; GError * _inner_error_ = NULL; #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, PublishingYouTubeUploadTransaction); @@ -3247,9 +3238,9 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS _tmp5_ = title; #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (g_strcmp0 (_tmp5_, "") == 0) { -#line 3244 "YouTubePublishing.c" - SpitPublishingPublishable* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; +#line 3235 "YouTubePublishing.c" + SpitPublishingPublishable* _tmp6_; + gchar* _tmp7_; #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp6_ = self->priv->publishable; #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -3258,7 +3249,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS _g_free0 (title); #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" title = _tmp7_; -#line 3255 "YouTubePublishing.c" +#line 3246 "YouTubePublishing.c" } #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp8_ = video; @@ -3280,17 +3271,17 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS _tmp14_ = publishing_you_tube_publishing_parameters_get_privacy (_tmp13_); #line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (_tmp14_ == PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED) { -#line 3277 "YouTubePublishing.c" - GDataYouTubeVideo* _tmp15_ = NULL; +#line 3268 "YouTubePublishing.c" + GDataYouTubeVideo* _tmp15_; #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp15_ = video; #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" gdata_youtube_video_set_access_control (_tmp15_, "list", GDATA_YOUTUBE_PERMISSION_DENIED); -#line 3283 "YouTubePublishing.c" +#line 3274 "YouTubePublishing.c" } else { - GDataYouTubeVideo* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; - gboolean _tmp18_ = FALSE; + GDataYouTubeVideo* _tmp16_; + gboolean _tmp17_; + gboolean _tmp18_; #line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp16_ = video; #line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -3299,13 +3290,13 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS _tmp18_ = _tmp17_; #line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (!_tmp18_) { -#line 3296 "YouTubePublishing.c" - GDataYouTubeVideo* _tmp19_ = NULL; +#line 3287 "YouTubePublishing.c" + GDataYouTubeVideo* _tmp19_; #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp19_ = video; #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" gdata_youtube_video_set_access_control (_tmp19_, "list", GDATA_YOUTUBE_PERMISSION_ALLOWED); -#line 3302 "YouTubePublishing.c" +#line 3293 "YouTubePublishing.c" } } #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -3314,32 +3305,32 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS _tmp21_ = spit_publishing_publishable_get_serialized_file (_tmp20_); #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" file = _tmp21_; -#line 3311 "YouTubePublishing.c" +#line 3302 "YouTubePublishing.c" { Block1Data* _data1_; GFileInfo* info = NULL; - GFile* _tmp22_ = NULL; - GFileInfo* _tmp23_ = NULL; + GFile* _tmp22_; + GFileInfo* _tmp23_; GDataUploadStream* upload_stream = NULL; - GDataYouTubeService* _tmp24_ = NULL; - GDataYouTubeVideo* _tmp25_ = NULL; - const gchar* _tmp26_ = NULL; - GFileInfo* _tmp27_ = NULL; - const gchar* _tmp28_ = NULL; - GDataUploadStream* _tmp29_ = NULL; + GDataYouTubeService* _tmp24_; + GDataYouTubeVideo* _tmp25_; + const gchar* _tmp26_; + GFileInfo* _tmp27_; + const gchar* _tmp28_; + GDataUploadStream* _tmp29_; GFileInputStream* input_stream = NULL; - GFile* _tmp30_ = NULL; - GFileInputStream* _tmp31_ = NULL; - GMainLoop* _tmp32_ = NULL; - GFileInfo* _tmp33_ = NULL; - GFileInputStream* _tmp34_ = NULL; - GDataUploadStream* _tmp35_ = NULL; - GMainLoop* _tmp36_ = NULL; + GFile* _tmp30_; + GFileInputStream* _tmp31_; + GMainLoop* _tmp32_; + GFileInfo* _tmp33_; + GFileInputStream* _tmp34_; + GDataUploadStream* _tmp35_; + GMainLoop* _tmp36_; GDataYouTubeVideo* _tmp37_ = NULL; - GDataYouTubeService* _tmp38_ = NULL; - GDataUploadStream* _tmp39_ = NULL; - GDataYouTubeVideo* _tmp40_ = NULL; - GDataYouTubeVideo* _tmp41_ = NULL; + GDataYouTubeService* _tmp38_; + GDataUploadStream* _tmp39_; + GDataYouTubeVideo* _tmp40_; + GDataYouTubeVideo* _tmp41_; #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data1_ = g_slice_new0 (Block1Data); #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -3358,7 +3349,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS block1_data_unref (_data1_); #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data1_ = NULL; -#line 3355 "YouTubePublishing.c" +#line 3346 "YouTubePublishing.c" goto __catch21_g_error; } #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -3383,7 +3374,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS block1_data_unref (_data1_); #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data1_ = NULL; -#line 3380 "YouTubePublishing.c" +#line 3371 "YouTubePublishing.c" goto __catch21_g_error; } #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -3402,7 +3393,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS block1_data_unref (_data1_); #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data1_ = NULL; -#line 3399 "YouTubePublishing.c" +#line 3390 "YouTubePublishing.c" goto __catch21_g_error; } #line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -3441,7 +3432,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS block1_data_unref (_data1_); #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data1_ = NULL; -#line 3438 "YouTubePublishing.c" +#line 3429 "YouTubePublishing.c" goto __catch21_g_error; } #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -3464,14 +3455,14 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS block1_data_unref (_data1_); #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data1_ = NULL; -#line 3461 "YouTubePublishing.c" +#line 3452 "YouTubePublishing.c" } goto __finally21; __catch21_g_error: { GError* _error_ = NULL; - GError* _tmp42_ = NULL; - const gchar* _tmp43_ = NULL; + GError* _tmp42_; + const gchar* _tmp43_; #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _error_ = _inner_error_; #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -3484,7 +3475,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS g_critical ("YouTubePublishing.vala:458: Upload failed: %s", _tmp43_); #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_error_free0 (_error_); -#line 3481 "YouTubePublishing.c" +#line 3472 "YouTubePublishing.c" } __finally21: #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -3503,7 +3494,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS _g_object_unref0 (video); #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 3500 "YouTubePublishing.c" +#line 3491 "YouTubePublishing.c" } else { #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_object_unref0 (file); @@ -3519,7 +3510,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS g_clear_error (&_inner_error_); #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 3516 "YouTubePublishing.c" +#line 3507 "YouTubePublishing.c" } } #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -3530,7 +3521,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS _g_free0 (slug); #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_object_unref0 (video); -#line 3527 "YouTubePublishing.c" +#line 3518 "YouTubePublishing.c" } @@ -3547,32 +3538,56 @@ static void publishing_you_tube_upload_transaction_splice_with_progress_data_fre _publishing_rest_support_transaction_unref0 (_data_->self); #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_slice_free (PublishingYouTubeUploadTransactionSpliceWithProgressData, _data_); -#line 3544 "YouTubePublishing.c" +#line 3535 "YouTubePublishing.c" +} + + +static void publishing_you_tube_upload_transaction_splice_with_progress_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) { + PublishingYouTubeUploadTransactionSpliceWithProgressData* _task_data_; +#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _task_data_ = g_task_get_task_data (G_TASK (res)); +#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + if (_task_data_->_callback_ != NULL) { +#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _task_data_->_callback_ (source_object, res, user_data); +#line 3547 "YouTubePublishing.c" + } +#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _task_data_->_task_complete_ = TRUE; +#line 3551 "YouTubePublishing.c" } static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) { #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self ? publishing_rest_support_transaction_ref (self) : NULL; -#line 3551 "YouTubePublishing.c" +#line 3558 "YouTubePublishing.c" } static void publishing_you_tube_upload_transaction_splice_with_progress (PublishingYouTubeUploadTransaction* self, GFileInfo* info, GInputStream* input, GOutputStream* output, GAsyncReadyCallback _callback_, gpointer _user_data_) { PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_; - PublishingYouTubeUploadTransaction* _tmp0_ = NULL; - GFileInfo* _tmp1_ = NULL; - GFileInfo* _tmp2_ = NULL; - GInputStream* _tmp3_ = NULL; - GInputStream* _tmp4_ = NULL; - GOutputStream* _tmp5_ = NULL; - GOutputStream* _tmp6_ = NULL; + PublishingYouTubeUploadTransaction* _tmp0_; + GFileInfo* _tmp1_; + GFileInfo* _tmp2_; + GInputStream* _tmp3_; + GInputStream* _tmp4_; + GOutputStream* _tmp5_; + GOutputStream* _tmp6_; #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_ = g_slice_new0 (PublishingYouTubeUploadTransactionSpliceWithProgressData); #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _data_->_async_result = g_simple_async_result_new (NULL, _callback_, _user_data_, publishing_you_tube_upload_transaction_splice_with_progress); + _data_->_callback_ = _callback_; +#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _data_->_async_result = g_task_new (NULL, NULL, publishing_you_tube_upload_transaction_splice_with_progress_async_ready_wrapper, _user_data_); +#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + if (_callback_ == NULL) { +#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _data_->_task_complete_ = TRUE; +#line 3581 "YouTubePublishing.c" + } #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, publishing_you_tube_upload_transaction_splice_with_progress_data_free); + g_task_set_task_data (_data_->_async_result, _data_, publishing_you_tube_upload_transaction_splice_with_progress_data_free); #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp0_ = _publishing_rest_support_transaction_ref0 (self); #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -3603,21 +3618,20 @@ static void publishing_you_tube_upload_transaction_splice_with_progress (Publish _data_->output = _tmp6_; #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_upload_transaction_splice_with_progress_co (_data_); -#line 3600 "YouTubePublishing.c" +#line 3615 "YouTubePublishing.c" } static void publishing_you_tube_upload_transaction_splice_with_progress_finish (PublishingYouTubeUploadTransaction* self, GAsyncResult* _res_, GError** error) { PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_; #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { + _data_ = g_task_propagate_pointer (G_TASK (_res_), error); +#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + if (NULL == _data_) { #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 3610 "YouTubePublishing.c" +#line 3627 "YouTubePublishing.c" } -#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 3614 "YouTubePublishing.c" } @@ -3630,8 +3644,10 @@ static void publishing_you_tube_upload_transaction_splice_with_progress_ready (G #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->_res_ = _res_; #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _data_->_task_complete_ = TRUE; +#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_upload_transaction_splice_with_progress_co (_data_); -#line 3628 "YouTubePublishing.c" +#line 3644 "YouTubePublishing.c" } @@ -3640,61 +3656,51 @@ static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co ( switch (_data_->_state_) { #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" case 0: -#line 3637 "YouTubePublishing.c" +#line 3653 "YouTubePublishing.c" goto _state_0; #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" case 1: -#line 3641 "YouTubePublishing.c" +#line 3657 "YouTubePublishing.c" goto _state_1; #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" case 2: -#line 3645 "YouTubePublishing.c" +#line 3661 "YouTubePublishing.c" goto _state_2; #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" case 3: -#line 3649 "YouTubePublishing.c" +#line 3665 "YouTubePublishing.c" goto _state_3; #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" case 4: -#line 3653 "YouTubePublishing.c" +#line 3669 "YouTubePublishing.c" goto _state_4; default: #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_assert_not_reached (); -#line 3658 "YouTubePublishing.c" +#line 3674 "YouTubePublishing.c" } _state_0: #line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _data_->_tmp0_ = NULL; -#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->_tmp0_ = _data_->info; #line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _data_->_tmp1_ = 0LL; -#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->_tmp1_ = g_file_info_get_size (_data_->_tmp0_); #line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->total_bytes = _data_->_tmp1_; #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _data_->_tmp2_ = 0LL; -#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->_tmp2_ = _data_->total_bytes; #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->bytes_to_write = _data_->_tmp2_; #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" while (TRUE) { #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _data_->_tmp3_ = 0LL; -#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->_tmp3_ = _data_->bytes_to_write; #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (!(_data_->_tmp3_ > ((gint64) 0))) { #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" break; -#line 3687 "YouTubePublishing.c" +#line 3695 "YouTubePublishing.c" } #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _data_->_tmp4_ = NULL; -#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->_tmp4_ = _data_->input; #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->_state_ = 1; @@ -3702,53 +3708,33 @@ static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co ( g_input_stream_read_async (_data_->_tmp4_, _data_->buffer, (gsize) 8192, G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_); #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return FALSE; -#line 3699 "YouTubePublishing.c" +#line 3705 "YouTubePublishing.c" _state_1: #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _data_->_tmp5_ = 0L; -#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->_tmp5_ = g_input_stream_read_finish (_data_->_tmp4_, _data_->_res_, &_data_->_inner_error_); #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->bytes_read = _data_->_tmp5_; #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); -#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_error_free (_data_->_inner_error_); -#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - if (_data_->_state_ == 0) { -#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3717 "YouTubePublishing.c" - } else { -#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_simple_async_result_complete (_data_->_async_result); -#line 3721 "YouTubePublishing.c" - } + g_task_return_error (_data_->_async_result, _data_->_inner_error_); #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_object_unref (_data_->_async_result); #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return FALSE; -#line 3727 "YouTubePublishing.c" +#line 3719 "YouTubePublishing.c" } #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _data_->_tmp6_ = 0L; -#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->_tmp6_ = _data_->bytes_read; #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (_data_->_tmp6_ == ((gssize) 0)) { #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" break; -#line 3737 "YouTubePublishing.c" +#line 3727 "YouTubePublishing.c" } #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _data_->_tmp7_ = NULL; -#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->_tmp7_ = _data_->output; #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _data_->_tmp8_ = 0L; -#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->_tmp8_ = _data_->bytes_read; #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->_state_ = 2; @@ -3756,65 +3742,39 @@ static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co ( g_output_stream_write_async (_data_->_tmp7_, _data_->buffer + 0, (gsize) (((gint) _data_->_tmp8_) - 0), G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_); #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return FALSE; -#line 3753 "YouTubePublishing.c" +#line 3739 "YouTubePublishing.c" _state_2: #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _data_->_tmp9_ = 0L; -#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->_tmp9_ = g_output_stream_write_finish (_data_->_tmp7_, _data_->_res_, &_data_->_inner_error_); #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->bytes_written = _data_->_tmp9_; #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); -#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_error_free (_data_->_inner_error_); -#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - if (_data_->_state_ == 0) { -#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3771 "YouTubePublishing.c" - } else { -#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_simple_async_result_complete (_data_->_async_result); -#line 3775 "YouTubePublishing.c" - } + g_task_return_error (_data_->_async_result, _data_->_inner_error_); #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_object_unref (_data_->_async_result); #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return FALSE; -#line 3781 "YouTubePublishing.c" +#line 3753 "YouTubePublishing.c" } #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _data_->_tmp10_ = 0LL; -#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->_tmp10_ = _data_->bytes_to_write; #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _data_->_tmp11_ = 0L; -#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->_tmp11_ = _data_->bytes_written; #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->bytes_to_write = _data_->_tmp10_ - _data_->_tmp11_; #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _data_->_tmp12_ = 0LL; -#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->_tmp12_ = _data_->total_bytes; #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _data_->_tmp13_ = 0LL; -#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->_tmp13_ = _data_->bytes_to_write; #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _data_->_tmp14_ = 0LL; -#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->_tmp14_ = _data_->total_bytes; #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "chunk-transmitted", (gint) (_data_->_tmp12_ - _data_->_tmp13_), (gint) _data_->_tmp14_); -#line 3807 "YouTubePublishing.c" +#line 3769 "YouTubePublishing.c" } #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _data_->_tmp15_ = NULL; -#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->_tmp15_ = _data_->output; #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->_state_ = 3; @@ -3822,35 +3782,21 @@ static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co ( g_output_stream_close_async (_data_->_tmp15_, G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_); #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return FALSE; -#line 3819 "YouTubePublishing.c" +#line 3779 "YouTubePublishing.c" _state_3: #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_output_stream_close_finish (_data_->_tmp15_, _data_->_res_, &_data_->_inner_error_); #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); -#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_error_free (_data_->_inner_error_); -#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - if (_data_->_state_ == 0) { -#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3833 "YouTubePublishing.c" - } else { -#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_simple_async_result_complete (_data_->_async_result); -#line 3837 "YouTubePublishing.c" - } + g_task_return_error (_data_->_async_result, _data_->_inner_error_); #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_object_unref (_data_->_async_result); #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return FALSE; -#line 3843 "YouTubePublishing.c" +#line 3791 "YouTubePublishing.c" } #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _data_->_tmp16_ = NULL; -#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->_tmp16_ = _data_->input; #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _data_->_state_ = 4; @@ -3858,47 +3804,36 @@ static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co ( g_input_stream_close_async (_data_->_tmp16_, G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_); #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return FALSE; -#line 3855 "YouTubePublishing.c" +#line 3801 "YouTubePublishing.c" _state_4: #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_input_stream_close_finish (_data_->_tmp16_, _data_->_res_, &_data_->_inner_error_); #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); -#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_error_free (_data_->_inner_error_); -#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - if (_data_->_state_ == 0) { -#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3869 "YouTubePublishing.c" - } else { -#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_simple_async_result_complete (_data_->_async_result); -#line 3873 "YouTubePublishing.c" - } + g_task_return_error (_data_->_async_result, _data_->_inner_error_); #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_object_unref (_data_->_async_result); #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return FALSE; -#line 3879 "YouTubePublishing.c" +#line 3813 "YouTubePublishing.c" } #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - if (_data_->_state_ == 0) { + g_task_return_pointer (_data_->_async_result, _data_, NULL); #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3885 "YouTubePublishing.c" - } else { + if (_data_->_state_ != 0) { #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_simple_async_result_complete (_data_->_async_result); -#line 3889 "YouTubePublishing.c" + while (_data_->_task_complete_ != TRUE) { +#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); +#line 3823 "YouTubePublishing.c" + } } #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_object_unref (_data_->_async_result); #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return FALSE; -#line 3895 "YouTubePublishing.c" +#line 3830 "YouTubePublishing.c" } @@ -3910,19 +3845,19 @@ static void publishing_you_tube_upload_transaction_class_init (PublishingYouTube #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_type_class_add_private (klass, sizeof (PublishingYouTubeUploadTransactionPrivate)); #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_you_tube_upload_transaction_real_execute; -#line 3908 "YouTubePublishing.c" + ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_you_tube_upload_transaction_real_execute; +#line 3843 "YouTubePublishing.c" } static void publishing_you_tube_upload_transaction_instance_init (PublishingYouTubeUploadTransaction * self) { #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self->priv = PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_GET_PRIVATE (self); -#line 3915 "YouTubePublishing.c" +#line 3850 "YouTubePublishing.c" } -static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) { +static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) { PublishingYouTubeUploadTransaction * self; #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, PublishingYouTubeUploadTransaction); @@ -3936,7 +3871,7 @@ static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSuppo _g_object_unref0 (self->priv->youtube_service); #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_you_tube_upload_transaction_parent_class)->finalize (obj); -#line 3933 "YouTubePublishing.c" +#line 3868 "YouTubePublishing.c" } @@ -3954,13 +3889,13 @@ GType publishing_you_tube_upload_transaction_get_type (void) { PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_type, GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters) { PublishingYouTubeUploader* self = NULL; - PublishingRESTSupportGoogleSession* _tmp0_ = NULL; - SpitPublishingPublishable** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - PublishingYouTubePublishingParameters* _tmp2_ = NULL; - PublishingYouTubePublishingParameters* _tmp3_ = NULL; - GDataYouTubeService* _tmp4_ = NULL; - GDataYouTubeService* _tmp5_ = NULL; + PublishingRESTSupportGoogleSession* _tmp0_; + SpitPublishingPublishable** _tmp1_; + gint _tmp1__length1; + PublishingYouTubePublishingParameters* _tmp2_; + PublishingYouTubePublishingParameters* _tmp3_; + GDataYouTubeService* _tmp4_; + GDataYouTubeService* _tmp5_; #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_val_if_fail (GDATA_IS_YOUTUBE_SERVICE (youtube_service), NULL); #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -3993,28 +3928,28 @@ PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_ self->priv->youtube_service = _tmp5_; #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self; -#line 3990 "YouTubePublishing.c" +#line 3925 "YouTubePublishing.c" } PublishingYouTubeUploader* publishing_you_tube_uploader_new (GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters) { #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return publishing_you_tube_uploader_construct (PUBLISHING_YOU_TUBE_TYPE_UPLOADER, youtube_service, session, publishables, publishables_length1, parameters); -#line 3997 "YouTubePublishing.c" +#line 3932 "YouTubePublishing.c" } static PublishingRESTSupportTransaction* publishing_you_tube_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) { PublishingYouTubeUploader * self; PublishingRESTSupportTransaction* result = NULL; - GDataYouTubeService* _tmp0_ = NULL; - PublishingRESTSupportSession* _tmp1_ = NULL; - PublishingRESTSupportGoogleSession* _tmp2_ = NULL; - PublishingYouTubePublishingParameters* _tmp3_ = NULL; - SpitPublishingPublishable* _tmp4_ = NULL; - SpitPublishingPublishable* _tmp5_ = NULL; - PublishingYouTubeUploadTransaction* _tmp6_ = NULL; - PublishingRESTSupportTransaction* _tmp7_ = NULL; + GDataYouTubeService* _tmp0_; + PublishingRESTSupportSession* _tmp1_; + PublishingRESTSupportGoogleSession* _tmp2_; + PublishingYouTubePublishingParameters* _tmp3_; + SpitPublishingPublishable* _tmp4_; + SpitPublishingPublishable* _tmp5_; + PublishingYouTubeUploadTransaction* _tmp6_; + PublishingRESTSupportTransaction* _tmp7_; #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploader); #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -4043,7 +3978,7 @@ static PublishingRESTSupportTransaction* publishing_you_tube_uploader_real_creat result = _tmp7_; #line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 4040 "YouTubePublishing.c" +#line 3975 "YouTubePublishing.c" } @@ -4055,19 +3990,19 @@ static void publishing_you_tube_uploader_class_init (PublishingYouTubeUploaderCl #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_type_class_add_private (klass, sizeof (PublishingYouTubeUploaderPrivate)); #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_you_tube_uploader_real_create_transaction; -#line 4053 "YouTubePublishing.c" + ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_you_tube_uploader_real_create_transaction; +#line 3988 "YouTubePublishing.c" } static void publishing_you_tube_uploader_instance_init (PublishingYouTubeUploader * self) { #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self->priv = PUBLISHING_YOU_TUBE_UPLOADER_GET_PRIVATE (self); -#line 4060 "YouTubePublishing.c" +#line 3995 "YouTubePublishing.c" } -static void publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUploader* obj) { +static void publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUploader * obj) { PublishingYouTubeUploader * self; #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploader); @@ -4077,7 +4012,7 @@ static void publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUpl _g_object_unref0 (self->priv->youtube_service); #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_you_tube_uploader_parent_class)->finalize (obj); -#line 4074 "YouTubePublishing.c" +#line 4009 "YouTubePublishing.c" } diff --git a/plugins/shotwell-publishing/shotwell-publishing.c b/plugins/shotwell-publishing/shotwell-publishing.c index eca05dc..8d7d080 100644 --- a/plugins/shotwell-publishing/shotwell-publishing.c +++ b/plugins/shotwell-publishing/shotwell-publishing.c @@ -1,4 +1,4 @@ -/* shotwell-publishing.c generated by valac 0.34.7, the Vala compiler +/* shotwell-publishing.c generated by valac 0.36.6, the Vala compiler * generated from shotwell-publishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -98,7 +98,7 @@ struct _ShotwellPublishingCoreServicesPrivate { static gpointer shotwell_publishing_core_services_parent_class = NULL; -static SpitModuleIface* shotwell_publishing_core_services_spit_module_parent_iface = NULL; +static SpitModuleIface * shotwell_publishing_core_services_spit_module_parent_iface = NULL; GType shotwell_publishing_core_services_get_type (void) G_GNUC_CONST; #define SHOTWELL_PUBLISHING_CORE_SERVICES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServicesPrivate)) @@ -110,34 +110,34 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy FacebookService* facebook_service_new (GFile* resource_directory); FacebookService* facebook_service_construct (GType object_type, GFile* resource_directory); GType facebook_service_get_type (void) G_GNUC_CONST; -static void _vala_array_add1 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add1 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); PicasaService* picasa_service_new (GFile* resource_directory); PicasaService* picasa_service_construct (GType object_type, GFile* resource_directory); GType picasa_service_get_type (void) G_GNUC_CONST; -static void _vala_array_add2 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add2 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); FlickrService* flickr_service_new (GFile* resource_directory); FlickrService* flickr_service_construct (GType object_type, GFile* resource_directory); GType flickr_service_get_type (void) G_GNUC_CONST; -static void _vala_array_add3 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add3 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); YouTubeService* you_tube_service_new (GFile* resource_directory); YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_directory); GType you_tube_service_get_type (void) G_GNUC_CONST; -static void _vala_array_add4 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add4 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); PiwigoService* piwigo_service_new (GFile* resource_directory); PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_directory); GType piwigo_service_get_type (void) G_GNUC_CONST; -static void _vala_array_add5 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add5 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); static const gchar* shotwell_publishing_core_services_real_get_module_name (SpitModule* base); static const gchar* shotwell_publishing_core_services_real_get_version (SpitModule* base); static const gchar* shotwell_publishing_core_services_real_get_id (SpitModule* base); static SpitPluggable** shotwell_publishing_core_services_real_get_pluggables (SpitModule* base, int* result_length1); -static void shotwell_publishing_core_services_finalize (GObject* obj); +static void shotwell_publishing_core_services_finalize (GObject * obj); SpitModule* spit_entry_point (SpitEntryPointParams* params); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_add1 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add1 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" if ((*length) == (*size)) { #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -154,7 +154,7 @@ static void _vala_array_add1 (SpitPluggable*** array, int* length, int* size, Sp } -static void _vala_array_add2 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add2 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" if ((*length) == (*size)) { #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -171,7 +171,7 @@ static void _vala_array_add2 (SpitPluggable*** array, int* length, int* size, Sp } -static void _vala_array_add3 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add3 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" if ((*length) == (*size)) { #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -188,7 +188,7 @@ static void _vala_array_add3 (SpitPluggable*** array, int* length, int* size, Sp } -static void _vala_array_add4 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add4 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" if ((*length) == (*size)) { #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -205,7 +205,7 @@ static void _vala_array_add4 (SpitPluggable*** array, int* length, int* size, Sp } -static void _vala_array_add5 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add5 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" if ((*length) == (*size)) { #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -225,31 +225,31 @@ static void _vala_array_add5 (SpitPluggable*** array, int* length, int* size, Sp ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GType object_type, GFile* module_file) { ShotwellPublishingCoreServices * self = NULL; GFile* resource_directory = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; PublishingAuthenticatorFactory* factory = NULL; - PublishingAuthenticatorFactory* _tmp2_ = NULL; + PublishingAuthenticatorFactory* _tmp2_; GeeList* authenicators = NULL; - PublishingAuthenticatorFactory* _tmp3_ = NULL; - GeeList* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GeeList* _tmp8_ = NULL; - gint _tmp9_ = 0; - gint _tmp10_ = 0; - GeeList* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - GeeList* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; - GeeList* _tmp21_ = NULL; - gboolean _tmp22_ = FALSE; - GeeList* _tmp26_ = NULL; - gboolean _tmp27_ = FALSE; - SpitPluggable** _tmp31_ = NULL; - gint _tmp31__length1 = 0; - GFile* _tmp32_ = NULL; - PiwigoService* _tmp33_ = NULL; + PublishingAuthenticatorFactory* _tmp3_; + GeeList* _tmp4_; + GFile* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + GeeList* _tmp8_; + gint _tmp9_; + gint _tmp10_; + GeeList* _tmp11_; + gboolean _tmp12_; + GeeList* _tmp16_; + gboolean _tmp17_; + GeeList* _tmp21_; + gboolean _tmp22_; + GeeList* _tmp26_; + gboolean _tmp27_; + SpitPluggable** _tmp31_; + gint _tmp31__length1; + GFile* _tmp32_; + PiwigoService* _tmp33_; #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" g_return_val_if_fail (G_IS_FILE (module_file), NULL); #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -295,10 +295,10 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy #line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" if (_tmp12_) { #line 298 "shotwell-publishing.c" - SpitPluggable** _tmp13_ = NULL; - gint _tmp13__length1 = 0; - GFile* _tmp14_ = NULL; - FacebookService* _tmp15_ = NULL; + SpitPluggable** _tmp13_; + gint _tmp13__length1; + GFile* _tmp14_; + FacebookService* _tmp15_; #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" _tmp13_ = self->priv->pluggables; #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -318,10 +318,10 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" if (_tmp17_) { #line 321 "shotwell-publishing.c" - SpitPluggable** _tmp18_ = NULL; - gint _tmp18__length1 = 0; - GFile* _tmp19_ = NULL; - PicasaService* _tmp20_ = NULL; + SpitPluggable** _tmp18_; + gint _tmp18__length1; + GFile* _tmp19_; + PicasaService* _tmp20_; #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" _tmp18_ = self->priv->pluggables; #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -341,10 +341,10 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" if (_tmp22_) { #line 344 "shotwell-publishing.c" - SpitPluggable** _tmp23_ = NULL; - gint _tmp23__length1 = 0; - GFile* _tmp24_ = NULL; - FlickrService* _tmp25_ = NULL; + SpitPluggable** _tmp23_; + gint _tmp23__length1; + GFile* _tmp24_; + FlickrService* _tmp25_; #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" _tmp23_ = self->priv->pluggables; #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -364,10 +364,10 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" if (_tmp27_) { #line 367 "shotwell-publishing.c" - SpitPluggable** _tmp28_ = NULL; - gint _tmp28__length1 = 0; - GFile* _tmp29_ = NULL; - YouTubeService* _tmp30_ = NULL; + SpitPluggable** _tmp28_; + gint _tmp28__length1; + GFile* _tmp29_; + YouTubeService* _tmp30_; #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" _tmp28_ = self->priv->pluggables; #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -412,16 +412,13 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_new (GFile* mo static const gchar* shotwell_publishing_core_services_real_get_module_name (SpitModule* base) { ShotwellPublishingCoreServices * self; const gchar* result = NULL; - const gchar* _tmp0_ = NULL; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices); #line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" - _tmp0_ = _ ("Core Publishing Services"); -#line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" - result = _tmp0_; + result = _ ("Core Publishing Services"); #line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" return result; -#line 425 "shotwell-publishing.c" +#line 422 "shotwell-publishing.c" } @@ -434,7 +431,7 @@ static const gchar* shotwell_publishing_core_services_real_get_version (SpitModu result = _VERSION; #line 59 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" return result; -#line 438 "shotwell-publishing.c" +#line 435 "shotwell-publishing.c" } @@ -447,17 +444,17 @@ static const gchar* shotwell_publishing_core_services_real_get_id (SpitModule* b result = "org.yorba.shotwell.publishing.core_services"; #line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" return result; -#line 451 "shotwell-publishing.c" +#line 448 "shotwell-publishing.c" } static SpitPluggable** shotwell_publishing_core_services_real_get_pluggables (SpitModule* base, int* result_length1) { ShotwellPublishingCoreServices * self; SpitPluggable** result = NULL; - SpitPluggable** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - SpitPluggable** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + SpitPluggable** _tmp0_; + gint _tmp0__length1; + SpitPluggable** _tmp1_; + gint _tmp1__length1; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices); #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -472,13 +469,13 @@ static SpitPluggable** shotwell_publishing_core_services_real_get_pluggables (Sp if (result_length1) { #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" *result_length1 = _tmp1__length1; -#line 476 "shotwell-publishing.c" +#line 473 "shotwell-publishing.c" } #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" result = _tmp1_; #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" return result; -#line 482 "shotwell-publishing.c" +#line 479 "shotwell-publishing.c" } @@ -489,7 +486,7 @@ static void shotwell_publishing_core_services_class_init (ShotwellPublishingCore g_type_class_add_private (klass, sizeof (ShotwellPublishingCoreServicesPrivate)); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" G_OBJECT_CLASS (klass)->finalize = shotwell_publishing_core_services_finalize; -#line 493 "shotwell-publishing.c" +#line 490 "shotwell-publishing.c" } @@ -497,19 +494,19 @@ static void shotwell_publishing_core_services_spit_module_interface_init (SpitMo #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" shotwell_publishing_core_services_spit_module_parent_iface = g_type_interface_peek_parent (iface); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" - iface->get_module_name = (const gchar* (*)(SpitModule*)) shotwell_publishing_core_services_real_get_module_name; + iface->get_module_name = (const gchar* (*) (SpitModule *)) shotwell_publishing_core_services_real_get_module_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" - iface->get_version = (const gchar* (*)(SpitModule*)) shotwell_publishing_core_services_real_get_version; + iface->get_version = (const gchar* (*) (SpitModule *)) shotwell_publishing_core_services_real_get_version; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" - iface->get_id = (const gchar* (*)(SpitModule*)) shotwell_publishing_core_services_real_get_id; + iface->get_id = (const gchar* (*) (SpitModule *)) shotwell_publishing_core_services_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" - iface->get_pluggables = (SpitPluggable** (*)(SpitModule*, int*)) shotwell_publishing_core_services_real_get_pluggables; -#line 508 "shotwell-publishing.c" + iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_publishing_core_services_real_get_pluggables; +#line 505 "shotwell-publishing.c" } static void shotwell_publishing_core_services_instance_init (ShotwellPublishingCoreServices * self) { - SpitPluggable** _tmp0_ = NULL; + SpitPluggable** _tmp0_; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" self->priv = SHOTWELL_PUBLISHING_CORE_SERVICES_GET_PRIVATE (self); #line 11 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -520,11 +517,11 @@ static void shotwell_publishing_core_services_instance_init (ShotwellPublishingC self->priv->pluggables_length1 = 0; #line 11 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" self->priv->_pluggables_size_ = self->priv->pluggables_length1; -#line 524 "shotwell-publishing.c" +#line 521 "shotwell-publishing.c" } -static void shotwell_publishing_core_services_finalize (GObject* obj) { +static void shotwell_publishing_core_services_finalize (GObject * obj) { ShotwellPublishingCoreServices * self; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices); @@ -532,7 +529,7 @@ static void shotwell_publishing_core_services_finalize (GObject* obj) { self->priv->pluggables = (_vala_array_free (self->priv->pluggables, self->priv->pluggables_length1, (GDestroyNotify) g_object_unref), NULL); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" G_OBJECT_CLASS (shotwell_publishing_core_services_parent_class)->finalize (obj); -#line 536 "shotwell-publishing.c" +#line 533 "shotwell-publishing.c" } @@ -552,14 +549,14 @@ GType shotwell_publishing_core_services_get_type (void) { SpitModule* spit_entry_point (SpitEntryPointParams* params) { SpitModule* result = NULL; - SpitEntryPointParams* _tmp0_ = NULL; - gint _tmp1_ = 0; - SpitEntryPointParams* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + SpitEntryPointParams* _tmp0_; + gint _tmp1_; + SpitEntryPointParams* _tmp2_; + gint _tmp3_; + gint _tmp4_; ShotwellPublishingCoreServices* _tmp5_ = NULL; - SpitEntryPointParams* _tmp6_ = NULL; - gint _tmp7_ = 0; + SpitEntryPointParams* _tmp6_; + gint _tmp7_; #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" _tmp0_ = params; #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -578,10 +575,10 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) { _tmp7_ = (*_tmp6_).module_spit_interface; #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) { -#line 582 "shotwell-publishing.c" - SpitEntryPointParams* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - ShotwellPublishingCoreServices* _tmp10_ = NULL; +#line 579 "shotwell-publishing.c" + SpitEntryPointParams* _tmp8_; + GFile* _tmp9_; + ShotwellPublishingCoreServices* _tmp10_; #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" _tmp8_ = params; #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -592,19 +589,19 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) { _g_object_unref0 (_tmp5_); #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" _tmp5_ = _tmp10_; -#line 596 "shotwell-publishing.c" +#line 593 "shotwell-publishing.c" } else { #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" _g_object_unref0 (_tmp5_); #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" _tmp5_ = NULL; -#line 602 "shotwell-publishing.c" +#line 599 "shotwell-publishing.c" } #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_MODULE, SpitModule); #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" return result; -#line 608 "shotwell-publishing.c" +#line 605 "shotwell-publishing.c" } diff --git a/plugins/shotwell-transitions/BlindsEffect.c b/plugins/shotwell-transitions/BlindsEffect.c index 516eefc..20733f9 100644 --- a/plugins/shotwell-transitions/BlindsEffect.c +++ b/plugins/shotwell-transitions/BlindsEffect.c @@ -1,4 +1,4 @@ -/* BlindsEffect.c generated by valac 0.34.7, the Vala compiler +/* BlindsEffect.c generated by valac 0.36.6, the Vala compiler * generated from BlindsEffect.vala, do not modify */ /* Copyright 2013 Jens Bav @@ -98,7 +98,7 @@ struct _BlindsEffectPrivate { static gpointer blinds_effect_descriptor_parent_class = NULL; static gpointer blinds_effect_parent_class = NULL; -static SpitTransitionsEffectIface* blinds_effect_spit_transitions_effect_parent_iface = NULL; +static SpitTransitionsEffectIface * blinds_effect_spit_transitions_effect_parent_iface = NULL; GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST; GType blinds_effect_descriptor_get_type (void) G_GNUC_CONST; @@ -127,14 +127,14 @@ static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitio static void blinds_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number); static void blinds_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number); static void blinds_effect_real_cancel (SpitTransitionsEffect* base); -static void blinds_effect_finalize (GObject* obj); +static void blinds_effect_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); BlindsEffectDescriptor* blinds_effect_descriptor_construct (GType object_type, GFile* resource_directory) { BlindsEffectDescriptor * self = NULL; - GFile* _tmp0_ = NULL; + GFile* _tmp0_; #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" g_return_val_if_fail (G_IS_FILE (resource_directory), NULL); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" @@ -170,23 +170,20 @@ static const gchar* blinds_effect_descriptor_real_get_id (ShotwellTransitionDesc static const gchar* blinds_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) { BlindsEffectDescriptor * self; const gchar* result = NULL; - const gchar* _tmp0_ = NULL; #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BLINDS_EFFECT_DESCRIPTOR, BlindsEffectDescriptor); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" - _tmp0_ = _ ("Blinds"); -#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" - result = _tmp0_; + result = _ ("Blinds"); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" return result; -#line 183 "BlindsEffect.c" +#line 180 "BlindsEffect.c" } static SpitTransitionsEffect* blinds_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) { BlindsEffectDescriptor * self; SpitTransitionsEffect* result = NULL; - BlindsEffect* _tmp0_ = NULL; + BlindsEffect* _tmp0_; #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BLINDS_EFFECT_DESCRIPTOR, BlindsEffectDescriptor); #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" @@ -197,7 +194,7 @@ static SpitTransitionsEffect* blinds_effect_descriptor_real_create (ShotwellTran result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect); #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" return result; -#line 201 "BlindsEffect.c" +#line 198 "BlindsEffect.c" } @@ -205,12 +202,12 @@ static void blinds_effect_descriptor_class_init (BlindsEffectDescriptorClass * k #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" blinds_effect_descriptor_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) blinds_effect_descriptor_real_get_id; + ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) blinds_effect_descriptor_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) blinds_effect_descriptor_real_get_pluggable_name; + ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) blinds_effect_descriptor_real_get_pluggable_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) blinds_effect_descriptor_real_create; -#line 214 "BlindsEffect.c" + ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) blinds_effect_descriptor_real_create; +#line 211 "BlindsEffect.c" } @@ -236,14 +233,14 @@ BlindsEffect* blinds_effect_construct (GType object_type) { self = (BlindsEffect*) g_object_new (object_type, NULL); #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" return self; -#line 240 "BlindsEffect.c" +#line 237 "BlindsEffect.c" } BlindsEffect* blinds_effect_new (void) { #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" return blinds_effect_construct (TYPE_BLINDS_EFFECT); -#line 247 "BlindsEffect.c" +#line 244 "BlindsEffect.c" } @@ -261,13 +258,13 @@ static void blinds_effect_real_get_fps (SpitTransitionsEffect* base, gint* desir if (desired_fps) { #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" *desired_fps = _vala_desired_fps; -#line 265 "BlindsEffect.c" +#line 262 "BlindsEffect.c" } #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" if (min_fps) { #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" *min_fps = _vala_min_fps; -#line 271 "BlindsEffect.c" +#line 268 "BlindsEffect.c" } } @@ -281,15 +278,15 @@ static gboolean blinds_effect_real_needs_clear_background (SpitTransitionsEffect result = TRUE; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" return result; -#line 285 "BlindsEffect.c" +#line 282 "BlindsEffect.c" } static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) { BlindsEffect * self; - SpitTransitionsVisuals* _tmp0_ = NULL; - GdkPixbuf* _tmp1_ = NULL; - GdkPixbuf* _tmp2_ = NULL; + SpitTransitionsVisuals* _tmp0_; + GdkPixbuf* _tmp1_; + GdkPixbuf* _tmp2_; #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BLINDS_EFFECT, BlindsEffect); #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" @@ -304,21 +301,21 @@ static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitio _tmp2_ = _tmp1_; #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" if (_tmp2_ != NULL) { -#line 308 "BlindsEffect.c" - SpitTransitionsVisuals* _tmp3_ = NULL; - GdkPixbuf* _tmp4_ = NULL; - GdkPixbuf* _tmp5_ = NULL; - gint _tmp6_ = 0; - gint _tmp7_ = 0; - SpitTransitionsVisuals* _tmp8_ = NULL; - GdkPixbuf* _tmp9_ = NULL; - GdkPixbuf* _tmp10_ = NULL; - gint _tmp11_ = 0; - gint _tmp12_ = 0; - gint _tmp13_ = 0; - gdouble _tmp14_ = 0.0; - gint _tmp15_ = 0; - cairo_surface_t** _tmp16_ = NULL; +#line 305 "BlindsEffect.c" + SpitTransitionsVisuals* _tmp3_; + GdkPixbuf* _tmp4_; + GdkPixbuf* _tmp5_; + gint _tmp6_; + gint _tmp7_; + SpitTransitionsVisuals* _tmp8_; + GdkPixbuf* _tmp9_; + GdkPixbuf* _tmp10_; + gint _tmp11_; + gint _tmp12_; + gint _tmp13_; + gdouble _tmp14_; + gint _tmp15_; + cairo_surface_t** _tmp16_; #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" _tmp3_ = visuals; #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" @@ -359,54 +356,54 @@ static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitio self->priv->to_blinds_length1 = _tmp15_; #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" self->priv->_to_blinds_size_ = self->priv->to_blinds_length1; -#line 363 "BlindsEffect.c" +#line 360 "BlindsEffect.c" { gint i = 0; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" i = 0; -#line 368 "BlindsEffect.c" +#line 365 "BlindsEffect.c" { gboolean _tmp17_ = FALSE; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" _tmp17_ = TRUE; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" while (TRUE) { -#line 375 "BlindsEffect.c" - gint _tmp19_ = 0; - gint _tmp20_ = 0; - cairo_surface_t** _tmp21_ = NULL; - gint _tmp21__length1 = 0; - gint _tmp22_ = 0; - gint _tmp23_ = 0; - SpitTransitionsVisuals* _tmp24_ = NULL; - GdkPixbuf* _tmp25_ = NULL; - GdkPixbuf* _tmp26_ = NULL; - gint _tmp27_ = 0; - gint _tmp28_ = 0; - cairo_surface_t* _tmp29_ = NULL; - cairo_surface_t* _tmp30_ = NULL; +#line 372 "BlindsEffect.c" + gint _tmp19_; + gint _tmp20_; + cairo_surface_t** _tmp21_; + gint _tmp21__length1; + gint _tmp22_; + gint _tmp23_; + SpitTransitionsVisuals* _tmp24_; + GdkPixbuf* _tmp25_; + GdkPixbuf* _tmp26_; + gint _tmp27_; + gint _tmp28_; + cairo_surface_t* _tmp29_; + cairo_surface_t* _tmp30_; cairo_t* ctx = NULL; - cairo_surface_t** _tmp31_ = NULL; - gint _tmp31__length1 = 0; - gint _tmp32_ = 0; - cairo_surface_t* _tmp33_ = NULL; - cairo_t* _tmp34_ = NULL; - cairo_t* _tmp35_ = NULL; - SpitTransitionsVisuals* _tmp36_ = NULL; - GdkPixbuf* _tmp37_ = NULL; - GdkPixbuf* _tmp38_ = NULL; - gint _tmp39_ = 0; - gint _tmp40_ = 0; - cairo_t* _tmp41_ = NULL; + cairo_surface_t** _tmp31_; + gint _tmp31__length1; + gint _tmp32_; + cairo_surface_t* _tmp33_; + cairo_t* _tmp34_; + cairo_t* _tmp35_; + SpitTransitionsVisuals* _tmp36_; + GdkPixbuf* _tmp37_; + GdkPixbuf* _tmp38_; + gint _tmp39_; + gint _tmp40_; + cairo_t* _tmp41_; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" if (!_tmp17_) { -#line 404 "BlindsEffect.c" - gint _tmp18_ = 0; +#line 401 "BlindsEffect.c" + gint _tmp18_; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" _tmp18_ = i; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" i = _tmp18_ + 1; -#line 410 "BlindsEffect.c" +#line 407 "BlindsEffect.c" } #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" _tmp17_ = FALSE; @@ -418,7 +415,7 @@ static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitio if (!(_tmp19_ < _tmp20_)) { #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" break; -#line 422 "BlindsEffect.c" +#line 419 "BlindsEffect.c" } #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" _tmp21_ = self->priv->to_blinds; @@ -478,7 +475,7 @@ static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitio cairo_paint (_tmp41_); #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" _cairo_destroy0 (ctx); -#line 482 "BlindsEffect.c" +#line 479 "BlindsEffect.c" } } } @@ -489,24 +486,24 @@ static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitio static void blinds_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) { BlindsEffect * self; gdouble alpha = 0.0; - SpitTransitionsMotion* _tmp0_ = NULL; - gint _tmp1_ = 0; - gdouble _tmp2_ = 0.0; + SpitTransitionsMotion* _tmp0_; + gint _tmp1_; + gdouble _tmp2_; gint y = 0; - SpitTransitionsVisuals* _tmp3_ = NULL; + SpitTransitionsVisuals* _tmp3_; GdkRectangle _tmp4_ = {0}; - GdkRectangle _tmp5_ = {0}; - gint _tmp6_ = 0; + GdkRectangle _tmp5_; + gint _tmp6_; gint x = 0; - SpitTransitionsVisuals* _tmp7_ = NULL; + SpitTransitionsVisuals* _tmp7_; GdkRectangle _tmp8_ = {0}; - GdkRectangle _tmp9_ = {0}; - gint _tmp10_ = 0; - SpitTransitionsVisuals* _tmp11_ = NULL; - GdkPixbuf* _tmp12_ = NULL; - GdkPixbuf* _tmp13_ = NULL; - cairo_t* _tmp53_ = NULL; - cairo_t* _tmp54_ = NULL; + GdkRectangle _tmp9_; + gint _tmp10_; + SpitTransitionsVisuals* _tmp11_; + GdkPixbuf* _tmp12_; + GdkPixbuf* _tmp13_; + cairo_t* _tmp53_; + cairo_t* _tmp54_; #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BLINDS_EFFECT, BlindsEffect); #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" @@ -551,21 +548,21 @@ static void blinds_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio _tmp13_ = _tmp12_; #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" if (_tmp13_ != NULL) { -#line 555 "BlindsEffect.c" - cairo_t* _tmp14_ = NULL; - SpitTransitionsVisuals* _tmp15_ = NULL; - GdkPixbuf* _tmp16_ = NULL; - GdkPixbuf* _tmp17_ = NULL; - SpitTransitionsVisuals* _tmp18_ = NULL; +#line 552 "BlindsEffect.c" + cairo_t* _tmp14_; + SpitTransitionsVisuals* _tmp15_; + GdkPixbuf* _tmp16_; + GdkPixbuf* _tmp17_; + SpitTransitionsVisuals* _tmp18_; GdkRectangle _tmp19_ = {0}; - GdkRectangle _tmp20_ = {0}; - gint _tmp21_ = 0; - SpitTransitionsVisuals* _tmp22_ = NULL; + GdkRectangle _tmp20_; + gint _tmp21_; + SpitTransitionsVisuals* _tmp22_; GdkRectangle _tmp23_ = {0}; - GdkRectangle _tmp24_ = {0}; - gint _tmp25_ = 0; - cairo_t* _tmp26_ = NULL; - gdouble _tmp27_ = 0.0; + GdkRectangle _tmp24_; + gint _tmp25_; + cairo_t* _tmp26_; + gdouble _tmp27_; #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" _tmp14_ = ctx; #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" @@ -598,53 +595,53 @@ static void blinds_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio _tmp27_ = alpha; #line 77 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" cairo_paint_with_alpha (_tmp26_, 1 - (_tmp27_ * 2)); -#line 602 "BlindsEffect.c" +#line 599 "BlindsEffect.c" } { gint i = 0; #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" i = 0; -#line 608 "BlindsEffect.c" +#line 605 "BlindsEffect.c" { gboolean _tmp28_ = FALSE; #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" _tmp28_ = TRUE; #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" while (TRUE) { -#line 615 "BlindsEffect.c" - gint _tmp30_ = 0; - gint _tmp31_ = 0; - cairo_t* _tmp32_ = NULL; - cairo_surface_t** _tmp33_ = NULL; - gint _tmp33__length1 = 0; - gint _tmp34_ = 0; - cairo_surface_t* _tmp35_ = NULL; - gint _tmp36_ = 0; - gint _tmp37_ = 0; - gint _tmp38_ = 0; - gint _tmp39_ = 0; - cairo_t* _tmp40_ = NULL; - gint _tmp41_ = 0; - gint _tmp42_ = 0; - gint _tmp43_ = 0; - gint _tmp44_ = 0; - gint _tmp45_ = 0; - gdouble _tmp46_ = 0.0; - SpitTransitionsVisuals* _tmp47_ = NULL; - GdkPixbuf* _tmp48_ = NULL; - GdkPixbuf* _tmp49_ = NULL; - gint _tmp50_ = 0; - gint _tmp51_ = 0; - cairo_t* _tmp52_ = NULL; +#line 612 "BlindsEffect.c" + gint _tmp30_; + gint _tmp31_; + cairo_t* _tmp32_; + cairo_surface_t** _tmp33_; + gint _tmp33__length1; + gint _tmp34_; + cairo_surface_t* _tmp35_; + gint _tmp36_; + gint _tmp37_; + gint _tmp38_; + gint _tmp39_; + cairo_t* _tmp40_; + gint _tmp41_; + gint _tmp42_; + gint _tmp43_; + gint _tmp44_; + gint _tmp45_; + gdouble _tmp46_; + SpitTransitionsVisuals* _tmp47_; + GdkPixbuf* _tmp48_; + GdkPixbuf* _tmp49_; + gint _tmp50_; + gint _tmp51_; + cairo_t* _tmp52_; #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" if (!_tmp28_) { -#line 642 "BlindsEffect.c" - gint _tmp29_ = 0; +#line 639 "BlindsEffect.c" + gint _tmp29_; #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" _tmp29_ = i; #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" i = _tmp29_ + 1; -#line 648 "BlindsEffect.c" +#line 645 "BlindsEffect.c" } #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" _tmp28_ = FALSE; @@ -656,7 +653,7 @@ static void blinds_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio if (!(_tmp30_ < _tmp31_)) { #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" break; -#line 660 "BlindsEffect.c" +#line 657 "BlindsEffect.c" } #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" _tmp32_ = ctx; @@ -708,7 +705,7 @@ static void blinds_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio _tmp52_ = ctx; #line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" cairo_fill (_tmp52_); -#line 712 "BlindsEffect.c" +#line 709 "BlindsEffect.c" } } } @@ -720,7 +717,7 @@ static void blinds_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio _tmp54_ = ctx; #line 88 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" cairo_paint (_tmp54_); -#line 724 "BlindsEffect.c" +#line 721 "BlindsEffect.c" } @@ -732,7 +729,7 @@ static void blinds_effect_real_advance (SpitTransitionsEffect* base, SpitTransit g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals)); #line 91 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 736 "BlindsEffect.c" +#line 733 "BlindsEffect.c" } @@ -740,7 +737,7 @@ static void blinds_effect_real_cancel (SpitTransitionsEffect* base) { BlindsEffect * self; #line 94 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BLINDS_EFFECT, BlindsEffect); -#line 744 "BlindsEffect.c" +#line 741 "BlindsEffect.c" } @@ -751,7 +748,7 @@ static void blinds_effect_class_init (BlindsEffectClass * klass) { g_type_class_add_private (klass, sizeof (BlindsEffectPrivate)); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" G_OBJECT_CLASS (klass)->finalize = blinds_effect_finalize; -#line 755 "BlindsEffect.c" +#line 752 "BlindsEffect.c" } @@ -759,29 +756,29 @@ static void blinds_effect_spit_transitions_effect_interface_init (SpitTransition #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" blinds_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" - iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) blinds_effect_real_get_fps; + iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) blinds_effect_real_get_fps; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" - iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) blinds_effect_real_needs_clear_background; + iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) blinds_effect_real_needs_clear_background; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" - iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) blinds_effect_real_start; + iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) blinds_effect_real_start; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" - iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) blinds_effect_real_paint; + iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) blinds_effect_real_paint; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" - iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) blinds_effect_real_advance; + iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) blinds_effect_real_advance; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" - iface->cancel = (void (*)(SpitTransitionsEffect*)) blinds_effect_real_cancel; -#line 774 "BlindsEffect.c" + iface->cancel = (void (*) (SpitTransitionsEffect *)) blinds_effect_real_cancel; +#line 771 "BlindsEffect.c" } static void blinds_effect_instance_init (BlindsEffect * self) { #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" self->priv = BLINDS_EFFECT_GET_PRIVATE (self); -#line 781 "BlindsEffect.c" +#line 778 "BlindsEffect.c" } -static void blinds_effect_finalize (GObject* obj) { +static void blinds_effect_finalize (GObject * obj) { BlindsEffect * self; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BLINDS_EFFECT, BlindsEffect); @@ -789,7 +786,7 @@ static void blinds_effect_finalize (GObject* obj) { self->priv->to_blinds = (_vala_array_free (self->priv->to_blinds, self->priv->to_blinds_length1, (GDestroyNotify) cairo_surface_destroy), NULL); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" G_OBJECT_CLASS (blinds_effect_parent_class)->finalize (obj); -#line 793 "BlindsEffect.c" +#line 790 "BlindsEffect.c" } diff --git a/plugins/shotwell-transitions/ChessEffect.c b/plugins/shotwell-transitions/ChessEffect.c index 712d938..e0e3b30 100644 --- a/plugins/shotwell-transitions/ChessEffect.c +++ b/plugins/shotwell-transitions/ChessEffect.c @@ -1,4 +1,4 @@ -/* ChessEffect.c generated by valac 0.34.7, the Vala compiler +/* ChessEffect.c generated by valac 0.36.6, the Vala compiler * generated from ChessEffect.vala, do not modify */ /* Copyright 2013 Jens Bav @@ -92,7 +92,7 @@ struct _ChessEffectPrivate { static gpointer chess_effect_descriptor_parent_class = NULL; static gpointer chess_effect_parent_class = NULL; -static SpitTransitionsEffectIface* chess_effect_spit_transitions_effect_parent_iface = NULL; +static SpitTransitionsEffectIface * chess_effect_spit_transitions_effect_parent_iface = NULL; GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST; GType chess_effect_descriptor_get_type (void) G_GNUC_CONST; @@ -121,12 +121,12 @@ static gboolean chess_effect_real_needs_clear_background (SpitTransitionsEffect* static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number); static void chess_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number); static void chess_effect_real_cancel (SpitTransitionsEffect* base); -static void chess_effect_finalize (GObject* obj); +static void chess_effect_finalize (GObject * obj); ChessEffectDescriptor* chess_effect_descriptor_construct (GType object_type, GFile* resource_directory) { ChessEffectDescriptor * self = NULL; - GFile* _tmp0_ = NULL; + GFile* _tmp0_; #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" g_return_val_if_fail (G_IS_FILE (resource_directory), NULL); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" @@ -162,23 +162,20 @@ static const gchar* chess_effect_descriptor_real_get_id (ShotwellTransitionDescr static const gchar* chess_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) { ChessEffectDescriptor * self; const gchar* result = NULL; - const gchar* _tmp0_ = NULL; #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHESS_EFFECT_DESCRIPTOR, ChessEffectDescriptor); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" - _tmp0_ = _ ("Chess"); -#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" - result = _tmp0_; + result = _ ("Chess"); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" return result; -#line 175 "ChessEffect.c" +#line 172 "ChessEffect.c" } static SpitTransitionsEffect* chess_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) { ChessEffectDescriptor * self; SpitTransitionsEffect* result = NULL; - ChessEffect* _tmp0_ = NULL; + ChessEffect* _tmp0_; #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHESS_EFFECT_DESCRIPTOR, ChessEffectDescriptor); #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" @@ -189,7 +186,7 @@ static SpitTransitionsEffect* chess_effect_descriptor_real_create (ShotwellTrans result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect); #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" return result; -#line 193 "ChessEffect.c" +#line 190 "ChessEffect.c" } @@ -197,12 +194,12 @@ static void chess_effect_descriptor_class_init (ChessEffectDescriptorClass * kla #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" chess_effect_descriptor_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) chess_effect_descriptor_real_get_id; + ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) chess_effect_descriptor_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) chess_effect_descriptor_real_get_pluggable_name; + ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) chess_effect_descriptor_real_get_pluggable_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) chess_effect_descriptor_real_create; -#line 206 "ChessEffect.c" + ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) chess_effect_descriptor_real_create; +#line 203 "ChessEffect.c" } @@ -228,14 +225,14 @@ ChessEffect* chess_effect_construct (GType object_type) { self = (ChessEffect*) g_object_new (object_type, NULL); #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" return self; -#line 232 "ChessEffect.c" +#line 229 "ChessEffect.c" } ChessEffect* chess_effect_new (void) { #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" return chess_effect_construct (TYPE_CHESS_EFFECT); -#line 239 "ChessEffect.c" +#line 236 "ChessEffect.c" } @@ -253,27 +250,27 @@ static void chess_effect_real_get_fps (SpitTransitionsEffect* base, gint* desire if (desired_fps) { #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" *desired_fps = _vala_desired_fps; -#line 257 "ChessEffect.c" +#line 254 "ChessEffect.c" } #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" if (min_fps) { #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" *min_fps = _vala_min_fps; -#line 263 "ChessEffect.c" +#line 260 "ChessEffect.c" } } static void chess_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) { ChessEffect * self; - SpitTransitionsVisuals* _tmp0_ = NULL; + SpitTransitionsVisuals* _tmp0_; GdkRectangle _tmp1_ = {0}; - GdkRectangle _tmp2_ = {0}; - gint _tmp3_ = 0; - SpitTransitionsVisuals* _tmp4_ = NULL; + GdkRectangle _tmp2_; + gint _tmp3_; + SpitTransitionsVisuals* _tmp4_; GdkRectangle _tmp5_ = {0}; - GdkRectangle _tmp6_ = {0}; - gint _tmp7_ = 0; + GdkRectangle _tmp6_; + gint _tmp7_; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHESS_EFFECT, ChessEffect); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" @@ -300,7 +297,7 @@ static void chess_effect_real_start (SpitTransitionsEffect* base, SpitTransition _tmp7_ = _tmp6_.width; #line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" self->priv->square_count_x = (gdouble) ((_tmp7_ / CHESS_EFFECT_SQUARE_SIZE) + 2); -#line 304 "ChessEffect.c" +#line 301 "ChessEffect.c" } @@ -313,24 +310,24 @@ static gboolean chess_effect_real_needs_clear_background (SpitTransitionsEffect* result = TRUE; #line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" return result; -#line 317 "ChessEffect.c" +#line 314 "ChessEffect.c" } static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) { ChessEffect * self; gdouble alpha = 0.0; - SpitTransitionsMotion* _tmp0_ = NULL; - gint _tmp1_ = 0; - gdouble _tmp2_ = 0.0; + SpitTransitionsMotion* _tmp0_; + gint _tmp1_; + gdouble _tmp2_; gdouble size = 0.0; - gdouble _tmp3_ = 0.0; - SpitTransitionsVisuals* _tmp4_ = NULL; - GdkPixbuf* _tmp5_ = NULL; - GdkPixbuf* _tmp6_ = NULL; - SpitTransitionsVisuals* _tmp21_ = NULL; - GdkPixbuf* _tmp22_ = NULL; - GdkPixbuf* _tmp23_ = NULL; + gdouble _tmp3_; + SpitTransitionsVisuals* _tmp4_; + GdkPixbuf* _tmp5_; + GdkPixbuf* _tmp6_; + SpitTransitionsVisuals* _tmp21_; + GdkPixbuf* _tmp22_; + GdkPixbuf* _tmp23_; #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHESS_EFFECT, ChessEffect); #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" @@ -359,21 +356,21 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp6_ = _tmp5_; #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" if (_tmp6_ != NULL) { -#line 363 "ChessEffect.c" - cairo_t* _tmp7_ = NULL; - SpitTransitionsVisuals* _tmp8_ = NULL; - GdkPixbuf* _tmp9_ = NULL; - GdkPixbuf* _tmp10_ = NULL; - SpitTransitionsVisuals* _tmp11_ = NULL; +#line 360 "ChessEffect.c" + cairo_t* _tmp7_; + SpitTransitionsVisuals* _tmp8_; + GdkPixbuf* _tmp9_; + GdkPixbuf* _tmp10_; + SpitTransitionsVisuals* _tmp11_; GdkRectangle _tmp12_ = {0}; - GdkRectangle _tmp13_ = {0}; - gint _tmp14_ = 0; - SpitTransitionsVisuals* _tmp15_ = NULL; + GdkRectangle _tmp13_; + gint _tmp14_; + SpitTransitionsVisuals* _tmp15_; GdkRectangle _tmp16_ = {0}; - GdkRectangle _tmp17_ = {0}; - gint _tmp18_ = 0; - cairo_t* _tmp19_ = NULL; - gdouble _tmp20_ = 0.0; + GdkRectangle _tmp17_; + gint _tmp18_; + cairo_t* _tmp19_; + gdouble _tmp20_; #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" _tmp7_ = ctx; #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" @@ -406,7 +403,7 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp20_ = alpha; #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" cairo_paint_with_alpha (_tmp19_, 1 - _tmp20_); -#line 410 "ChessEffect.c" +#line 407 "ChessEffect.c" } #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" _tmp21_ = visuals; @@ -416,22 +413,22 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp23_ = _tmp22_; #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" if (_tmp23_ != NULL) { -#line 420 "ChessEffect.c" - cairo_t* _tmp24_ = NULL; - SpitTransitionsVisuals* _tmp25_ = NULL; - GdkPixbuf* _tmp26_ = NULL; - GdkPixbuf* _tmp27_ = NULL; - SpitTransitionsVisuals* _tmp28_ = NULL; +#line 417 "ChessEffect.c" + cairo_t* _tmp24_; + SpitTransitionsVisuals* _tmp25_; + GdkPixbuf* _tmp26_; + GdkPixbuf* _tmp27_; + SpitTransitionsVisuals* _tmp28_; GdkRectangle _tmp29_ = {0}; - GdkRectangle _tmp30_ = {0}; - gint _tmp31_ = 0; - SpitTransitionsVisuals* _tmp32_ = NULL; + GdkRectangle _tmp30_; + gint _tmp31_; + SpitTransitionsVisuals* _tmp32_; GdkRectangle _tmp33_ = {0}; - GdkRectangle _tmp34_ = {0}; - gint _tmp35_ = 0; - cairo_t* _tmp81_ = NULL; - cairo_t* _tmp82_ = NULL; - gdouble _tmp83_ = 0.0; + GdkRectangle _tmp34_; + gint _tmp35_; + cairo_t* _tmp81_; + cairo_t* _tmp82_; + gdouble _tmp83_; #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" _tmp24_ = ctx; #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" @@ -458,30 +455,30 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp35_ = _tmp34_.y; #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" gdk_cairo_set_source_pixbuf (_tmp24_, _tmp27_, (gdouble) _tmp31_, (gdouble) _tmp35_); -#line 462 "ChessEffect.c" +#line 459 "ChessEffect.c" { gdouble y = 0.0; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" y = (gdouble) 0; -#line 467 "ChessEffect.c" +#line 464 "ChessEffect.c" { gboolean _tmp36_ = FALSE; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" _tmp36_ = TRUE; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" while (TRUE) { -#line 474 "ChessEffect.c" - gdouble _tmp38_ = 0.0; - gdouble _tmp39_ = 0.0; +#line 471 "ChessEffect.c" + gdouble _tmp38_; + gdouble _tmp39_; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" if (!_tmp36_) { -#line 479 "ChessEffect.c" - gdouble _tmp37_ = 0.0; +#line 476 "ChessEffect.c" + gdouble _tmp37_; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" _tmp37_ = y; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" y = _tmp37_ + 1; -#line 485 "ChessEffect.c" +#line 482 "ChessEffect.c" } #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" _tmp36_ = FALSE; @@ -493,38 +490,38 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition if (!(_tmp38_ <= _tmp39_)) { #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" break; -#line 497 "ChessEffect.c" +#line 494 "ChessEffect.c" } { gdouble x = 0.0; #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" x = (gdouble) 0; -#line 503 "ChessEffect.c" +#line 500 "ChessEffect.c" { gboolean _tmp40_ = FALSE; #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" _tmp40_ = TRUE; #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" while (TRUE) { -#line 510 "ChessEffect.c" - gdouble _tmp42_ = 0.0; - gdouble _tmp43_ = 0.0; +#line 507 "ChessEffect.c" + gdouble _tmp42_; + gdouble _tmp43_; gdouble _tmp44_ = 0.0; - gdouble _tmp45_ = 0.0; - gdouble _tmp46_ = 0.0; + gdouble _tmp45_; + gdouble _tmp46_; gdouble translation = 0.0; - SpitTransitionsMotion* _tmp47_ = NULL; - SpitTransitionsDirection _tmp48_ = 0; - SpitTransitionsDirection _tmp49_ = 0; + SpitTransitionsMotion* _tmp47_; + SpitTransitionsDirection _tmp48_; + SpitTransitionsDirection _tmp49_; #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" if (!_tmp40_) { -#line 522 "ChessEffect.c" - gdouble _tmp41_ = 0.0; +#line 519 "ChessEffect.c" + gdouble _tmp41_; #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" _tmp41_ = x; #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" x = _tmp41_ + 1; -#line 528 "ChessEffect.c" +#line 525 "ChessEffect.c" } #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" _tmp40_ = FALSE; @@ -536,7 +533,7 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition if (!(_tmp42_ <= _tmp43_)) { #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" break; -#line 540 "ChessEffect.c" +#line 537 "ChessEffect.c" } #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" _tmp45_ = x; @@ -546,11 +543,11 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition if (fmod (_tmp45_ + _tmp46_, 2) == ((gdouble) 0)) { #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" _tmp44_ = (-1.5) * CHESS_EFFECT_SQUARE_SIZE; -#line 550 "ChessEffect.c" +#line 547 "ChessEffect.c" } else { #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" _tmp44_ = 1.5 * CHESS_EFFECT_SQUARE_SIZE; -#line 554 "ChessEffect.c" +#line 551 "ChessEffect.c" } #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" translation = _tmp44_; @@ -562,20 +559,20 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp49_ = _tmp48_; #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" if (_tmp49_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) { -#line 566 "ChessEffect.c" - cairo_t* _tmp50_ = NULL; - SpitTransitionsVisuals* _tmp51_ = NULL; +#line 563 "ChessEffect.c" + cairo_t* _tmp50_; + SpitTransitionsVisuals* _tmp51_; GdkRectangle _tmp52_ = {0}; - GdkRectangle _tmp53_ = {0}; - gint _tmp54_ = 0; - gdouble _tmp55_ = 0.0; - gdouble _tmp56_ = 0.0; - SpitTransitionsVisuals* _tmp57_ = NULL; + GdkRectangle _tmp53_; + gint _tmp54_; + gdouble _tmp55_; + gdouble _tmp56_; + SpitTransitionsVisuals* _tmp57_; GdkRectangle _tmp58_ = {0}; - GdkRectangle _tmp59_ = {0}; - gint _tmp60_ = 0; - gdouble _tmp61_ = 0.0; - gdouble _tmp62_ = 0.0; + GdkRectangle _tmp59_; + gint _tmp60_; + gdouble _tmp61_; + gdouble _tmp62_; #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" _tmp50_ = ctx; #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" @@ -604,26 +601,26 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp62_ = size; #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" cairo_rectangle (_tmp50_, (_tmp54_ + _tmp55_) + (_tmp56_ * CHESS_EFFECT_SQUARE_SIZE), _tmp60_ + (_tmp61_ * CHESS_EFFECT_SQUARE_SIZE), _tmp62_, (gdouble) CHESS_EFFECT_SQUARE_SIZE); -#line 608 "ChessEffect.c" +#line 605 "ChessEffect.c" } else { - cairo_t* _tmp63_ = NULL; - SpitTransitionsVisuals* _tmp64_ = NULL; + cairo_t* _tmp63_; + SpitTransitionsVisuals* _tmp64_; GdkRectangle _tmp65_ = {0}; - GdkRectangle _tmp66_ = {0}; - gint _tmp67_ = 0; - SpitTransitionsVisuals* _tmp68_ = NULL; + GdkRectangle _tmp66_; + gint _tmp67_; + SpitTransitionsVisuals* _tmp68_; GdkRectangle _tmp69_ = {0}; - GdkRectangle _tmp70_ = {0}; - gint _tmp71_ = 0; - gdouble _tmp72_ = 0.0; - gdouble _tmp73_ = 0.0; - gdouble _tmp74_ = 0.0; - SpitTransitionsVisuals* _tmp75_ = NULL; + GdkRectangle _tmp70_; + gint _tmp71_; + gdouble _tmp72_; + gdouble _tmp73_; + gdouble _tmp74_; + SpitTransitionsVisuals* _tmp75_; GdkRectangle _tmp76_ = {0}; - GdkRectangle _tmp77_ = {0}; - gint _tmp78_ = 0; - gdouble _tmp79_ = 0.0; - gdouble _tmp80_ = 0.0; + GdkRectangle _tmp77_; + gint _tmp78_; + gdouble _tmp79_; + gdouble _tmp80_; #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" _tmp63_ = ctx; #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" @@ -662,7 +659,7 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp80_ = size; #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" cairo_rectangle (_tmp63_, (((_tmp67_ + _tmp71_) + _tmp72_) - (_tmp73_ * CHESS_EFFECT_SQUARE_SIZE)) - _tmp74_, _tmp78_ + (_tmp79_ * CHESS_EFFECT_SQUARE_SIZE), _tmp80_, (gdouble) CHESS_EFFECT_SQUARE_SIZE); -#line 666 "ChessEffect.c" +#line 663 "ChessEffect.c" } } } @@ -680,7 +677,7 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp83_ = alpha; #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" cairo_paint_with_alpha (_tmp82_, _tmp83_); -#line 684 "ChessEffect.c" +#line 681 "ChessEffect.c" } } @@ -693,7 +690,7 @@ static void chess_effect_real_advance (SpitTransitionsEffect* base, SpitTransiti g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals)); #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 697 "ChessEffect.c" +#line 694 "ChessEffect.c" } @@ -701,7 +698,7 @@ static void chess_effect_real_cancel (SpitTransitionsEffect* base) { ChessEffect * self; #line 86 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHESS_EFFECT, ChessEffect); -#line 705 "ChessEffect.c" +#line 702 "ChessEffect.c" } @@ -712,7 +709,7 @@ static void chess_effect_class_init (ChessEffectClass * klass) { g_type_class_add_private (klass, sizeof (ChessEffectPrivate)); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" G_OBJECT_CLASS (klass)->finalize = chess_effect_finalize; -#line 716 "ChessEffect.c" +#line 713 "ChessEffect.c" } @@ -720,35 +717,35 @@ static void chess_effect_spit_transitions_effect_interface_init (SpitTransitions #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" chess_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" - iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) chess_effect_real_get_fps; + iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) chess_effect_real_get_fps; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" - iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) chess_effect_real_start; + iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) chess_effect_real_start; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" - iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) chess_effect_real_needs_clear_background; + iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) chess_effect_real_needs_clear_background; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" - iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) chess_effect_real_paint; + iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) chess_effect_real_paint; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" - iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) chess_effect_real_advance; + iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) chess_effect_real_advance; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" - iface->cancel = (void (*)(SpitTransitionsEffect*)) chess_effect_real_cancel; -#line 735 "ChessEffect.c" + iface->cancel = (void (*) (SpitTransitionsEffect *)) chess_effect_real_cancel; +#line 732 "ChessEffect.c" } static void chess_effect_instance_init (ChessEffect * self) { #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" self->priv = CHESS_EFFECT_GET_PRIVATE (self); -#line 742 "ChessEffect.c" +#line 739 "ChessEffect.c" } -static void chess_effect_finalize (GObject* obj) { +static void chess_effect_finalize (GObject * obj) { ChessEffect * self; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CHESS_EFFECT, ChessEffect); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" G_OBJECT_CLASS (chess_effect_parent_class)->finalize (obj); -#line 752 "ChessEffect.c" +#line 749 "ChessEffect.c" } diff --git a/plugins/shotwell-transitions/CircleEffect.c b/plugins/shotwell-transitions/CircleEffect.c index 41871a7..97680cb 100644 --- a/plugins/shotwell-transitions/CircleEffect.c +++ b/plugins/shotwell-transitions/CircleEffect.c @@ -1,4 +1,4 @@ -/* CircleEffect.c generated by valac 0.34.7, the Vala compiler +/* CircleEffect.c generated by valac 0.36.6, the Vala compiler * generated from CircleEffect.vala, do not modify */ /* Copyright 2013 Jens Bav @@ -87,7 +87,7 @@ struct _CircleEffectClass { static gpointer circle_effect_descriptor_parent_class = NULL; static gpointer circle_effect_parent_class = NULL; -static SpitTransitionsEffectIface* circle_effect_spit_transitions_effect_parent_iface = NULL; +static SpitTransitionsEffectIface * circle_effect_spit_transitions_effect_parent_iface = NULL; GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST; GType circle_effect_descriptor_get_type (void) G_GNUC_CONST; @@ -118,7 +118,7 @@ static void circle_effect_real_cancel (SpitTransitionsEffect* base); CircleEffectDescriptor* circle_effect_descriptor_construct (GType object_type, GFile* resource_directory) { CircleEffectDescriptor * self = NULL; - GFile* _tmp0_ = NULL; + GFile* _tmp0_; #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" g_return_val_if_fail (G_IS_FILE (resource_directory), NULL); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" @@ -154,23 +154,20 @@ static const gchar* circle_effect_descriptor_real_get_id (ShotwellTransitionDesc static const gchar* circle_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) { CircleEffectDescriptor * self; const gchar* result = NULL; - const gchar* _tmp0_ = NULL; #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLE_EFFECT_DESCRIPTOR, CircleEffectDescriptor); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" - _tmp0_ = _ ("Circle"); -#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" - result = _tmp0_; + result = _ ("Circle"); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" return result; -#line 167 "CircleEffect.c" +#line 164 "CircleEffect.c" } static SpitTransitionsEffect* circle_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) { CircleEffectDescriptor * self; SpitTransitionsEffect* result = NULL; - CircleEffect* _tmp0_ = NULL; + CircleEffect* _tmp0_; #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLE_EFFECT_DESCRIPTOR, CircleEffectDescriptor); #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" @@ -181,7 +178,7 @@ static SpitTransitionsEffect* circle_effect_descriptor_real_create (ShotwellTran result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect); #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" return result; -#line 185 "CircleEffect.c" +#line 182 "CircleEffect.c" } @@ -189,12 +186,12 @@ static void circle_effect_descriptor_class_init (CircleEffectDescriptorClass * k #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" circle_effect_descriptor_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) circle_effect_descriptor_real_get_id; + ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) circle_effect_descriptor_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) circle_effect_descriptor_real_get_pluggable_name; + ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) circle_effect_descriptor_real_get_pluggable_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) circle_effect_descriptor_real_create; -#line 198 "CircleEffect.c" + ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) circle_effect_descriptor_real_create; +#line 195 "CircleEffect.c" } @@ -220,14 +217,14 @@ CircleEffect* circle_effect_construct (GType object_type) { self = (CircleEffect*) g_object_new (object_type, NULL); #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" return self; -#line 224 "CircleEffect.c" +#line 221 "CircleEffect.c" } CircleEffect* circle_effect_new (void) { #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" return circle_effect_construct (TYPE_CIRCLE_EFFECT); -#line 231 "CircleEffect.c" +#line 228 "CircleEffect.c" } @@ -245,13 +242,13 @@ static void circle_effect_real_get_fps (SpitTransitionsEffect* base, gint* desir if (desired_fps) { #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" *desired_fps = _vala_desired_fps; -#line 249 "CircleEffect.c" +#line 246 "CircleEffect.c" } #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" if (min_fps) { #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" *min_fps = _vala_min_fps; -#line 255 "CircleEffect.c" +#line 252 "CircleEffect.c" } } @@ -264,7 +261,7 @@ static void circle_effect_real_start (SpitTransitionsEffect* base, SpitTransitio g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals)); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 268 "CircleEffect.c" +#line 265 "CircleEffect.c" } @@ -277,27 +274,27 @@ static gboolean circle_effect_real_needs_clear_background (SpitTransitionsEffect result = TRUE; #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" return result; -#line 281 "CircleEffect.c" +#line 278 "CircleEffect.c" } static void circle_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) { CircleEffect * self; gdouble alpha = 0.0; - SpitTransitionsMotion* _tmp0_ = NULL; - gint _tmp1_ = 0; - gdouble _tmp2_ = 0.0; + SpitTransitionsMotion* _tmp0_; + gint _tmp1_; + gdouble _tmp2_; gint radius = 0; - gdouble _tmp3_ = 0.0; - gint _tmp4_ = 0; - gint _tmp5_ = 0; - gdouble _tmp6_ = 0.0; - SpitTransitionsVisuals* _tmp7_ = NULL; - GdkPixbuf* _tmp8_ = NULL; - GdkPixbuf* _tmp9_ = NULL; - SpitTransitionsVisuals* _tmp24_ = NULL; - GdkPixbuf* _tmp25_ = NULL; - GdkPixbuf* _tmp26_ = NULL; + gdouble _tmp3_; + gint _tmp4_; + gint _tmp5_; + gdouble _tmp6_; + SpitTransitionsVisuals* _tmp7_; + GdkPixbuf* _tmp8_; + GdkPixbuf* _tmp9_; + SpitTransitionsVisuals* _tmp24_; + GdkPixbuf* _tmp25_; + GdkPixbuf* _tmp26_; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLE_EFFECT, CircleEffect); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" @@ -332,21 +329,21 @@ static void circle_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio _tmp9_ = _tmp8_; #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" if (_tmp9_ != NULL) { -#line 336 "CircleEffect.c" - cairo_t* _tmp10_ = NULL; - SpitTransitionsVisuals* _tmp11_ = NULL; - GdkPixbuf* _tmp12_ = NULL; - GdkPixbuf* _tmp13_ = NULL; - SpitTransitionsVisuals* _tmp14_ = NULL; +#line 333 "CircleEffect.c" + cairo_t* _tmp10_; + SpitTransitionsVisuals* _tmp11_; + GdkPixbuf* _tmp12_; + GdkPixbuf* _tmp13_; + SpitTransitionsVisuals* _tmp14_; GdkRectangle _tmp15_ = {0}; - GdkRectangle _tmp16_ = {0}; - gint _tmp17_ = 0; - SpitTransitionsVisuals* _tmp18_ = NULL; + GdkRectangle _tmp16_; + gint _tmp17_; + SpitTransitionsVisuals* _tmp18_; GdkRectangle _tmp19_ = {0}; - GdkRectangle _tmp20_ = {0}; - gint _tmp21_ = 0; - cairo_t* _tmp22_ = NULL; - gdouble _tmp23_ = 0.0; + GdkRectangle _tmp20_; + gint _tmp21_; + cairo_t* _tmp22_; + gdouble _tmp23_; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" _tmp10_ = ctx; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" @@ -379,7 +376,7 @@ static void circle_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio _tmp23_ = alpha; #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" cairo_paint_with_alpha (_tmp22_, 1 - _tmp23_); -#line 383 "CircleEffect.c" +#line 380 "CircleEffect.c" } #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" _tmp24_ = visuals; @@ -389,25 +386,25 @@ static void circle_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio _tmp26_ = _tmp25_; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" if (_tmp26_ != NULL) { -#line 393 "CircleEffect.c" - cairo_t* _tmp27_ = NULL; - SpitTransitionsVisuals* _tmp28_ = NULL; - GdkPixbuf* _tmp29_ = NULL; - GdkPixbuf* _tmp30_ = NULL; - SpitTransitionsVisuals* _tmp31_ = NULL; +#line 390 "CircleEffect.c" + cairo_t* _tmp27_; + SpitTransitionsVisuals* _tmp28_; + GdkPixbuf* _tmp29_; + GdkPixbuf* _tmp30_; + SpitTransitionsVisuals* _tmp31_; GdkRectangle _tmp32_ = {0}; - GdkRectangle _tmp33_ = {0}; - gint _tmp34_ = 0; - SpitTransitionsVisuals* _tmp35_ = NULL; + GdkRectangle _tmp33_; + gint _tmp34_; + SpitTransitionsVisuals* _tmp35_; GdkRectangle _tmp36_ = {0}; - GdkRectangle _tmp37_ = {0}; - gint _tmp38_ = 0; - cairo_t* _tmp39_ = NULL; - gint _tmp40_ = 0; - gint _tmp41_ = 0; - gint _tmp42_ = 0; - cairo_t* _tmp43_ = NULL; - cairo_t* _tmp44_ = NULL; + GdkRectangle _tmp37_; + gint _tmp38_; + cairo_t* _tmp39_; + gint _tmp40_; + gint _tmp41_; + gint _tmp42_; + cairo_t* _tmp43_; + cairo_t* _tmp44_; #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" _tmp27_ = ctx; #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" @@ -452,7 +449,7 @@ static void circle_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio _tmp44_ = ctx; #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" cairo_paint (_tmp44_); -#line 456 "CircleEffect.c" +#line 453 "CircleEffect.c" } } @@ -465,7 +462,7 @@ static void circle_effect_real_advance (SpitTransitionsEffect* base, SpitTransit g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals)); #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 469 "CircleEffect.c" +#line 466 "CircleEffect.c" } @@ -473,14 +470,14 @@ static void circle_effect_real_cancel (SpitTransitionsEffect* base) { CircleEffect * self; #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLE_EFFECT, CircleEffect); -#line 477 "CircleEffect.c" +#line 474 "CircleEffect.c" } static void circle_effect_class_init (CircleEffectClass * klass) { #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" circle_effect_parent_class = g_type_class_peek_parent (klass); -#line 484 "CircleEffect.c" +#line 481 "CircleEffect.c" } @@ -488,18 +485,18 @@ static void circle_effect_spit_transitions_effect_interface_init (SpitTransition #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" circle_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" - iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) circle_effect_real_get_fps; + iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) circle_effect_real_get_fps; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" - iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) circle_effect_real_start; + iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) circle_effect_real_start; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" - iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) circle_effect_real_needs_clear_background; + iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) circle_effect_real_needs_clear_background; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" - iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) circle_effect_real_paint; + iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) circle_effect_real_paint; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" - iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) circle_effect_real_advance; + iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) circle_effect_real_advance; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" - iface->cancel = (void (*)(SpitTransitionsEffect*)) circle_effect_real_cancel; -#line 503 "CircleEffect.c" + iface->cancel = (void (*) (SpitTransitionsEffect *)) circle_effect_real_cancel; +#line 500 "CircleEffect.c" } diff --git a/plugins/shotwell-transitions/CirclesEffect.c b/plugins/shotwell-transitions/CirclesEffect.c index b4b82c6..2ae59b7 100644 --- a/plugins/shotwell-transitions/CirclesEffect.c +++ b/plugins/shotwell-transitions/CirclesEffect.c @@ -1,4 +1,4 @@ -/* CirclesEffect.c generated by valac 0.34.7, the Vala compiler +/* CirclesEffect.c generated by valac 0.36.6, the Vala compiler * generated from CirclesEffect.vala, do not modify */ /* Copyright 2013 Jens Bav @@ -87,7 +87,7 @@ struct _CirclesEffectClass { static gpointer circles_effect_descriptor_parent_class = NULL; static gpointer circles_effect_parent_class = NULL; -static SpitTransitionsEffectIface* circles_effect_spit_transitions_effect_parent_iface = NULL; +static SpitTransitionsEffectIface * circles_effect_spit_transitions_effect_parent_iface = NULL; GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST; GType circles_effect_descriptor_get_type (void) G_GNUC_CONST; @@ -119,7 +119,7 @@ static void circles_effect_real_cancel (SpitTransitionsEffect* base); CirclesEffectDescriptor* circles_effect_descriptor_construct (GType object_type, GFile* resource_directory) { CirclesEffectDescriptor * self = NULL; - GFile* _tmp0_ = NULL; + GFile* _tmp0_; #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" g_return_val_if_fail (G_IS_FILE (resource_directory), NULL); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" @@ -155,23 +155,20 @@ static const gchar* circles_effect_descriptor_real_get_id (ShotwellTransitionDes static const gchar* circles_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) { CirclesEffectDescriptor * self; const gchar* result = NULL; - const gchar* _tmp0_ = NULL; #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLES_EFFECT_DESCRIPTOR, CirclesEffectDescriptor); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" - _tmp0_ = _ ("Circles"); -#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" - result = _tmp0_; + result = _ ("Circles"); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" return result; -#line 168 "CirclesEffect.c" +#line 165 "CirclesEffect.c" } static SpitTransitionsEffect* circles_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) { CirclesEffectDescriptor * self; SpitTransitionsEffect* result = NULL; - CirclesEffect* _tmp0_ = NULL; + CirclesEffect* _tmp0_; #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLES_EFFECT_DESCRIPTOR, CirclesEffectDescriptor); #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" @@ -182,7 +179,7 @@ static SpitTransitionsEffect* circles_effect_descriptor_real_create (ShotwellTra result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect); #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" return result; -#line 186 "CirclesEffect.c" +#line 183 "CirclesEffect.c" } @@ -190,12 +187,12 @@ static void circles_effect_descriptor_class_init (CirclesEffectDescriptorClass * #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" circles_effect_descriptor_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) circles_effect_descriptor_real_get_id; + ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) circles_effect_descriptor_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) circles_effect_descriptor_real_get_pluggable_name; + ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) circles_effect_descriptor_real_get_pluggable_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) circles_effect_descriptor_real_create; -#line 199 "CirclesEffect.c" + ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) circles_effect_descriptor_real_create; +#line 196 "CirclesEffect.c" } @@ -221,14 +218,14 @@ CirclesEffect* circles_effect_construct (GType object_type) { self = (CirclesEffect*) g_object_new (object_type, NULL); #line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" return self; -#line 225 "CirclesEffect.c" +#line 222 "CirclesEffect.c" } CirclesEffect* circles_effect_new (void) { #line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" return circles_effect_construct (TYPE_CIRCLES_EFFECT); -#line 232 "CirclesEffect.c" +#line 229 "CirclesEffect.c" } @@ -246,13 +243,13 @@ static void circles_effect_real_get_fps (SpitTransitionsEffect* base, gint* desi if (desired_fps) { #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" *desired_fps = _vala_desired_fps; -#line 250 "CirclesEffect.c" +#line 247 "CirclesEffect.c" } #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" if (min_fps) { #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" *min_fps = _vala_min_fps; -#line 256 "CirclesEffect.c" +#line 253 "CirclesEffect.c" } } @@ -265,7 +262,7 @@ static void circles_effect_real_start (SpitTransitionsEffect* base, SpitTransiti g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals)); #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 269 "CirclesEffect.c" +#line 266 "CirclesEffect.c" } @@ -278,32 +275,32 @@ static gboolean circles_effect_real_needs_clear_background (SpitTransitionsEffec result = TRUE; #line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" return result; -#line 282 "CirclesEffect.c" +#line 279 "CirclesEffect.c" } static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) { CirclesEffect * self; gdouble alpha = 0.0; - SpitTransitionsMotion* _tmp0_ = NULL; - gint _tmp1_ = 0; - gdouble _tmp2_ = 0.0; + SpitTransitionsMotion* _tmp0_; + gint _tmp1_; + gdouble _tmp2_; gint distance = 0; gint radius = 0; gint circleCountX = 0; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + gint _tmp3_; + gint _tmp4_; gint circleCountY = 0; - gint _tmp5_ = 0; - gint _tmp6_ = 0; + gint _tmp5_; + gint _tmp6_; gdouble maxRadius = 0.0; - gint _tmp7_ = 0; - SpitTransitionsVisuals* _tmp8_ = NULL; - GdkPixbuf* _tmp9_ = NULL; - GdkPixbuf* _tmp10_ = NULL; - SpitTransitionsVisuals* _tmp25_ = NULL; - GdkPixbuf* _tmp26_ = NULL; - GdkPixbuf* _tmp27_ = NULL; + gint _tmp7_; + SpitTransitionsVisuals* _tmp8_; + GdkPixbuf* _tmp9_; + GdkPixbuf* _tmp10_; + SpitTransitionsVisuals* _tmp25_; + GdkPixbuf* _tmp26_; + GdkPixbuf* _tmp27_; #line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLES_EFFECT, CirclesEffect); #line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" @@ -346,21 +343,21 @@ static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp10_ = _tmp9_; #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" if (_tmp10_ != NULL) { -#line 350 "CirclesEffect.c" - cairo_t* _tmp11_ = NULL; - SpitTransitionsVisuals* _tmp12_ = NULL; - GdkPixbuf* _tmp13_ = NULL; - GdkPixbuf* _tmp14_ = NULL; - SpitTransitionsVisuals* _tmp15_ = NULL; +#line 347 "CirclesEffect.c" + cairo_t* _tmp11_; + SpitTransitionsVisuals* _tmp12_; + GdkPixbuf* _tmp13_; + GdkPixbuf* _tmp14_; + SpitTransitionsVisuals* _tmp15_; GdkRectangle _tmp16_ = {0}; - GdkRectangle _tmp17_ = {0}; - gint _tmp18_ = 0; - SpitTransitionsVisuals* _tmp19_ = NULL; + GdkRectangle _tmp17_; + gint _tmp18_; + SpitTransitionsVisuals* _tmp19_; GdkRectangle _tmp20_ = {0}; - GdkRectangle _tmp21_ = {0}; - gint _tmp22_ = 0; - cairo_t* _tmp23_ = NULL; - gdouble _tmp24_ = 0.0; + GdkRectangle _tmp21_; + gint _tmp22_; + cairo_t* _tmp23_; + gdouble _tmp24_; #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" _tmp11_ = ctx; #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" @@ -393,7 +390,7 @@ static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp24_ = alpha; #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" cairo_paint_with_alpha (_tmp23_, 1 - _tmp24_); -#line 397 "CirclesEffect.c" +#line 394 "CirclesEffect.c" } #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" _tmp25_ = visuals; @@ -403,22 +400,22 @@ static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp27_ = _tmp26_; #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" if (_tmp27_ != NULL) { -#line 407 "CirclesEffect.c" - cairo_t* _tmp28_ = NULL; - SpitTransitionsVisuals* _tmp29_ = NULL; - GdkPixbuf* _tmp30_ = NULL; - GdkPixbuf* _tmp31_ = NULL; - SpitTransitionsVisuals* _tmp32_ = NULL; +#line 404 "CirclesEffect.c" + cairo_t* _tmp28_; + SpitTransitionsVisuals* _tmp29_; + GdkPixbuf* _tmp30_; + GdkPixbuf* _tmp31_; + SpitTransitionsVisuals* _tmp32_; GdkRectangle _tmp33_ = {0}; - GdkRectangle _tmp34_ = {0}; - gint _tmp35_ = 0; - SpitTransitionsVisuals* _tmp36_ = NULL; + GdkRectangle _tmp34_; + gint _tmp35_; + SpitTransitionsVisuals* _tmp36_; GdkRectangle _tmp37_ = {0}; - GdkRectangle _tmp38_ = {0}; - gint _tmp39_ = 0; - cairo_t* _tmp63_ = NULL; - cairo_t* _tmp64_ = NULL; - gdouble _tmp65_ = 0.0; + GdkRectangle _tmp38_; + gint _tmp39_; + cairo_t* _tmp63_; + cairo_t* _tmp64_; + gdouble _tmp65_; #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" _tmp28_ = ctx; #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" @@ -445,30 +442,30 @@ static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp39_ = _tmp38_.y; #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" gdk_cairo_set_source_pixbuf (_tmp28_, _tmp31_, (gdouble) _tmp35_, (gdouble) _tmp39_); -#line 449 "CirclesEffect.c" +#line 446 "CirclesEffect.c" { gint y = 0; #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" y = 0; -#line 454 "CirclesEffect.c" +#line 451 "CirclesEffect.c" { gboolean _tmp40_ = FALSE; #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" _tmp40_ = TRUE; #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" while (TRUE) { -#line 461 "CirclesEffect.c" - gint _tmp42_ = 0; - gint _tmp43_ = 0; +#line 458 "CirclesEffect.c" + gint _tmp42_; + gint _tmp43_; #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" if (!_tmp40_) { -#line 466 "CirclesEffect.c" - gint _tmp41_ = 0; +#line 463 "CirclesEffect.c" + gint _tmp41_; #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" _tmp41_ = y; #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" y = _tmp41_ + 1; -#line 472 "CirclesEffect.c" +#line 469 "CirclesEffect.c" } #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" _tmp40_ = FALSE; @@ -480,46 +477,46 @@ static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti if (!(_tmp42_ <= _tmp43_)) { #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" break; -#line 484 "CirclesEffect.c" +#line 481 "CirclesEffect.c" } { gint x = 0; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" x = 0; -#line 490 "CirclesEffect.c" +#line 487 "CirclesEffect.c" { gboolean _tmp44_ = FALSE; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" _tmp44_ = TRUE; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" while (TRUE) { -#line 497 "CirclesEffect.c" - gint _tmp46_ = 0; - gint _tmp47_ = 0; - gdouble _tmp48_ = 0.0; - gint _tmp49_ = 0; - gint _tmp50_ = 0; - gint _tmp51_ = 0; - gint _tmp52_ = 0; - gdouble _tmp53_ = 0.0; - gdouble _tmp54_ = 0.0; - gdouble _tmp55_ = 0.0; - cairo_t* _tmp56_ = NULL; - gint _tmp57_ = 0; - gint _tmp58_ = 0; - gint _tmp59_ = 0; - gint _tmp60_ = 0; - gint _tmp61_ = 0; - cairo_t* _tmp62_ = NULL; +#line 494 "CirclesEffect.c" + gint _tmp46_; + gint _tmp47_; + gdouble _tmp48_; + gint _tmp49_; + gint _tmp50_; + gint _tmp51_; + gint _tmp52_; + gdouble _tmp53_; + gdouble _tmp54_; + gdouble _tmp55_; + cairo_t* _tmp56_; + gint _tmp57_; + gint _tmp58_; + gint _tmp59_; + gint _tmp60_; + gint _tmp61_; + cairo_t* _tmp62_; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" if (!_tmp44_) { -#line 517 "CirclesEffect.c" - gint _tmp45_ = 0; +#line 514 "CirclesEffect.c" + gint _tmp45_; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" _tmp45_ = x; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" x = _tmp45_ + 1; -#line 523 "CirclesEffect.c" +#line 520 "CirclesEffect.c" } #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" _tmp44_ = FALSE; @@ -531,7 +528,7 @@ static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti if (!(_tmp46_ <= _tmp47_)) { #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" break; -#line 535 "CirclesEffect.c" +#line 532 "CirclesEffect.c" } #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" _tmp48_ = alpha; @@ -569,7 +566,7 @@ static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp62_ = ctx; #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" cairo_fill (_tmp62_); -#line 573 "CirclesEffect.c" +#line 570 "CirclesEffect.c" } } } @@ -586,7 +583,7 @@ static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp65_ = alpha; #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" cairo_paint_with_alpha (_tmp64_, _tmp65_); -#line 590 "CirclesEffect.c" +#line 587 "CirclesEffect.c" } } @@ -599,7 +596,7 @@ static void circles_effect_real_advance (SpitTransitionsEffect* base, SpitTransi g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals)); #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 603 "CirclesEffect.c" +#line 600 "CirclesEffect.c" } @@ -607,14 +604,14 @@ static void circles_effect_real_cancel (SpitTransitionsEffect* base) { CirclesEffect * self; #line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLES_EFFECT, CirclesEffect); -#line 611 "CirclesEffect.c" +#line 608 "CirclesEffect.c" } static void circles_effect_class_init (CirclesEffectClass * klass) { #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" circles_effect_parent_class = g_type_class_peek_parent (klass); -#line 618 "CirclesEffect.c" +#line 615 "CirclesEffect.c" } @@ -622,18 +619,18 @@ static void circles_effect_spit_transitions_effect_interface_init (SpitTransitio #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" circles_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" - iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) circles_effect_real_get_fps; + iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) circles_effect_real_get_fps; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" - iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) circles_effect_real_start; + iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) circles_effect_real_start; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" - iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) circles_effect_real_needs_clear_background; + iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) circles_effect_real_needs_clear_background; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" - iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) circles_effect_real_paint; + iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) circles_effect_real_paint; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" - iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) circles_effect_real_advance; + iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) circles_effect_real_advance; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" - iface->cancel = (void (*)(SpitTransitionsEffect*)) circles_effect_real_cancel; -#line 637 "CirclesEffect.c" + iface->cancel = (void (*) (SpitTransitionsEffect *)) circles_effect_real_cancel; +#line 634 "CirclesEffect.c" } diff --git a/plugins/shotwell-transitions/ClockEffect.c b/plugins/shotwell-transitions/ClockEffect.c index 8f5ed37..c1f5257 100644 --- a/plugins/shotwell-transitions/ClockEffect.c +++ b/plugins/shotwell-transitions/ClockEffect.c @@ -1,4 +1,4 @@ -/* ClockEffect.c generated by valac 0.34.7, the Vala compiler +/* ClockEffect.c generated by valac 0.36.6, the Vala compiler * generated from ClockEffect.vala, do not modify */ /* Copyright 2013 Jens Bav @@ -87,7 +87,7 @@ struct _ClockEffectClass { static gpointer clock_effect_descriptor_parent_class = NULL; static gpointer clock_effect_parent_class = NULL; -static SpitTransitionsEffectIface* clock_effect_spit_transitions_effect_parent_iface = NULL; +static SpitTransitionsEffectIface * clock_effect_spit_transitions_effect_parent_iface = NULL; GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST; GType clock_effect_descriptor_get_type (void) G_GNUC_CONST; @@ -119,7 +119,7 @@ static void clock_effect_real_cancel (SpitTransitionsEffect* base); ClockEffectDescriptor* clock_effect_descriptor_construct (GType object_type, GFile* resource_directory) { ClockEffectDescriptor * self = NULL; - GFile* _tmp0_ = NULL; + GFile* _tmp0_; #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" g_return_val_if_fail (G_IS_FILE (resource_directory), NULL); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" @@ -155,23 +155,20 @@ static const gchar* clock_effect_descriptor_real_get_id (ShotwellTransitionDescr static const gchar* clock_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) { ClockEffectDescriptor * self; const gchar* result = NULL; - const gchar* _tmp0_ = NULL; #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CLOCK_EFFECT_DESCRIPTOR, ClockEffectDescriptor); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" - _tmp0_ = _ ("Clock"); -#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" - result = _tmp0_; + result = _ ("Clock"); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" return result; -#line 168 "ClockEffect.c" +#line 165 "ClockEffect.c" } static SpitTransitionsEffect* clock_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) { ClockEffectDescriptor * self; SpitTransitionsEffect* result = NULL; - ClockEffect* _tmp0_ = NULL; + ClockEffect* _tmp0_; #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CLOCK_EFFECT_DESCRIPTOR, ClockEffectDescriptor); #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" @@ -182,7 +179,7 @@ static SpitTransitionsEffect* clock_effect_descriptor_real_create (ShotwellTrans result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect); #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" return result; -#line 186 "ClockEffect.c" +#line 183 "ClockEffect.c" } @@ -190,12 +187,12 @@ static void clock_effect_descriptor_class_init (ClockEffectDescriptorClass * kla #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" clock_effect_descriptor_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) clock_effect_descriptor_real_get_id; + ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) clock_effect_descriptor_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) clock_effect_descriptor_real_get_pluggable_name; + ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) clock_effect_descriptor_real_get_pluggable_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) clock_effect_descriptor_real_create; -#line 199 "ClockEffect.c" + ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) clock_effect_descriptor_real_create; +#line 196 "ClockEffect.c" } @@ -221,14 +218,14 @@ ClockEffect* clock_effect_construct (GType object_type) { self = (ClockEffect*) g_object_new (object_type, NULL); #line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" return self; -#line 225 "ClockEffect.c" +#line 222 "ClockEffect.c" } ClockEffect* clock_effect_new (void) { #line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" return clock_effect_construct (TYPE_CLOCK_EFFECT); -#line 232 "ClockEffect.c" +#line 229 "ClockEffect.c" } @@ -246,13 +243,13 @@ static void clock_effect_real_get_fps (SpitTransitionsEffect* base, gint* desire if (desired_fps) { #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" *desired_fps = _vala_desired_fps; -#line 250 "ClockEffect.c" +#line 247 "ClockEffect.c" } #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" if (min_fps) { #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" *min_fps = _vala_min_fps; -#line 256 "ClockEffect.c" +#line 253 "ClockEffect.c" } } @@ -265,7 +262,7 @@ static void clock_effect_real_start (SpitTransitionsEffect* base, SpitTransition g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals)); #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 269 "ClockEffect.c" +#line 266 "ClockEffect.c" } @@ -278,37 +275,37 @@ static gboolean clock_effect_real_needs_clear_background (SpitTransitionsEffect* result = TRUE; #line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" return result; -#line 282 "ClockEffect.c" +#line 279 "ClockEffect.c" } static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) { ClockEffect * self; gdouble alpha = 0.0; - SpitTransitionsMotion* _tmp0_ = NULL; - gint _tmp1_ = 0; - gdouble _tmp2_ = 0.0; + SpitTransitionsMotion* _tmp0_; + gint _tmp1_; + gdouble _tmp2_; gdouble start_angle = 0.0; gdouble stop_angle = 0.0; - SpitTransitionsMotion* _tmp3_ = NULL; - SpitTransitionsDirection _tmp4_ = 0; - SpitTransitionsDirection _tmp5_ = 0; + SpitTransitionsMotion* _tmp3_; + SpitTransitionsDirection _tmp4_; + SpitTransitionsDirection _tmp5_; gint radius = 0; - SpitTransitionsVisuals* _tmp8_ = NULL; + SpitTransitionsVisuals* _tmp8_; GdkRectangle _tmp9_ = {0}; - GdkRectangle _tmp10_ = {0}; - gint _tmp11_ = 0; - SpitTransitionsVisuals* _tmp12_ = NULL; + GdkRectangle _tmp10_; + gint _tmp11_; + SpitTransitionsVisuals* _tmp12_; GdkRectangle _tmp13_ = {0}; - GdkRectangle _tmp14_ = {0}; - gint _tmp15_ = 0; - gdouble _tmp16_ = 0.0; - SpitTransitionsVisuals* _tmp17_ = NULL; - GdkPixbuf* _tmp18_ = NULL; - GdkPixbuf* _tmp19_ = NULL; - SpitTransitionsVisuals* _tmp34_ = NULL; - GdkPixbuf* _tmp35_ = NULL; - GdkPixbuf* _tmp36_ = NULL; + GdkRectangle _tmp14_; + gint _tmp15_; + gdouble _tmp16_; + SpitTransitionsVisuals* _tmp17_; + GdkPixbuf* _tmp18_; + GdkPixbuf* _tmp19_; + SpitTransitionsVisuals* _tmp34_; + GdkPixbuf* _tmp35_; + GdkPixbuf* _tmp36_; #line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CLOCK_EFFECT, ClockEffect); #line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" @@ -337,20 +334,20 @@ static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp5_ = _tmp4_; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" if (_tmp5_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) { -#line 341 "ClockEffect.c" - gdouble _tmp6_ = 0.0; +#line 338 "ClockEffect.c" + gdouble _tmp6_; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" _tmp6_ = alpha; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" stop_angle = ((_tmp6_ * G_PI) * 2) - CLOCK_EFFECT_TOP_RADIANT; -#line 347 "ClockEffect.c" +#line 344 "ClockEffect.c" } else { - gdouble _tmp7_ = 0.0; + gdouble _tmp7_; #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" _tmp7_ = alpha; #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" start_angle = ((2 * (1 - _tmp7_)) * G_PI) - CLOCK_EFFECT_TOP_RADIANT; -#line 354 "ClockEffect.c" +#line 351 "ClockEffect.c" } #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" _tmp8_ = visuals; @@ -380,21 +377,21 @@ static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp19_ = _tmp18_; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" if (_tmp19_ != NULL) { -#line 384 "ClockEffect.c" - cairo_t* _tmp20_ = NULL; - SpitTransitionsVisuals* _tmp21_ = NULL; - GdkPixbuf* _tmp22_ = NULL; - GdkPixbuf* _tmp23_ = NULL; - SpitTransitionsVisuals* _tmp24_ = NULL; +#line 381 "ClockEffect.c" + cairo_t* _tmp20_; + SpitTransitionsVisuals* _tmp21_; + GdkPixbuf* _tmp22_; + GdkPixbuf* _tmp23_; + SpitTransitionsVisuals* _tmp24_; GdkRectangle _tmp25_ = {0}; - GdkRectangle _tmp26_ = {0}; - gint _tmp27_ = 0; - SpitTransitionsVisuals* _tmp28_ = NULL; + GdkRectangle _tmp26_; + gint _tmp27_; + SpitTransitionsVisuals* _tmp28_; GdkRectangle _tmp29_ = {0}; - GdkRectangle _tmp30_ = {0}; - gint _tmp31_ = 0; - cairo_t* _tmp32_ = NULL; - gdouble _tmp33_ = 0.0; + GdkRectangle _tmp30_; + gint _tmp31_; + cairo_t* _tmp32_; + gdouble _tmp33_; #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" _tmp20_ = ctx; #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" @@ -427,7 +424,7 @@ static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp33_ = alpha; #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" cairo_paint_with_alpha (_tmp32_, 1 - _tmp33_); -#line 431 "ClockEffect.c" +#line 428 "ClockEffect.c" } #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" _tmp34_ = visuals; @@ -437,47 +434,47 @@ static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp36_ = _tmp35_; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" if (_tmp36_ != NULL) { -#line 441 "ClockEffect.c" - cairo_t* _tmp37_ = NULL; - SpitTransitionsVisuals* _tmp38_ = NULL; - GdkPixbuf* _tmp39_ = NULL; - GdkPixbuf* _tmp40_ = NULL; - SpitTransitionsVisuals* _tmp41_ = NULL; +#line 438 "ClockEffect.c" + cairo_t* _tmp37_; + SpitTransitionsVisuals* _tmp38_; + GdkPixbuf* _tmp39_; + GdkPixbuf* _tmp40_; + SpitTransitionsVisuals* _tmp41_; GdkRectangle _tmp42_ = {0}; - GdkRectangle _tmp43_ = {0}; - gint _tmp44_ = 0; - SpitTransitionsVisuals* _tmp45_ = NULL; + GdkRectangle _tmp43_; + gint _tmp44_; + SpitTransitionsVisuals* _tmp45_; GdkRectangle _tmp46_ = {0}; - GdkRectangle _tmp47_ = {0}; - gint _tmp48_ = 0; + GdkRectangle _tmp47_; + gint _tmp48_; gint x = 0; - SpitTransitionsVisuals* _tmp49_ = NULL; + SpitTransitionsVisuals* _tmp49_; GdkRectangle _tmp50_ = {0}; - GdkRectangle _tmp51_ = {0}; - gint _tmp52_ = 0; - SpitTransitionsVisuals* _tmp53_ = NULL; + GdkRectangle _tmp51_; + gint _tmp52_; + SpitTransitionsVisuals* _tmp53_; GdkRectangle _tmp54_ = {0}; - GdkRectangle _tmp55_ = {0}; - gint _tmp56_ = 0; + GdkRectangle _tmp55_; + gint _tmp56_; gint y = 0; - SpitTransitionsVisuals* _tmp57_ = NULL; + SpitTransitionsVisuals* _tmp57_; GdkRectangle _tmp58_ = {0}; - GdkRectangle _tmp59_ = {0}; - gint _tmp60_ = 0; - SpitTransitionsVisuals* _tmp61_ = NULL; + GdkRectangle _tmp59_; + gint _tmp60_; + SpitTransitionsVisuals* _tmp61_; GdkRectangle _tmp62_ = {0}; - GdkRectangle _tmp63_ = {0}; - gint _tmp64_ = 0; - cairo_t* _tmp65_ = NULL; - gint _tmp66_ = 0; - gint _tmp67_ = 0; - cairo_t* _tmp68_ = NULL; - gint _tmp69_ = 0; - gint _tmp70_ = 0; - gint _tmp71_ = 0; - gdouble _tmp72_ = 0.0; - gdouble _tmp73_ = 0.0; - cairo_t* _tmp74_ = NULL; + GdkRectangle _tmp63_; + gint _tmp64_; + cairo_t* _tmp65_; + gint _tmp66_; + gint _tmp67_; + cairo_t* _tmp68_; + gint _tmp69_; + gint _tmp70_; + gint _tmp71_; + gdouble _tmp72_; + gdouble _tmp73_; + cairo_t* _tmp74_; #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" _tmp37_ = ctx; #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" @@ -566,7 +563,7 @@ static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp74_ = ctx; #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" cairo_fill_preserve (_tmp74_); -#line 570 "ClockEffect.c" +#line 567 "ClockEffect.c" } } @@ -579,7 +576,7 @@ static void clock_effect_real_advance (SpitTransitionsEffect* base, SpitTransiti g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals)); #line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 583 "ClockEffect.c" +#line 580 "ClockEffect.c" } @@ -587,14 +584,14 @@ static void clock_effect_real_cancel (SpitTransitionsEffect* base) { ClockEffect * self; #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CLOCK_EFFECT, ClockEffect); -#line 591 "ClockEffect.c" +#line 588 "ClockEffect.c" } static void clock_effect_class_init (ClockEffectClass * klass) { #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" clock_effect_parent_class = g_type_class_peek_parent (klass); -#line 598 "ClockEffect.c" +#line 595 "ClockEffect.c" } @@ -602,18 +599,18 @@ static void clock_effect_spit_transitions_effect_interface_init (SpitTransitions #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" clock_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" - iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) clock_effect_real_get_fps; + iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) clock_effect_real_get_fps; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" - iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) clock_effect_real_start; + iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) clock_effect_real_start; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" - iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) clock_effect_real_needs_clear_background; + iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) clock_effect_real_needs_clear_background; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" - iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) clock_effect_real_paint; + iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) clock_effect_real_paint; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" - iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) clock_effect_real_advance; + iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) clock_effect_real_advance; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" - iface->cancel = (void (*)(SpitTransitionsEffect*)) clock_effect_real_cancel; -#line 617 "ClockEffect.c" + iface->cancel = (void (*) (SpitTransitionsEffect *)) clock_effect_real_cancel; +#line 614 "ClockEffect.c" } diff --git a/plugins/shotwell-transitions/CrumbleEffect.c b/plugins/shotwell-transitions/CrumbleEffect.c index 5b490c9..56f3667 100644 --- a/plugins/shotwell-transitions/CrumbleEffect.c +++ b/plugins/shotwell-transitions/CrumbleEffect.c @@ -1,4 +1,4 @@ -/* CrumbleEffect.c generated by valac 0.34.7, the Vala compiler +/* CrumbleEffect.c generated by valac 0.36.6, the Vala compiler * generated from CrumbleEffect.vala, do not modify */ /* Copyright 2010 Maxim Kartashev @@ -101,7 +101,7 @@ struct _CrumbleEffectPrivate { static gpointer crumble_effect_descriptor_parent_class = NULL; static gpointer crumble_effect_parent_class = NULL; -static SpitTransitionsEffectIface* crumble_effect_spit_transitions_effect_parent_iface = NULL; +static SpitTransitionsEffectIface * crumble_effect_spit_transitions_effect_parent_iface = NULL; GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST; GType crumble_effect_descriptor_get_type (void) G_GNUC_CONST; @@ -130,14 +130,14 @@ static void crumble_effect_real_start (SpitTransitionsEffect* base, SpitTransiti static void crumble_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number); static void crumble_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number); static void crumble_effect_real_cancel (SpitTransitionsEffect* base); -static void crumble_effect_finalize (GObject* obj); +static void crumble_effect_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); CrumbleEffectDescriptor* crumble_effect_descriptor_construct (GType object_type, GFile* resource_directory) { CrumbleEffectDescriptor * self = NULL; - GFile* _tmp0_ = NULL; + GFile* _tmp0_; #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" g_return_val_if_fail (G_IS_FILE (resource_directory), NULL); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" @@ -173,23 +173,20 @@ static const gchar* crumble_effect_descriptor_real_get_id (ShotwellTransitionDes static const gchar* crumble_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) { CrumbleEffectDescriptor * self; const gchar* result = NULL; - const gchar* _tmp0_ = NULL; #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CRUMBLE_EFFECT_DESCRIPTOR, CrumbleEffectDescriptor); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" - _tmp0_ = _ ("Crumble"); -#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" - result = _tmp0_; + result = _ ("Crumble"); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" return result; -#line 186 "CrumbleEffect.c" +#line 183 "CrumbleEffect.c" } static SpitTransitionsEffect* crumble_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) { CrumbleEffectDescriptor * self; SpitTransitionsEffect* result = NULL; - CrumbleEffect* _tmp0_ = NULL; + CrumbleEffect* _tmp0_; #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CRUMBLE_EFFECT_DESCRIPTOR, CrumbleEffectDescriptor); #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" @@ -200,7 +197,7 @@ static SpitTransitionsEffect* crumble_effect_descriptor_real_create (ShotwellTra result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect); #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" return result; -#line 204 "CrumbleEffect.c" +#line 201 "CrumbleEffect.c" } @@ -208,12 +205,12 @@ static void crumble_effect_descriptor_class_init (CrumbleEffectDescriptorClass * #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" crumble_effect_descriptor_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) crumble_effect_descriptor_real_get_id; + ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) crumble_effect_descriptor_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) crumble_effect_descriptor_real_get_pluggable_name; + ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) crumble_effect_descriptor_real_get_pluggable_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) crumble_effect_descriptor_real_create; -#line 217 "CrumbleEffect.c" + ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) crumble_effect_descriptor_real_create; +#line 214 "CrumbleEffect.c" } @@ -239,14 +236,14 @@ CrumbleEffect* crumble_effect_construct (GType object_type) { self = (CrumbleEffect*) g_object_new (object_type, NULL); #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" return self; -#line 243 "CrumbleEffect.c" +#line 240 "CrumbleEffect.c" } CrumbleEffect* crumble_effect_new (void) { #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" return crumble_effect_construct (TYPE_CRUMBLE_EFFECT); -#line 250 "CrumbleEffect.c" +#line 247 "CrumbleEffect.c" } @@ -264,13 +261,13 @@ static void crumble_effect_real_get_fps (SpitTransitionsEffect* base, gint* desi if (desired_fps) { #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" *desired_fps = _vala_desired_fps; -#line 268 "CrumbleEffect.c" +#line 265 "CrumbleEffect.c" } #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" if (min_fps) { #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" *min_fps = _vala_min_fps; -#line 274 "CrumbleEffect.c" +#line 271 "CrumbleEffect.c" } } @@ -284,17 +281,17 @@ static gboolean crumble_effect_real_needs_clear_background (SpitTransitionsEffec result = TRUE; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" return result; -#line 288 "CrumbleEffect.c" +#line 285 "CrumbleEffect.c" } static void crumble_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) { CrumbleEffect * self; GRand* rand = NULL; - GRand* _tmp0_ = NULL; - SpitTransitionsVisuals* _tmp1_ = NULL; - GdkPixbuf* _tmp2_ = NULL; - GdkPixbuf* _tmp3_ = NULL; + GRand* _tmp0_; + SpitTransitionsVisuals* _tmp1_; + GdkPixbuf* _tmp2_; + GdkPixbuf* _tmp3_; #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CRUMBLE_EFFECT, CrumbleEffect); #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" @@ -313,16 +310,16 @@ static void crumble_effect_real_start (SpitTransitionsEffect* base, SpitTransiti _tmp3_ = _tmp2_; #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" if (_tmp3_ != NULL) { -#line 317 "CrumbleEffect.c" - SpitTransitionsVisuals* _tmp4_ = NULL; - GdkPixbuf* _tmp5_ = NULL; - GdkPixbuf* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - gint _tmp9_ = 0; - cairo_surface_t** _tmp10_ = NULL; - gint _tmp11_ = 0; - gdouble* _tmp12_ = NULL; +#line 314 "CrumbleEffect.c" + SpitTransitionsVisuals* _tmp4_; + GdkPixbuf* _tmp5_; + GdkPixbuf* _tmp6_; + gint _tmp7_; + gint _tmp8_; + gint _tmp9_; + cairo_surface_t** _tmp10_; + gint _tmp11_; + gdouble* _tmp12_; #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" _tmp4_ = visuals; #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" @@ -359,58 +356,58 @@ static void crumble_effect_real_start (SpitTransitionsEffect* base, SpitTransiti self->priv->accelerations_length1 = _tmp11_; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" self->priv->_accelerations_size_ = self->priv->accelerations_length1; -#line 363 "CrumbleEffect.c" +#line 360 "CrumbleEffect.c" { gint i = 0; #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" i = 0; -#line 368 "CrumbleEffect.c" +#line 365 "CrumbleEffect.c" { gboolean _tmp13_ = FALSE; #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" _tmp13_ = TRUE; #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" while (TRUE) { -#line 375 "CrumbleEffect.c" - gint _tmp15_ = 0; - gint _tmp16_ = 0; - cairo_surface_t** _tmp17_ = NULL; - gint _tmp17__length1 = 0; - gint _tmp18_ = 0; - SpitTransitionsVisuals* _tmp19_ = NULL; - GdkPixbuf* _tmp20_ = NULL; - GdkPixbuf* _tmp21_ = NULL; - gint _tmp22_ = 0; - gint _tmp23_ = 0; - cairo_surface_t* _tmp24_ = NULL; - cairo_surface_t* _tmp25_ = NULL; +#line 372 "CrumbleEffect.c" + gint _tmp15_; + gint _tmp16_; + cairo_surface_t** _tmp17_; + gint _tmp17__length1; + gint _tmp18_; + SpitTransitionsVisuals* _tmp19_; + GdkPixbuf* _tmp20_; + GdkPixbuf* _tmp21_; + gint _tmp22_; + gint _tmp23_; + cairo_surface_t* _tmp24_; + cairo_surface_t* _tmp25_; cairo_t* ctx = NULL; - cairo_surface_t** _tmp26_ = NULL; - gint _tmp26__length1 = 0; - gint _tmp27_ = 0; - cairo_surface_t* _tmp28_ = NULL; - cairo_t* _tmp29_ = NULL; - cairo_t* _tmp30_ = NULL; - SpitTransitionsVisuals* _tmp31_ = NULL; - GdkPixbuf* _tmp32_ = NULL; - GdkPixbuf* _tmp33_ = NULL; - gint _tmp34_ = 0; - cairo_t* _tmp35_ = NULL; - gdouble* _tmp36_ = NULL; - gint _tmp36__length1 = 0; - gint _tmp37_ = 0; - GRand* _tmp38_ = NULL; - gdouble _tmp39_ = 0.0; - gdouble _tmp40_ = 0.0; + cairo_surface_t** _tmp26_; + gint _tmp26__length1; + gint _tmp27_; + cairo_surface_t* _tmp28_; + cairo_t* _tmp29_; + cairo_t* _tmp30_; + SpitTransitionsVisuals* _tmp31_; + GdkPixbuf* _tmp32_; + GdkPixbuf* _tmp33_; + gint _tmp34_; + cairo_t* _tmp35_; + gdouble* _tmp36_; + gint _tmp36__length1; + gint _tmp37_; + GRand* _tmp38_; + gdouble _tmp39_; + gdouble _tmp40_; #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" if (!_tmp13_) { -#line 408 "CrumbleEffect.c" - gint _tmp14_ = 0; +#line 405 "CrumbleEffect.c" + gint _tmp14_; #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" _tmp14_ = i; #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" i = _tmp14_ + 1; -#line 414 "CrumbleEffect.c" +#line 411 "CrumbleEffect.c" } #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" _tmp13_ = FALSE; @@ -422,7 +419,7 @@ static void crumble_effect_real_start (SpitTransitionsEffect* base, SpitTransiti if (!(_tmp15_ < _tmp16_)) { #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" break; -#line 426 "CrumbleEffect.c" +#line 423 "CrumbleEffect.c" } #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" _tmp17_ = self->priv->from_stripes; @@ -492,24 +489,24 @@ static void crumble_effect_real_start (SpitTransitionsEffect* base, SpitTransiti _tmp40_ = _tmp36_[_tmp37_]; #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" _cairo_destroy0 (ctx); -#line 496 "CrumbleEffect.c" +#line 493 "CrumbleEffect.c" } } } } #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" _g_rand_free0 (rand); -#line 503 "CrumbleEffect.c" +#line 500 "CrumbleEffect.c" } static void crumble_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) { CrumbleEffect * self; gdouble alpha = 0.0; - SpitTransitionsMotion* _tmp0_ = NULL; - gint _tmp1_ = 0; - gdouble _tmp2_ = 0.0; - gdouble _tmp3_ = 0.0; + SpitTransitionsMotion* _tmp0_; + gint _tmp1_; + gdouble _tmp2_; + gdouble _tmp3_; #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CRUMBLE_EFFECT, CrumbleEffect); #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" @@ -530,69 +527,69 @@ static void crumble_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp3_ = alpha; #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" if (_tmp3_ < 0.5) { -#line 534 "CrumbleEffect.c" - gdouble _tmp4_ = 0.0; +#line 531 "CrumbleEffect.c" + gdouble _tmp4_; #line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" _tmp4_ = alpha; #line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" alpha = _tmp4_ * 2; -#line 540 "CrumbleEffect.c" +#line 537 "CrumbleEffect.c" { gint i = 0; #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" i = 0; -#line 545 "CrumbleEffect.c" +#line 542 "CrumbleEffect.c" { gboolean _tmp5_ = FALSE; #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" _tmp5_ = TRUE; #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" while (TRUE) { -#line 552 "CrumbleEffect.c" - gint _tmp7_ = 0; - gint _tmp8_ = 0; +#line 549 "CrumbleEffect.c" + gint _tmp7_; + gint _tmp8_; gint x = 0; - SpitTransitionsVisuals* _tmp9_ = NULL; + SpitTransitionsVisuals* _tmp9_; GdkRectangle _tmp10_ = {0}; - GdkRectangle _tmp11_ = {0}; - gint _tmp12_ = 0; - gint _tmp13_ = 0; + GdkRectangle _tmp11_; + gint _tmp12_; + gint _tmp13_; gdouble a = 0.0; - gdouble _tmp14_ = 0.0; - gdouble _tmp15_ = 0.0; - gdouble* _tmp16_ = NULL; - gint _tmp16__length1 = 0; - gint _tmp17_ = 0; - gdouble _tmp18_ = 0.0; + gdouble _tmp14_; + gdouble _tmp15_; + gdouble* _tmp16_; + gint _tmp16__length1; + gint _tmp17_; + gdouble _tmp18_; gint y = 0; - SpitTransitionsVisuals* _tmp19_ = NULL; + SpitTransitionsVisuals* _tmp19_; GdkRectangle _tmp20_ = {0}; - GdkRectangle _tmp21_ = {0}; - gint _tmp22_ = 0; - SpitTransitionsVisuals* _tmp23_ = NULL; - GdkPixbuf* _tmp24_ = NULL; - GdkPixbuf* _tmp25_ = NULL; - gint _tmp26_ = 0; - gint _tmp27_ = 0; - gdouble _tmp28_ = 0.0; - gdouble _tmp29_ = 0.0; - cairo_t* _tmp30_ = NULL; - cairo_surface_t** _tmp31_ = NULL; - gint _tmp31__length1 = 0; - gint _tmp32_ = 0; - cairo_surface_t* _tmp33_ = NULL; - gint _tmp34_ = 0; - gint _tmp35_ = 0; - cairo_t* _tmp36_ = NULL; + GdkRectangle _tmp21_; + gint _tmp22_; + SpitTransitionsVisuals* _tmp23_; + GdkPixbuf* _tmp24_; + GdkPixbuf* _tmp25_; + gint _tmp26_; + gint _tmp27_; + gdouble _tmp28_; + gdouble _tmp29_; + cairo_t* _tmp30_; + cairo_surface_t** _tmp31_; + gint _tmp31__length1; + gint _tmp32_; + cairo_surface_t* _tmp33_; + gint _tmp34_; + gint _tmp35_; + cairo_t* _tmp36_; #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" if (!_tmp5_) { -#line 590 "CrumbleEffect.c" - gint _tmp6_ = 0; +#line 587 "CrumbleEffect.c" + gint _tmp6_; #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" _tmp6_ = i; #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" i = _tmp6_ + 1; -#line 596 "CrumbleEffect.c" +#line 593 "CrumbleEffect.c" } #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" _tmp5_ = FALSE; @@ -604,7 +601,7 @@ static void crumble_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti if (!(_tmp7_ < _tmp8_)) { #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" break; -#line 608 "CrumbleEffect.c" +#line 605 "CrumbleEffect.c" } #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" _tmp9_ = visuals; @@ -676,14 +673,14 @@ static void crumble_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp36_ = ctx; #line 85 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" cairo_paint (_tmp36_); -#line 680 "CrumbleEffect.c" +#line 677 "CrumbleEffect.c" } } } } else { - SpitTransitionsVisuals* _tmp37_ = NULL; - GdkPixbuf* _tmp38_ = NULL; - GdkPixbuf* _tmp39_ = NULL; + SpitTransitionsVisuals* _tmp37_; + GdkPixbuf* _tmp38_; + GdkPixbuf* _tmp39_; #line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" _tmp37_ = visuals; #line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" @@ -692,22 +689,22 @@ static void crumble_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp39_ = _tmp38_; #line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" if (_tmp39_ != NULL) { -#line 696 "CrumbleEffect.c" - gdouble _tmp40_ = 0.0; - cairo_t* _tmp41_ = NULL; - SpitTransitionsVisuals* _tmp42_ = NULL; - GdkPixbuf* _tmp43_ = NULL; - GdkPixbuf* _tmp44_ = NULL; - SpitTransitionsVisuals* _tmp45_ = NULL; +#line 693 "CrumbleEffect.c" + gdouble _tmp40_; + cairo_t* _tmp41_; + SpitTransitionsVisuals* _tmp42_; + GdkPixbuf* _tmp43_; + GdkPixbuf* _tmp44_; + SpitTransitionsVisuals* _tmp45_; GdkRectangle _tmp46_ = {0}; - GdkRectangle _tmp47_ = {0}; - gint _tmp48_ = 0; - SpitTransitionsVisuals* _tmp49_ = NULL; + GdkRectangle _tmp47_; + gint _tmp48_; + SpitTransitionsVisuals* _tmp49_; GdkRectangle _tmp50_ = {0}; - GdkRectangle _tmp51_ = {0}; - gint _tmp52_ = 0; - cairo_t* _tmp53_ = NULL; - gdouble _tmp54_ = 0.0; + GdkRectangle _tmp51_; + gint _tmp52_; + cairo_t* _tmp53_; + gdouble _tmp54_; #line 89 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" _tmp40_ = alpha; #line 89 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" @@ -744,7 +741,7 @@ static void crumble_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp54_ = alpha; #line 91 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" cairo_paint_with_alpha (_tmp53_, _tmp54_); -#line 748 "CrumbleEffect.c" +#line 745 "CrumbleEffect.c" } else { } } @@ -759,7 +756,7 @@ static void crumble_effect_real_advance (SpitTransitionsEffect* base, SpitTransi g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals)); #line 97 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 763 "CrumbleEffect.c" +#line 760 "CrumbleEffect.c" } @@ -767,7 +764,7 @@ static void crumble_effect_real_cancel (SpitTransitionsEffect* base) { CrumbleEffect * self; #line 100 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CRUMBLE_EFFECT, CrumbleEffect); -#line 771 "CrumbleEffect.c" +#line 768 "CrumbleEffect.c" } @@ -778,7 +775,7 @@ static void crumble_effect_class_init (CrumbleEffectClass * klass) { g_type_class_add_private (klass, sizeof (CrumbleEffectPrivate)); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" G_OBJECT_CLASS (klass)->finalize = crumble_effect_finalize; -#line 782 "CrumbleEffect.c" +#line 779 "CrumbleEffect.c" } @@ -786,29 +783,29 @@ static void crumble_effect_spit_transitions_effect_interface_init (SpitTransitio #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" crumble_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" - iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) crumble_effect_real_get_fps; + iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) crumble_effect_real_get_fps; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" - iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) crumble_effect_real_needs_clear_background; + iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) crumble_effect_real_needs_clear_background; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" - iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) crumble_effect_real_start; + iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) crumble_effect_real_start; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" - iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) crumble_effect_real_paint; + iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) crumble_effect_real_paint; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" - iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) crumble_effect_real_advance; + iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) crumble_effect_real_advance; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" - iface->cancel = (void (*)(SpitTransitionsEffect*)) crumble_effect_real_cancel; -#line 801 "CrumbleEffect.c" + iface->cancel = (void (*) (SpitTransitionsEffect *)) crumble_effect_real_cancel; +#line 798 "CrumbleEffect.c" } static void crumble_effect_instance_init (CrumbleEffect * self) { #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" self->priv = CRUMBLE_EFFECT_GET_PRIVATE (self); -#line 808 "CrumbleEffect.c" +#line 805 "CrumbleEffect.c" } -static void crumble_effect_finalize (GObject* obj) { +static void crumble_effect_finalize (GObject * obj) { CrumbleEffect * self; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CRUMBLE_EFFECT, CrumbleEffect); @@ -818,7 +815,7 @@ static void crumble_effect_finalize (GObject* obj) { self->priv->accelerations = (g_free (self->priv->accelerations), NULL); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" G_OBJECT_CLASS (crumble_effect_parent_class)->finalize (obj); -#line 822 "CrumbleEffect.c" +#line 819 "CrumbleEffect.c" } diff --git a/plugins/shotwell-transitions/FadeEffect.c b/plugins/shotwell-transitions/FadeEffect.c index fd081d0..8234972 100644 --- a/plugins/shotwell-transitions/FadeEffect.c +++ b/plugins/shotwell-transitions/FadeEffect.c @@ -1,4 +1,4 @@ -/* FadeEffect.c generated by valac 0.34.7, the Vala compiler +/* FadeEffect.c generated by valac 0.36.6, the Vala compiler * generated from FadeEffect.vala, do not modify */ /* Copyright 2010 Maxim Kartashev @@ -87,7 +87,7 @@ struct _FadeEffectClass { static gpointer fade_effect_descriptor_parent_class = NULL; static gpointer fade_effect_parent_class = NULL; -static SpitTransitionsEffectIface* fade_effect_spit_transitions_effect_parent_iface = NULL; +static SpitTransitionsEffectIface * fade_effect_spit_transitions_effect_parent_iface = NULL; GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST; GType fade_effect_descriptor_get_type (void) G_GNUC_CONST; @@ -118,7 +118,7 @@ static void fade_effect_real_cancel (SpitTransitionsEffect* base); FadeEffectDescriptor* fade_effect_descriptor_construct (GType object_type, GFile* resource_directory) { FadeEffectDescriptor * self = NULL; - GFile* _tmp0_ = NULL; + GFile* _tmp0_; #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" g_return_val_if_fail (G_IS_FILE (resource_directory), NULL); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" @@ -154,23 +154,20 @@ static const gchar* fade_effect_descriptor_real_get_id (ShotwellTransitionDescri static const gchar* fade_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) { FadeEffectDescriptor * self; const gchar* result = NULL; - const gchar* _tmp0_ = NULL; #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT_DESCRIPTOR, FadeEffectDescriptor); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" - _tmp0_ = _ ("Fade"); -#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" - result = _tmp0_; + result = _ ("Fade"); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" return result; -#line 167 "FadeEffect.c" +#line 164 "FadeEffect.c" } static SpitTransitionsEffect* fade_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) { FadeEffectDescriptor * self; SpitTransitionsEffect* result = NULL; - FadeEffect* _tmp0_ = NULL; + FadeEffect* _tmp0_; #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT_DESCRIPTOR, FadeEffectDescriptor); #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" @@ -181,7 +178,7 @@ static SpitTransitionsEffect* fade_effect_descriptor_real_create (ShotwellTransi result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect); #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" return result; -#line 185 "FadeEffect.c" +#line 182 "FadeEffect.c" } @@ -189,12 +186,12 @@ static void fade_effect_descriptor_class_init (FadeEffectDescriptorClass * klass #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" fade_effect_descriptor_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) fade_effect_descriptor_real_get_id; + ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) fade_effect_descriptor_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) fade_effect_descriptor_real_get_pluggable_name; + ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) fade_effect_descriptor_real_get_pluggable_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) fade_effect_descriptor_real_create; -#line 198 "FadeEffect.c" + ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) fade_effect_descriptor_real_create; +#line 195 "FadeEffect.c" } @@ -220,14 +217,14 @@ FadeEffect* fade_effect_construct (GType object_type) { self = (FadeEffect*) g_object_new (object_type, NULL); #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" return self; -#line 224 "FadeEffect.c" +#line 221 "FadeEffect.c" } FadeEffect* fade_effect_new (void) { #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" return fade_effect_construct (TYPE_FADE_EFFECT); -#line 231 "FadeEffect.c" +#line 228 "FadeEffect.c" } @@ -245,13 +242,13 @@ static void fade_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired if (desired_fps) { #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" *desired_fps = _vala_desired_fps; -#line 249 "FadeEffect.c" +#line 246 "FadeEffect.c" } #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" if (min_fps) { #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" *min_fps = _vala_min_fps; -#line 255 "FadeEffect.c" +#line 252 "FadeEffect.c" } } @@ -264,7 +261,7 @@ static void fade_effect_real_start (SpitTransitionsEffect* base, SpitTransitions g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals)); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 268 "FadeEffect.c" +#line 265 "FadeEffect.c" } @@ -277,22 +274,22 @@ static gboolean fade_effect_real_needs_clear_background (SpitTransitionsEffect* result = TRUE; #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" return result; -#line 281 "FadeEffect.c" +#line 278 "FadeEffect.c" } static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) { FadeEffect * self; gdouble alpha = 0.0; - SpitTransitionsMotion* _tmp0_ = NULL; - gint _tmp1_ = 0; - gdouble _tmp2_ = 0.0; - SpitTransitionsVisuals* _tmp3_ = NULL; - GdkPixbuf* _tmp4_ = NULL; - GdkPixbuf* _tmp5_ = NULL; - SpitTransitionsVisuals* _tmp20_ = NULL; - GdkPixbuf* _tmp21_ = NULL; - GdkPixbuf* _tmp22_ = NULL; + SpitTransitionsMotion* _tmp0_; + gint _tmp1_; + gdouble _tmp2_; + SpitTransitionsVisuals* _tmp3_; + GdkPixbuf* _tmp4_; + GdkPixbuf* _tmp5_; + SpitTransitionsVisuals* _tmp20_; + GdkPixbuf* _tmp21_; + GdkPixbuf* _tmp22_; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT, FadeEffect); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" @@ -317,21 +314,21 @@ static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitions _tmp5_ = _tmp4_; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" if (_tmp5_ != NULL) { -#line 321 "FadeEffect.c" - cairo_t* _tmp6_ = NULL; - SpitTransitionsVisuals* _tmp7_ = NULL; - GdkPixbuf* _tmp8_ = NULL; - GdkPixbuf* _tmp9_ = NULL; - SpitTransitionsVisuals* _tmp10_ = NULL; +#line 318 "FadeEffect.c" + cairo_t* _tmp6_; + SpitTransitionsVisuals* _tmp7_; + GdkPixbuf* _tmp8_; + GdkPixbuf* _tmp9_; + SpitTransitionsVisuals* _tmp10_; GdkRectangle _tmp11_ = {0}; - GdkRectangle _tmp12_ = {0}; - gint _tmp13_ = 0; - SpitTransitionsVisuals* _tmp14_ = NULL; + GdkRectangle _tmp12_; + gint _tmp13_; + SpitTransitionsVisuals* _tmp14_; GdkRectangle _tmp15_ = {0}; - GdkRectangle _tmp16_ = {0}; - gint _tmp17_ = 0; - cairo_t* _tmp18_ = NULL; - gdouble _tmp19_ = 0.0; + GdkRectangle _tmp16_; + gint _tmp17_; + cairo_t* _tmp18_; + gdouble _tmp19_; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" _tmp6_ = ctx; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" @@ -364,7 +361,7 @@ static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitions _tmp19_ = alpha; #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" cairo_paint_with_alpha (_tmp18_, 1.0 - _tmp19_); -#line 368 "FadeEffect.c" +#line 365 "FadeEffect.c" } #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" _tmp20_ = visuals; @@ -374,21 +371,21 @@ static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitions _tmp22_ = _tmp21_; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" if (_tmp22_ != NULL) { -#line 378 "FadeEffect.c" - cairo_t* _tmp23_ = NULL; - SpitTransitionsVisuals* _tmp24_ = NULL; - GdkPixbuf* _tmp25_ = NULL; - GdkPixbuf* _tmp26_ = NULL; - SpitTransitionsVisuals* _tmp27_ = NULL; +#line 375 "FadeEffect.c" + cairo_t* _tmp23_; + SpitTransitionsVisuals* _tmp24_; + GdkPixbuf* _tmp25_; + GdkPixbuf* _tmp26_; + SpitTransitionsVisuals* _tmp27_; GdkRectangle _tmp28_ = {0}; - GdkRectangle _tmp29_ = {0}; - gint _tmp30_ = 0; - SpitTransitionsVisuals* _tmp31_ = NULL; + GdkRectangle _tmp29_; + gint _tmp30_; + SpitTransitionsVisuals* _tmp31_; GdkRectangle _tmp32_ = {0}; - GdkRectangle _tmp33_ = {0}; - gint _tmp34_ = 0; - cairo_t* _tmp35_ = NULL; - gdouble _tmp36_ = 0.0; + GdkRectangle _tmp33_; + gint _tmp34_; + cairo_t* _tmp35_; + gdouble _tmp36_; #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" _tmp23_ = ctx; #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" @@ -421,7 +418,7 @@ static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitions _tmp36_ = alpha; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" cairo_paint_with_alpha (_tmp35_, _tmp36_); -#line 425 "FadeEffect.c" +#line 422 "FadeEffect.c" } } @@ -434,7 +431,7 @@ static void fade_effect_real_advance (SpitTransitionsEffect* base, SpitTransitio g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals)); #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 438 "FadeEffect.c" +#line 435 "FadeEffect.c" } @@ -442,14 +439,14 @@ static void fade_effect_real_cancel (SpitTransitionsEffect* base) { FadeEffect * self; #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT, FadeEffect); -#line 446 "FadeEffect.c" +#line 443 "FadeEffect.c" } static void fade_effect_class_init (FadeEffectClass * klass) { #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" fade_effect_parent_class = g_type_class_peek_parent (klass); -#line 453 "FadeEffect.c" +#line 450 "FadeEffect.c" } @@ -457,18 +454,18 @@ static void fade_effect_spit_transitions_effect_interface_init (SpitTransitionsE #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" fade_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" - iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) fade_effect_real_get_fps; + iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) fade_effect_real_get_fps; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" - iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) fade_effect_real_start; + iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) fade_effect_real_start; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" - iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) fade_effect_real_needs_clear_background; + iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) fade_effect_real_needs_clear_background; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" - iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) fade_effect_real_paint; + iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) fade_effect_real_paint; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" - iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) fade_effect_real_advance; + iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) fade_effect_real_advance; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" - iface->cancel = (void (*)(SpitTransitionsEffect*)) fade_effect_real_cancel; -#line 472 "FadeEffect.c" + iface->cancel = (void (*) (SpitTransitionsEffect *)) fade_effect_real_cancel; +#line 469 "FadeEffect.c" } diff --git a/plugins/shotwell-transitions/SlideEffect.c b/plugins/shotwell-transitions/SlideEffect.c index 678cc11..7cc87e7 100644 --- a/plugins/shotwell-transitions/SlideEffect.c +++ b/plugins/shotwell-transitions/SlideEffect.c @@ -1,4 +1,4 @@ -/* SlideEffect.c generated by valac 0.34.7, the Vala compiler +/* SlideEffect.c generated by valac 0.36.6, the Vala compiler * generated from SlideEffect.vala, do not modify */ /* Copyright 2010 Maxim Kartashev @@ -88,7 +88,7 @@ struct _SlideEffectClass { static gpointer slide_effect_descriptor_parent_class = NULL; static gpointer slide_effect_parent_class = NULL; -static SpitTransitionsEffectIface* slide_effect_spit_transitions_effect_parent_iface = NULL; +static SpitTransitionsEffectIface * slide_effect_spit_transitions_effect_parent_iface = NULL; GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST; GType slide_effect_descriptor_get_type (void) G_GNUC_CONST; @@ -119,7 +119,7 @@ static void slide_effect_real_cancel (SpitTransitionsEffect* base); SlideEffectDescriptor* slide_effect_descriptor_construct (GType object_type, GFile* resource_directory) { SlideEffectDescriptor * self = NULL; - GFile* _tmp0_ = NULL; + GFile* _tmp0_; #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" g_return_val_if_fail (G_IS_FILE (resource_directory), NULL); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" @@ -155,23 +155,20 @@ static const gchar* slide_effect_descriptor_real_get_id (ShotwellTransitionDescr static const gchar* slide_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) { SlideEffectDescriptor * self; const gchar* result = NULL; - const gchar* _tmp0_ = NULL; #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDE_EFFECT_DESCRIPTOR, SlideEffectDescriptor); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - _tmp0_ = _ ("Slide"); -#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - result = _tmp0_; + result = _ ("Slide"); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" return result; -#line 168 "SlideEffect.c" +#line 165 "SlideEffect.c" } static SpitTransitionsEffect* slide_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) { SlideEffectDescriptor * self; SpitTransitionsEffect* result = NULL; - SlideEffect* _tmp0_ = NULL; + SlideEffect* _tmp0_; #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDE_EFFECT_DESCRIPTOR, SlideEffectDescriptor); #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" @@ -182,7 +179,7 @@ static SpitTransitionsEffect* slide_effect_descriptor_real_create (ShotwellTrans result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect); #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" return result; -#line 186 "SlideEffect.c" +#line 183 "SlideEffect.c" } @@ -190,12 +187,12 @@ static void slide_effect_descriptor_class_init (SlideEffectDescriptorClass * kla #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" slide_effect_descriptor_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) slide_effect_descriptor_real_get_id; + ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) slide_effect_descriptor_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) slide_effect_descriptor_real_get_pluggable_name; + ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) slide_effect_descriptor_real_get_pluggable_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) slide_effect_descriptor_real_create; -#line 199 "SlideEffect.c" + ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) slide_effect_descriptor_real_create; +#line 196 "SlideEffect.c" } @@ -221,14 +218,14 @@ SlideEffect* slide_effect_construct (GType object_type) { self = (SlideEffect*) g_object_new (object_type, NULL); #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" return self; -#line 225 "SlideEffect.c" +#line 222 "SlideEffect.c" } SlideEffect* slide_effect_new (void) { #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" return slide_effect_construct (TYPE_SLIDE_EFFECT); -#line 232 "SlideEffect.c" +#line 229 "SlideEffect.c" } @@ -246,13 +243,13 @@ static void slide_effect_real_get_fps (SpitTransitionsEffect* base, gint* desire if (desired_fps) { #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" *desired_fps = _vala_desired_fps; -#line 250 "SlideEffect.c" +#line 247 "SlideEffect.c" } #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" if (min_fps) { #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" *min_fps = _vala_min_fps; -#line 256 "SlideEffect.c" +#line 253 "SlideEffect.c" } } @@ -265,7 +262,7 @@ static void slide_effect_real_start (SpitTransitionsEffect* base, SpitTransition g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals)); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 269 "SlideEffect.c" +#line 266 "SlideEffect.c" } @@ -278,22 +275,22 @@ static gboolean slide_effect_real_needs_clear_background (SpitTransitionsEffect* result = TRUE; #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" return result; -#line 282 "SlideEffect.c" +#line 279 "SlideEffect.c" } static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) { SlideEffect * self; gdouble alpha = 0.0; - SpitTransitionsMotion* _tmp0_ = NULL; - gint _tmp1_ = 0; - gdouble _tmp2_ = 0.0; - SpitTransitionsVisuals* _tmp3_ = NULL; - GdkPixbuf* _tmp4_ = NULL; - GdkPixbuf* _tmp5_ = NULL; - SpitTransitionsVisuals* _tmp33_ = NULL; - GdkPixbuf* _tmp34_ = NULL; - GdkPixbuf* _tmp35_ = NULL; + SpitTransitionsMotion* _tmp0_; + gint _tmp1_; + gdouble _tmp2_; + SpitTransitionsVisuals* _tmp3_; + GdkPixbuf* _tmp4_; + GdkPixbuf* _tmp5_; + SpitTransitionsVisuals* _tmp33_; + GdkPixbuf* _tmp34_; + GdkPixbuf* _tmp35_; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDE_EFFECT, SlideEffect); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" @@ -318,30 +315,30 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp5_ = _tmp4_; #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" if (_tmp5_ != NULL) { -#line 322 "SlideEffect.c" +#line 319 "SlideEffect.c" gint _tmp6_ = 0; - SpitTransitionsMotion* _tmp7_ = NULL; - SpitTransitionsDirection _tmp8_ = 0; - SpitTransitionsDirection _tmp9_ = 0; + SpitTransitionsMotion* _tmp7_; + SpitTransitionsDirection _tmp8_; + SpitTransitionsDirection _tmp9_; gint from_target_x = 0; gint from_current_x = 0; - SpitTransitionsVisuals* _tmp16_ = NULL; + SpitTransitionsVisuals* _tmp16_; GdkRectangle _tmp17_ = {0}; - GdkRectangle _tmp18_ = {0}; - gint _tmp19_ = 0; - gdouble _tmp20_ = 0.0; - gint _tmp21_ = 0; - gdouble _tmp22_ = 0.0; - cairo_t* _tmp23_ = NULL; - SpitTransitionsVisuals* _tmp24_ = NULL; - GdkPixbuf* _tmp25_ = NULL; - GdkPixbuf* _tmp26_ = NULL; - gint _tmp27_ = 0; - SpitTransitionsVisuals* _tmp28_ = NULL; + GdkRectangle _tmp18_; + gint _tmp19_; + gdouble _tmp20_; + gint _tmp21_; + gdouble _tmp22_; + cairo_t* _tmp23_; + SpitTransitionsVisuals* _tmp24_; + GdkPixbuf* _tmp25_; + GdkPixbuf* _tmp26_; + gint _tmp27_; + SpitTransitionsVisuals* _tmp28_; GdkRectangle _tmp29_ = {0}; - GdkRectangle _tmp30_ = {0}; - gint _tmp31_ = 0; - cairo_t* _tmp32_ = NULL; + GdkRectangle _tmp30_; + gint _tmp31_; + cairo_t* _tmp32_; #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" _tmp7_ = motion; #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" @@ -350,12 +347,12 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp9_ = _tmp8_; #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" if (_tmp9_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) { -#line 354 "SlideEffect.c" - SpitTransitionsVisuals* _tmp10_ = NULL; - GdkPixbuf* _tmp11_ = NULL; - GdkPixbuf* _tmp12_ = NULL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; +#line 351 "SlideEffect.c" + SpitTransitionsVisuals* _tmp10_; + GdkPixbuf* _tmp11_; + GdkPixbuf* _tmp12_; + gint _tmp13_; + gint _tmp14_; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" _tmp10_ = visuals; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" @@ -368,14 +365,14 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp14_ = _tmp13_; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" _tmp6_ = -_tmp14_; -#line 372 "SlideEffect.c" +#line 369 "SlideEffect.c" } else { - gint _tmp15_ = 0; + gint _tmp15_; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" _tmp15_ = width; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" _tmp6_ = _tmp15_; -#line 379 "SlideEffect.c" +#line 376 "SlideEffect.c" } #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" from_target_x = _tmp6_; @@ -419,7 +416,7 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp32_ = ctx; #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" cairo_paint (_tmp32_); -#line 423 "SlideEffect.c" +#line 420 "SlideEffect.c" } #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" _tmp33_ = visuals; @@ -429,34 +426,34 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp35_ = _tmp34_; #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" if (_tmp35_ != NULL) { -#line 433 "SlideEffect.c" +#line 430 "SlideEffect.c" gint to_target_x = 0; - gint _tmp36_ = 0; - SpitTransitionsVisuals* _tmp37_ = NULL; - GdkPixbuf* _tmp38_ = NULL; - GdkPixbuf* _tmp39_ = NULL; - gint _tmp40_ = 0; - gint _tmp41_ = 0; + gint _tmp36_; + SpitTransitionsVisuals* _tmp37_; + GdkPixbuf* _tmp38_; + GdkPixbuf* _tmp39_; + gint _tmp40_; + gint _tmp41_; gint _tmp42_ = 0; - SpitTransitionsMotion* _tmp43_ = NULL; - SpitTransitionsDirection _tmp44_ = 0; - SpitTransitionsDirection _tmp45_ = 0; + SpitTransitionsMotion* _tmp43_; + SpitTransitionsDirection _tmp44_; + SpitTransitionsDirection _tmp45_; gint from_x = 0; gint to_current_x = 0; - gint _tmp52_ = 0; - gdouble _tmp53_ = 0.0; - gint _tmp54_ = 0; - gdouble _tmp55_ = 0.0; - cairo_t* _tmp56_ = NULL; - SpitTransitionsVisuals* _tmp57_ = NULL; - GdkPixbuf* _tmp58_ = NULL; - GdkPixbuf* _tmp59_ = NULL; - gint _tmp60_ = 0; - SpitTransitionsVisuals* _tmp61_ = NULL; + gint _tmp52_; + gdouble _tmp53_; + gint _tmp54_; + gdouble _tmp55_; + cairo_t* _tmp56_; + SpitTransitionsVisuals* _tmp57_; + GdkPixbuf* _tmp58_; + GdkPixbuf* _tmp59_; + gint _tmp60_; + SpitTransitionsVisuals* _tmp61_; GdkRectangle _tmp62_ = {0}; - GdkRectangle _tmp63_ = {0}; - gint _tmp64_ = 0; - cairo_t* _tmp65_ = NULL; + GdkRectangle _tmp63_; + gint _tmp64_; + cairo_t* _tmp65_; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" _tmp36_ = width; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" @@ -479,19 +476,19 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp45_ = _tmp44_; #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" if (_tmp45_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) { -#line 483 "SlideEffect.c" - gint _tmp46_ = 0; +#line 480 "SlideEffect.c" + gint _tmp46_; #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" _tmp46_ = width; #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" _tmp42_ = _tmp46_; -#line 489 "SlideEffect.c" +#line 486 "SlideEffect.c" } else { - SpitTransitionsVisuals* _tmp47_ = NULL; - GdkPixbuf* _tmp48_ = NULL; - GdkPixbuf* _tmp49_ = NULL; - gint _tmp50_ = 0; - gint _tmp51_ = 0; + SpitTransitionsVisuals* _tmp47_; + GdkPixbuf* _tmp48_; + GdkPixbuf* _tmp49_; + gint _tmp50_; + gint _tmp51_; #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" _tmp47_ = visuals; #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" @@ -504,7 +501,7 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp51_ = _tmp50_; #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" _tmp42_ = -_tmp51_; -#line 508 "SlideEffect.c" +#line 505 "SlideEffect.c" } #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" from_x = _tmp42_; @@ -542,7 +539,7 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp65_ = ctx; #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" cairo_paint (_tmp65_); -#line 546 "SlideEffect.c" +#line 543 "SlideEffect.c" } } @@ -555,7 +552,7 @@ static void slide_effect_real_advance (SpitTransitionsEffect* base, SpitTransiti g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals)); #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 559 "SlideEffect.c" +#line 556 "SlideEffect.c" } @@ -563,14 +560,14 @@ static void slide_effect_real_cancel (SpitTransitionsEffect* base) { SlideEffect * self; #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDE_EFFECT, SlideEffect); -#line 567 "SlideEffect.c" +#line 564 "SlideEffect.c" } static void slide_effect_class_init (SlideEffectClass * klass) { #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" slide_effect_parent_class = g_type_class_peek_parent (klass); -#line 574 "SlideEffect.c" +#line 571 "SlideEffect.c" } @@ -578,18 +575,18 @@ static void slide_effect_spit_transitions_effect_interface_init (SpitTransitions #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" slide_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) slide_effect_real_get_fps; + iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) slide_effect_real_get_fps; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) slide_effect_real_start; + iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) slide_effect_real_start; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) slide_effect_real_needs_clear_background; + iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) slide_effect_real_needs_clear_background; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) slide_effect_real_paint; + iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) slide_effect_real_paint; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) slide_effect_real_advance; + iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) slide_effect_real_advance; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - iface->cancel = (void (*)(SpitTransitionsEffect*)) slide_effect_real_cancel; -#line 593 "SlideEffect.c" + iface->cancel = (void (*) (SpitTransitionsEffect *)) slide_effect_real_cancel; +#line 590 "SlideEffect.c" } diff --git a/plugins/shotwell-transitions/SquaresEffect.c b/plugins/shotwell-transitions/SquaresEffect.c index fdf32ee..402d502 100644 --- a/plugins/shotwell-transitions/SquaresEffect.c +++ b/plugins/shotwell-transitions/SquaresEffect.c @@ -1,4 +1,4 @@ -/* SquaresEffect.c generated by valac 0.34.7, the Vala compiler +/* SquaresEffect.c generated by valac 0.36.6, the Vala compiler * generated from SquaresEffect.vala, do not modify */ /* Copyright 2013 Jens Bav @@ -92,7 +92,7 @@ struct _SquaresEffectPrivate { static gpointer squares_effect_descriptor_parent_class = NULL; static gpointer squares_effect_parent_class = NULL; -static SpitTransitionsEffectIface* squares_effect_spit_transitions_effect_parent_iface = NULL; +static SpitTransitionsEffectIface * squares_effect_spit_transitions_effect_parent_iface = NULL; GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST; GType squares_effect_descriptor_get_type (void) G_GNUC_CONST; @@ -121,12 +121,12 @@ static gboolean squares_effect_real_needs_clear_background (SpitTransitionsEffec static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number); static void squares_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number); static void squares_effect_real_cancel (SpitTransitionsEffect* base); -static void squares_effect_finalize (GObject* obj); +static void squares_effect_finalize (GObject * obj); SquaresEffectDescriptor* squares_effect_descriptor_construct (GType object_type, GFile* resource_directory) { SquaresEffectDescriptor * self = NULL; - GFile* _tmp0_ = NULL; + GFile* _tmp0_; #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" g_return_val_if_fail (G_IS_FILE (resource_directory), NULL); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" @@ -162,23 +162,20 @@ static const gchar* squares_effect_descriptor_real_get_id (ShotwellTransitionDes static const gchar* squares_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) { SquaresEffectDescriptor * self; const gchar* result = NULL; - const gchar* _tmp0_ = NULL; #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SQUARES_EFFECT_DESCRIPTOR, SquaresEffectDescriptor); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" - _tmp0_ = _ ("Squares"); -#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" - result = _tmp0_; + result = _ ("Squares"); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" return result; -#line 175 "SquaresEffect.c" +#line 172 "SquaresEffect.c" } static SpitTransitionsEffect* squares_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) { SquaresEffectDescriptor * self; SpitTransitionsEffect* result = NULL; - SquaresEffect* _tmp0_ = NULL; + SquaresEffect* _tmp0_; #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SQUARES_EFFECT_DESCRIPTOR, SquaresEffectDescriptor); #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" @@ -189,7 +186,7 @@ static SpitTransitionsEffect* squares_effect_descriptor_real_create (ShotwellTra result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect); #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" return result; -#line 193 "SquaresEffect.c" +#line 190 "SquaresEffect.c" } @@ -197,12 +194,12 @@ static void squares_effect_descriptor_class_init (SquaresEffectDescriptorClass * #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" squares_effect_descriptor_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) squares_effect_descriptor_real_get_id; + ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) squares_effect_descriptor_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) squares_effect_descriptor_real_get_pluggable_name; + ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) squares_effect_descriptor_real_get_pluggable_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) squares_effect_descriptor_real_create; -#line 206 "SquaresEffect.c" + ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) squares_effect_descriptor_real_create; +#line 203 "SquaresEffect.c" } @@ -228,14 +225,14 @@ SquaresEffect* squares_effect_construct (GType object_type) { self = (SquaresEffect*) g_object_new (object_type, NULL); #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" return self; -#line 232 "SquaresEffect.c" +#line 229 "SquaresEffect.c" } SquaresEffect* squares_effect_new (void) { #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" return squares_effect_construct (TYPE_SQUARES_EFFECT); -#line 239 "SquaresEffect.c" +#line 236 "SquaresEffect.c" } @@ -253,27 +250,27 @@ static void squares_effect_real_get_fps (SpitTransitionsEffect* base, gint* desi if (desired_fps) { #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" *desired_fps = _vala_desired_fps; -#line 257 "SquaresEffect.c" +#line 254 "SquaresEffect.c" } #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" if (min_fps) { #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" *min_fps = _vala_min_fps; -#line 263 "SquaresEffect.c" +#line 260 "SquaresEffect.c" } } static void squares_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) { SquaresEffect * self; - SpitTransitionsVisuals* _tmp0_ = NULL; + SpitTransitionsVisuals* _tmp0_; GdkRectangle _tmp1_ = {0}; - GdkRectangle _tmp2_ = {0}; - gint _tmp3_ = 0; - SpitTransitionsVisuals* _tmp4_ = NULL; + GdkRectangle _tmp2_; + gint _tmp3_; + SpitTransitionsVisuals* _tmp4_; GdkRectangle _tmp5_ = {0}; - GdkRectangle _tmp6_ = {0}; - gint _tmp7_ = 0; + GdkRectangle _tmp6_; + gint _tmp7_; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SQUARES_EFFECT, SquaresEffect); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" @@ -300,7 +297,7 @@ static void squares_effect_real_start (SpitTransitionsEffect* base, SpitTransiti _tmp7_ = _tmp6_.height; #line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" self->priv->square_count_y = (gdouble) ((_tmp7_ / SQUARES_EFFECT_SQUARE_SIZE) + 1); -#line 304 "SquaresEffect.c" +#line 301 "SquaresEffect.c" } @@ -313,22 +310,22 @@ static gboolean squares_effect_real_needs_clear_background (SpitTransitionsEffec result = TRUE; #line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" return result; -#line 317 "SquaresEffect.c" +#line 314 "SquaresEffect.c" } static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) { SquaresEffect * self; gdouble alpha = 0.0; - SpitTransitionsMotion* _tmp0_ = NULL; - gint _tmp1_ = 0; - gdouble _tmp2_ = 0.0; - SpitTransitionsVisuals* _tmp3_ = NULL; - GdkPixbuf* _tmp4_ = NULL; - GdkPixbuf* _tmp5_ = NULL; - SpitTransitionsVisuals* _tmp20_ = NULL; - GdkPixbuf* _tmp21_ = NULL; - GdkPixbuf* _tmp22_ = NULL; + SpitTransitionsMotion* _tmp0_; + gint _tmp1_; + gdouble _tmp2_; + SpitTransitionsVisuals* _tmp3_; + GdkPixbuf* _tmp4_; + GdkPixbuf* _tmp5_; + SpitTransitionsVisuals* _tmp20_; + GdkPixbuf* _tmp21_; + GdkPixbuf* _tmp22_; #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SQUARES_EFFECT, SquaresEffect); #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" @@ -353,21 +350,21 @@ static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp5_ = _tmp4_; #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" if (_tmp5_ != NULL) { -#line 357 "SquaresEffect.c" - cairo_t* _tmp6_ = NULL; - SpitTransitionsVisuals* _tmp7_ = NULL; - GdkPixbuf* _tmp8_ = NULL; - GdkPixbuf* _tmp9_ = NULL; - SpitTransitionsVisuals* _tmp10_ = NULL; +#line 354 "SquaresEffect.c" + cairo_t* _tmp6_; + SpitTransitionsVisuals* _tmp7_; + GdkPixbuf* _tmp8_; + GdkPixbuf* _tmp9_; + SpitTransitionsVisuals* _tmp10_; GdkRectangle _tmp11_ = {0}; - GdkRectangle _tmp12_ = {0}; - gint _tmp13_ = 0; - SpitTransitionsVisuals* _tmp14_ = NULL; + GdkRectangle _tmp12_; + gint _tmp13_; + SpitTransitionsVisuals* _tmp14_; GdkRectangle _tmp15_ = {0}; - GdkRectangle _tmp16_ = {0}; - gint _tmp17_ = 0; - cairo_t* _tmp18_ = NULL; - gdouble _tmp19_ = 0.0; + GdkRectangle _tmp16_; + gint _tmp17_; + cairo_t* _tmp18_; + gdouble _tmp19_; #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" _tmp6_ = ctx; #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" @@ -400,7 +397,7 @@ static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp19_ = alpha; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" cairo_paint_with_alpha (_tmp18_, 1 - _tmp19_); -#line 404 "SquaresEffect.c" +#line 401 "SquaresEffect.c" } #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" _tmp20_ = visuals; @@ -410,22 +407,22 @@ static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp22_ = _tmp21_; #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" if (_tmp22_ != NULL) { -#line 414 "SquaresEffect.c" - cairo_t* _tmp23_ = NULL; - SpitTransitionsVisuals* _tmp24_ = NULL; - GdkPixbuf* _tmp25_ = NULL; - GdkPixbuf* _tmp26_ = NULL; - SpitTransitionsVisuals* _tmp27_ = NULL; +#line 411 "SquaresEffect.c" + cairo_t* _tmp23_; + SpitTransitionsVisuals* _tmp24_; + GdkPixbuf* _tmp25_; + GdkPixbuf* _tmp26_; + SpitTransitionsVisuals* _tmp27_; GdkRectangle _tmp28_ = {0}; - GdkRectangle _tmp29_ = {0}; - gint _tmp30_ = 0; - SpitTransitionsVisuals* _tmp31_ = NULL; + GdkRectangle _tmp29_; + gint _tmp30_; + SpitTransitionsVisuals* _tmp31_; GdkRectangle _tmp32_ = {0}; - GdkRectangle _tmp33_ = {0}; - gint _tmp34_ = 0; - cairo_t* _tmp65_ = NULL; - cairo_t* _tmp66_ = NULL; - gdouble _tmp67_ = 0.0; + GdkRectangle _tmp33_; + gint _tmp34_; + cairo_t* _tmp65_; + cairo_t* _tmp66_; + gdouble _tmp67_; #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" _tmp23_ = ctx; #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" @@ -452,30 +449,30 @@ static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp34_ = _tmp33_.y; #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" gdk_cairo_set_source_pixbuf (_tmp23_, _tmp26_, (gdouble) _tmp30_, (gdouble) _tmp34_); -#line 456 "SquaresEffect.c" +#line 453 "SquaresEffect.c" { gdouble y = 0.0; #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" y = (gdouble) 0; -#line 461 "SquaresEffect.c" +#line 458 "SquaresEffect.c" { gboolean _tmp35_ = FALSE; #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" _tmp35_ = TRUE; #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" while (TRUE) { -#line 468 "SquaresEffect.c" - gdouble _tmp37_ = 0.0; - gdouble _tmp38_ = 0.0; +#line 465 "SquaresEffect.c" + gdouble _tmp37_; + gdouble _tmp38_; #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" if (!_tmp35_) { -#line 473 "SquaresEffect.c" - gdouble _tmp36_ = 0.0; +#line 470 "SquaresEffect.c" + gdouble _tmp36_; #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" _tmp36_ = y; #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" y = _tmp36_ + 1; -#line 479 "SquaresEffect.c" +#line 476 "SquaresEffect.c" } #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" _tmp35_ = FALSE; @@ -487,54 +484,54 @@ static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti if (!(_tmp37_ <= _tmp38_)) { #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" break; -#line 491 "SquaresEffect.c" +#line 488 "SquaresEffect.c" } { gdouble x = 0.0; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" x = (gdouble) 0; -#line 497 "SquaresEffect.c" +#line 494 "SquaresEffect.c" { gboolean _tmp39_ = FALSE; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" _tmp39_ = TRUE; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" while (TRUE) { -#line 504 "SquaresEffect.c" - gdouble _tmp41_ = 0.0; - gdouble _tmp42_ = 0.0; +#line 501 "SquaresEffect.c" + gdouble _tmp41_; + gdouble _tmp42_; gdouble size = 0.0; - gdouble _tmp43_ = 0.0; - gdouble _tmp44_ = 0.0; - gdouble _tmp45_ = 0.0; - gdouble _tmp46_ = 0.0; - gdouble _tmp47_ = 0.0; - gdouble _tmp48_ = 0.0; - gdouble _tmp49_ = 0.0; - gdouble _tmp50_ = 0.0; - cairo_t* _tmp51_ = NULL; - SpitTransitionsVisuals* _tmp52_ = NULL; + gdouble _tmp43_; + gdouble _tmp44_; + gdouble _tmp45_; + gdouble _tmp46_; + gdouble _tmp47_; + gdouble _tmp48_; + gdouble _tmp49_; + gdouble _tmp50_; + cairo_t* _tmp51_; + SpitTransitionsVisuals* _tmp52_; GdkRectangle _tmp53_ = {0}; - GdkRectangle _tmp54_ = {0}; - gint _tmp55_ = 0; - gdouble _tmp56_ = 0.0; - SpitTransitionsVisuals* _tmp57_ = NULL; + GdkRectangle _tmp54_; + gint _tmp55_; + gdouble _tmp56_; + SpitTransitionsVisuals* _tmp57_; GdkRectangle _tmp58_ = {0}; - GdkRectangle _tmp59_ = {0}; - gint _tmp60_ = 0; - gdouble _tmp61_ = 0.0; - gdouble _tmp62_ = 0.0; - gdouble _tmp63_ = 0.0; - cairo_t* _tmp64_ = NULL; + GdkRectangle _tmp59_; + gint _tmp60_; + gdouble _tmp61_; + gdouble _tmp62_; + gdouble _tmp63_; + cairo_t* _tmp64_; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" if (!_tmp39_) { -#line 532 "SquaresEffect.c" - gdouble _tmp40_ = 0.0; +#line 529 "SquaresEffect.c" + gdouble _tmp40_; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" _tmp40_ = x; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" x = _tmp40_ + 1; -#line 538 "SquaresEffect.c" +#line 535 "SquaresEffect.c" } #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" _tmp39_ = FALSE; @@ -546,7 +543,7 @@ static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti if (!(_tmp41_ <= _tmp42_)) { #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" break; -#line 550 "SquaresEffect.c" +#line 547 "SquaresEffect.c" } #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" _tmp43_ = alpha; @@ -598,7 +595,7 @@ static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp64_ = ctx; #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" cairo_fill (_tmp64_); -#line 602 "SquaresEffect.c" +#line 599 "SquaresEffect.c" } } } @@ -615,7 +612,7 @@ static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp67_ = alpha; #line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" cairo_paint_with_alpha (_tmp66_, _tmp67_); -#line 619 "SquaresEffect.c" +#line 616 "SquaresEffect.c" } } @@ -628,7 +625,7 @@ static void squares_effect_real_advance (SpitTransitionsEffect* base, SpitTransi g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals)); #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 632 "SquaresEffect.c" +#line 629 "SquaresEffect.c" } @@ -636,7 +633,7 @@ static void squares_effect_real_cancel (SpitTransitionsEffect* base) { SquaresEffect * self; #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SQUARES_EFFECT, SquaresEffect); -#line 640 "SquaresEffect.c" +#line 637 "SquaresEffect.c" } @@ -647,7 +644,7 @@ static void squares_effect_class_init (SquaresEffectClass * klass) { g_type_class_add_private (klass, sizeof (SquaresEffectPrivate)); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" G_OBJECT_CLASS (klass)->finalize = squares_effect_finalize; -#line 651 "SquaresEffect.c" +#line 648 "SquaresEffect.c" } @@ -655,35 +652,35 @@ static void squares_effect_spit_transitions_effect_interface_init (SpitTransitio #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" squares_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" - iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) squares_effect_real_get_fps; + iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) squares_effect_real_get_fps; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" - iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) squares_effect_real_start; + iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) squares_effect_real_start; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" - iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) squares_effect_real_needs_clear_background; + iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) squares_effect_real_needs_clear_background; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" - iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) squares_effect_real_paint; + iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) squares_effect_real_paint; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" - iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) squares_effect_real_advance; + iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) squares_effect_real_advance; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" - iface->cancel = (void (*)(SpitTransitionsEffect*)) squares_effect_real_cancel; -#line 670 "SquaresEffect.c" + iface->cancel = (void (*) (SpitTransitionsEffect *)) squares_effect_real_cancel; +#line 667 "SquaresEffect.c" } static void squares_effect_instance_init (SquaresEffect * self) { #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" self->priv = SQUARES_EFFECT_GET_PRIVATE (self); -#line 677 "SquaresEffect.c" +#line 674 "SquaresEffect.c" } -static void squares_effect_finalize (GObject* obj) { +static void squares_effect_finalize (GObject * obj) { SquaresEffect * self; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SQUARES_EFFECT, SquaresEffect); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" G_OBJECT_CLASS (squares_effect_parent_class)->finalize (obj); -#line 687 "SquaresEffect.c" +#line 684 "SquaresEffect.c" } diff --git a/plugins/shotwell-transitions/StripesEffect.c b/plugins/shotwell-transitions/StripesEffect.c index eec9185..53ef18d 100644 --- a/plugins/shotwell-transitions/StripesEffect.c +++ b/plugins/shotwell-transitions/StripesEffect.c @@ -1,4 +1,4 @@ -/* StripesEffect.c generated by valac 0.34.7, the Vala compiler +/* StripesEffect.c generated by valac 0.36.6, the Vala compiler * generated from StripesEffect.vala, do not modify */ /* Copyright 2013 Jens Bav @@ -91,7 +91,7 @@ struct _StripesEffectPrivate { static gpointer stripes_effect_descriptor_parent_class = NULL; static gpointer stripes_effect_parent_class = NULL; -static SpitTransitionsEffectIface* stripes_effect_spit_transitions_effect_parent_iface = NULL; +static SpitTransitionsEffectIface * stripes_effect_spit_transitions_effect_parent_iface = NULL; GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST; GType stripes_effect_descriptor_get_type (void) G_GNUC_CONST; @@ -120,12 +120,12 @@ static gboolean stripes_effect_real_needs_clear_background (SpitTransitionsEffec static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number); static void stripes_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number); static void stripes_effect_real_cancel (SpitTransitionsEffect* base); -static void stripes_effect_finalize (GObject* obj); +static void stripes_effect_finalize (GObject * obj); StripesEffectDescriptor* stripes_effect_descriptor_construct (GType object_type, GFile* resource_directory) { StripesEffectDescriptor * self = NULL; - GFile* _tmp0_ = NULL; + GFile* _tmp0_; #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" g_return_val_if_fail (G_IS_FILE (resource_directory), NULL); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" @@ -161,23 +161,20 @@ static const gchar* stripes_effect_descriptor_real_get_id (ShotwellTransitionDes static const gchar* stripes_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) { StripesEffectDescriptor * self; const gchar* result = NULL; - const gchar* _tmp0_ = NULL; #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_STRIPES_EFFECT_DESCRIPTOR, StripesEffectDescriptor); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" - _tmp0_ = _ ("Stripes"); -#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" - result = _tmp0_; + result = _ ("Stripes"); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" return result; -#line 174 "StripesEffect.c" +#line 171 "StripesEffect.c" } static SpitTransitionsEffect* stripes_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) { StripesEffectDescriptor * self; SpitTransitionsEffect* result = NULL; - StripesEffect* _tmp0_ = NULL; + StripesEffect* _tmp0_; #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_STRIPES_EFFECT_DESCRIPTOR, StripesEffectDescriptor); #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" @@ -188,7 +185,7 @@ static SpitTransitionsEffect* stripes_effect_descriptor_real_create (ShotwellTra result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect); #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" return result; -#line 192 "StripesEffect.c" +#line 189 "StripesEffect.c" } @@ -196,12 +193,12 @@ static void stripes_effect_descriptor_class_init (StripesEffectDescriptorClass * #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" stripes_effect_descriptor_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) stripes_effect_descriptor_real_get_id; + ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) stripes_effect_descriptor_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) stripes_effect_descriptor_real_get_pluggable_name; + ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) stripes_effect_descriptor_real_get_pluggable_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) stripes_effect_descriptor_real_create; -#line 205 "StripesEffect.c" + ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) stripes_effect_descriptor_real_create; +#line 202 "StripesEffect.c" } @@ -227,14 +224,14 @@ StripesEffect* stripes_effect_construct (GType object_type) { self = (StripesEffect*) g_object_new (object_type, NULL); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" return self; -#line 231 "StripesEffect.c" +#line 228 "StripesEffect.c" } StripesEffect* stripes_effect_new (void) { #line 34 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" return stripes_effect_construct (TYPE_STRIPES_EFFECT); -#line 238 "StripesEffect.c" +#line 235 "StripesEffect.c" } @@ -252,23 +249,23 @@ static void stripes_effect_real_get_fps (SpitTransitionsEffect* base, gint* desi if (desired_fps) { #line 37 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" *desired_fps = _vala_desired_fps; -#line 256 "StripesEffect.c" +#line 253 "StripesEffect.c" } #line 37 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" if (min_fps) { #line 37 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" *min_fps = _vala_min_fps; -#line 262 "StripesEffect.c" +#line 259 "StripesEffect.c" } } static void stripes_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) { StripesEffect * self; - SpitTransitionsVisuals* _tmp0_ = NULL; + SpitTransitionsVisuals* _tmp0_; GdkRectangle _tmp1_ = {0}; - GdkRectangle _tmp2_ = {0}; - gint _tmp3_ = 0; + GdkRectangle _tmp2_; + gint _tmp3_; #line 42 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_STRIPES_EFFECT, StripesEffect); #line 42 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" @@ -285,7 +282,7 @@ static void stripes_effect_real_start (SpitTransitionsEffect* base, SpitTransiti _tmp3_ = _tmp2_.height; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" self->priv->stripe_count = (_tmp3_ / STRIPES_EFFECT_STRIPE_HEIGHT) + 1; -#line 289 "StripesEffect.c" +#line 286 "StripesEffect.c" } @@ -298,22 +295,22 @@ static gboolean stripes_effect_real_needs_clear_background (SpitTransitionsEffec result = TRUE; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" return result; -#line 302 "StripesEffect.c" +#line 299 "StripesEffect.c" } static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) { StripesEffect * self; gdouble alpha = 0.0; - SpitTransitionsMotion* _tmp0_ = NULL; - gint _tmp1_ = 0; - gdouble _tmp2_ = 0.0; - SpitTransitionsVisuals* _tmp3_ = NULL; - GdkPixbuf* _tmp4_ = NULL; - GdkPixbuf* _tmp5_ = NULL; - SpitTransitionsVisuals* _tmp21_ = NULL; - GdkPixbuf* _tmp22_ = NULL; - GdkPixbuf* _tmp23_ = NULL; + SpitTransitionsMotion* _tmp0_; + gint _tmp1_; + gdouble _tmp2_; + SpitTransitionsVisuals* _tmp3_; + GdkPixbuf* _tmp4_; + GdkPixbuf* _tmp5_; + SpitTransitionsVisuals* _tmp21_; + GdkPixbuf* _tmp22_; + GdkPixbuf* _tmp23_; #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_STRIPES_EFFECT, StripesEffect); #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" @@ -338,22 +335,22 @@ static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp5_ = _tmp4_; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" if (_tmp5_ != NULL) { -#line 342 "StripesEffect.c" - cairo_t* _tmp6_ = NULL; - SpitTransitionsVisuals* _tmp7_ = NULL; - GdkPixbuf* _tmp8_ = NULL; - GdkPixbuf* _tmp9_ = NULL; - SpitTransitionsVisuals* _tmp10_ = NULL; +#line 339 "StripesEffect.c" + cairo_t* _tmp6_; + SpitTransitionsVisuals* _tmp7_; + GdkPixbuf* _tmp8_; + GdkPixbuf* _tmp9_; + SpitTransitionsVisuals* _tmp10_; GdkRectangle _tmp11_ = {0}; - GdkRectangle _tmp12_ = {0}; - gint _tmp13_ = 0; - SpitTransitionsVisuals* _tmp14_ = NULL; + GdkRectangle _tmp12_; + gint _tmp13_; + SpitTransitionsVisuals* _tmp14_; GdkRectangle _tmp15_ = {0}; - GdkRectangle _tmp16_ = {0}; - gint _tmp17_ = 0; - cairo_t* _tmp18_ = NULL; - gdouble _tmp19_ = 0.0; - gdouble _tmp20_ = 0.0; + GdkRectangle _tmp16_; + gint _tmp17_; + cairo_t* _tmp18_; + gdouble _tmp19_; + gdouble _tmp20_; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" _tmp6_ = ctx; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" @@ -388,7 +385,7 @@ static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp20_ = fmin ((gdouble) 1, _tmp19_ * 2); #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" cairo_paint_with_alpha (_tmp18_, 1 - _tmp20_); -#line 392 "StripesEffect.c" +#line 389 "StripesEffect.c" } #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" _tmp21_ = visuals; @@ -398,32 +395,32 @@ static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp23_ = _tmp22_; #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" if (_tmp23_ != NULL) { -#line 402 "StripesEffect.c" - cairo_t* _tmp24_ = NULL; - SpitTransitionsVisuals* _tmp25_ = NULL; - GdkPixbuf* _tmp26_ = NULL; - GdkPixbuf* _tmp27_ = NULL; - SpitTransitionsVisuals* _tmp28_ = NULL; +#line 399 "StripesEffect.c" + cairo_t* _tmp24_; + SpitTransitionsVisuals* _tmp25_; + GdkPixbuf* _tmp26_; + GdkPixbuf* _tmp27_; + SpitTransitionsVisuals* _tmp28_; GdkRectangle _tmp29_ = {0}; - GdkRectangle _tmp30_ = {0}; - gint _tmp31_ = 0; - SpitTransitionsVisuals* _tmp32_ = NULL; + GdkRectangle _tmp30_; + gint _tmp31_; + SpitTransitionsVisuals* _tmp32_; GdkRectangle _tmp33_ = {0}; - GdkRectangle _tmp34_ = {0}; - gint _tmp35_ = 0; + GdkRectangle _tmp34_; + gint _tmp35_; gint x = 0; - SpitTransitionsVisuals* _tmp36_ = NULL; + SpitTransitionsVisuals* _tmp36_; GdkRectangle _tmp37_ = {0}; - GdkRectangle _tmp38_ = {0}; - gint _tmp39_ = 0; + GdkRectangle _tmp38_; + gint _tmp39_; gint y = 0; - SpitTransitionsVisuals* _tmp40_ = NULL; + SpitTransitionsVisuals* _tmp40_; GdkRectangle _tmp41_ = {0}; - GdkRectangle _tmp42_ = {0}; - gint _tmp43_ = 0; - cairo_t* _tmp79_ = NULL; - cairo_t* _tmp80_ = NULL; - gdouble _tmp81_ = 0.0; + GdkRectangle _tmp42_; + gint _tmp43_; + cairo_t* _tmp79_; + cairo_t* _tmp80_; + gdouble _tmp81_; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" _tmp24_ = ctx; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" @@ -470,34 +467,34 @@ static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp43_ = _tmp42_.y; #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" y = _tmp43_; -#line 474 "StripesEffect.c" +#line 471 "StripesEffect.c" { gint i = 0; #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" i = 0; -#line 479 "StripesEffect.c" +#line 476 "StripesEffect.c" { gboolean _tmp44_ = FALSE; #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" _tmp44_ = TRUE; #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" while (TRUE) { -#line 486 "StripesEffect.c" - gint _tmp46_ = 0; - gint _tmp47_ = 0; - gint _tmp48_ = 0; - SpitTransitionsMotion* _tmp49_ = NULL; - SpitTransitionsDirection _tmp50_ = 0; - SpitTransitionsDirection _tmp51_ = 0; +#line 483 "StripesEffect.c" + gint _tmp46_; + gint _tmp47_; + gint _tmp48_; + SpitTransitionsMotion* _tmp49_; + SpitTransitionsDirection _tmp50_; + SpitTransitionsDirection _tmp51_; #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" if (!_tmp44_) { -#line 495 "StripesEffect.c" - gint _tmp45_ = 0; +#line 492 "StripesEffect.c" + gint _tmp45_; #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" _tmp45_ = i; #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" i = _tmp45_ + 1; -#line 501 "StripesEffect.c" +#line 498 "StripesEffect.c" } #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" _tmp44_ = FALSE; @@ -509,7 +506,7 @@ static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti if (!(_tmp46_ <= _tmp47_)) { #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" break; -#line 513 "StripesEffect.c" +#line 510 "StripesEffect.c" } #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" _tmp48_ = i; @@ -521,25 +518,25 @@ static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp51_ = _tmp50_; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" if ((_tmp48_ % 2) == ((gint) _tmp51_)) { -#line 525 "StripesEffect.c" - cairo_t* _tmp52_ = NULL; - gint _tmp53_ = 0; - SpitTransitionsVisuals* _tmp54_ = NULL; +#line 522 "StripesEffect.c" + cairo_t* _tmp52_; + gint _tmp53_; + SpitTransitionsVisuals* _tmp54_; GdkRectangle _tmp55_ = {0}; - GdkRectangle _tmp56_ = {0}; - gint _tmp57_ = 0; - gdouble _tmp58_ = 0.0; - SpitTransitionsVisuals* _tmp59_ = NULL; + GdkRectangle _tmp56_; + gint _tmp57_; + gdouble _tmp58_; + SpitTransitionsVisuals* _tmp59_; GdkRectangle _tmp60_ = {0}; - GdkRectangle _tmp61_ = {0}; - gint _tmp62_ = 0; - gint _tmp63_ = 0; - gint _tmp64_ = 0; - gint _tmp65_ = 0; - SpitTransitionsVisuals* _tmp66_ = NULL; + GdkRectangle _tmp61_; + gint _tmp62_; + gint _tmp63_; + gint _tmp64_; + gint _tmp65_; + SpitTransitionsVisuals* _tmp66_; GdkRectangle _tmp67_ = {0}; - GdkRectangle _tmp68_ = {0}; - gint _tmp69_ = 0; + GdkRectangle _tmp68_; + gint _tmp69_; #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" _tmp52_ = ctx; #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" @@ -578,17 +575,17 @@ static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp69_ = _tmp68_.width; #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" cairo_rectangle (_tmp52_, (_tmp53_ + _tmp57_) - (_tmp58_ * _tmp62_), (gdouble) (_tmp63_ + (_tmp64_ * STRIPES_EFFECT_STRIPE_HEIGHT)), (gdouble) (_tmp65_ + _tmp69_), (gdouble) STRIPES_EFFECT_STRIPE_HEIGHT); -#line 582 "StripesEffect.c" +#line 579 "StripesEffect.c" } else { - cairo_t* _tmp70_ = NULL; - gint _tmp71_ = 0; - gint _tmp72_ = 0; - gint _tmp73_ = 0; - SpitTransitionsVisuals* _tmp74_ = NULL; + cairo_t* _tmp70_; + gint _tmp71_; + gint _tmp72_; + gint _tmp73_; + SpitTransitionsVisuals* _tmp74_; GdkRectangle _tmp75_ = {0}; - GdkRectangle _tmp76_ = {0}; - gint _tmp77_ = 0; - gdouble _tmp78_ = 0.0; + GdkRectangle _tmp76_; + gint _tmp77_; + gdouble _tmp78_; #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" _tmp70_ = ctx; #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" @@ -609,7 +606,7 @@ static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp78_ = alpha; #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" cairo_rectangle (_tmp70_, (gdouble) _tmp71_, (gdouble) (_tmp72_ + (STRIPES_EFFECT_STRIPE_HEIGHT * _tmp73_)), _tmp77_ * _tmp78_, (gdouble) STRIPES_EFFECT_STRIPE_HEIGHT); -#line 613 "StripesEffect.c" +#line 610 "StripesEffect.c" } } } @@ -624,7 +621,7 @@ static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti _tmp81_ = alpha; #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" cairo_paint_with_alpha (_tmp80_, _tmp81_); -#line 628 "StripesEffect.c" +#line 625 "StripesEffect.c" } } @@ -637,7 +634,7 @@ static void stripes_effect_real_advance (SpitTransitionsEffect* base, SpitTransi g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals)); #line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 641 "StripesEffect.c" +#line 638 "StripesEffect.c" } @@ -645,7 +642,7 @@ static void stripes_effect_real_cancel (SpitTransitionsEffect* base) { StripesEffect * self; #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_STRIPES_EFFECT, StripesEffect); -#line 649 "StripesEffect.c" +#line 646 "StripesEffect.c" } @@ -656,7 +653,7 @@ static void stripes_effect_class_init (StripesEffectClass * klass) { g_type_class_add_private (klass, sizeof (StripesEffectPrivate)); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" G_OBJECT_CLASS (klass)->finalize = stripes_effect_finalize; -#line 660 "StripesEffect.c" +#line 657 "StripesEffect.c" } @@ -664,35 +661,35 @@ static void stripes_effect_spit_transitions_effect_interface_init (SpitTransitio #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" stripes_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" - iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) stripes_effect_real_get_fps; + iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) stripes_effect_real_get_fps; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" - iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) stripes_effect_real_start; + iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) stripes_effect_real_start; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" - iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) stripes_effect_real_needs_clear_background; + iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) stripes_effect_real_needs_clear_background; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" - iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) stripes_effect_real_paint; + iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) stripes_effect_real_paint; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" - iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) stripes_effect_real_advance; + iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) stripes_effect_real_advance; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" - iface->cancel = (void (*)(SpitTransitionsEffect*)) stripes_effect_real_cancel; -#line 679 "StripesEffect.c" + iface->cancel = (void (*) (SpitTransitionsEffect *)) stripes_effect_real_cancel; +#line 676 "StripesEffect.c" } static void stripes_effect_instance_init (StripesEffect * self) { #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" self->priv = STRIPES_EFFECT_GET_PRIVATE (self); -#line 686 "StripesEffect.c" +#line 683 "StripesEffect.c" } -static void stripes_effect_finalize (GObject* obj) { +static void stripes_effect_finalize (GObject * obj) { StripesEffect * self; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_STRIPES_EFFECT, StripesEffect); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" G_OBJECT_CLASS (stripes_effect_parent_class)->finalize (obj); -#line 696 "StripesEffect.c" +#line 693 "StripesEffect.c" } diff --git a/plugins/shotwell-transitions/shotwell-transitions.c b/plugins/shotwell-transitions/shotwell-transitions.c index e8e7b90..37d3f6d 100644 --- a/plugins/shotwell-transitions/shotwell-transitions.c +++ b/plugins/shotwell-transitions/shotwell-transitions.c @@ -1,4 +1,4 @@ -/* shotwell-transitions.c generated by valac 0.34.7, the Vala compiler +/* shotwell-transitions.c generated by valac 0.36.6, the Vala compiler * generated from shotwell-transitions.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -171,15 +171,15 @@ struct _ShotwellTransitionDescriptorClass { static gpointer shotwell_transitions_parent_class = NULL; -static SpitModuleIface* shotwell_transitions_spit_module_parent_iface = NULL; +static SpitModuleIface * shotwell_transitions_spit_module_parent_iface = NULL; static gpointer shotwell_transition_descriptor_parent_class = NULL; static GdkPixbuf** shotwell_transition_descriptor_icon_pixbuf_set; static gint shotwell_transition_descriptor_icon_pixbuf_set_length1; static GdkPixbuf** shotwell_transition_descriptor_icon_pixbuf_set = NULL; static gint shotwell_transition_descriptor_icon_pixbuf_set_length1 = 0; static gint _shotwell_transition_descriptor_icon_pixbuf_set_size_ = 0; -static SpitPluggableIface* shotwell_transition_descriptor_spit_pluggable_parent_iface = NULL; -static SpitTransitionsDescriptorIface* shotwell_transition_descriptor_spit_transitions_descriptor_parent_iface = NULL; +static SpitPluggableIface * shotwell_transition_descriptor_spit_pluggable_parent_iface = NULL; +static SpitTransitionsDescriptorIface * shotwell_transition_descriptor_spit_transitions_descriptor_parent_iface = NULL; GType shotwell_transitions_get_type (void) G_GNUC_CONST; #define SHOTWELL_TRANSITIONS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SHOTWELL_TRANSITIONS, ShotwellTransitionsPrivate)) @@ -192,48 +192,48 @@ FadeEffectDescriptor* fade_effect_descriptor_new (GFile* resource_directory); FadeEffectDescriptor* fade_effect_descriptor_construct (GType object_type, GFile* resource_directory); GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST; GType fade_effect_descriptor_get_type (void) G_GNUC_CONST; -static void _vala_array_add1 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add1 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); SlideEffectDescriptor* slide_effect_descriptor_new (GFile* resource_directory); SlideEffectDescriptor* slide_effect_descriptor_construct (GType object_type, GFile* resource_directory); GType slide_effect_descriptor_get_type (void) G_GNUC_CONST; -static void _vala_array_add2 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add2 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); CrumbleEffectDescriptor* crumble_effect_descriptor_new (GFile* resource_directory); CrumbleEffectDescriptor* crumble_effect_descriptor_construct (GType object_type, GFile* resource_directory); GType crumble_effect_descriptor_get_type (void) G_GNUC_CONST; -static void _vala_array_add3 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add3 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); BlindsEffectDescriptor* blinds_effect_descriptor_new (GFile* resource_directory); BlindsEffectDescriptor* blinds_effect_descriptor_construct (GType object_type, GFile* resource_directory); GType blinds_effect_descriptor_get_type (void) G_GNUC_CONST; -static void _vala_array_add4 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add4 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); CircleEffectDescriptor* circle_effect_descriptor_new (GFile* resource_directory); CircleEffectDescriptor* circle_effect_descriptor_construct (GType object_type, GFile* resource_directory); GType circle_effect_descriptor_get_type (void) G_GNUC_CONST; -static void _vala_array_add5 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add5 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); CirclesEffectDescriptor* circles_effect_descriptor_new (GFile* resource_directory); CirclesEffectDescriptor* circles_effect_descriptor_construct (GType object_type, GFile* resource_directory); GType circles_effect_descriptor_get_type (void) G_GNUC_CONST; -static void _vala_array_add6 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add6 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); ClockEffectDescriptor* clock_effect_descriptor_new (GFile* resource_directory); ClockEffectDescriptor* clock_effect_descriptor_construct (GType object_type, GFile* resource_directory); GType clock_effect_descriptor_get_type (void) G_GNUC_CONST; -static void _vala_array_add7 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add7 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); SquaresEffectDescriptor* squares_effect_descriptor_new (GFile* resource_directory); SquaresEffectDescriptor* squares_effect_descriptor_construct (GType object_type, GFile* resource_directory); GType squares_effect_descriptor_get_type (void) G_GNUC_CONST; -static void _vala_array_add8 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add8 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); ChessEffectDescriptor* chess_effect_descriptor_new (GFile* resource_directory); ChessEffectDescriptor* chess_effect_descriptor_construct (GType object_type, GFile* resource_directory); GType chess_effect_descriptor_get_type (void) G_GNUC_CONST; -static void _vala_array_add9 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add9 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); StripesEffectDescriptor* stripes_effect_descriptor_new (GFile* resource_directory); StripesEffectDescriptor* stripes_effect_descriptor_construct (GType object_type, GFile* resource_directory); GType stripes_effect_descriptor_get_type (void) G_GNUC_CONST; -static void _vala_array_add10 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add10 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); static const gchar* shotwell_transitions_real_get_module_name (SpitModule* base); static const gchar* shotwell_transitions_real_get_version (SpitModule* base); static const gchar* shotwell_transitions_real_get_id (SpitModule* base); static SpitPluggable** shotwell_transitions_real_get_pluggables (SpitModule* base, int* result_length1); -static void shotwell_transitions_finalize (GObject* obj); +static void shotwell_transitions_finalize (GObject * obj); SpitModule* spit_entry_point (SpitEntryPointParams* params); enum { SHOTWELL_TRANSITION_DESCRIPTOR_DUMMY_PROPERTY @@ -250,12 +250,12 @@ static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length); static void shotwell_transition_descriptor_real_activation (SpitPluggable* base, gboolean enabled); SpitTransitionsEffect* shotwell_transition_descriptor_create (ShotwellTransitionDescriptor* self, SpitHostInterface* host); static SpitTransitionsEffect* shotwell_transition_descriptor_real_create (ShotwellTransitionDescriptor* self, SpitHostInterface* host); -static void shotwell_transition_descriptor_finalize (GObject* obj); +static void shotwell_transition_descriptor_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_add1 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add1 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" if ((*length) == (*size)) { #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -272,7 +272,7 @@ static void _vala_array_add1 (SpitPluggable*** array, int* length, int* size, Sp } -static void _vala_array_add2 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add2 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" if ((*length) == (*size)) { #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -289,7 +289,7 @@ static void _vala_array_add2 (SpitPluggable*** array, int* length, int* size, Sp } -static void _vala_array_add3 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add3 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 17 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" if ((*length) == (*size)) { #line 17 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -306,7 +306,7 @@ static void _vala_array_add3 (SpitPluggable*** array, int* length, int* size, Sp } -static void _vala_array_add4 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add4 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 18 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" if ((*length) == (*size)) { #line 18 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -323,7 +323,7 @@ static void _vala_array_add4 (SpitPluggable*** array, int* length, int* size, Sp } -static void _vala_array_add5 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add5 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" if ((*length) == (*size)) { #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -340,7 +340,7 @@ static void _vala_array_add5 (SpitPluggable*** array, int* length, int* size, Sp } -static void _vala_array_add6 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add6 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" if ((*length) == (*size)) { #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -357,7 +357,7 @@ static void _vala_array_add6 (SpitPluggable*** array, int* length, int* size, Sp } -static void _vala_array_add7 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add7 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 21 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" if ((*length) == (*size)) { #line 21 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -374,7 +374,7 @@ static void _vala_array_add7 (SpitPluggable*** array, int* length, int* size, Sp } -static void _vala_array_add8 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add8 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 22 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" if ((*length) == (*size)) { #line 22 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -391,7 +391,7 @@ static void _vala_array_add8 (SpitPluggable*** array, int* length, int* size, Sp } -static void _vala_array_add9 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add9 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" if ((*length) == (*size)) { #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -408,7 +408,7 @@ static void _vala_array_add9 (SpitPluggable*** array, int* length, int* size, Sp } -static void _vala_array_add10 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add10 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" if ((*length) == (*size)) { #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -428,38 +428,38 @@ static void _vala_array_add10 (SpitPluggable*** array, int* length, int* size, S ShotwellTransitions* shotwell_transitions_construct (GType object_type, GFile* module_file) { ShotwellTransitions * self = NULL; GFile* resource_directory = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - SpitPluggable** _tmp2_ = NULL; - gint _tmp2__length1 = 0; - FadeEffectDescriptor* _tmp3_ = NULL; - SpitPluggable** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - SlideEffectDescriptor* _tmp5_ = NULL; - SpitPluggable** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - CrumbleEffectDescriptor* _tmp7_ = NULL; - SpitPluggable** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - BlindsEffectDescriptor* _tmp9_ = NULL; - SpitPluggable** _tmp10_ = NULL; - gint _tmp10__length1 = 0; - CircleEffectDescriptor* _tmp11_ = NULL; - SpitPluggable** _tmp12_ = NULL; - gint _tmp12__length1 = 0; - CirclesEffectDescriptor* _tmp13_ = NULL; - SpitPluggable** _tmp14_ = NULL; - gint _tmp14__length1 = 0; - ClockEffectDescriptor* _tmp15_ = NULL; - SpitPluggable** _tmp16_ = NULL; - gint _tmp16__length1 = 0; - SquaresEffectDescriptor* _tmp17_ = NULL; - SpitPluggable** _tmp18_ = NULL; - gint _tmp18__length1 = 0; - ChessEffectDescriptor* _tmp19_ = NULL; - SpitPluggable** _tmp20_ = NULL; - gint _tmp20__length1 = 0; - StripesEffectDescriptor* _tmp21_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; + SpitPluggable** _tmp2_; + gint _tmp2__length1; + FadeEffectDescriptor* _tmp3_; + SpitPluggable** _tmp4_; + gint _tmp4__length1; + SlideEffectDescriptor* _tmp5_; + SpitPluggable** _tmp6_; + gint _tmp6__length1; + CrumbleEffectDescriptor* _tmp7_; + SpitPluggable** _tmp8_; + gint _tmp8__length1; + BlindsEffectDescriptor* _tmp9_; + SpitPluggable** _tmp10_; + gint _tmp10__length1; + CircleEffectDescriptor* _tmp11_; + SpitPluggable** _tmp12_; + gint _tmp12__length1; + CirclesEffectDescriptor* _tmp13_; + SpitPluggable** _tmp14_; + gint _tmp14__length1; + ClockEffectDescriptor* _tmp15_; + SpitPluggable** _tmp16_; + gint _tmp16__length1; + SquaresEffectDescriptor* _tmp17_; + SpitPluggable** _tmp18_; + gint _tmp18__length1; + ChessEffectDescriptor* _tmp19_; + SpitPluggable** _tmp20_; + gint _tmp20__length1; + StripesEffectDescriptor* _tmp21_; #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" g_return_val_if_fail (G_IS_FILE (module_file), NULL); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -568,16 +568,13 @@ ShotwellTransitions* shotwell_transitions_new (GFile* module_file) { static const gchar* shotwell_transitions_real_get_module_name (SpitModule* base) { ShotwellTransitions * self; const gchar* result = NULL; - const gchar* _tmp0_ = NULL; #line 27 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_TRANSITIONS, ShotwellTransitions); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - _tmp0_ = _ ("Core Slideshow Transitions"); -#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - result = _tmp0_; + result = _ ("Core Slideshow Transitions"); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" return result; -#line 581 "shotwell-transitions.c" +#line 578 "shotwell-transitions.c" } @@ -590,7 +587,7 @@ static const gchar* shotwell_transitions_real_get_version (SpitModule* base) { result = _VERSION; #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" return result; -#line 594 "shotwell-transitions.c" +#line 591 "shotwell-transitions.c" } @@ -603,17 +600,17 @@ static const gchar* shotwell_transitions_real_get_id (SpitModule* base) { result = "org.yorba.shotwell.transitions"; #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" return result; -#line 607 "shotwell-transitions.c" +#line 604 "shotwell-transitions.c" } static SpitPluggable** shotwell_transitions_real_get_pluggables (SpitModule* base, int* result_length1) { ShotwellTransitions * self; SpitPluggable** result = NULL; - SpitPluggable** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - SpitPluggable** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + SpitPluggable** _tmp0_; + gint _tmp0__length1; + SpitPluggable** _tmp1_; + gint _tmp1__length1; #line 39 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_TRANSITIONS, ShotwellTransitions); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -628,13 +625,13 @@ static SpitPluggable** shotwell_transitions_real_get_pluggables (SpitModule* bas if (result_length1) { #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" *result_length1 = _tmp1__length1; -#line 632 "shotwell-transitions.c" +#line 629 "shotwell-transitions.c" } #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" result = _tmp1_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" return result; -#line 638 "shotwell-transitions.c" +#line 635 "shotwell-transitions.c" } @@ -645,7 +642,7 @@ static void shotwell_transitions_class_init (ShotwellTransitionsClass * klass) { g_type_class_add_private (klass, sizeof (ShotwellTransitionsPrivate)); #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" G_OBJECT_CLASS (klass)->finalize = shotwell_transitions_finalize; -#line 649 "shotwell-transitions.c" +#line 646 "shotwell-transitions.c" } @@ -653,19 +650,19 @@ static void shotwell_transitions_spit_module_interface_init (SpitModuleIface * i #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" shotwell_transitions_spit_module_parent_iface = g_type_interface_peek_parent (iface); #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - iface->get_module_name = (const gchar* (*)(SpitModule*)) shotwell_transitions_real_get_module_name; + iface->get_module_name = (const gchar* (*) (SpitModule *)) shotwell_transitions_real_get_module_name; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - iface->get_version = (const gchar* (*)(SpitModule*)) shotwell_transitions_real_get_version; + iface->get_version = (const gchar* (*) (SpitModule *)) shotwell_transitions_real_get_version; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - iface->get_id = (const gchar* (*)(SpitModule*)) shotwell_transitions_real_get_id; + iface->get_id = (const gchar* (*) (SpitModule *)) shotwell_transitions_real_get_id; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - iface->get_pluggables = (SpitPluggable** (*)(SpitModule*, int*)) shotwell_transitions_real_get_pluggables; -#line 664 "shotwell-transitions.c" + iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_transitions_real_get_pluggables; +#line 661 "shotwell-transitions.c" } static void shotwell_transitions_instance_init (ShotwellTransitions * self) { - SpitPluggable** _tmp0_ = NULL; + SpitPluggable** _tmp0_; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" self->priv = SHOTWELL_TRANSITIONS_GET_PRIVATE (self); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -676,11 +673,11 @@ static void shotwell_transitions_instance_init (ShotwellTransitions * self) { self->priv->pluggables_length1 = 0; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" self->priv->_pluggables_size_ = self->priv->pluggables_length1; -#line 680 "shotwell-transitions.c" +#line 677 "shotwell-transitions.c" } -static void shotwell_transitions_finalize (GObject* obj) { +static void shotwell_transitions_finalize (GObject * obj) { ShotwellTransitions * self; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_TRANSITIONS, ShotwellTransitions); @@ -688,7 +685,7 @@ static void shotwell_transitions_finalize (GObject* obj) { self->priv->pluggables = (_vala_array_free (self->priv->pluggables, self->priv->pluggables_length1, (GDestroyNotify) g_object_unref), NULL); #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" G_OBJECT_CLASS (shotwell_transitions_parent_class)->finalize (obj); -#line 692 "shotwell-transitions.c" +#line 689 "shotwell-transitions.c" } @@ -708,14 +705,14 @@ GType shotwell_transitions_get_type (void) { SpitModule* spit_entry_point (SpitEntryPointParams* params) { SpitModule* result = NULL; - SpitEntryPointParams* _tmp0_ = NULL; - gint _tmp1_ = 0; - SpitEntryPointParams* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + SpitEntryPointParams* _tmp0_; + gint _tmp1_; + SpitEntryPointParams* _tmp2_; + gint _tmp3_; + gint _tmp4_; ShotwellTransitions* _tmp5_ = NULL; - SpitEntryPointParams* _tmp6_ = NULL; - gint _tmp7_ = 0; + SpitEntryPointParams* _tmp6_; + gint _tmp7_; #line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" _tmp0_ = params; #line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -734,10 +731,10 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) { _tmp7_ = (*_tmp6_).module_spit_interface; #line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) { -#line 738 "shotwell-transitions.c" - SpitEntryPointParams* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - ShotwellTransitions* _tmp10_ = NULL; +#line 735 "shotwell-transitions.c" + SpitEntryPointParams* _tmp8_; + GFile* _tmp9_; + ShotwellTransitions* _tmp10_; #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" _tmp8_ = params; #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -748,26 +745,26 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) { _g_object_unref0 (_tmp5_); #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" _tmp5_ = _tmp10_; -#line 752 "shotwell-transitions.c" +#line 749 "shotwell-transitions.c" } else { #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" _g_object_unref0 (_tmp5_); #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" _tmp5_ = NULL; -#line 758 "shotwell-transitions.c" +#line 755 "shotwell-transitions.c" } #line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_MODULE, SpitModule); #line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" return result; -#line 764 "shotwell-transitions.c" +#line 761 "shotwell-transitions.c" } ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory) { ShotwellTransitionDescriptor * self = NULL; - GdkPixbuf** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + GdkPixbuf** _tmp0_; + gint _tmp0__length1; #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" g_return_val_if_fail (G_IS_FILE (resource_directory), NULL); #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -778,9 +775,9 @@ ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType ob _tmp0__length1 = shotwell_transition_descriptor_icon_pixbuf_set_length1; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" if (_tmp0_ == NULL) { -#line 782 "shotwell-transitions.c" - gint _tmp1_ = 0; - GdkPixbuf** _tmp2_ = NULL; +#line 779 "shotwell-transitions.c" + gint _tmp1_; + GdkPixbuf** _tmp2_; #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" _tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" SHOTWELL_TRANSITION_DESCRIPTOR_ICON_FILENAME, &_tmp1_); #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -791,20 +788,20 @@ ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType ob shotwell_transition_descriptor_icon_pixbuf_set_length1 = _tmp1_; #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" _shotwell_transition_descriptor_icon_pixbuf_set_size_ = shotwell_transition_descriptor_icon_pixbuf_set_length1; -#line 795 "shotwell-transitions.c" +#line 792 "shotwell-transitions.c" } #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" return self; -#line 799 "shotwell-transitions.c" +#line 796 "shotwell-transitions.c" } static gint shotwell_transition_descriptor_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) { ShotwellTransitionDescriptor * self; gint result = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_TRANSITION_DESCRIPTOR, ShotwellTransitionDescriptor); #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -817,7 +814,7 @@ static gint shotwell_transition_descriptor_real_get_pluggable_interface (SpitPlu result = _tmp2_; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" return result; -#line 821 "shotwell-transitions.c" +#line 818 "shotwell-transitions.c" } @@ -826,7 +823,7 @@ static const gchar* shotwell_transition_descriptor_real_get_id (ShotwellTransiti g_critical ("Type `%s' does not implement abstract method `shotwell_transition_descriptor_get_id'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" return NULL; -#line 830 "shotwell-transitions.c" +#line 827 "shotwell-transitions.c" } @@ -835,7 +832,7 @@ const gchar* shotwell_transition_descriptor_get_id (ShotwellTransitionDescriptor g_return_val_if_fail (IS_SHOTWELL_TRANSITION_DESCRIPTOR (self), NULL); #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" return SHOTWELL_TRANSITION_DESCRIPTOR_GET_CLASS (self)->get_id (self); -#line 839 "shotwell-transitions.c" +#line 836 "shotwell-transitions.c" } @@ -844,7 +841,7 @@ static const gchar* shotwell_transition_descriptor_real_get_pluggable_name (Shot g_critical ("Type `%s' does not implement abstract method `shotwell_transition_descriptor_get_pluggable_name'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" return NULL; -#line 848 "shotwell-transitions.c" +#line 845 "shotwell-transitions.c" } @@ -853,14 +850,14 @@ const gchar* shotwell_transition_descriptor_get_pluggable_name (ShotwellTransiti g_return_val_if_fail (IS_SHOTWELL_TRANSITION_DESCRIPTOR (self), NULL); #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" return SHOTWELL_TRANSITION_DESCRIPTOR_GET_CLASS (self)->get_pluggable_name (self); -#line 857 "shotwell-transitions.c" +#line 854 "shotwell-transitions.c" } static gpointer _g_object_ref0 (gpointer self) { #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" return self ? g_object_ref (self) : NULL; -#line 864 "shotwell-transitions.c" +#line 861 "shotwell-transitions.c" } @@ -871,34 +868,33 @@ static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) { result = g_new0 (GdkPixbuf*, length + 1); #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" for (i = 0; i < length; i++) { -#line 875 "shotwell-transitions.c" - GdkPixbuf* _tmp0_ = NULL; +#line 872 "shotwell-transitions.c" + GdkPixbuf* _tmp0_; #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" result[i] = _tmp0_; -#line 881 "shotwell-transitions.c" +#line 878 "shotwell-transitions.c" } #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" return result; -#line 885 "shotwell-transitions.c" +#line 882 "shotwell-transitions.c" } static void shotwell_transition_descriptor_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) { ShotwellTransitionDescriptor * self; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GdkPixbuf** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - GdkPixbuf** _tmp9_ = NULL; - gint _tmp9__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + GdkPixbuf** _tmp7_; + gint _tmp7__length1; + GdkPixbuf** _tmp8_; + gint _tmp8__length1; #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_TRANSITION_DESCRIPTOR, ShotwellTransitionDescriptor); #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -910,61 +906,59 @@ static void shotwell_transition_descriptor_real_get_info (SpitPluggable* base, S #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" (*info).authors = _tmp0_; #line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - _tmp1_ = _ ("Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conser" \ -"vancy Inc."); -#line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp1_ = g_strdup (_ ("Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conser" \ +"vancy Inc.")); #line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" _g_free0 ((*info).copyright); #line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - (*info).copyright = _tmp2_; + (*info).copyright = _tmp1_; #line 77 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - _tmp3_ = g_strdup (RESOURCES_TRANSLATORS); + _tmp2_ = g_strdup (RESOURCES_TRANSLATORS); #line 77 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" _g_free0 ((*info).translators); #line 77 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - (*info).translators = _tmp3_; + (*info).translators = _tmp2_; #line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - _tmp4_ = g_strdup (_VERSION); + _tmp3_ = g_strdup (_VERSION); #line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" _g_free0 ((*info).version); #line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - (*info).version = _tmp4_; + (*info).version = _tmp3_; #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - _tmp5_ = g_strdup (RESOURCES_WEBSITE_NAME); + _tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME); #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" _g_free0 ((*info).website_name); #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - (*info).website_name = _tmp5_; + (*info).website_name = _tmp4_; #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - _tmp6_ = g_strdup (RESOURCES_WEBSITE_URL); + _tmp5_ = g_strdup (RESOURCES_WEBSITE_URL); #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" _g_free0 ((*info).website_url); #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - (*info).website_url = _tmp6_; + (*info).website_url = _tmp5_; #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" (*info).is_license_wordwrapped = FALSE; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - _tmp7_ = g_strdup (RESOURCES_LICENSE); + _tmp6_ = g_strdup (RESOURCES_LICENSE); #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" _g_free0 ((*info).license); #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - (*info).license = _tmp7_; + (*info).license = _tmp6_; #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - _tmp8_ = shotwell_transition_descriptor_icon_pixbuf_set; + _tmp7_ = shotwell_transition_descriptor_icon_pixbuf_set; #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - _tmp8__length1 = shotwell_transition_descriptor_icon_pixbuf_set_length1; + _tmp7__length1 = shotwell_transition_descriptor_icon_pixbuf_set_length1; #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup1 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_); + _tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup1 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_); #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - _tmp9__length1 = _tmp8__length1; + _tmp8__length1 = _tmp7__length1; #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" (*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL); #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - (*info).icons = _tmp9_; + (*info).icons = _tmp8_; #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - (*info).icons_length1 = _tmp9__length1; -#line 967 "shotwell-transitions.c" + (*info).icons_length1 = _tmp8__length1; +#line 961 "shotwell-transitions.c" } @@ -972,7 +966,7 @@ static void shotwell_transition_descriptor_real_activation (SpitPluggable* base, ShotwellTransitionDescriptor * self; #line 86 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_TRANSITION_DESCRIPTOR, ShotwellTransitionDescriptor); -#line 975 "shotwell-transitions.c" +#line 969 "shotwell-transitions.c" } @@ -981,7 +975,7 @@ static SpitTransitionsEffect* shotwell_transition_descriptor_real_create (Shotwe g_critical ("Type `%s' does not implement abstract method `shotwell_transition_descriptor_create'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 89 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" return NULL; -#line 984 "shotwell-transitions.c" +#line 978 "shotwell-transitions.c" } @@ -990,7 +984,7 @@ SpitTransitionsEffect* shotwell_transition_descriptor_create (ShotwellTransition g_return_val_if_fail (IS_SHOTWELL_TRANSITION_DESCRIPTOR (self), NULL); #line 89 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" return SHOTWELL_TRANSITION_DESCRIPTOR_GET_CLASS (self)->create (self, host); -#line 993 "shotwell-transitions.c" +#line 987 "shotwell-transitions.c" } @@ -998,14 +992,14 @@ static void shotwell_transition_descriptor_class_init (ShotwellTransitionDescrip #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" shotwell_transition_descriptor_parent_class = g_type_class_peek_parent (klass); #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) shotwell_transition_descriptor_real_get_id; + ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) shotwell_transition_descriptor_real_get_id; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) shotwell_transition_descriptor_real_get_pluggable_name; + ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) shotwell_transition_descriptor_real_get_pluggable_name; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) shotwell_transition_descriptor_real_create; + ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) shotwell_transition_descriptor_real_create; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" G_OBJECT_CLASS (klass)->finalize = shotwell_transition_descriptor_finalize; -#line 1008 "shotwell-transitions.c" +#line 1002 "shotwell-transitions.c" } @@ -1013,16 +1007,16 @@ static void shotwell_transition_descriptor_spit_pluggable_interface_init (SpitPl #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" shotwell_transition_descriptor_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface); #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) shotwell_transition_descriptor_real_get_pluggable_interface; + iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) shotwell_transition_descriptor_real_get_pluggable_interface; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - iface->get_id = (const gchar* (*)(SpitPluggable*)) shotwell_transition_descriptor_get_id; + iface->get_id = (const gchar* (*) (SpitPluggable *)) shotwell_transition_descriptor_get_id; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) shotwell_transition_descriptor_get_pluggable_name; + iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) shotwell_transition_descriptor_get_pluggable_name; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) shotwell_transition_descriptor_real_get_info; + iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) shotwell_transition_descriptor_real_get_info; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - iface->activation = (void (*)(SpitPluggable*, gboolean)) shotwell_transition_descriptor_real_activation; -#line 1025 "shotwell-transitions.c" + iface->activation = (void (*) (SpitPluggable *, gboolean)) shotwell_transition_descriptor_real_activation; +#line 1019 "shotwell-transitions.c" } @@ -1030,8 +1024,8 @@ static void shotwell_transition_descriptor_spit_transitions_descriptor_interface #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" shotwell_transition_descriptor_spit_transitions_descriptor_parent_iface = g_type_interface_peek_parent (iface); #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - iface->create = (SpitTransitionsEffect* (*)(SpitTransitionsDescriptor*, SpitHostInterface*)) shotwell_transition_descriptor_create; -#line 1034 "shotwell-transitions.c" + iface->create = (SpitTransitionsEffect* (*) (SpitTransitionsDescriptor *, SpitHostInterface*)) shotwell_transition_descriptor_create; +#line 1028 "shotwell-transitions.c" } @@ -1039,13 +1033,13 @@ static void shotwell_transition_descriptor_instance_init (ShotwellTransitionDesc } -static void shotwell_transition_descriptor_finalize (GObject* obj) { +static void shotwell_transition_descriptor_finalize (GObject * obj) { ShotwellTransitionDescriptor * self; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_TRANSITION_DESCRIPTOR, ShotwellTransitionDescriptor); #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" G_OBJECT_CLASS (shotwell_transition_descriptor_parent_class)->finalize (obj); -#line 1048 "shotwell-transitions.c" +#line 1042 "shotwell-transitions.c" } |