Merge branch 'feature/upstream' into develop

1 files changed, 188 insertions, 137 deletions

diff --git a/src/config/Config.c b/src/config/Config.c
index 7008805..7dd8334 100644
--- a/src/config/Config.c
+++ b/src/config/Config.c
@@ -1,4 +1,4 @@
-/* Config.c generated by valac 0.36.6, the Vala compiler
+/* Config.c generated by valac 0.40.4, the Vala compiler
  * generated from Config.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -15,6 +15,7 @@
  * the preconfigure() method, implement it, and ensure in init() that it's been called.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -60,6 +61,11 @@ typedef struct _Dimensions Dimensions;
 typedef struct _ConfigFacade ConfigFacade;
 typedef struct _ConfigFacadeClass ConfigFacadeClass;
 typedef struct _ConfigFacadePrivate ConfigFacadePrivate;
+enum  {
+	CONFIG_FACADE_0_PROPERTY,
+	CONFIG_FACADE_NUM_PROPERTIES
+};
+static GParamSpec* config_facade_properties[CONFIG_FACADE_NUM_PROPERTIES];
 #define _g_free0(var) (var = (g_free (var), NULL))
 
 #define TYPE_GSETTINGS_CONFIGURATION_ENGINE (gsettings_configuration_engine_get_type ())
@@ -84,9 +90,9 @@ typedef struct _ConfigurationEngineIface ConfigurationEngineIface;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 enum  {
 	CONFIG_FACADE_COLORS_CHANGED_SIGNAL,
-	CONFIG_FACADE_LAST_SIGNAL
+	CONFIG_FACADE_NUM_SIGNALS
 };
-static guint config_facade_signals[CONFIG_FACADE_LAST_SIGNAL] = {0};
+static guint config_facade_signals[CONFIG_FACADE_NUM_SIGNALS] = {0};
 
 struct _Dimensions {
 	gint width;
@@ -422,9 +428,6 @@ GType raw_developer_get_type (void) G_GNUC_CONST;
 GType fuzzy_property_state_get_type (void) G_GNUC_CONST;
 GType config_facade_get_type (void) G_GNUC_CONST;
 #define CONFIG_FACADE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CONFIG_TYPE_FACADE, ConfigFacadePrivate))
-enum  {
-	CONFIG_FACADE_DUMMY_PROPERTY
-};
 #define CONFIG_FACADE_WIDTH_DEFAULT 1024
 #define CONFIG_FACADE_HEIGHT_DEFAULT 768
 #define CONFIG_FACADE_SIDEBAR_MIN_POSITION 180
@@ -448,24 +451,37 @@ GType gsettings_configuration_engine_get_type (void) G_GNUC_CONST;
 GType configurable_property_get_type (void) G_GNUC_CONST;
 GQuark configuration_error_quark (void);
 GType configuration_engine_get_type (void) G_GNUC_CONST;
-ConfigurationFacade* configuration_facade_construct (GType object_type, ConfigurationEngine* engine);
+ConfigurationFacade* configuration_facade_construct (GType object_type,
+                                                     ConfigurationEngine* engine);
 static void config_facade_on_color_name_changed (ConfigFacade* self);
-static void _config_facade_on_color_name_changed_configuration_facade_bg_color_name_changed (ConfigurationFacade* _sender, gpointer self);
-static void _config_facade_on_color_name_changed_configuration_facade_transparent_background_type_changed (ConfigurationFacade* _sender, gpointer self);
-static void _config_facade_on_color_name_changed_configuration_facade_transparent_background_color_changed (ConfigurationFacade* _sender, gpointer self);
+static void _config_facade_on_color_name_changed_configuration_facade_bg_color_name_changed (ConfigurationFacade* _sender,
+                                                                                      gpointer self);
+static void _config_facade_on_color_name_changed_configuration_facade_transparent_background_type_changed (ConfigurationFacade* _sender,
+                                                                                                    gpointer self);
+static void _config_facade_on_color_name_changed_configuration_facade_transparent_background_color_changed (ConfigurationFacade* _sender,
+                                                                                                     gpointer self);
 ConfigFacade* config_facade_get_instance (void);
-static void config_facade_set_text_colors (ConfigFacade* self, GdkRGBA* bg_color);
+static void config_facade_set_text_colors (ConfigFacade* self,
+                                    GdkRGBA* bg_color);
 static void config_facade_get_colors (ConfigFacade* self);
 gchar* configuration_facade_get_bg_color_name (ConfigurationFacade* self);
 gboolean is_color_parsable (const gchar* spec);
-void parse_color (const gchar* spec, GdkRGBA* result);
-void config_facade_get_bg_color (ConfigFacade* self, GdkRGBA* result);
+void parse_color (const gchar* spec,
+                  GdkRGBA* result);
+void config_facade_get_bg_color (ConfigFacade* self,
+                                 GdkRGBA* result);
 gboolean is_string_empty (const gchar* s);
-void config_facade_get_selected_color (ConfigFacade* self, gboolean in_focus, GdkRGBA* result);
-void config_facade_get_unselected_color (ConfigFacade* self, GdkRGBA* result);
-void config_facade_get_border_color (ConfigFacade* self, GdkRGBA* result);
-void config_facade_set_bg_color (ConfigFacade* self, GdkRGBA* color);
-void configuration_facade_set_bg_color_name (ConfigurationFacade* self, const gchar* color_name);
+void config_facade_get_selected_color (ConfigFacade* self,
+                                       gboolean in_focus,
+                                       GdkRGBA* result);
+void config_facade_get_unselected_color (ConfigFacade* self,
+                                         GdkRGBA* result);
+void config_facade_get_border_color (ConfigFacade* self,
+                                     GdkRGBA* result);
+void config_facade_set_bg_color (ConfigFacade* self,
+                                 GdkRGBA* color);
+void configuration_facade_set_bg_color_name (ConfigurationFacade* self,
+                                             const gchar* color_name);
 void config_facade_commit_bg_color (ConfigFacade* self);
 static void config_facade_finalize (GObject * obj);
 void config_preconfigure (void);
@@ -473,28 +489,39 @@ void config_init (GError** error);
 void config_terminate (void);
 
 
-static void _config_facade_on_color_name_changed_configuration_facade_bg_color_name_changed (ConfigurationFacade* _sender, gpointer self) {
+static void
+_config_facade_on_color_name_changed_configuration_facade_bg_color_name_changed (ConfigurationFacade* _sender,
+                                                                                 gpointer self)
+{
 #line 49 "/home/jens/Source/shotwell/src/config/Config.vala"
 	config_facade_on_color_name_changed ((ConfigFacade*) self);
-#line 480 "Config.c"
+#line 499 "Config.c"
 }
 
 
-static void _config_facade_on_color_name_changed_configuration_facade_transparent_background_type_changed (ConfigurationFacade* _sender, gpointer self) {
+static void
+_config_facade_on_color_name_changed_configuration_facade_transparent_background_type_changed (ConfigurationFacade* _sender,
+                                                                                               gpointer self)
+{
 #line 50 "/home/jens/Source/shotwell/src/config/Config.vala"
 	config_facade_on_color_name_changed ((ConfigFacade*) self);
-#line 487 "Config.c"
+#line 509 "Config.c"
 }
 
 
-static void _config_facade_on_color_name_changed_configuration_facade_transparent_background_color_changed (ConfigurationFacade* _sender, gpointer self) {
+static void
+_config_facade_on_color_name_changed_configuration_facade_transparent_background_color_changed (ConfigurationFacade* _sender,
+                                                                                                gpointer self)
+{
 #line 51 "/home/jens/Source/shotwell/src/config/Config.vala"
 	config_facade_on_color_name_changed ((ConfigFacade*) self);
-#line 494 "Config.c"
+#line 519 "Config.c"
 }
 
 
-static ConfigFacade* config_facade_construct (GType object_type) {
+static ConfigFacade*
+config_facade_construct (GType object_type)
+{
 	ConfigFacade * self = NULL;
 	GSettingsConfigurationEngine* _tmp0_;
 	GSettingsConfigurationEngine* _tmp1_;
@@ -514,25 +541,31 @@ static ConfigFacade* config_facade_construct (GType object_type) {
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "transparent-background-color-changed", (GCallback) _config_facade_on_color_name_changed_configuration_facade_transparent_background_color_changed, self, 0);
 #line 46 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return self;
-#line 518 "Config.c"
+#line 545 "Config.c"
 }
 
 
-static ConfigFacade* config_facade_new (void) {
+static ConfigFacade*
+config_facade_new (void)
+{
 #line 46 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return config_facade_construct (CONFIG_TYPE_FACADE);
-#line 525 "Config.c"
+#line 554 "Config.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 58 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 532 "Config.c"
+#line 563 "Config.c"
 }
 
 
-ConfigFacade* config_facade_get_instance (void) {
+ConfigFacade*
+config_facade_get_instance (void)
+{
 	ConfigFacade* result = NULL;
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp2_;
@@ -541,7 +574,7 @@ ConfigFacade* config_facade_get_instance (void) {
 	_tmp0_ = config_facade_instance;
 #line 55 "/home/jens/Source/shotwell/src/config/Config.vala"
 	if (_tmp0_ == NULL) {
-#line 545 "Config.c"
+#line 578 "Config.c"
 		ConfigFacade* _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp1_ = config_facade_new ();
@@ -549,7 +582,7 @@ ConfigFacade* config_facade_get_instance (void) {
 		_g_object_unref0 (config_facade_instance);
 #line 56 "/home/jens/Source/shotwell/src/config/Config.vala"
 		config_facade_instance = _tmp1_;
-#line 553 "Config.c"
+#line 586 "Config.c"
 	}
 #line 58 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp2_ = config_facade_instance;
@@ -559,20 +592,25 @@ ConfigFacade* config_facade_get_instance (void) {
 	result = _tmp3_;
 #line 58 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return result;
-#line 563 "Config.c"
+#line 596 "Config.c"
 }
 
 
-static void config_facade_on_color_name_changed (ConfigFacade* self) {
+static void
+config_facade_on_color_name_changed (ConfigFacade* self)
+{
 #line 61 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
 #line 62 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_signal_emit (self, config_facade_signals[CONFIG_FACADE_COLORS_CHANGED_SIGNAL], 0);
-#line 572 "Config.c"
+#line 607 "Config.c"
 }
 
 
-static void config_facade_set_text_colors (ConfigFacade* self, GdkRGBA* bg_color) {
+static void
+config_facade_set_text_colors (ConfigFacade* self,
+                               GdkRGBA* bg_color)
+{
 	GdkRGBA _tmp0_;
 	gdouble _tmp1_;
 #line 65 "/home/jens/Source/shotwell/src/config/Config.vala"
@@ -585,7 +623,7 @@ static void config_facade_set_text_colors (ConfigFacade* self, GdkRGBA* bg_color
 	_tmp1_ = _tmp0_.red;
 #line 69 "/home/jens/Source/shotwell/src/config/Config.vala"
 	if (_tmp1_ > CONFIG_FACADE_BLACK_THRESHOLD) {
-#line 589 "Config.c"
+#line 627 "Config.c"
 		gchar* _tmp2_;
 		gchar* _tmp3_;
 		gchar* _tmp4_;
@@ -614,7 +652,7 @@ static void config_facade_set_text_colors (ConfigFacade* self, GdkRGBA* bg_color
 		_g_free0 (self->priv->border_color);
 #line 73 "/home/jens/Source/shotwell/src/config/Config.vala"
 		self->priv->border_color = _tmp5_;
-#line 618 "Config.c"
+#line 656 "Config.c"
 	} else {
 		gchar* _tmp6_;
 		gchar* _tmp7_;
@@ -644,17 +682,18 @@ static void config_facade_set_text_colors (ConfigFacade* self, GdkRGBA* bg_color
 		_g_free0 (self->priv->border_color);
 #line 78 "/home/jens/Source/shotwell/src/config/Config.vala"
 		self->priv->border_color = _tmp9_;
-#line 648 "Config.c"
+#line 686 "Config.c"
 	}
 }
 
 
-static void config_facade_get_colors (ConfigFacade* self) {
+static void
+config_facade_get_colors (ConfigFacade* self)
+{
 	gchar* _tmp0_;
 	const gchar* _tmp1_;
-	gboolean _tmp2_;
-	const gchar* _tmp4_;
-	GdkRGBA _tmp5_ = {0};
+	const gchar* _tmp3_;
+	GdkRGBA _tmp4_ = {0};
 #line 82 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
 #line 83 "/home/jens/Source/shotwell/src/config/Config.vala"
@@ -666,177 +705,173 @@ static void config_facade_get_colors (ConfigFacade* self) {
 #line 85 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp1_ = self->priv->bg_color;
 #line 85 "/home/jens/Source/shotwell/src/config/Config.vala"
-	_tmp2_ = is_color_parsable (_tmp1_);
-#line 85 "/home/jens/Source/shotwell/src/config/Config.vala"
-	if (!_tmp2_) {
-#line 673 "Config.c"
-		gchar* _tmp3_;
+	if (!is_color_parsable (_tmp1_)) {
+#line 710 "Config.c"
+		gchar* _tmp2_;
 #line 86 "/home/jens/Source/shotwell/src/config/Config.vala"
-		_tmp3_ = g_strdup (CONFIG_FACADE_DEFAULT_BG_COLOR);
+		_tmp2_ = g_strdup (CONFIG_FACADE_DEFAULT_BG_COLOR);
 #line 86 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_g_free0 (self->priv->bg_color);
 #line 86 "/home/jens/Source/shotwell/src/config/Config.vala"
-		self->priv->bg_color = _tmp3_;
-#line 681 "Config.c"
+		self->priv->bg_color = _tmp2_;
+#line 718 "Config.c"
 	}
 #line 88 "/home/jens/Source/shotwell/src/config/Config.vala"
-	_tmp4_ = self->priv->bg_color;
+	_tmp3_ = self->priv->bg_color;
 #line 88 "/home/jens/Source/shotwell/src/config/Config.vala"
-	parse_color (_tmp4_, &_tmp5_);
+	parse_color (_tmp3_, &_tmp4_);
 #line 88 "/home/jens/Source/shotwell/src/config/Config.vala"
-	config_facade_set_text_colors (self, &_tmp5_);
-#line 689 "Config.c"
+	config_facade_set_text_colors (self, &_tmp4_);
+#line 726 "Config.c"
 }
 
 
-void config_facade_get_bg_color (ConfigFacade* self, GdkRGBA* result) {
+void
+config_facade_get_bg_color (ConfigFacade* self,
+                            GdkRGBA* result)
+{
 	const gchar* _tmp0_;
-	gboolean _tmp1_;
-	const gchar* _tmp2_;
-	GdkRGBA _tmp3_ = {0};
+	const gchar* _tmp1_;
+	GdkRGBA _tmp2_ = {0};
 #line 91 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
 #line 92 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp0_ = self->priv->bg_color;
 #line 92 "/home/jens/Source/shotwell/src/config/Config.vala"
-	_tmp1_ = is_string_empty (_tmp0_);
-#line 92 "/home/jens/Source/shotwell/src/config/Config.vala"
-	if (_tmp1_) {
+	if (is_string_empty (_tmp0_)) {
 #line 93 "/home/jens/Source/shotwell/src/config/Config.vala"
 		config_facade_get_colors (self);
-#line 708 "Config.c"
+#line 745 "Config.c"
 	}
 #line 95 "/home/jens/Source/shotwell/src/config/Config.vala"
-	_tmp2_ = self->priv->bg_color;
+	_tmp1_ = self->priv->bg_color;
 #line 95 "/home/jens/Source/shotwell/src/config/Config.vala"
-	parse_color (_tmp2_, &_tmp3_);
+	parse_color (_tmp1_, &_tmp2_);
 #line 95 "/home/jens/Source/shotwell/src/config/Config.vala"
-	*result = _tmp3_;
+	*result = _tmp2_;
 #line 95 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return;
-#line 718 "Config.c"
+#line 755 "Config.c"
 }
 
 
-void config_facade_get_selected_color (ConfigFacade* self, gboolean in_focus, GdkRGBA* result) {
-	gboolean _tmp0_;
+void
+config_facade_get_selected_color (ConfigFacade* self,
+                                  gboolean in_focus,
+                                  GdkRGBA* result)
+{
 #line 98 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
 #line 99 "/home/jens/Source/shotwell/src/config/Config.vala"
-	_tmp0_ = in_focus;
-#line 99 "/home/jens/Source/shotwell/src/config/Config.vala"
-	if (_tmp0_) {
-#line 730 "Config.c"
+	if (in_focus) {
+#line 768 "Config.c"
+		const gchar* _tmp0_;
 		const gchar* _tmp1_;
-		gboolean _tmp2_;
-		const gchar* _tmp3_;
-		GdkRGBA _tmp4_ = {0};
-#line 100 "/home/jens/Source/shotwell/src/config/Config.vala"
-		_tmp1_ = self->priv->selected_color;
+		GdkRGBA _tmp2_ = {0};
 #line 100 "/home/jens/Source/shotwell/src/config/Config.vala"
-		_tmp2_ = is_string_empty (_tmp1_);
+		_tmp0_ = self->priv->selected_color;
 #line 100 "/home/jens/Source/shotwell/src/config/Config.vala"
-		if (_tmp2_) {
+		if (is_string_empty (_tmp0_)) {
 #line 101 "/home/jens/Source/shotwell/src/config/Config.vala"
 			config_facade_get_colors (self);
-#line 743 "Config.c"
+#line 778 "Config.c"
 		}
 #line 103 "/home/jens/Source/shotwell/src/config/Config.vala"
-		_tmp3_ = self->priv->selected_color;
+		_tmp1_ = self->priv->selected_color;
 #line 103 "/home/jens/Source/shotwell/src/config/Config.vala"
-		parse_color (_tmp3_, &_tmp4_);
+		parse_color (_tmp1_, &_tmp2_);
 #line 103 "/home/jens/Source/shotwell/src/config/Config.vala"
-		*result = _tmp4_;
+		*result = _tmp2_;
 #line 103 "/home/jens/Source/shotwell/src/config/Config.vala"
 		return;
-#line 753 "Config.c"
+#line 788 "Config.c"
 	} else {
-		const gchar* _tmp5_;
-		gboolean _tmp6_;
-		const gchar* _tmp7_;
-		GdkRGBA _tmp8_ = {0};
-#line 105 "/home/jens/Source/shotwell/src/config/Config.vala"
-		_tmp5_ = self->priv->unfocused_selected_color;
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+		GdkRGBA _tmp5_ = {0};
 #line 105 "/home/jens/Source/shotwell/src/config/Config.vala"
-		_tmp6_ = is_string_empty (_tmp5_);
+		_tmp3_ = self->priv->unfocused_selected_color;
 #line 105 "/home/jens/Source/shotwell/src/config/Config.vala"
-		if (_tmp6_) {
+		if (is_string_empty (_tmp3_)) {
 #line 106 "/home/jens/Source/shotwell/src/config/Config.vala"
 			config_facade_get_colors (self);
-#line 767 "Config.c"
+#line 799 "Config.c"
 		}
 #line 108 "/home/jens/Source/shotwell/src/config/Config.vala"
-		_tmp7_ = self->priv->unfocused_selected_color;
+		_tmp4_ = self->priv->unfocused_selected_color;
 #line 108 "/home/jens/Source/shotwell/src/config/Config.vala"
-		parse_color (_tmp7_, &_tmp8_);
+		parse_color (_tmp4_, &_tmp5_);
 #line 108 "/home/jens/Source/shotwell/src/config/Config.vala"
-		*result = _tmp8_;
+		*result = _tmp5_;
 #line 108 "/home/jens/Source/shotwell/src/config/Config.vala"
 		return;
-#line 777 "Config.c"
+#line 809 "Config.c"
 	}
 }
 
 
-void config_facade_get_unselected_color (ConfigFacade* self, GdkRGBA* result) {
+void
+config_facade_get_unselected_color (ConfigFacade* self,
+                                    GdkRGBA* result)
+{
 	const gchar* _tmp0_;
-	gboolean _tmp1_;
-	const gchar* _tmp2_;
-	GdkRGBA _tmp3_ = {0};
+	const gchar* _tmp1_;
+	GdkRGBA _tmp2_ = {0};
 #line 112 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
 #line 113 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp0_ = self->priv->unselected_color;
 #line 113 "/home/jens/Source/shotwell/src/config/Config.vala"
-	_tmp1_ = is_string_empty (_tmp0_);
-#line 113 "/home/jens/Source/shotwell/src/config/Config.vala"
-	if (_tmp1_) {
+	if (is_string_empty (_tmp0_)) {
 #line 114 "/home/jens/Source/shotwell/src/config/Config.vala"
 		config_facade_get_colors (self);
-#line 797 "Config.c"
+#line 829 "Config.c"
 	}
 #line 116 "/home/jens/Source/shotwell/src/config/Config.vala"
-	_tmp2_ = self->priv->unselected_color;
+	_tmp1_ = self->priv->unselected_color;
 #line 116 "/home/jens/Source/shotwell/src/config/Config.vala"
-	parse_color (_tmp2_, &_tmp3_);
+	parse_color (_tmp1_, &_tmp2_);
 #line 116 "/home/jens/Source/shotwell/src/config/Config.vala"
-	*result = _tmp3_;
+	*result = _tmp2_;
 #line 116 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return;
-#line 807 "Config.c"
+#line 839 "Config.c"
 }
 
 
-void config_facade_get_border_color (ConfigFacade* self, GdkRGBA* result) {
+void
+config_facade_get_border_color (ConfigFacade* self,
+                                GdkRGBA* result)
+{
 	const gchar* _tmp0_;
-	gboolean _tmp1_;
-	const gchar* _tmp2_;
-	GdkRGBA _tmp3_ = {0};
+	const gchar* _tmp1_;
+	GdkRGBA _tmp2_ = {0};
 #line 119 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
 #line 120 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp0_ = self->priv->border_color;
 #line 120 "/home/jens/Source/shotwell/src/config/Config.vala"
-	_tmp1_ = is_string_empty (_tmp0_);
-#line 120 "/home/jens/Source/shotwell/src/config/Config.vala"
-	if (_tmp1_) {
+	if (is_string_empty (_tmp0_)) {
 #line 121 "/home/jens/Source/shotwell/src/config/Config.vala"
 		config_facade_get_colors (self);
-#line 826 "Config.c"
+#line 858 "Config.c"
 	}
 #line 123 "/home/jens/Source/shotwell/src/config/Config.vala"
-	_tmp2_ = self->priv->border_color;
+	_tmp1_ = self->priv->border_color;
 #line 123 "/home/jens/Source/shotwell/src/config/Config.vala"
-	parse_color (_tmp2_, &_tmp3_);
+	parse_color (_tmp1_, &_tmp2_);
 #line 123 "/home/jens/Source/shotwell/src/config/Config.vala"
-	*result = _tmp3_;
+	*result = _tmp2_;
 #line 123 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return;
-#line 836 "Config.c"
+#line 868 "Config.c"
 }
 
 
-void config_facade_set_bg_color (ConfigFacade* self, GdkRGBA* color) {
+void
+config_facade_set_bg_color (ConfigFacade* self,
+                            GdkRGBA* color)
+{
 	guint8 col_tmp = 0U;
 	GdkRGBA _tmp0_;
 	gdouble _tmp1_;
@@ -867,11 +902,13 @@ void config_facade_set_bg_color (ConfigFacade* self, GdkRGBA* color) {
 	_tmp4_ = *color;
 #line 132 "/home/jens/Source/shotwell/src/config/Config.vala"
 	config_facade_set_text_colors (self, &_tmp4_);
-#line 871 "Config.c"
+#line 906 "Config.c"
 }
 
 
-void config_facade_commit_bg_color (ConfigFacade* self) {
+void
+config_facade_commit_bg_color (ConfigFacade* self)
+{
 	const gchar* _tmp0_;
 #line 135 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
@@ -879,11 +916,13 @@ void config_facade_commit_bg_color (ConfigFacade* self) {
 	_tmp0_ = self->priv->bg_color;
 #line 136 "/home/jens/Source/shotwell/src/config/Config.vala"
 	CONFIGURATION_FACADE_CLASS (config_facade_parent_class)->set_bg_color_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp0_);
-#line 883 "Config.c"
+#line 920 "Config.c"
 }
 
 
-static void config_facade_class_init (ConfigFacadeClass * klass) {
+static void
+config_facade_class_init (ConfigFacadeClass * klass)
+{
 #line 18 "/home/jens/Source/shotwell/src/config/Config.vala"
 	config_facade_parent_class = g_type_class_peek_parent (klass);
 #line 18 "/home/jens/Source/shotwell/src/config/Config.vala"
@@ -892,11 +931,13 @@ static void config_facade_class_init (ConfigFacadeClass * klass) {
 	G_OBJECT_CLASS (klass)->finalize = config_facade_finalize;
 #line 18 "/home/jens/Source/shotwell/src/config/Config.vala"
 	config_facade_signals[CONFIG_FACADE_COLORS_CHANGED_SIGNAL] = g_signal_new ("colors-changed", CONFIG_TYPE_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 896 "Config.c"
+#line 935 "Config.c"
 }
 
 
-static void config_facade_instance_init (ConfigFacade * self) {
+static void
+config_facade_instance_init (ConfigFacade * self)
+{
 #line 18 "/home/jens/Source/shotwell/src/config/Config.vala"
 	self->priv = CONFIG_FACADE_GET_PRIVATE (self);
 #line 36 "/home/jens/Source/shotwell/src/config/Config.vala"
@@ -909,11 +950,13 @@ static void config_facade_instance_init (ConfigFacade * self) {
 	self->priv->unfocused_selected_color = NULL;
 #line 40 "/home/jens/Source/shotwell/src/config/Config.vala"
 	self->priv->border_color = NULL;
-#line 913 "Config.c"
+#line 954 "Config.c"
 }
 
 
-static void config_facade_finalize (GObject * obj) {
+static void
+config_facade_finalize (GObject * obj)
+{
 	ConfigFacade * self;
 #line 18 "/home/jens/Source/shotwell/src/config/Config.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CONFIG_TYPE_FACADE, ConfigFacade);
@@ -929,11 +972,13 @@ static void config_facade_finalize (GObject * obj) {
 	_g_free0 (self->priv->border_color);
 #line 18 "/home/jens/Source/shotwell/src/config/Config.vala"
 	G_OBJECT_CLASS (config_facade_parent_class)->finalize (obj);
-#line 933 "Config.c"
+#line 976 "Config.c"
 }
 
 
-GType config_facade_get_type (void) {
+GType
+config_facade_get_type (void)
+{
 	static volatile gsize config_facade_type_id__volatile = 0;
 	if (g_once_init_enter (&config_facade_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (ConfigFacadeClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) config_facade_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ConfigFacade), 0, (GInstanceInitFunc) config_facade_instance_init, NULL };
@@ -945,15 +990,21 @@ GType config_facade_get_type (void) {
 }
 
 
-void config_preconfigure (void) {
+void
+config_preconfigure (void)
+{
 }
 
 
-void config_init (GError** error) {
+void
+config_init (GError** error)
+{
 }
 
 
-void config_terminate (void) {
+void
+config_terminate (void)
+{
 }