Merge branch 'feature/upstream' into develop

1 files changed, 167 insertions, 104 deletions

diff --git a/plugins/common/BuilderPane.c b/plugins/common/BuilderPane.c
index 5797f7d..5bfa676 100644
--- a/plugins/common/BuilderPane.c
+++ b/plugins/common/BuilderPane.c
@@ -1,4 +1,4 @@
-/* BuilderPane.c generated by valac 0.36.6, the Vala compiler
+/* BuilderPane.c generated by valac 0.40.4, the Vala compiler
  * generated from BuilderPane.vala, do not modify */
 
 /* Copyright 2016 Jens Georg <mail@jensge.org>
@@ -7,6 +7,7 @@
  * See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include "shotwell-plugin-dev-1.0.h"
@@ -25,6 +26,15 @@
 typedef struct _ShotwellPluginsCommonBuilderPane ShotwellPluginsCommonBuilderPane;
 typedef struct _ShotwellPluginsCommonBuilderPaneClass ShotwellPluginsCommonBuilderPaneClass;
 typedef struct _ShotwellPluginsCommonBuilderPanePrivate ShotwellPluginsCommonBuilderPanePrivate;
+enum  {
+	SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_0_PROPERTY,
+	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,
+	SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_NUM_PROPERTIES
+};
+static GParamSpec* shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_NUM_PROPERTIES];
 #define _g_free0(var) (var = (g_free (var), NULL))
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
@@ -55,13 +65,6 @@ static SpitPublishingDialogPaneIface * shotwell_plugins_common_builder_pane_spit
 
 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_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);
 gboolean shotwell_plugins_common_builder_pane_get_connect_signals (ShotwellPluginsCommonBuilderPane* self);
@@ -77,23 +80,37 @@ static void shotwell_plugins_common_builder_pane_real_on_pane_installed (Shotwel
 void shotwell_plugins_common_builder_pane_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self);
 static void shotwell_plugins_common_builder_pane_real_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self);
 ShotwellPluginsCommonBuilderPane* shotwell_plugins_common_builder_pane_construct (GType object_type);
-static void shotwell_plugins_common_builder_pane_set_preferred_geometry (ShotwellPluginsCommonBuilderPane* self, SpitPublishingDialogPaneGeometryOptions value);
-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_set_preferred_geometry (ShotwellPluginsCommonBuilderPane* self,
+                                                                  SpitPublishingDialogPaneGeometryOptions value);
+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 _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);
-
-
-static gpointer _g_object_ref0 (gpointer self) {
+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);
+
+
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 32 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 93 "BuilderPane.c"
+#line 108 "BuilderPane.c"
 }
 
 
-static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base) {
+static void
+shotwell_plugins_common_builder_pane_real_constructed (GObject* base)
+{
 	ShotwellPluginsCommonBuilderPane * self;
 	gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -141,13 +158,13 @@ static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base
 	_tmp7_ = self->priv->_connect_signals;
 #line 28 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	if (_tmp7_) {
-#line 145 "BuilderPane.c"
+#line 162 "BuilderPane.c"
 		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"
 		gtk_builder_connect_signals (_tmp8_, NULL);
-#line 151 "BuilderPane.c"
+#line 168 "BuilderPane.c"
 	}
 #line 32 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	_tmp9_ = self->priv->builder;
@@ -167,7 +184,7 @@ static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base
 	_tmp14_ = _tmp13_;
 #line 35 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	if (_tmp14_ != NULL) {
-#line 171 "BuilderPane.c"
+#line 188 "BuilderPane.c"
 		GtkWidget* _tmp15_;
 		GtkContainer* _tmp16_;
 		GtkContainer* _tmp17_;
@@ -182,12 +199,14 @@ static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base
 		_tmp18_ = self->priv->content;
 #line 36 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		gtk_container_remove (_tmp17_, _tmp18_);
-#line 186 "BuilderPane.c"
+#line 203 "BuilderPane.c"
 	}
 }
 
 
-static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+shotwell_plugins_common_builder_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
 	ShotwellPluginsCommonBuilderPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
 	SpitPublishingDialogPaneGeometryOptions _tmp0_;
@@ -199,11 +218,13 @@ static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_p
 	result = _tmp0_;
 #line 41 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	return result;
-#line 203 "BuilderPane.c"
+#line 222 "BuilderPane.c"
 }
 
 
-static GtkWidget* shotwell_plugins_common_builder_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+shotwell_plugins_common_builder_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
 	ShotwellPluginsCommonBuilderPane * self;
 	GtkWidget* result = NULL;
 	GtkWidget* _tmp0_;
@@ -218,11 +239,13 @@ static GtkWidget* shotwell_plugins_common_builder_pane_real_get_widget (SpitPubl
 	result = _tmp1_;
 #line 45 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	return result;
-#line 222 "BuilderPane.c"
+#line 243 "BuilderPane.c"
 }
 
 
-GtkBuilder* shotwell_plugins_common_builder_pane_get_builder (ShotwellPluginsCommonBuilderPane* self) {
+GtkBuilder*
+shotwell_plugins_common_builder_pane_get_builder (ShotwellPluginsCommonBuilderPane* self)
+{
 	GtkBuilder* result = NULL;
 	GtkBuilder* _tmp0_;
 	GtkBuilder* _tmp1_;
@@ -236,11 +259,13 @@ GtkBuilder* shotwell_plugins_common_builder_pane_get_builder (ShotwellPluginsCom
 	result = _tmp1_;
 #line 49 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	return result;
-#line 240 "BuilderPane.c"
+#line 263 "BuilderPane.c"
 }
 
 
-static GtkWidget* shotwell_plugins_common_builder_pane_real_get_default_widget (ShotwellPluginsCommonBuilderPane* self) {
+static GtkWidget*
+shotwell_plugins_common_builder_pane_real_get_default_widget (ShotwellPluginsCommonBuilderPane* self)
+{
 	GtkWidget* result = NULL;
 	GtkBuilder* _tmp0_;
 	GtkBuilder* _tmp1_;
@@ -274,56 +299,70 @@ static GtkWidget* shotwell_plugins_common_builder_pane_real_get_default_widget (
 	result = _tmp7_;
 #line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	return result;
-#line 278 "BuilderPane.c"
+#line 303 "BuilderPane.c"
 }
 
 
-GtkWidget* shotwell_plugins_common_builder_pane_get_default_widget (ShotwellPluginsCommonBuilderPane* self) {
+GtkWidget*
+shotwell_plugins_common_builder_pane_get_default_widget (ShotwellPluginsCommonBuilderPane* self)
+{
 #line 52 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), NULL);
 #line 52 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	return SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_CLASS (self)->get_default_widget (self);
-#line 287 "BuilderPane.c"
+#line 314 "BuilderPane.c"
 }
 
 
-static void shotwell_plugins_common_builder_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* self) {
+static void
+shotwell_plugins_common_builder_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* self)
+{
 }
 
 
-void shotwell_plugins_common_builder_pane_on_pane_installed (ShotwellPluginsCommonBuilderPane* self) {
+void
+shotwell_plugins_common_builder_pane_on_pane_installed (ShotwellPluginsCommonBuilderPane* self)
+{
 #line 56 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
 #line 56 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_CLASS (self)->on_pane_installed (self);
-#line 300 "BuilderPane.c"
+#line 331 "BuilderPane.c"
 }
 
 
-static void shotwell_plugins_common_builder_pane_real_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self) {
+static void
+shotwell_plugins_common_builder_pane_real_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self)
+{
 }
 
 
-void shotwell_plugins_common_builder_pane_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self) {
+void
+shotwell_plugins_common_builder_pane_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self)
+{
 #line 58 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
 #line 58 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_CLASS (self)->on_pane_uninstalled (self);
-#line 313 "BuilderPane.c"
+#line 348 "BuilderPane.c"
 }
 
 
-ShotwellPluginsCommonBuilderPane* shotwell_plugins_common_builder_pane_construct (GType object_type) {
+ShotwellPluginsCommonBuilderPane*
+shotwell_plugins_common_builder_pane_construct (GType object_type)
+{
 	ShotwellPluginsCommonBuilderPane * self = NULL;
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	self = (ShotwellPluginsCommonBuilderPane*) g_object_new (object_type, NULL);
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	return self;
-#line 323 "BuilderPane.c"
+#line 360 "BuilderPane.c"
 }
 
 
-SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_get_preferred_geometry (ShotwellPluginsCommonBuilderPane* self) {
+SpitPublishingDialogPaneGeometryOptions
+shotwell_plugins_common_builder_pane_get_preferred_geometry (ShotwellPluginsCommonBuilderPane* self)
+{
 	SpitPublishingDialogPaneGeometryOptions result;
 	SpitPublishingDialogPaneGeometryOptions _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -334,29 +373,30 @@ SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_get
 	result = _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	return result;
-#line 338 "BuilderPane.c"
+#line 377 "BuilderPane.c"
 }
 
 
-static void shotwell_plugins_common_builder_pane_set_preferred_geometry (ShotwellPluginsCommonBuilderPane* self, SpitPublishingDialogPaneGeometryOptions value) {
+static void
+shotwell_plugins_common_builder_pane_set_preferred_geometry (ShotwellPluginsCommonBuilderPane* self,
+                                                             SpitPublishingDialogPaneGeometryOptions value)
+{
 #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"
 	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"
-		_tmp0_ = value;
 #line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-		self->priv->_preferred_geometry = _tmp0_;
+		self->priv->_preferred_geometry = value;
 #line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-		g_object_notify ((GObject *) self, "preferred-geometry");
-#line 355 "BuilderPane.c"
+		g_object_notify_by_pspec ((GObject *) self, shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY_PROPERTY]);
+#line 393 "BuilderPane.c"
 	}
 }
 
 
-gchar* shotwell_plugins_common_builder_pane_get_resource_path (ShotwellPluginsCommonBuilderPane* self) {
+gchar*
+shotwell_plugins_common_builder_pane_get_resource_path (ShotwellPluginsCommonBuilderPane* self)
+{
 	gchar* result;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -370,34 +410,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 374 "BuilderPane.c"
+#line 414 "BuilderPane.c"
 }
 
 
-static void shotwell_plugins_common_builder_pane_set_resource_path (ShotwellPluginsCommonBuilderPane* self, const gchar* value) {
+static void
+shotwell_plugins_common_builder_pane_set_resource_path (ShotwellPluginsCommonBuilderPane* self,
+                                                        const gchar* value)
+{
 #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"
 	if (g_strcmp0 (value, shotwell_plugins_common_builder_pane_get_resource_path (self)) != 0) {
-#line 383 "BuilderPane.c"
-		const gchar* _tmp0_;
-		gchar* _tmp1_;
+#line 426 "BuilderPane.c"
+		gchar* _tmp0_;
 #line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-		_tmp0_ = value;
-#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-		_tmp1_ = g_strdup (_tmp0_);
+		_tmp0_ = g_strdup (value);
 #line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		_g_free0 (self->priv->_resource_path);
 #line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-		self->priv->_resource_path = _tmp1_;
+		self->priv->_resource_path = _tmp0_;
 #line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-		g_object_notify ((GObject *) self, "resource-path");
-#line 396 "BuilderPane.c"
+		g_object_notify_by_pspec ((GObject *) self, shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH_PROPERTY]);
+#line 436 "BuilderPane.c"
 	}
 }
 
 
-gboolean shotwell_plugins_common_builder_pane_get_connect_signals (ShotwellPluginsCommonBuilderPane* self) {
+gboolean
+shotwell_plugins_common_builder_pane_get_connect_signals (ShotwellPluginsCommonBuilderPane* self)
+{
 	gboolean result;
 	gboolean _tmp0_;
 #line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -408,29 +450,30 @@ 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 412 "BuilderPane.c"
+#line 454 "BuilderPane.c"
 }
 
 
-static void shotwell_plugins_common_builder_pane_set_connect_signals (ShotwellPluginsCommonBuilderPane* self, gboolean value) {
+static void
+shotwell_plugins_common_builder_pane_set_connect_signals (ShotwellPluginsCommonBuilderPane* self,
+                                                          gboolean value)
+{
 #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"
 	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 = value;
 #line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-		g_object_notify ((GObject *) self, "connect-signals");
-#line 429 "BuilderPane.c"
+		g_object_notify_by_pspec ((GObject *) self, shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS_PROPERTY]);
+#line 470 "BuilderPane.c"
 	}
 }
 
 
-gchar* shotwell_plugins_common_builder_pane_get_default_id (ShotwellPluginsCommonBuilderPane* self) {
+gchar*
+shotwell_plugins_common_builder_pane_get_default_id (ShotwellPluginsCommonBuilderPane* self)
+{
 	gchar* result;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -444,34 +487,36 @@ 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 448 "BuilderPane.c"
+#line 491 "BuilderPane.c"
 }
 
 
-static void shotwell_plugins_common_builder_pane_set_default_id (ShotwellPluginsCommonBuilderPane* self, const gchar* value) {
+static void
+shotwell_plugins_common_builder_pane_set_default_id (ShotwellPluginsCommonBuilderPane* self,
+                                                     const gchar* value)
+{
 #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"
 	if (g_strcmp0 (value, shotwell_plugins_common_builder_pane_get_default_id (self)) != 0) {
-#line 457 "BuilderPane.c"
-		const gchar* _tmp0_;
-		gchar* _tmp1_;
+#line 503 "BuilderPane.c"
+		gchar* _tmp0_;
 #line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-		_tmp0_ = value;
-#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-		_tmp1_ = g_strdup (_tmp0_);
+		_tmp0_ = g_strdup (value);
 #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 = _tmp0_;
 #line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-		g_object_notify ((GObject *) self, "default-id");
-#line 470 "BuilderPane.c"
+		g_object_notify_by_pspec ((GObject *) self, shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID_PROPERTY]);
+#line 513 "BuilderPane.c"
 	}
 }
 
 
-static void shotwell_plugins_common_builder_pane_class_init (ShotwellPluginsCommonBuilderPaneClass * klass) {
+static void
+shotwell_plugins_common_builder_pane_class_init (ShotwellPluginsCommonBuilderPaneClass * klass)
+{
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	shotwell_plugins_common_builder_pane_parent_class = g_type_class_peek_parent (klass);
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -491,18 +536,20 @@ 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_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));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY_PROPERTY, shotwell_plugins_common_builder_pane_properties[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_STRINGS | 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_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));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH_PROPERTY, shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH_PROPERTY] = g_param_spec_string ("resource-path", "resource-path", "resource-path", NULL, G_PARAM_STATIC_STRINGS | 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_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));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS_PROPERTY, shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS_PROPERTY] = g_param_spec_boolean ("connect-signals", "connect-signals", "connect-signals", FALSE, G_PARAM_STATIC_STRINGS | 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_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"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID_PROPERTY, shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID_PROPERTY] = g_param_spec_string ("default-id", "default-id", "default-id", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 547 "BuilderPane.c"
 }
 
 
-static void shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
 #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"
@@ -513,11 +560,13 @@ static void shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_int
 	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 517 "BuilderPane.c"
+#line 564 "BuilderPane.c"
 }
 
 
-static void shotwell_plugins_common_builder_pane_instance_init (ShotwellPluginsCommonBuilderPane * self) {
+static void
+shotwell_plugins_common_builder_pane_instance_init (ShotwellPluginsCommonBuilderPane * self)
+{
 	gchar* _tmp0_;
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	self->priv = SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_PRIVATE (self);
@@ -529,11 +578,13 @@ 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 533 "BuilderPane.c"
+#line 582 "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);
@@ -547,11 +598,13 @@ 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 551 "BuilderPane.c"
+#line 602 "BuilderPane.c"
 }
 
 
-GType shotwell_plugins_common_builder_pane_get_type (void) {
+GType
+shotwell_plugins_common_builder_pane_get_type (void)
+{
 	static volatile gsize shotwell_plugins_common_builder_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&shotwell_plugins_common_builder_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (ShotwellPluginsCommonBuilderPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) shotwell_plugins_common_builder_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ShotwellPluginsCommonBuilderPane), 0, (GInstanceInitFunc) shotwell_plugins_common_builder_pane_instance_init, NULL };
@@ -565,7 +618,12 @@ GType shotwell_plugins_common_builder_pane_get_type (void) {
 }
 
 
-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_get_property (GObject * object,
+                                                         guint property_id,
+                                                         GValue * value,
+                                                         GParamSpec * pspec)
+{
 	ShotwellPluginsCommonBuilderPane * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane);
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -594,18 +652,23 @@ static void _vala_shotwell_plugins_common_builder_pane_get_property (GObject * o
 		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 598 "BuilderPane.c"
+#line 656 "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 604 "BuilderPane.c"
+#line 662 "BuilderPane.c"
 	}
 }
 
 
-static void _vala_shotwell_plugins_common_builder_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+static void
+_vala_shotwell_plugins_common_builder_pane_set_property (GObject * object,
+                                                         guint property_id,
+                                                         const GValue * value,
+                                                         GParamSpec * pspec)
+{
 	ShotwellPluginsCommonBuilderPane * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane);
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -634,13 +697,13 @@ static void _vala_shotwell_plugins_common_builder_pane_set_property (GObject * o
 		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 638 "BuilderPane.c"
+#line 701 "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 644 "BuilderPane.c"
+#line 707 "BuilderPane.c"
 	}
 }