Merge branch 'feature/upstream' into develop

1 files changed, 208 insertions, 78 deletions

diff --git a/src/shotwell-graphics-processor.h b/src/shotwell-graphics-processor.h
index fc05d79..9dbd564 100644
--- a/src/shotwell-graphics-processor.h
+++ b/src/shotwell-graphics-processor.h
@@ -1,4 +1,4 @@
-/* shotwell-graphics-processor.h generated by valac 0.36.6, the Vala compiler, do not modify */
+/* shotwell-graphics-processor.h generated by valac 0.40.4, the Vala compiler, do not modify */
 
 
 #ifndef __SRC_SHOTWELL_GRAPHICS_PROCESSOR_H__
@@ -437,33 +437,57 @@ GType rgb_analytic_pixel_get_type (void) G_GNUC_CONST;
 RGBAnalyticPixel* rgb_analytic_pixel_dup (const RGBAnalyticPixel* self);
 void rgb_analytic_pixel_free (RGBAnalyticPixel* self);
 void rgb_analytic_pixel_init (RGBAnalyticPixel *self);
-void rgb_analytic_pixel_init_from_components (RGBAnalyticPixel *self, gfloat red, gfloat green, gfloat blue);
-void rgb_analytic_pixel_init_from_quantized_components (RGBAnalyticPixel *self, guchar red_quantized, guchar green_quantized, guchar blue_quantized);
+void rgb_analytic_pixel_init_from_components (RGBAnalyticPixel *self,
+                                              gfloat red,
+                                              gfloat green,
+                                              gfloat blue);
+void rgb_analytic_pixel_init_from_quantized_components (RGBAnalyticPixel *self,
+                                                        guchar red_quantized,
+                                                        guchar green_quantized,
+                                                        guchar blue_quantized);
 GType hsv_analytic_pixel_get_type (void) G_GNUC_CONST;
 HSVAnalyticPixel* hsv_analytic_pixel_dup (const HSVAnalyticPixel* self);
 void hsv_analytic_pixel_free (HSVAnalyticPixel* self);
-void rgb_analytic_pixel_init_from_hsv (RGBAnalyticPixel *self, HSVAnalyticPixel* hsv_pixel);
+void rgb_analytic_pixel_init_from_hsv (RGBAnalyticPixel *self,
+                                       HSVAnalyticPixel* hsv_pixel);
 guchar rgb_analytic_pixel_quantized_red (RGBAnalyticPixel *self);
 guchar rgb_analytic_pixel_quantized_green (RGBAnalyticPixel *self);
 guchar rgb_analytic_pixel_quantized_blue (RGBAnalyticPixel *self);
-gboolean rgb_analytic_pixel_equals (RGBAnalyticPixel *self, RGBAnalyticPixel* rhs);
+gboolean rgb_analytic_pixel_equals (RGBAnalyticPixel *self,
+                                    RGBAnalyticPixel* rhs);
 guint rgb_analytic_pixel_hash_code (RGBAnalyticPixel *self);
-void rgb_analytic_pixel_to_hsv (RGBAnalyticPixel *self, HSVAnalyticPixel* result);
+void rgb_analytic_pixel_to_hsv (RGBAnalyticPixel *self,
+                                HSVAnalyticPixel* result);
 void hsv_analytic_pixel_init (HSVAnalyticPixel *self);
-void hsv_analytic_pixel_init_from_components (HSVAnalyticPixel *self, gfloat hue, gfloat saturation, gfloat light_value);
-void hsv_analytic_pixel_init_from_quantized_components (HSVAnalyticPixel *self, guchar hue_quantized, guchar saturation_quantized, guchar light_value_quantized);
-void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* p);
-void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result);
-gboolean hsv_analytic_pixel_equals (HSVAnalyticPixel *self, HSVAnalyticPixel* rhs);
+void hsv_analytic_pixel_init_from_components (HSVAnalyticPixel *self,
+                                              gfloat hue,
+                                              gfloat saturation,
+                                              gfloat light_value);
+void hsv_analytic_pixel_init_from_quantized_components (HSVAnalyticPixel *self,
+                                                        guchar hue_quantized,
+                                                        guchar saturation_quantized,
+                                                        guchar light_value_quantized);
+void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self,
+                                       RGBAnalyticPixel* p);
+void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self,
+                                RGBAnalyticPixel* result);
+gboolean hsv_analytic_pixel_equals (HSVAnalyticPixel *self,
+                                    HSVAnalyticPixel* rhs);
 guint hsv_analytic_pixel_hash_code (HSVAnalyticPixel *self);
 GType composition_mode_get_type (void) G_GNUC_CONST;
 GType pixel_format_get_type (void) G_GNUC_CONST;
 GType pixel_transformation_type_get_type (void) G_GNUC_CONST;
 gpointer pixel_transformation_bundle_ref (gpointer instance);
 void pixel_transformation_bundle_unref (gpointer instance);
-GParamSpec* param_spec_pixel_transformation_bundle (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_pixel_transformation_bundle (GValue* value, gpointer v_object);
-void value_take_pixel_transformation_bundle (GValue* value, gpointer v_object);
+GParamSpec* param_spec_pixel_transformation_bundle (const gchar* name,
+                                                    const gchar* nick,
+                                                    const gchar* blurb,
+                                                    GType object_type,
+                                                    GParamFlags flags);
+void value_set_pixel_transformation_bundle (GValue* value,
+                                            gpointer v_object);
+void value_take_pixel_transformation_bundle (GValue* value,
+                                             gpointer v_object);
 gpointer value_get_pixel_transformation_bundle (const GValue* value);
 GType pixel_transformation_bundle_get_type (void) G_GNUC_CONST;
 PixelTransformationBundle* pixel_transformation_bundle_new (void);
@@ -473,162 +497,268 @@ void pixel_transformation_bundle_set_copied_color_adjustments (PixelTransformati
 gboolean pixel_transformation_bundle_has_copied_color_adjustments (void);
 gpointer pixel_transformation_ref (gpointer instance);
 void pixel_transformation_unref (gpointer instance);
-GParamSpec* param_spec_pixel_transformation (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_pixel_transformation (GValue* value, gpointer v_object);
-void value_take_pixel_transformation (GValue* value, gpointer v_object);
+GParamSpec* param_spec_pixel_transformation (const gchar* name,
+                                             const gchar* nick,
+                                             const gchar* blurb,
+                                             GType object_type,
+                                             GParamFlags flags);
+void value_set_pixel_transformation (GValue* value,
+                                     gpointer v_object);
+void value_take_pixel_transformation (GValue* value,
+                                      gpointer v_object);
 gpointer value_get_pixel_transformation (const GValue* value);
 GType pixel_transformation_get_type (void) G_GNUC_CONST;
-void pixel_transformation_bundle_set (PixelTransformationBundle* self, PixelTransformation* transformation);
+void pixel_transformation_bundle_set (PixelTransformationBundle* self,
+                                      PixelTransformation* transformation);
 void pixel_transformation_bundle_set_to_identity (PixelTransformationBundle* self);
 gpointer key_value_map_ref (gpointer instance);
 void key_value_map_unref (gpointer instance);
-GParamSpec* param_spec_key_value_map (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_key_value_map (GValue* value, gpointer v_object);
-void value_take_key_value_map (GValue* value, gpointer v_object);
+GParamSpec* param_spec_key_value_map (const gchar* name,
+                                      const gchar* nick,
+                                      const gchar* blurb,
+                                      GType object_type,
+                                      GParamFlags flags);
+void value_set_key_value_map (GValue* value,
+                              gpointer v_object);
+void value_take_key_value_map (GValue* value,
+                               gpointer v_object);
 gpointer value_get_key_value_map (const GValue* value);
 GType key_value_map_get_type (void) G_GNUC_CONST;
-void pixel_transformation_bundle_load (PixelTransformationBundle* self, KeyValueMap* store);
-KeyValueMap* pixel_transformation_bundle_save (PixelTransformationBundle* self, const gchar* group);
+void pixel_transformation_bundle_load (PixelTransformationBundle* self,
+                                       KeyValueMap* store);
+KeyValueMap* pixel_transformation_bundle_save (PixelTransformationBundle* self,
+                                               const gchar* group);
 gint pixel_transformation_bundle_get_count (PixelTransformationBundle* self);
-PixelTransformation* pixel_transformation_bundle_get_transformation (PixelTransformationBundle* self, PixelTransformationType type);
+PixelTransformation* pixel_transformation_bundle_get_transformation (PixelTransformationBundle* self,
+                                                                     PixelTransformationType type);
 GeeIterable* pixel_transformation_bundle_get_transformations (PixelTransformationBundle* self);
 gboolean pixel_transformation_bundle_is_identity (PixelTransformationBundle* self);
 gpointer pixel_transformer_ref (gpointer instance);
 void pixel_transformer_unref (gpointer instance);
-GParamSpec* param_spec_pixel_transformer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_pixel_transformer (GValue* value, gpointer v_object);
-void value_take_pixel_transformer (GValue* value, gpointer v_object);
+GParamSpec* param_spec_pixel_transformer (const gchar* name,
+                                          const gchar* nick,
+                                          const gchar* blurb,
+                                          GType object_type,
+                                          GParamFlags flags);
+void value_set_pixel_transformer (GValue* value,
+                                  gpointer v_object);
+void value_take_pixel_transformer (GValue* value,
+                                   gpointer v_object);
 gpointer value_get_pixel_transformer (const GValue* value);
 GType pixel_transformer_get_type (void) G_GNUC_CONST;
 PixelTransformer* pixel_transformation_bundle_generate_transformer (PixelTransformationBundle* self);
 PixelTransformationBundle* pixel_transformation_bundle_copy (PixelTransformationBundle* self);
-PixelTransformation* pixel_transformation_construct (GType object_type, PixelTransformationType type, PixelFormat preferred_format);
+PixelTransformation* pixel_transformation_construct (GType object_type,
+                                                     PixelTransformationType type,
+                                                     PixelFormat preferred_format);
 PixelTransformationType pixel_transformation_get_transformation_type (PixelTransformation* self);
 PixelFormat pixel_transformation_get_preferred_format (PixelTransformation* self);
 CompositionMode pixel_transformation_get_composition_mode (PixelTransformation* self);
-void pixel_transformation_compose_with (PixelTransformation* self, PixelTransformation* other);
+void pixel_transformation_compose_with (PixelTransformation* self,
+                                        PixelTransformation* other);
 gboolean pixel_transformation_is_identity (PixelTransformation* self);
-void pixel_transformation_transform_pixel_hsv (PixelTransformation* self, HSVAnalyticPixel* p, HSVAnalyticPixel* result);
-void pixel_transformation_transform_pixel_rgb (PixelTransformation* self, RGBAnalyticPixel* p, RGBAnalyticPixel* result);
+void pixel_transformation_transform_pixel_hsv (PixelTransformation* self,
+                                               HSVAnalyticPixel* p,
+                                               HSVAnalyticPixel* result);
+void pixel_transformation_transform_pixel_rgb (PixelTransformation* self,
+                                               RGBAnalyticPixel* p,
+                                               RGBAnalyticPixel* result);
 gchar* pixel_transformation_to_string (PixelTransformation* self);
 PixelTransformation* pixel_transformation_copy (PixelTransformation* self);
 GType rgb_transformation_get_type (void) G_GNUC_CONST;
 #define RGB_TRANSFORMATION_MATRIX_SIZE 16
 RGBTransformation* rgb_transformation_new (PixelTransformationType type);
-RGBTransformation* rgb_transformation_construct (GType object_type, PixelTransformationType type);
+RGBTransformation* rgb_transformation_construct (GType object_type,
+                                                 PixelTransformationType type);
 GType hsv_transformation_get_type (void) G_GNUC_CONST;
-HSVTransformation* hsv_transformation_construct (GType object_type, PixelTransformationType type);
+HSVTransformation* hsv_transformation_construct (GType object_type,
+                                                 PixelTransformationType type);
 GType tint_transformation_get_type (void) G_GNUC_CONST;
 #define TINT_TRANSFORMATION_MIN_PARAMETER (-16.0f)
 #define TINT_TRANSFORMATION_MAX_PARAMETER 16.0f
 TintTransformation* tint_transformation_new (gfloat client_param);
-TintTransformation* tint_transformation_construct (GType object_type, gfloat client_param);
+TintTransformation* tint_transformation_construct (GType object_type,
+                                                   gfloat client_param);
 gfloat tint_transformation_get_parameter (TintTransformation* self);
 GType temperature_transformation_get_type (void) G_GNUC_CONST;
 #define TEMPERATURE_TRANSFORMATION_MIN_PARAMETER (-16.0f)
 #define TEMPERATURE_TRANSFORMATION_MAX_PARAMETER 16.0f
 TemperatureTransformation* temperature_transformation_new (gfloat client_parameter);
-TemperatureTransformation* temperature_transformation_construct (GType object_type, gfloat client_parameter);
+TemperatureTransformation* temperature_transformation_construct (GType object_type,
+                                                                 gfloat client_parameter);
 gfloat temperature_transformation_get_parameter (TemperatureTransformation* self);
 GType saturation_transformation_get_type (void) G_GNUC_CONST;
 #define SATURATION_TRANSFORMATION_MIN_PARAMETER (-16.0f)
 #define SATURATION_TRANSFORMATION_MAX_PARAMETER 16.0f
 SaturationTransformation* saturation_transformation_new (gfloat client_parameter);
-SaturationTransformation* saturation_transformation_construct (GType object_type, gfloat client_parameter);
+SaturationTransformation* saturation_transformation_construct (GType object_type,
+                                                               gfloat client_parameter);
 gfloat saturation_transformation_get_parameter (SaturationTransformation* self);
 GType exposure_transformation_get_type (void) G_GNUC_CONST;
 #define EXPOSURE_TRANSFORMATION_MIN_PARAMETER (-16.0f)
 #define EXPOSURE_TRANSFORMATION_MAX_PARAMETER 16.0f
 ExposureTransformation* exposure_transformation_new (gfloat client_parameter);
-ExposureTransformation* exposure_transformation_construct (GType object_type, gfloat client_parameter);
+ExposureTransformation* exposure_transformation_construct (GType object_type,
+                                                           gfloat client_parameter);
 gfloat exposure_transformation_get_parameter (ExposureTransformation* self);
 GType contrast_transformation_get_type (void) G_GNUC_CONST;
 #define CONTRAST_TRANSFORMATION_MIN_PARAMETER (-16.0f)
 #define CONTRAST_TRANSFORMATION_MAX_PARAMETER 16.0f
 ContrastTransformation* contrast_transformation_new (gfloat client_parameter);
-ContrastTransformation* contrast_transformation_construct (GType object_type, gfloat client_parameter);
+ContrastTransformation* contrast_transformation_construct (GType object_type,
+                                                           gfloat client_parameter);
 gfloat contrast_transformation_get_parameter (ContrastTransformation* self);
 PixelTransformer* pixel_transformer_new (void);
 PixelTransformer* pixel_transformer_construct (GType object_type);
 PixelTransformer* pixel_transformer_copy (PixelTransformer* self);
-void pixel_transformer_attach_transformation (PixelTransformer* self, PixelTransformation* trans);
-void pixel_transformer_detach_transformation (PixelTransformer* self, PixelTransformation* victim);
-void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTransformation* old_trans, PixelTransformation* new_trans);
-void pixel_transformer_transform_pixbuf (PixelTransformer* self, GdkPixbuf* pixbuf, GCancellable* cancellable);
-void pixel_transformer_transform_from_fp (PixelTransformer* self, gfloat** fp_pixel_cache, int* fp_pixel_cache_length1, GdkPixbuf* dest);
-void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPixbuf* source, GdkPixbuf* dest, GCancellable* cancellable, gint jobs);
+void pixel_transformer_attach_transformation (PixelTransformer* self,
+                                              PixelTransformation* trans);
+void pixel_transformer_detach_transformation (PixelTransformer* self,
+                                              PixelTransformation* victim);
+void pixel_transformer_replace_transformation (PixelTransformer* self,
+                                               PixelTransformation* old_trans,
+                                               PixelTransformation* new_trans);
+void pixel_transformer_transform_pixbuf (PixelTransformer* self,
+                                         GdkPixbuf* pixbuf,
+                                         GCancellable* cancellable);
+void pixel_transformer_transform_from_fp (PixelTransformer* self,
+                                          gfloat** fp_pixel_cache,
+                                          int* fp_pixel_cache_length1,
+                                          GdkPixbuf* dest);
+void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self,
+                                                  GdkPixbuf* source,
+                                                  GdkPixbuf* dest,
+                                                  GCancellable* cancellable,
+                                                  gint jobs);
 gpointer rgb_histogram_ref (gpointer instance);
 void rgb_histogram_unref (gpointer instance);
-GParamSpec* param_spec_rgb_histogram (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_rgb_histogram (GValue* value, gpointer v_object);
-void value_take_rgb_histogram (GValue* value, gpointer v_object);
+GParamSpec* param_spec_rgb_histogram (const gchar* name,
+                                      const gchar* nick,
+                                      const gchar* blurb,
+                                      GType object_type,
+                                      GParamFlags flags);
+void value_set_rgb_histogram (GValue* value,
+                              gpointer v_object);
+void value_take_rgb_histogram (GValue* value,
+                               gpointer v_object);
 gpointer value_get_rgb_histogram (const GValue* value);
 GType rgb_histogram_get_type (void) G_GNUC_CONST;
 #define RGB_HISTOGRAM_GRAPHIC_WIDTH 256
 #define RGB_HISTOGRAM_GRAPHIC_HEIGHT 100
 RGBHistogram* rgb_histogram_new (GdkPixbuf* pixbuf);
-RGBHistogram* rgb_histogram_construct (GType object_type, GdkPixbuf* pixbuf);
+RGBHistogram* rgb_histogram_construct (GType object_type,
+                                       GdkPixbuf* pixbuf);
 GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self);
 gpointer intensity_histogram_ref (gpointer instance);
 void intensity_histogram_unref (gpointer instance);
-GParamSpec* param_spec_intensity_histogram (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_intensity_histogram (GValue* value, gpointer v_object);
-void value_take_intensity_histogram (GValue* value, gpointer v_object);
+GParamSpec* param_spec_intensity_histogram (const gchar* name,
+                                            const gchar* nick,
+                                            const gchar* blurb,
+                                            GType object_type,
+                                            GParamFlags flags);
+void value_set_intensity_histogram (GValue* value,
+                                    gpointer v_object);
+void value_take_intensity_histogram (GValue* value,
+                                     gpointer v_object);
 gpointer value_get_intensity_histogram (const GValue* value);
 GType intensity_histogram_get_type (void) G_GNUC_CONST;
 IntensityHistogram* intensity_histogram_new (GdkPixbuf* pixbuf);
-IntensityHistogram* intensity_histogram_construct (GType object_type, GdkPixbuf* pixbuf);
-gfloat intensity_histogram_get_cumulative_probability (IntensityHistogram* self, gint level);
+IntensityHistogram* intensity_histogram_construct (GType object_type,
+                                                   GdkPixbuf* pixbuf);
+gfloat intensity_histogram_get_cumulative_probability (IntensityHistogram* self,
+                                                       gint level);
 GType expansion_transformation_get_type (void) G_GNUC_CONST;
 ExpansionTransformation* expansion_transformation_new (IntensityHistogram* histogram);
-ExpansionTransformation* expansion_transformation_construct (GType object_type, IntensityHistogram* histogram);
-ExpansionTransformation* expansion_transformation_new_from_extrema (gint black_point, gint white_point);
-ExpansionTransformation* expansion_transformation_construct_from_extrema (GType object_type, gint black_point, gint white_point);
+ExpansionTransformation* expansion_transformation_construct (GType object_type,
+                                                             IntensityHistogram* histogram);
+ExpansionTransformation* expansion_transformation_new_from_extrema (gint black_point,
+                                                                    gint white_point);
+ExpansionTransformation* expansion_transformation_construct_from_extrema (GType object_type,
+                                                                          gint black_point,
+                                                                          gint white_point);
 ExpansionTransformation* expansion_transformation_new_from_string (const gchar* encoded_transformation);
-ExpansionTransformation* expansion_transformation_construct_from_string (GType object_type, const gchar* encoded_transformation);
+ExpansionTransformation* expansion_transformation_construct_from_string (GType object_type,
+                                                                         const gchar* encoded_transformation);
 gint expansion_transformation_get_white_point (ExpansionTransformation* self);
 gint expansion_transformation_get_black_point (ExpansionTransformation* self);
 GType shadow_detail_transformation_get_type (void) G_GNUC_CONST;
 #define SHADOW_DETAIL_TRANSFORMATION_MIN_PARAMETER 0.0f
 #define SHADOW_DETAIL_TRANSFORMATION_MAX_PARAMETER 32.0f
 ShadowDetailTransformation* shadow_detail_transformation_new (gfloat user_intensity);
-ShadowDetailTransformation* shadow_detail_transformation_construct (GType object_type, gfloat user_intensity);
+ShadowDetailTransformation* shadow_detail_transformation_construct (GType object_type,
+                                                                    gfloat user_intensity);
 gfloat shadow_detail_transformation_get_parameter (ShadowDetailTransformation* self);
 gpointer hermite_gamma_approximation_function_ref (gpointer instance);
 void hermite_gamma_approximation_function_unref (gpointer instance);
-GParamSpec* param_spec_hermite_gamma_approximation_function (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_hermite_gamma_approximation_function (GValue* value, gpointer v_object);
-void value_take_hermite_gamma_approximation_function (GValue* value, gpointer v_object);
+GParamSpec* param_spec_hermite_gamma_approximation_function (const gchar* name,
+                                                             const gchar* nick,
+                                                             const gchar* blurb,
+                                                             GType object_type,
+                                                             GParamFlags flags);
+void value_set_hermite_gamma_approximation_function (GValue* value,
+                                                     gpointer v_object);
+void value_take_hermite_gamma_approximation_function (GValue* value,
+                                                      gpointer v_object);
 gpointer value_get_hermite_gamma_approximation_function (const GValue* value);
 GType hermite_gamma_approximation_function_get_type (void) G_GNUC_CONST;
 HermiteGammaApproximationFunction* hermite_gamma_approximation_function_new (gfloat user_interval_upper);
-HermiteGammaApproximationFunction* hermite_gamma_approximation_function_construct (GType object_type, gfloat user_interval_upper);
-gfloat hermite_gamma_approximation_function_evaluate (HermiteGammaApproximationFunction* self, gfloat x);
+HermiteGammaApproximationFunction* hermite_gamma_approximation_function_construct (GType object_type,
+                                                                                   gfloat user_interval_upper);
+gfloat hermite_gamma_approximation_function_evaluate (HermiteGammaApproximationFunction* self,
+                                                      gfloat x);
 GType highlight_detail_transformation_get_type (void) G_GNUC_CONST;
 #define HIGHLIGHT_DETAIL_TRANSFORMATION_MIN_PARAMETER (-32.0f)
 #define HIGHLIGHT_DETAIL_TRANSFORMATION_MAX_PARAMETER 0.0f
 HighlightDetailTransformation* highlight_detail_transformation_new (gfloat user_intensity);
-HighlightDetailTransformation* highlight_detail_transformation_construct (GType object_type, gfloat user_intensity);
+HighlightDetailTransformation* highlight_detail_transformation_construct (GType object_type,
+                                                                          gfloat user_intensity);
 gfloat highlight_detail_transformation_get_parameter (HighlightDetailTransformation* self);
 PixelTransformationBundle* auto_enhance_create_auto_enhance_adjustments (GdkPixbuf* pixbuf);
 KeyValueMap* key_value_map_new (const gchar* group);
-KeyValueMap* key_value_map_construct (GType object_type, const gchar* group);
+KeyValueMap* key_value_map_construct (GType object_type,
+                                      const gchar* group);
 KeyValueMap* key_value_map_copy (KeyValueMap* self);
 gchar* key_value_map_get_group (KeyValueMap* self);
 GeeSet* key_value_map_get_keys (KeyValueMap* self);
-gboolean key_value_map_has_key (KeyValueMap* self, const gchar* key);
-void key_value_map_set_string (KeyValueMap* self, const gchar* key, const gchar* value);
-void key_value_map_set_int (KeyValueMap* self, const gchar* key, gint value);
-void key_value_map_set_double (KeyValueMap* self, const gchar* key, gdouble value);
-void key_value_map_set_float (KeyValueMap* self, const gchar* key, gfloat value);
-void key_value_map_set_bool (KeyValueMap* self, const gchar* key, gboolean value);
-gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gchar* def);
-gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def);
-gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble def);
-gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def);
-gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean def);
-void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def, GdkPoint* result);
-void key_value_map_set_point (KeyValueMap* self, const gchar* key, GdkPoint* point);
+gboolean key_value_map_has_key (KeyValueMap* self,
+                                const gchar* key);
+void key_value_map_set_string (KeyValueMap* self,
+                               const gchar* key,
+                               const gchar* value);
+void key_value_map_set_int (KeyValueMap* self,
+                            const gchar* key,
+                            gint value);
+void key_value_map_set_double (KeyValueMap* self,
+                               const gchar* key,
+                               gdouble value);
+void key_value_map_set_float (KeyValueMap* self,
+                              const gchar* key,
+                              gfloat value);
+void key_value_map_set_bool (KeyValueMap* self,
+                             const gchar* key,
+                             gboolean value);
+gchar* key_value_map_get_string (KeyValueMap* self,
+                                 const gchar* key,
+                                 const gchar* def);
+gint key_value_map_get_int (KeyValueMap* self,
+                            const gchar* key,
+                            gint def);
+gdouble key_value_map_get_double (KeyValueMap* self,
+                                  const gchar* key,
+                                  gdouble def);
+gfloat key_value_map_get_float (KeyValueMap* self,
+                                const gchar* key,
+                                gfloat def);
+gboolean key_value_map_get_bool (KeyValueMap* self,
+                                 const gchar* key,
+                                 gboolean def);
+void key_value_map_get_point (KeyValueMap* self,
+                              const gchar* key,
+                              GdkPoint* def,
+                              GdkPoint* result);
+void key_value_map_set_point (KeyValueMap* self,
+                              const gchar* key,
+                              GdkPoint* point);
 
 extern const gfloat rgb_lookup_table[256];