Update upstream source from tag 'upstream/0.26.4'

Update to upstream version '0.26.4'
with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4

1 files changed, 120 insertions, 104 deletions

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