Merge branch 'feature/upstream' into develop

1 files changed, 74 insertions, 66 deletions

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"
 	}
 }