summaryrefslogtreecommitdiff
path: root/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 16:48:02 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 16:48:02 +0100
commitabdaad68fb94e2d61448a6dfc14847df8a2c32b9 (patch)
tree26855c5dd3bfffdbf319d5ba4a38223a28de3e7c /plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
parent0f67b3cc674377559e66c5a6729fd499049a992f (diff)
parentdd7f98a232efe86f6e6055119c9414a0f9d9e67b (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c')
-rw-r--r--plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c88
1 files changed, 41 insertions, 47 deletions
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"
}