Merge branch 'feature/upstream' into develop

1 files changed, 4142 insertions, 4286 deletions

diff --git a/src/editing_tools/EditingTools.c b/src/editing_tools/EditingTools.c
index b3bf03b..f101fb4 100644
--- a/src/editing_tools/EditingTools.c
+++ b/src/editing_tools/EditingTools.c
@@ -1,4 +1,4 @@
-/* EditingTools.c generated by valac 0.34.7, the Vala compiler
+/* EditingTools.c generated by valac 0.36.6, the Vala compiler
  * generated from EditingTools.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -149,6 +149,12 @@ typedef struct _Scaling Scaling;
 #define TYPE_BOX (box_get_type ())
 typedef struct _Box Box;
 typedef struct _EditingToolsParamSpecPhotoCanvas EditingToolsParamSpecPhotoCanvas;
+enum  {
+	EDITING_TOOLS_PHOTO_CANVAS_NEW_SURFACE_SIGNAL,
+	EDITING_TOOLS_PHOTO_CANVAS_RESIZED_SCALED_PIXBUF_SIGNAL,
+	EDITING_TOOLS_PHOTO_CANVAS_LAST_SIGNAL
+};
+static guint editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_LAST_SIGNAL] = {0};
 
 #define EDITING_TOOLS_TYPE_EDITING_TOOL (editing_tools_editing_tool_get_type ())
 #define EDITING_TOOLS_EDITING_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool))
@@ -173,6 +179,15 @@ typedef struct _EditingToolsEditingToolPrivate EditingToolsEditingToolPrivate;
 typedef struct _Command Command;
 typedef struct _CommandClass CommandClass;
 typedef struct _EditingToolsParamSpecEditingTool EditingToolsParamSpecEditingTool;
+enum  {
+	EDITING_TOOLS_EDITING_TOOL_ACTIVATED_SIGNAL,
+	EDITING_TOOLS_EDITING_TOOL_DEACTIVATED_SIGNAL,
+	EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL,
+	EDITING_TOOLS_EDITING_TOOL_CANCELLED_SIGNAL,
+	EDITING_TOOLS_EDITING_TOOL_ABORTED_SIGNAL,
+	EDITING_TOOLS_EDITING_TOOL_LAST_SIGNAL
+};
+static guint editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_LAST_SIGNAL] = {0};
 
 #define EDITING_TOOLS_TYPE_CROP_TOOL (editing_tools_crop_tool_get_type ())
 #define EDITING_TOOLS_CROP_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool))
@@ -1047,7 +1062,7 @@ AppWindow* app_window_get_instance (void);
 static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWidget* base, GdkEventButton* event);
 static void editing_tools_editing_tool_window_real_realize (GtkWidget* base);
 #define RESOURCES_TRANSIENT_WINDOW_OPACITY 0.90
-static void editing_tools_editing_tool_window_finalize (GObject* obj);
+static void editing_tools_editing_tool_window_finalize (GObject * obj);
 gpointer editing_tools_photo_canvas_ref (gpointer instance);
 void editing_tools_photo_canvas_unref (gpointer instance);
 GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -1120,7 +1135,7 @@ void editing_tools_photo_canvas_erase_box (EditingToolsPhotoCanvas* self, Box* b
 void editing_tools_photo_canvas_invalidate_area (EditingToolsPhotoCanvas* self, Box* area);
 static void g_cclosure_user_marshal_VOID__POINTER_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
 static void g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas* obj);
+static void editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas * obj);
 gpointer editing_tools_editing_tool_ref (gpointer instance);
 void editing_tools_editing_tool_unref (gpointer instance);
 GParamSpec* editing_tools_param_spec_editing_tool (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -1159,7 +1174,7 @@ void editing_tools_editing_tool_paint (EditingToolsEditingTool* self, cairo_t* c
 static void editing_tools_editing_tool_real_paint (EditingToolsEditingTool* self, cairo_t* ctx);
 GType command_get_type (void) G_GNUC_CONST;
 static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void editing_tools_editing_tool_finalize (EditingToolsEditingTool* obj);
+static void editing_tools_editing_tool_finalize (EditingToolsEditingTool * obj);
 GType editing_tools_crop_tool_get_type (void) G_GNUC_CONST;
 static GType editing_tools_crop_tool_crop_tool_window_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 GType box_location_get_type (void) G_GNUC_CONST;
@@ -1203,35 +1218,35 @@ void scaling_get_scaled_dimensions (Scaling *self, Dimensions* original, Dimensi
 void photo_get_original_dimensions (Photo* self, Dimensions* result);
 static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_new (const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio);
 static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_construct (GType object_type, const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio);
-static void _vala_array_add4 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add5 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add6 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add7 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add8 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add9 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add10 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add11 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add12 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add13 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add14 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add15 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add16 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add17 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add18 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add19 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add20 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add21 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add22 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add23 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add24 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add25 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add26 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add27 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add28 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add29 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add30 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add31 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add32 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add4 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add5 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add6 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add7 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add8 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add9 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add10 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add11 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add12 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add13 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add14 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add15 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add16 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add17 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add18 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add19 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add20 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add21 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add22 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add23 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add24 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add25 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add26 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add27 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add28 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add29 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add30 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add31 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add32 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
 static void editing_tools_crop_tool_update_pivot_button_state (EditingToolsCropTool* self);
 static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_selected_constraint (EditingToolsCropTool* self);
 static gboolean editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCropTool* self, GdkEventFocus* event);
@@ -1315,7 +1330,7 @@ GType generic_photo_transformation_command_get_type (void) G_GNUC_CONST;
 GType crop_command_get_type (void) G_GNUC_CONST;
 void box_get_dimensions (Box *self, Dimensions* result);
 static gint editing_tools_crop_tool_eval_radial_line (EditingToolsCropTool* self, gdouble center_x, gdouble center_y, gdouble bounds_x, gdouble bounds_y, gdouble user_x);
-static gboolean _box_equal (const Box* s1, const Box* s2);
+static gboolean _box_equal (const Box * s1, const Box * s2);
 static void editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self, Box* new_crop);
 gboolean box_equals (Box *self, Box* box);
 GType box_complements_get_type (void) G_GNUC_CONST;
@@ -1325,7 +1340,7 @@ void box_get_reduced (Box *self, gint amount, Box* result);
 enum  {
 	EDITING_TOOLS_CROP_TOOL_CONSTRAINT_DESCRIPTION_DUMMY_PROPERTY
 };
-static void editing_tools_crop_tool_constraint_description_finalize (EditingToolsCropToolConstraintDescription* obj);
+static void editing_tools_crop_tool_constraint_description_finalize (EditingToolsCropToolConstraintDescription * obj);
 enum  {
 	EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_DUMMY_PROPERTY
 };
@@ -1333,8 +1348,8 @@ enum  {
 #define EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING 8
 static gboolean editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func (GtkTreeModel* model, GtkTreeIter* iter);
 static gboolean _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model, GtkTreeIter* iter, gpointer self);
-static void editing_tools_crop_tool_crop_tool_window_finalize (GObject* obj);
-static void editing_tools_crop_tool_finalize (EditingToolsEditingTool* obj);
+static void editing_tools_crop_tool_crop_tool_window_finalize (GObject * obj);
+static void editing_tools_crop_tool_finalize (EditingToolsEditingTool * obj);
 GType editing_tools_redeye_instance_get_type (void) G_GNUC_CONST;
 EditingToolsRedeyeInstance* editing_tools_redeye_instance_dup (const EditingToolsRedeyeInstance* self);
 void editing_tools_redeye_instance_free (EditingToolsRedeyeInstance* self);
@@ -1420,8 +1435,8 @@ enum  {
 };
 #define RESOURCES_APPLY_LABEL _ ("_Apply")
 #define EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_CONTROL_SPACING 8
-static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject* obj);
-static void editing_tools_redeye_tool_finalize (EditingToolsEditingTool* obj);
+static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject * obj);
+static void editing_tools_redeye_tool_finalize (EditingToolsEditingTool * obj);
 GType editing_tools_adjust_tool_get_type (void) G_GNUC_CONST;
 static GType editing_tools_adjust_tool_adjust_tool_window_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 gpointer pixel_transformer_ref (gpointer instance);
@@ -1615,7 +1630,7 @@ enum  {
 #define RESOURCES_OK_LABEL _ ("_OK")
 RGBHistogramManipulator* rgb_histogram_manipulator_new (void);
 RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type);
-static void editing_tools_adjust_tool_adjust_tool_window_finalize (GObject* obj);
+static void editing_tools_adjust_tool_adjust_tool_window_finalize (GObject * obj);
 GType command_description_get_type (void) G_GNUC_CONST;
 enum  {
 	EDITING_TOOLS_ADJUST_TOOL_ADJUST_TOOL_COMMAND_DUMMY_PROPERTY
@@ -1625,7 +1640,7 @@ static void _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_
 static EditingToolsAdjustToolAdjustToolCommand* editing_tools_adjust_tool_adjust_tool_command_construct (GType object_type, EditingToolsAdjustTool* owner, const gchar* name, const gchar* explanation);
 Command* command_construct (GType object_type, const gchar* name, const gchar* explanation);
 void command_manager_reset (CommandManager* self);
-static void editing_tools_adjust_tool_adjust_tool_command_finalize (GObject* obj);
+static void editing_tools_adjust_tool_adjust_tool_command_finalize (GObject * obj);
 #define EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommandPrivate))
 enum  {
 	EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_DUMMY_PROPERTY
@@ -1637,7 +1652,7 @@ void pixel_transformation_bundle_set_to_identity (PixelTransformationBundle* sel
 static void editing_tools_adjust_tool_adjust_reset_command_real_execute (Command* base);
 static void editing_tools_adjust_tool_adjust_reset_command_real_undo (Command* base);
 static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Command* base, Command* command);
-static void editing_tools_adjust_tool_adjust_reset_command_finalize (GObject* obj);
+static void editing_tools_adjust_tool_adjust_reset_command_finalize (GObject * obj);
 #define EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommandPrivate))
 enum  {
 	EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_DUMMY_PROPERTY
@@ -1647,7 +1662,7 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_undo (Comma
 static void editing_tools_adjust_tool_slider_adjustment_command_real_redo (Command* base);
 static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compress (Command* base, Command* command);
 void command_execute (Command* self);
-static void editing_tools_adjust_tool_slider_adjustment_command_finalize (GObject* obj);
+static void editing_tools_adjust_tool_slider_adjustment_command_finalize (GObject * obj);
 #define EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommandPrivate))
 enum  {
 	EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_DUMMY_PROPERTY
@@ -1661,8 +1676,8 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 GType enhance_single_command_get_type (void) G_GNUC_CONST;
 DataSource* single_data_source_command_get_source (SingleDataSourceCommand* self);
 gboolean data_source_equals (DataSource* self, DataSource* source);
-static void editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject* obj);
-static void editing_tools_adjust_tool_finalize (EditingToolsEditingTool* obj);
+static void editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject * obj);
+static void editing_tools_adjust_tool_finalize (EditingToolsEditingTool * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -1682,18 +1697,18 @@ void editing_tools_terminate (void) {
 static void _editing_tools_editing_tool_window_suppress_warnings_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) {
 #line 56 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_editing_tool_window_suppress_warnings ((EditingToolsEditingToolWindow*) self, log_domain, log_levels, message);
-#line 1686 "EditingTools.c"
+#line 1701 "EditingTools.c"
 }
 
 
 EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GType object_type, GtkWindow* container) {
 	EditingToolsEditingToolWindow * self = NULL;
-	GtkWindow* _tmp0_ = NULL;
+	GtkWindow* _tmp0_;
 	GtkFrame* outer_frame = NULL;
-	GtkFrame* _tmp1_ = NULL;
-	GtkFrame* _tmp2_ = NULL;
-	GtkFrame* _tmp3_ = NULL;
-	GtkFrame* _tmp4_ = NULL;
+	GtkFrame* _tmp1_;
+	GtkFrame* _tmp2_;
+	GtkFrame* _tmp3_;
+	GtkFrame* _tmp4_;
 #line 34 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
 #line 34 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1742,14 +1757,14 @@ EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GTyp
 	_g_object_unref0 (outer_frame);
 #line 34 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 1746 "EditingTools.c"
+#line 1761 "EditingTools.c"
 }
 
 
 static void editing_tools_editing_tool_window_real_add (GtkContainer* base, GtkWidget* widget) {
 	EditingToolsEditingToolWindow * self;
-	GtkFrame* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkFrame* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 63 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow);
 #line 63 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1760,13 +1775,13 @@ static void editing_tools_editing_tool_window_real_add (GtkContainer* base, GtkW
 	_tmp1_ = widget;
 #line 64 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), _tmp1_);
-#line 1764 "EditingTools.c"
+#line 1779 "EditingTools.c"
 }
 
 
 gboolean editing_tools_editing_tool_window_has_user_moved (EditingToolsEditingToolWindow* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 67 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL_WINDOW (self), FALSE);
 #line 68 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1775,20 +1790,20 @@ gboolean editing_tools_editing_tool_window_has_user_moved (EditingToolsEditingTo
 	result = _tmp0_;
 #line 68 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 1779 "EditingTools.c"
+#line 1794 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_editing_tool_window_real_key_press_event (GtkWidget* base, GdkEventKey* event) {
 	EditingToolsEditingToolWindow * self;
 	gboolean result = FALSE;
-	GdkEventKey* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	AppWindow* _tmp2_ = NULL;
-	AppWindow* _tmp3_ = NULL;
-	GdkEventKey* _tmp4_ = NULL;
+	GdkEventKey* _tmp0_;
+	gboolean _tmp1_;
+	AppWindow* _tmp2_;
+	AppWindow* _tmp3_;
+	GdkEventKey* _tmp4_;
 	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
+	gboolean _tmp6_;
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow);
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1803,7 +1818,7 @@ static gboolean editing_tools_editing_tool_window_real_key_press_event (GtkWidge
 		result = TRUE;
 #line 73 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 1807 "EditingTools.c"
+#line 1822 "EditingTools.c"
 	}
 #line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = app_window_get_instance ();
@@ -1821,23 +1836,23 @@ static gboolean editing_tools_editing_tool_window_real_key_press_event (GtkWidge
 	result = _tmp6_;
 #line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 1825 "EditingTools.c"
+#line 1840 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWidget* base, GdkEventButton* event) {
 	EditingToolsEditingToolWindow * self;
 	gboolean result = FALSE;
-	GdkEventButton* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	GdkEventButton* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
-	GdkEventButton* _tmp7_ = NULL;
-	gdouble _tmp8_ = 0.0;
-	GdkEventButton* _tmp9_ = NULL;
-	gdouble _tmp10_ = 0.0;
-	GdkEventButton* _tmp11_ = NULL;
-	guint32 _tmp12_ = 0U;
+	GdkEventButton* _tmp0_;
+	guint _tmp1_;
+	GdkEventButton* _tmp5_;
+	guint _tmp6_;
+	GdkEventButton* _tmp7_;
+	gdouble _tmp8_;
+	GdkEventButton* _tmp9_;
+	gdouble _tmp10_;
+	GdkEventButton* _tmp11_;
+	guint32 _tmp12_;
 #line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow);
 #line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1848,30 +1863,30 @@ static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWi
 	_tmp1_ = _tmp0_->button;
 #line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ != ((guint) 1)) {
-#line 1852 "EditingTools.c"
+#line 1867 "EditingTools.c"
 		gboolean _tmp2_ = FALSE;
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->button_press_event != NULL) {
-#line 1856 "EditingTools.c"
-			GdkEventButton* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+#line 1871 "EditingTools.c"
+			GdkEventButton* _tmp3_;
+			gboolean _tmp4_;
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp3_ = event;
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp4_ = GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), _tmp3_);
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = _tmp4_;
-#line 1865 "EditingTools.c"
+#line 1880 "EditingTools.c"
 		} else {
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = TRUE;
-#line 1869 "EditingTools.c"
+#line 1884 "EditingTools.c"
 		}
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = _tmp2_;
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 1875 "EditingTools.c"
+#line 1890 "EditingTools.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = event;
@@ -1897,7 +1912,7 @@ static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWi
 	result = TRUE;
 #line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 1901 "EditingTools.c"
+#line 1916 "EditingTools.c"
 }
 
 
@@ -1909,7 +1924,7 @@ static void editing_tools_editing_tool_window_real_realize (GtkWidget* base) {
 	gtk_widget_set_opacity (G_TYPE_CHECK_INSTANCE_TYPE (self, gtk_widget_get_type ()) ? ((GtkWidget*) self) : NULL, RESOURCES_TRANSIENT_WINDOW_OPACITY);
 #line 92 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget));
-#line 1913 "EditingTools.c"
+#line 1928 "EditingTools.c"
 }
 
 
@@ -1918,7 +1933,7 @@ static void editing_tools_editing_tool_window_suppress_warnings (EditingToolsEdi
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL_WINDOW (self));
 #line 95 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (message != NULL);
-#line 1922 "EditingTools.c"
+#line 1937 "EditingTools.c"
 }
 
 
@@ -1928,21 +1943,21 @@ static void editing_tools_editing_tool_window_class_init (EditingToolsEditingToo
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsEditingToolWindowPrivate));
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((GtkContainerClass *) klass)->add = (void (*)(GtkContainer*, GtkWidget*)) editing_tools_editing_tool_window_real_add;
+	((GtkContainerClass *) klass)->add = (void (*) (GtkContainer *, GtkWidget*)) editing_tools_editing_tool_window_real_add;
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) editing_tools_editing_tool_window_real_key_press_event;
+	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) editing_tools_editing_tool_window_real_key_press_event;
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((GtkWidgetClass *) klass)->button_press_event = (gboolean (*)(GtkWidget*, GdkEventButton*)) editing_tools_editing_tool_window_real_button_press_event;
+	((GtkWidgetClass *) klass)->button_press_event = (gboolean (*) (GtkWidget *, GdkEventButton*)) editing_tools_editing_tool_window_real_button_press_event;
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((GtkWidgetClass *) klass)->realize = (void (*)(GtkWidget*)) editing_tools_editing_tool_window_real_realize;
+	((GtkWidgetClass *) klass)->realize = (void (*) (GtkWidget *)) editing_tools_editing_tool_window_real_realize;
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_editing_tool_window_finalize;
-#line 1941 "EditingTools.c"
+#line 1956 "EditingTools.c"
 }
 
 
 static void editing_tools_editing_tool_window_instance_init (EditingToolsEditingToolWindow * self) {
-	GtkFrame* _tmp0_ = NULL;
+	GtkFrame* _tmp0_;
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_EDITING_TOOL_WINDOW_GET_PRIVATE (self);
 #line 31 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1953,14 +1968,14 @@ static void editing_tools_editing_tool_window_instance_init (EditingToolsEditing
 	self->priv->layout_frame = _tmp0_;
 #line 32 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_moved = FALSE;
-#line 1957 "EditingTools.c"
+#line 1972 "EditingTools.c"
 }
 
 
-static void editing_tools_editing_tool_window_finalize (GObject* obj) {
+static void editing_tools_editing_tool_window_finalize (GObject * obj) {
 	EditingToolsEditingToolWindow * self;
-	GLogFunc _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
+	GLogFunc _tmp0_;
+	void* _tmp0__target;
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow);
 #line 60 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1973,7 +1988,7 @@ static void editing_tools_editing_tool_window_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->layout_frame);
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_editing_tool_window_parent_class)->finalize (obj);
-#line 1977 "EditingTools.c"
+#line 1992 "EditingTools.c"
 }
 
 
@@ -1992,35 +2007,35 @@ GType editing_tools_editing_tool_window_get_type (void) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1996 "EditingTools.c"
+#line 2011 "EditingTools.c"
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
 #line 118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 2003 "EditingTools.c"
+#line 2018 "EditingTools.c"
 }
 
 
 EditingToolsPhotoCanvas* editing_tools_photo_canvas_construct (GType object_type, GtkWindow* container, GdkWindow* drawing_window, Photo* photo, cairo_t* default_ctx, Dimensions* surface_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position) {
 	EditingToolsPhotoCanvas* self = NULL;
-	GtkWindow* _tmp0_ = NULL;
-	GtkWindow* _tmp1_ = NULL;
-	GdkWindow* _tmp2_ = NULL;
-	GdkWindow* _tmp3_ = NULL;
-	Photo* _tmp4_ = NULL;
-	Photo* _tmp5_ = NULL;
-	cairo_t* _tmp6_ = NULL;
-	cairo_t* _tmp7_ = NULL;
-	Dimensions _tmp8_ = {0};
-	GdkRectangle _tmp9_ = {0};
-	GdkPixbuf* _tmp10_ = NULL;
-	GdkPixbuf* _tmp11_ = NULL;
-	cairo_t* _tmp12_ = NULL;
-	GdkPixbuf* _tmp13_ = NULL;
-	GdkRectangle _tmp14_ = {0};
-	cairo_surface_t* _tmp15_ = NULL;
+	GtkWindow* _tmp0_;
+	GtkWindow* _tmp1_;
+	GdkWindow* _tmp2_;
+	GdkWindow* _tmp3_;
+	Photo* _tmp4_;
+	Photo* _tmp5_;
+	cairo_t* _tmp6_;
+	cairo_t* _tmp7_;
+	Dimensions _tmp8_;
+	GdkRectangle _tmp9_;
+	GdkPixbuf* _tmp10_;
+	GdkPixbuf* _tmp11_;
+	cairo_t* _tmp12_;
+	GdkPixbuf* _tmp13_;
+	GdkRectangle _tmp14_;
+	cairo_surface_t* _tmp15_;
 #line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
 #line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2099,13 +2114,13 @@ EditingToolsPhotoCanvas* editing_tools_photo_canvas_construct (GType object_type
 	self->priv->scaled = _tmp15_;
 #line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 2103 "EditingTools.c"
+#line 2118 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_unscaled_to_raw_rect (EditingToolsPhotoCanvas* self, GdkRectangle* rectangle, GdkRectangle* result) {
-	Photo* _tmp0_ = NULL;
-	GdkRectangle _tmp1_ = {0};
+	Photo* _tmp0_;
+	GdkRectangle _tmp1_;
 	GdkRectangle _tmp2_ = {0};
 #line 130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
@@ -2121,7 +2136,7 @@ void editing_tools_photo_canvas_unscaled_to_raw_rect (EditingToolsPhotoCanvas* s
 	*result = _tmp2_;
 #line 131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2125 "EditingTools.c"
+#line 2140 "EditingTools.c"
 }
 
 
@@ -2129,24 +2144,24 @@ void editing_tools_photo_canvas_active_to_unscaled_point (EditingToolsPhotoCanva
 	GdkRectangle scaled_position = {0};
 	GdkRectangle _tmp0_ = {0};
 	Dimensions unscaled_dims = {0};
-	Photo* _tmp1_ = NULL;
+	Photo* _tmp1_;
 	Dimensions _tmp2_ = {0};
 	gdouble scale_factor_x = 0.0;
-	Dimensions _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	GdkRectangle _tmp5_ = {0};
-	gint _tmp6_ = 0;
+	Dimensions _tmp3_;
+	gint _tmp4_;
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
 	gdouble scale_factor_y = 0.0;
-	Dimensions _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	GdkRectangle _tmp9_ = {0};
-	gint _tmp10_ = 0;
+	Dimensions _tmp7_;
+	gint _tmp8_;
+	GdkRectangle _tmp9_;
+	gint _tmp10_;
 	GdkPoint _result_ = {0};
 	GdkPoint _tmp11_ = {0};
-	GdkPoint _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	GdkPoint _tmp14_ = {0};
-	gint _tmp15_ = 0;
+	GdkPoint _tmp12_;
+	gint _tmp13_;
+	GdkPoint _tmp14_;
+	gint _tmp15_;
 #line 134 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 134 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2201,7 +2216,7 @@ void editing_tools_photo_canvas_active_to_unscaled_point (EditingToolsPhotoCanva
 	*result = _result_;
 #line 147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2205 "EditingTools.c"
+#line 2220 "EditingTools.c"
 }
 
 
@@ -2210,35 +2225,35 @@ void editing_tools_photo_canvas_active_to_unscaled_rect (EditingToolsPhotoCanvas
 	GdkPoint _tmp0_ = {0};
 	GdkPoint lower_right = {0};
 	GdkPoint _tmp1_ = {0};
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	GdkPoint _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	GdkRectangle _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	GdkPoint _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	GdkRectangle _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	GdkPoint _tmp14_ = {0};
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	GdkPoint _tmp6_;
+	gint _tmp7_;
+	GdkRectangle _tmp8_;
+	gint _tmp9_;
+	GdkPoint _tmp10_;
+	gint _tmp11_;
+	GdkRectangle _tmp12_;
+	gint _tmp13_;
+	GdkPoint _tmp14_;
 	GdkPoint _tmp15_ = {0};
-	GdkPoint _tmp16_ = {0};
+	GdkPoint _tmp16_;
 	GdkPoint _tmp17_ = {0};
 	GdkRectangle unscaled_rect = {0};
-	GdkPoint _tmp18_ = {0};
-	gint _tmp19_ = 0;
-	GdkPoint _tmp20_ = {0};
-	gint _tmp21_ = 0;
-	GdkPoint _tmp22_ = {0};
-	gint _tmp23_ = 0;
-	GdkPoint _tmp24_ = {0};
-	gint _tmp25_ = 0;
-	GdkPoint _tmp26_ = {0};
-	gint _tmp27_ = 0;
-	GdkPoint _tmp28_ = {0};
-	gint _tmp29_ = 0;
+	GdkPoint _tmp18_;
+	gint _tmp19_;
+	GdkPoint _tmp20_;
+	gint _tmp21_;
+	GdkPoint _tmp22_;
+	gint _tmp23_;
+	GdkPoint _tmp24_;
+	gint _tmp25_;
+	GdkPoint _tmp26_;
+	gint _tmp27_;
+	GdkPoint _tmp28_;
+	gint _tmp29_;
 #line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2333,7 +2348,7 @@ void editing_tools_photo_canvas_active_to_unscaled_rect (EditingToolsPhotoCanvas
 	*result = unscaled_rect;
 #line 167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2337 "EditingTools.c"
+#line 2352 "EditingTools.c"
 }
 
 
@@ -2342,14 +2357,14 @@ void editing_tools_photo_canvas_user_to_active_point (EditingToolsPhotoCanvas* s
 	GdkRectangle _tmp0_ = {0};
 	GdkPoint _result_ = {0};
 	GdkPoint _tmp1_ = {0};
-	GdkPoint _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	GdkPoint _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	GdkRectangle _tmp8_ = {0};
-	gint _tmp9_ = 0;
+	GdkPoint _tmp2_;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	GdkPoint _tmp6_;
+	gint _tmp7_;
+	GdkRectangle _tmp8_;
+	gint _tmp9_;
 #line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2386,7 +2401,7 @@ void editing_tools_photo_canvas_user_to_active_point (EditingToolsPhotoCanvas* s
 	*result = _result_;
 #line 177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2390 "EditingTools.c"
+#line 2405 "EditingTools.c"
 }
 
 
@@ -2395,35 +2410,35 @@ void editing_tools_photo_canvas_user_to_active_rect (EditingToolsPhotoCanvas* se
 	GdkPoint _tmp0_ = {0};
 	GdkPoint lower_right = {0};
 	GdkPoint _tmp1_ = {0};
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	GdkPoint _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	GdkRectangle _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	GdkPoint _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	GdkRectangle _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	GdkPoint _tmp14_ = {0};
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	GdkPoint _tmp6_;
+	gint _tmp7_;
+	GdkRectangle _tmp8_;
+	gint _tmp9_;
+	GdkPoint _tmp10_;
+	gint _tmp11_;
+	GdkRectangle _tmp12_;
+	gint _tmp13_;
+	GdkPoint _tmp14_;
 	GdkPoint _tmp15_ = {0};
-	GdkPoint _tmp16_ = {0};
+	GdkPoint _tmp16_;
 	GdkPoint _tmp17_ = {0};
 	GdkRectangle active_rect = {0};
-	GdkPoint _tmp18_ = {0};
-	gint _tmp19_ = 0;
-	GdkPoint _tmp20_ = {0};
-	gint _tmp21_ = 0;
-	GdkPoint _tmp22_ = {0};
-	gint _tmp23_ = 0;
-	GdkPoint _tmp24_ = {0};
-	gint _tmp25_ = 0;
-	GdkPoint _tmp26_ = {0};
-	gint _tmp27_ = 0;
-	GdkPoint _tmp28_ = {0};
-	gint _tmp29_ = 0;
+	GdkPoint _tmp18_;
+	gint _tmp19_;
+	GdkPoint _tmp20_;
+	gint _tmp21_;
+	GdkPoint _tmp22_;
+	gint _tmp23_;
+	GdkPoint _tmp24_;
+	gint _tmp25_;
+	GdkPoint _tmp26_;
+	gint _tmp27_;
+	GdkPoint _tmp28_;
+	gint _tmp29_;
 #line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2518,14 +2533,14 @@ void editing_tools_photo_canvas_user_to_active_rect (EditingToolsPhotoCanvas* se
 	*result = active_rect;
 #line 197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2522 "EditingTools.c"
+#line 2537 "EditingTools.c"
 }
 
 
 Photo* editing_tools_photo_canvas_get_photo (EditingToolsPhotoCanvas* self) {
 	Photo* result = NULL;
-	Photo* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
+	Photo* _tmp0_;
+	Photo* _tmp1_;
 #line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
 #line 201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2536,14 +2551,14 @@ Photo* editing_tools_photo_canvas_get_photo (EditingToolsPhotoCanvas* self) {
 	result = _tmp1_;
 #line 201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2540 "EditingTools.c"
+#line 2555 "EditingTools.c"
 }
 
 
 GtkWindow* editing_tools_photo_canvas_get_container (EditingToolsPhotoCanvas* self) {
 	GtkWindow* result = NULL;
-	GtkWindow* _tmp0_ = NULL;
-	GtkWindow* _tmp1_ = NULL;
+	GtkWindow* _tmp0_;
+	GtkWindow* _tmp1_;
 #line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
 #line 205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2554,14 +2569,14 @@ GtkWindow* editing_tools_photo_canvas_get_container (EditingToolsPhotoCanvas* se
 	result = _tmp1_;
 #line 205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2558 "EditingTools.c"
+#line 2573 "EditingTools.c"
 }
 
 
 GdkWindow* editing_tools_photo_canvas_get_drawing_window (EditingToolsPhotoCanvas* self) {
 	GdkWindow* result = NULL;
-	GdkWindow* _tmp0_ = NULL;
-	GdkWindow* _tmp1_ = NULL;
+	GdkWindow* _tmp0_;
+	GdkWindow* _tmp1_;
 #line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
 #line 209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2572,14 +2587,14 @@ GdkWindow* editing_tools_photo_canvas_get_drawing_window (EditingToolsPhotoCanva
 	result = _tmp1_;
 #line 209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2576 "EditingTools.c"
+#line 2591 "EditingTools.c"
 }
 
 
 cairo_t* editing_tools_photo_canvas_get_default_ctx (EditingToolsPhotoCanvas* self) {
 	cairo_t* result = NULL;
-	cairo_t* _tmp0_ = NULL;
-	cairo_t* _tmp1_ = NULL;
+	cairo_t* _tmp0_;
+	cairo_t* _tmp1_;
 #line 212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
 #line 213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2590,12 +2605,12 @@ cairo_t* editing_tools_photo_canvas_get_default_ctx (EditingToolsPhotoCanvas* se
 	result = _tmp1_;
 #line 213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2594 "EditingTools.c"
+#line 2609 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self, Dimensions* result) {
-	Dimensions _tmp0_ = {0};
+	Dimensions _tmp0_;
 #line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2604,12 +2619,12 @@ void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self,
 	*result = _tmp0_;
 #line 217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2608 "EditingTools.c"
+#line 2623 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_get_scaling (EditingToolsPhotoCanvas* self, Scaling* result) {
-	Dimensions _tmp0_ = {0};
+	Dimensions _tmp0_;
 	Scaling _tmp1_ = {0};
 #line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
@@ -2621,16 +2636,16 @@ void editing_tools_photo_canvas_get_scaling (EditingToolsPhotoCanvas* self, Scal
 	*result = _tmp1_;
 #line 221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2625 "EditingTools.c"
+#line 2640 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self, cairo_t* default_ctx, Dimensions* surface_dim) {
-	cairo_t* _tmp0_ = NULL;
-	cairo_t* _tmp1_ = NULL;
-	Dimensions _tmp2_ = {0};
-	cairo_t* _tmp3_ = NULL;
-	Dimensions _tmp4_ = {0};
+	cairo_t* _tmp0_;
+	cairo_t* _tmp1_;
+	Dimensions _tmp2_;
+	cairo_t* _tmp3_;
+	Dimensions _tmp4_;
 #line 224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2654,22 +2669,22 @@ void editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self, cair
 #line 228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = *surface_dim;
 #line 228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_emit_by_name (self, "new-surface", _tmp3_, &_tmp4_);
-#line 2659 "EditingTools.c"
+	g_signal_emit (self, editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_NEW_SURFACE_SIGNAL], 0, _tmp3_, &_tmp4_);
+#line 2674 "EditingTools.c"
 }
 
 
 static gpointer _cairo_surface_reference0 (gpointer self) {
 #line 232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? cairo_surface_reference (self) : NULL;
-#line 2666 "EditingTools.c"
+#line 2681 "EditingTools.c"
 }
 
 
 cairo_surface_t* editing_tools_photo_canvas_get_scaled_surface (EditingToolsPhotoCanvas* self) {
 	cairo_surface_t* result = NULL;
-	cairo_surface_t* _tmp0_ = NULL;
-	cairo_surface_t* _tmp1_ = NULL;
+	cairo_surface_t* _tmp0_;
+	cairo_surface_t* _tmp1_;
 #line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
 #line 232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2680,14 +2695,14 @@ cairo_surface_t* editing_tools_photo_canvas_get_scaled_surface (EditingToolsPhot
 	result = _tmp1_;
 #line 232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2684 "EditingTools.c"
+#line 2699 "EditingTools.c"
 }
 
 
 GdkPixbuf* editing_tools_photo_canvas_get_scaled_pixbuf (EditingToolsPhotoCanvas* self) {
 	GdkPixbuf* result = NULL;
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp1_;
 #line 235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
 #line 236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2698,12 +2713,12 @@ GdkPixbuf* editing_tools_photo_canvas_get_scaled_pixbuf (EditingToolsPhotoCanvas
 	result = _tmp1_;
 #line 236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2702 "EditingTools.c"
+#line 2717 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_get_scaled_pixbuf_position (EditingToolsPhotoCanvas* self, GdkRectangle* result) {
-	GdkRectangle _tmp0_ = {0};
+	GdkRectangle _tmp0_;
 #line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2712,21 +2727,21 @@ void editing_tools_photo_canvas_get_scaled_pixbuf_position (EditingToolsPhotoCan
 	*result = _tmp0_;
 #line 240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2716 "EditingTools.c"
+#line 2731 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position) {
-	cairo_t* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-	GdkRectangle _tmp2_ = {0};
-	cairo_surface_t* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
-	GdkRectangle _tmp6_ = {0};
-	Dimensions _tmp7_ = {0};
-	GdkPixbuf* _tmp8_ = NULL;
-	GdkRectangle _tmp9_ = {0};
+	cairo_t* _tmp0_;
+	GdkPixbuf* _tmp1_;
+	GdkRectangle _tmp2_;
+	cairo_surface_t* _tmp3_;
+	GdkPixbuf* _tmp4_;
+	GdkPixbuf* _tmp5_;
+	GdkRectangle _tmp6_;
+	Dimensions _tmp7_;
+	GdkPixbuf* _tmp8_;
+	GdkRectangle _tmp9_;
 #line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2766,8 +2781,8 @@ void editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self, D
 #line 248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = *scaled_position;
 #line 248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_emit_by_name (self, "resized-scaled-pixbuf", &_tmp7_, _tmp8_, &_tmp9_);
-#line 2771 "EditingTools.c"
+	g_signal_emit (self, editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_RESIZED_SCALED_PIXBUF_SIGNAL], 0, &_tmp7_, _tmp8_, &_tmp9_);
+#line 2786 "EditingTools.c"
 }
 
 
@@ -2776,7 +2791,7 @@ static void editing_tools_photo_canvas_real_repaint (EditingToolsPhotoCanvas* se
 	g_critical ("Type `%s' does not implement abstract method `editing_tools_photo_canvas_repaint'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2780 "EditingTools.c"
+#line 2795 "EditingTools.c"
 }
 
 
@@ -2785,36 +2800,36 @@ void editing_tools_photo_canvas_repaint (EditingToolsPhotoCanvas* self) {
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_PHOTO_CANVAS_GET_CLASS (self)->repaint (self);
-#line 2789 "EditingTools.c"
+#line 2804 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, GdkPixbuf* pixbuf) {
-	cairo_t* _tmp0_ = NULL;
-	cairo_t* _tmp1_ = NULL;
-	cairo_t* _tmp2_ = NULL;
-	Dimensions _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	Dimensions _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	cairo_t* _tmp7_ = NULL;
-	cairo_t* _tmp8_ = NULL;
-	GdkPixbuf* _tmp9_ = NULL;
-	GdkRectangle _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	GdkRectangle _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	cairo_t* _tmp14_ = NULL;
-	GdkRectangle _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	GdkRectangle _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	GdkPixbuf* _tmp19_ = NULL;
-	gint _tmp20_ = 0;
-	GdkPixbuf* _tmp21_ = NULL;
-	gint _tmp22_ = 0;
-	cairo_t* _tmp23_ = NULL;
-	cairo_t* _tmp24_ = NULL;
+	cairo_t* _tmp0_;
+	cairo_t* _tmp1_;
+	cairo_t* _tmp2_;
+	Dimensions _tmp3_;
+	gint _tmp4_;
+	Dimensions _tmp5_;
+	gint _tmp6_;
+	cairo_t* _tmp7_;
+	cairo_t* _tmp8_;
+	GdkPixbuf* _tmp9_;
+	GdkRectangle _tmp10_;
+	gint _tmp11_;
+	GdkRectangle _tmp12_;
+	gint _tmp13_;
+	cairo_t* _tmp14_;
+	GdkRectangle _tmp15_;
+	gint _tmp16_;
+	GdkRectangle _tmp17_;
+	gint _tmp18_;
+	GdkPixbuf* _tmp19_;
+	gint _tmp20_;
+	GdkPixbuf* _tmp21_;
+	gint _tmp22_;
+	cairo_t* _tmp23_;
+	cairo_t* _tmp24_;
 #line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2885,33 +2900,33 @@ void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, Gdk
 	_tmp24_ = self->priv->default_ctx;
 #line 272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp24_);
-#line 2889 "EditingTools.c"
+#line 2904 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_paint_pixbuf_area (EditingToolsPhotoCanvas* self, GdkPixbuf* pixbuf, Box* source_area) {
-	cairo_t* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	cairo_t* _tmp16_ = NULL;
-	GdkPixbuf* _tmp17_ = NULL;
-	GdkRectangle _tmp18_ = {0};
-	gint _tmp19_ = 0;
-	GdkRectangle _tmp20_ = {0};
-	gint _tmp21_ = 0;
-	cairo_t* _tmp22_ = NULL;
-	GdkRectangle _tmp23_ = {0};
-	gint _tmp24_ = 0;
-	Box _tmp25_ = {0};
-	gint _tmp26_ = 0;
-	GdkRectangle _tmp27_ = {0};
-	gint _tmp28_ = 0;
-	Box _tmp29_ = {0};
-	gint _tmp30_ = 0;
-	gint _tmp31_ = 0;
-	gint _tmp32_ = 0;
-	cairo_t* _tmp33_ = NULL;
-	cairo_t* _tmp34_ = NULL;
+	cairo_t* _tmp0_;
+	GdkPixbuf* _tmp1_;
+	gboolean _tmp2_;
+	cairo_t* _tmp16_;
+	GdkPixbuf* _tmp17_;
+	GdkRectangle _tmp18_;
+	gint _tmp19_;
+	GdkRectangle _tmp20_;
+	gint _tmp21_;
+	cairo_t* _tmp22_;
+	GdkRectangle _tmp23_;
+	gint _tmp24_;
+	Box _tmp25_;
+	gint _tmp26_;
+	GdkRectangle _tmp27_;
+	gint _tmp28_;
+	Box _tmp29_;
+	gint _tmp30_;
+	gint _tmp31_;
+	gint _tmp32_;
+	cairo_t* _tmp33_;
+	cairo_t* _tmp34_;
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2928,20 +2943,20 @@ void editing_tools_photo_canvas_paint_pixbuf_area (EditingToolsPhotoCanvas* self
 	_tmp2_ = gdk_pixbuf_get_has_alpha (_tmp1_);
 #line 277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_) {
-#line 2932 "EditingTools.c"
-		cairo_t* _tmp3_ = NULL;
-		cairo_t* _tmp4_ = NULL;
-		GdkRectangle _tmp5_ = {0};
-		gint _tmp6_ = 0;
-		Box _tmp7_ = {0};
-		gint _tmp8_ = 0;
-		GdkRectangle _tmp9_ = {0};
-		gint _tmp10_ = 0;
-		Box _tmp11_ = {0};
-		gint _tmp12_ = 0;
-		gint _tmp13_ = 0;
-		gint _tmp14_ = 0;
-		cairo_t* _tmp15_ = NULL;
+#line 2947 "EditingTools.c"
+		cairo_t* _tmp3_;
+		cairo_t* _tmp4_;
+		GdkRectangle _tmp5_;
+		gint _tmp6_;
+		Box _tmp7_;
+		gint _tmp8_;
+		GdkRectangle _tmp9_;
+		gint _tmp10_;
+		Box _tmp11_;
+		gint _tmp12_;
+		gint _tmp13_;
+		gint _tmp14_;
+		cairo_t* _tmp15_;
 #line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = self->priv->default_ctx;
 #line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2974,7 +2989,7 @@ void editing_tools_photo_canvas_paint_pixbuf_area (EditingToolsPhotoCanvas* self
 		_tmp15_ = self->priv->default_ctx;
 #line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_fill (_tmp15_);
-#line 2978 "EditingTools.c"
+#line 2993 "EditingTools.c"
 	}
 #line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->priv->default_ctx;
@@ -3022,28 +3037,28 @@ void editing_tools_photo_canvas_paint_pixbuf_area (EditingToolsPhotoCanvas* self
 	_tmp34_ = self->priv->default_ctx;
 #line 291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp34_);
-#line 3026 "EditingTools.c"
+#line 3041 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, cairo_surface_t* surface, gboolean over) {
-	cairo_t* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	cairo_t* _tmp4_ = NULL;
-	cairo_surface_t* _tmp5_ = NULL;
-	GdkRectangle _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	GdkRectangle _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	cairo_t* _tmp10_ = NULL;
-	cairo_t* _tmp11_ = NULL;
-	cairo_surface_t* _tmp12_ = NULL;
-	GdkRectangle _tmp13_ = {0};
-	gint _tmp14_ = 0;
-	GdkRectangle _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	cairo_t* _tmp17_ = NULL;
-	cairo_t* _tmp18_ = NULL;
+	cairo_t* _tmp0_;
+	gboolean _tmp1_;
+	cairo_t* _tmp4_;
+	cairo_surface_t* _tmp5_;
+	GdkRectangle _tmp6_;
+	gint _tmp7_;
+	GdkRectangle _tmp8_;
+	gint _tmp9_;
+	cairo_t* _tmp10_;
+	cairo_t* _tmp11_;
+	cairo_surface_t* _tmp12_;
+	GdkRectangle _tmp13_;
+	gint _tmp14_;
+	GdkRectangle _tmp15_;
+	gint _tmp16_;
+	cairo_t* _tmp17_;
+	cairo_t* _tmp18_;
 #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3056,20 +3071,20 @@ void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, ca
 	_tmp1_ = over;
 #line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == FALSE) {
-#line 3060 "EditingTools.c"
-		cairo_t* _tmp2_ = NULL;
+#line 3075 "EditingTools.c"
+		cairo_t* _tmp2_;
 #line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->default_ctx;
 #line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp2_, CAIRO_OPERATOR_SOURCE);
-#line 3066 "EditingTools.c"
+#line 3081 "EditingTools.c"
 	} else {
-		cairo_t* _tmp3_ = NULL;
+		cairo_t* _tmp3_;
 #line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = self->priv->default_ctx;
 #line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp3_, CAIRO_OPERATOR_OVER);
-#line 3073 "EditingTools.c"
+#line 3088 "EditingTools.c"
 	}
 #line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->default_ctx;
@@ -3111,50 +3126,50 @@ void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, ca
 	_tmp18_ = self->priv->default_ctx;
 #line 306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp18_);
-#line 3115 "EditingTools.c"
+#line 3130 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* self, cairo_surface_t* surface, Box* source_area, gboolean over) {
-	cairo_t* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	cairo_t* _tmp4_ = NULL;
-	cairo_surface_t* _tmp5_ = NULL;
-	GdkRectangle _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	GdkRectangle _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	cairo_t* _tmp10_ = NULL;
-	GdkRectangle _tmp11_ = {0};
-	gint _tmp12_ = 0;
-	Box _tmp13_ = {0};
-	gint _tmp14_ = 0;
-	GdkRectangle _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	Box _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
-	cairo_t* _tmp21_ = NULL;
-	cairo_t* _tmp22_ = NULL;
-	cairo_surface_t* _tmp23_ = NULL;
-	GdkRectangle _tmp24_ = {0};
-	gint _tmp25_ = 0;
-	GdkRectangle _tmp26_ = {0};
-	gint _tmp27_ = 0;
-	cairo_t* _tmp28_ = NULL;
-	GdkRectangle _tmp29_ = {0};
-	gint _tmp30_ = 0;
-	Box _tmp31_ = {0};
-	gint _tmp32_ = 0;
-	GdkRectangle _tmp33_ = {0};
-	gint _tmp34_ = 0;
-	Box _tmp35_ = {0};
-	gint _tmp36_ = 0;
-	gint _tmp37_ = 0;
-	gint _tmp38_ = 0;
-	cairo_t* _tmp39_ = NULL;
-	cairo_t* _tmp40_ = NULL;
+	cairo_t* _tmp0_;
+	gboolean _tmp1_;
+	cairo_t* _tmp4_;
+	cairo_surface_t* _tmp5_;
+	GdkRectangle _tmp6_;
+	gint _tmp7_;
+	GdkRectangle _tmp8_;
+	gint _tmp9_;
+	cairo_t* _tmp10_;
+	GdkRectangle _tmp11_;
+	gint _tmp12_;
+	Box _tmp13_;
+	gint _tmp14_;
+	GdkRectangle _tmp15_;
+	gint _tmp16_;
+	Box _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
+	cairo_t* _tmp21_;
+	cairo_t* _tmp22_;
+	cairo_surface_t* _tmp23_;
+	GdkRectangle _tmp24_;
+	gint _tmp25_;
+	GdkRectangle _tmp26_;
+	gint _tmp27_;
+	cairo_t* _tmp28_;
+	GdkRectangle _tmp29_;
+	gint _tmp30_;
+	Box _tmp31_;
+	gint _tmp32_;
+	GdkRectangle _tmp33_;
+	gint _tmp34_;
+	Box _tmp35_;
+	gint _tmp36_;
+	gint _tmp37_;
+	gint _tmp38_;
+	cairo_t* _tmp39_;
+	cairo_t* _tmp40_;
 #line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3169,20 +3184,20 @@ void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* sel
 	_tmp1_ = over;
 #line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == FALSE) {
-#line 3173 "EditingTools.c"
-		cairo_t* _tmp2_ = NULL;
+#line 3188 "EditingTools.c"
+		cairo_t* _tmp2_;
 #line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->default_ctx;
 #line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp2_, CAIRO_OPERATOR_SOURCE);
-#line 3179 "EditingTools.c"
+#line 3194 "EditingTools.c"
 	} else {
-		cairo_t* _tmp3_ = NULL;
+		cairo_t* _tmp3_;
 #line 314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = self->priv->default_ctx;
 #line 314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp3_, CAIRO_OPERATOR_OVER);
-#line 3186 "EditingTools.c"
+#line 3201 "EditingTools.c"
 	}
 #line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->default_ctx;
@@ -3272,29 +3287,29 @@ void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* sel
 	_tmp40_ = self->priv->default_ctx;
 #line 327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp40_);
-#line 3276 "EditingTools.c"
+#line 3291 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self, cairo_t* ctx, Box* box) {
 	GdkRectangle rect = {0};
 	GdkRectangle _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	GdkRectangle _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	cairo_t* _tmp7_ = NULL;
-	GdkRectangle _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	GdkRectangle _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	GdkRectangle _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	GdkRectangle _tmp14_ = {0};
-	gint _tmp15_ = 0;
-	cairo_t* _tmp16_ = NULL;
+	gint _tmp1_;
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
+	cairo_t* _tmp7_;
+	GdkRectangle _tmp8_;
+	gint _tmp9_;
+	GdkRectangle _tmp10_;
+	gint _tmp11_;
+	GdkRectangle _tmp12_;
+	gint _tmp13_;
+	GdkRectangle _tmp14_;
+	gint _tmp15_;
+	cairo_t* _tmp16_;
 #line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3345,37 +3360,37 @@ void editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self, cairo_t
 	_tmp16_ = ctx;
 #line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp16_);
-#line 3349 "EditingTools.c"
+#line 3364 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_t* ctx, const gchar* text, gint x, gint y, gboolean use_scaled_pos) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	cairo_text_extents_t extents = {0};
-	cairo_t* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
+	cairo_t* _tmp7_;
+	const gchar* _tmp8_;
 	cairo_text_extents_t _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	cairo_text_extents_t _tmp11_ = {0};
-	gdouble _tmp12_ = 0.0;
-	cairo_t* _tmp13_ = NULL;
+	gint _tmp10_;
+	cairo_text_extents_t _tmp11_;
+	gdouble _tmp12_;
+	cairo_t* _tmp13_;
 	gint pane_border = 0;
-	cairo_t* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	cairo_text_extents_t _tmp17_ = {0};
-	gdouble _tmp18_ = 0.0;
-	cairo_text_extents_t _tmp19_ = {0};
-	gdouble _tmp20_ = 0.0;
-	cairo_text_extents_t _tmp21_ = {0};
-	gdouble _tmp22_ = 0.0;
-	cairo_t* _tmp23_ = NULL;
-	cairo_t* _tmp24_ = NULL;
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
-	cairo_t* _tmp27_ = NULL;
-	cairo_t* _tmp28_ = NULL;
-	const gchar* _tmp29_ = NULL;
+	cairo_t* _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	cairo_text_extents_t _tmp17_;
+	gdouble _tmp18_;
+	cairo_text_extents_t _tmp19_;
+	gdouble _tmp20_;
+	cairo_text_extents_t _tmp21_;
+	gdouble _tmp22_;
+	cairo_t* _tmp23_;
+	cairo_t* _tmp24_;
+	gint _tmp25_;
+	gint _tmp26_;
+	cairo_t* _tmp27_;
+	cairo_t* _tmp28_;
+	const gchar* _tmp29_;
 #line 339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3386,13 +3401,13 @@ void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_
 	_tmp0_ = use_scaled_pos;
 #line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 3390 "EditingTools.c"
-		gint _tmp1_ = 0;
-		GdkRectangle _tmp2_ = {0};
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
-		GdkRectangle _tmp5_ = {0};
-		gint _tmp6_ = 0;
+#line 3405 "EditingTools.c"
+		gint _tmp1_;
+		GdkRectangle _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
+		GdkRectangle _tmp5_;
+		gint _tmp6_;
 #line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = x;
 #line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3409,7 +3424,7 @@ void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_
 		_tmp6_ = _tmp5_.y;
 #line 342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = _tmp4_ + _tmp6_;
-#line 3413 "EditingTools.c"
+#line 3428 "EditingTools.c"
 	}
 #line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = ctx;
@@ -3475,7 +3490,7 @@ void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_
 	_tmp29_ = text;
 #line 358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_show_text (_tmp28_, _tmp29_);
-#line 3479 "EditingTools.c"
+#line 3494 "EditingTools.c"
 }
 
 
@@ -3491,15 +3506,15 @@ void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_
      *      position of the scaled image.
      */
 void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint x, gint y, gint width, gboolean use_scaled_pos) {
-	gboolean _tmp0_ = FALSE;
-	cairo_t* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	cairo_t* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	cairo_t* _tmp14_ = NULL;
+	gboolean _tmp0_;
+	cairo_t* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	cairo_t* _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
+	cairo_t* _tmp14_;
 #line 372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3508,13 +3523,13 @@ void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* s
 	_tmp0_ = use_scaled_pos;
 #line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 3512 "EditingTools.c"
-		gint _tmp1_ = 0;
-		GdkRectangle _tmp2_ = {0};
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
-		GdkRectangle _tmp5_ = {0};
-		gint _tmp6_ = 0;
+#line 3527 "EditingTools.c"
+		gint _tmp1_;
+		GdkRectangle _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
+		GdkRectangle _tmp5_;
+		gint _tmp6_;
 #line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = x;
 #line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3531,7 +3546,7 @@ void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* s
 		_tmp6_ = _tmp5_.y;
 #line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = _tmp4_ + _tmp6_;
-#line 3535 "EditingTools.c"
+#line 3550 "EditingTools.c"
 	}
 #line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = ctx;
@@ -3555,7 +3570,7 @@ void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* s
 	_tmp14_ = ctx;
 #line 380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp14_);
-#line 3559 "EditingTools.c"
+#line 3574 "EditingTools.c"
 }
 
 
@@ -3571,15 +3586,15 @@ void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* s
      *      position of the scaled image.
      */
 void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint x, gint y, gint height, gboolean use_scaled_pos) {
-	gboolean _tmp0_ = FALSE;
-	cairo_t* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	cairo_t* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	cairo_t* _tmp14_ = NULL;
+	gboolean _tmp0_;
+	cairo_t* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	cairo_t* _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
+	cairo_t* _tmp14_;
 #line 394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3588,13 +3603,13 @@ void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* sel
 	_tmp0_ = use_scaled_pos;
 #line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 3592 "EditingTools.c"
-		gint _tmp1_ = 0;
-		GdkRectangle _tmp2_ = {0};
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
-		GdkRectangle _tmp5_ = {0};
-		gint _tmp6_ = 0;
+#line 3607 "EditingTools.c"
+		gint _tmp1_;
+		GdkRectangle _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
+		GdkRectangle _tmp5_;
+		gint _tmp6_;
 #line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = x;
 #line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3611,7 +3626,7 @@ void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* sel
 		_tmp6_ = _tmp5_.y;
 #line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = _tmp4_ + _tmp6_;
-#line 3615 "EditingTools.c"
+#line 3630 "EditingTools.c"
 	}
 #line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = ctx;
@@ -3635,29 +3650,29 @@ void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* sel
 	_tmp14_ = ctx;
 #line 402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp14_);
-#line 3639 "EditingTools.c"
+#line 3654 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_erase_horizontal_line (EditingToolsPhotoCanvas* self, gint x, gint y, gint width) {
-	cairo_t* _tmp0_ = NULL;
-	cairo_t* _tmp1_ = NULL;
-	cairo_t* _tmp2_ = NULL;
-	cairo_surface_t* _tmp3_ = NULL;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	GdkRectangle _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	cairo_t* _tmp8_ = NULL;
-	GdkRectangle _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	GdkRectangle _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	cairo_t* _tmp16_ = NULL;
-	cairo_t* _tmp17_ = NULL;
+	cairo_t* _tmp0_;
+	cairo_t* _tmp1_;
+	cairo_t* _tmp2_;
+	cairo_surface_t* _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	GdkRectangle _tmp6_;
+	gint _tmp7_;
+	cairo_t* _tmp8_;
+	GdkRectangle _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	GdkRectangle _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
+	cairo_t* _tmp16_;
+	cairo_t* _tmp17_;
 #line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3708,22 +3723,22 @@ void editing_tools_photo_canvas_erase_horizontal_line (EditingToolsPhotoCanvas*
 	_tmp17_ = self->priv->default_ctx;
 #line 414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp17_);
-#line 3712 "EditingTools.c"
+#line 3727 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_draw_circle (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint active_center_x, gint active_center_y, gint radius) {
 	gint center_x = 0;
-	gint _tmp0_ = 0;
-	GdkRectangle _tmp1_ = {0};
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	GdkRectangle _tmp1_;
+	gint _tmp2_;
 	gint center_y = 0;
-	gint _tmp3_ = 0;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	cairo_t* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	cairo_t* _tmp8_ = NULL;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	cairo_t* _tmp6_;
+	gint _tmp7_;
+	cairo_t* _tmp8_;
 #line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3754,29 +3769,29 @@ void editing_tools_photo_canvas_draw_circle (EditingToolsPhotoCanvas* self, cair
 	_tmp8_ = ctx;
 #line 423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp8_);
-#line 3758 "EditingTools.c"
+#line 3773 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_erase_vertical_line (EditingToolsPhotoCanvas* self, gint x, gint y, gint height) {
-	cairo_t* _tmp0_ = NULL;
-	cairo_t* _tmp1_ = NULL;
-	cairo_t* _tmp2_ = NULL;
-	cairo_surface_t* _tmp3_ = NULL;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	GdkRectangle _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	cairo_t* _tmp8_ = NULL;
-	GdkRectangle _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	GdkRectangle _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	cairo_t* _tmp16_ = NULL;
-	cairo_t* _tmp17_ = NULL;
+	cairo_t* _tmp0_;
+	cairo_t* _tmp1_;
+	cairo_t* _tmp2_;
+	cairo_surface_t* _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	GdkRectangle _tmp6_;
+	gint _tmp7_;
+	cairo_t* _tmp8_;
+	GdkRectangle _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	GdkRectangle _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
+	cairo_t* _tmp16_;
+	cairo_t* _tmp17_;
 #line 426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3827,31 +3842,31 @@ void editing_tools_photo_canvas_erase_vertical_line (EditingToolsPhotoCanvas* se
 	_tmp17_ = self->priv->default_ctx;
 #line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp17_);
-#line 3831 "EditingTools.c"
+#line 3846 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_erase_box (EditingToolsPhotoCanvas* self, Box* box) {
-	Box _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	Box _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	Box _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	Box _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	Box _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	Box _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	Box _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	Box _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
+	Box _tmp0_;
+	gint _tmp1_;
+	Box _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	Box _tmp5_;
+	gint _tmp6_;
+	Box _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	Box _tmp10_;
+	gint _tmp11_;
+	Box _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
+	Box _tmp15_;
+	gint _tmp16_;
+	Box _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
 #line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3904,21 +3919,21 @@ void editing_tools_photo_canvas_erase_box (EditingToolsPhotoCanvas* self, Box* b
 	_tmp19_ = box_get_height (box);
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_erase_vertical_line (self, _tmp16_, _tmp18_, _tmp19_);
-#line 3908 "EditingTools.c"
+#line 3923 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_invalidate_area (EditingToolsPhotoCanvas* self, Box* area) {
 	GdkRectangle rect = {0};
 	GdkRectangle _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	GdkRectangle _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	GdkWindow* _tmp7_ = NULL;
-	GdkRectangle _tmp8_ = {0};
+	gint _tmp1_;
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
+	GdkWindow* _tmp7_;
+	GdkRectangle _tmp8_;
 #line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3949,23 +3964,23 @@ void editing_tools_photo_canvas_invalidate_area (EditingToolsPhotoCanvas* self,
 	_tmp8_ = rect;
 #line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gdk_window_invalidate_rect (_tmp7_, &_tmp8_, FALSE);
-#line 3953 "EditingTools.c"
+#line 3968 "EditingTools.c"
 }
 
 
 static cairo_surface_t* editing_tools_photo_canvas_pixbuf_to_surface (EditingToolsPhotoCanvas* self, cairo_t* default_ctx, GdkPixbuf* pixbuf, GdkRectangle* pos) {
 	cairo_surface_t* result = NULL;
 	cairo_surface_t* surface = NULL;
-	cairo_t* _tmp0_ = NULL;
-	cairo_surface_t* _tmp1_ = NULL;
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	cairo_surface_t* _tmp6_ = NULL;
+	cairo_t* _tmp0_;
+	cairo_surface_t* _tmp1_;
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	cairo_surface_t* _tmp6_;
 	cairo_t* ctx = NULL;
-	cairo_t* _tmp7_ = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
+	cairo_t* _tmp7_;
+	GdkPixbuf* _tmp8_;
 #line 458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
 #line 458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4006,7 +4021,7 @@ static cairo_surface_t* editing_tools_photo_canvas_pixbuf_to_surface (EditingToo
 	_cairo_destroy0 (ctx);
 #line 465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4010 "EditingTools.c"
+#line 4025 "EditingTools.c"
 }
 
 
@@ -4025,19 +4040,19 @@ static void g_cclosure_user_marshal_VOID__POINTER_BOXED (GClosure * closure, GVa
 		data1 = closure->data;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4029 "EditingTools.c"
+#line 4044 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = closure->data;
-#line 4035 "EditingTools.c"
+#line 4050 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback = (GMarshalFunc_VOID__POINTER_BOXED) (marshal_data ? marshal_data : cc->callback);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback (data1, g_value_get_pointer (param_values + 1), g_value_get_boxed (param_values + 2), data2);
-#line 4041 "EditingTools.c"
+#line 4056 "EditingTools.c"
 }
 
 
@@ -4056,26 +4071,26 @@ static void g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED (GClosure * closure
 		data1 = closure->data;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4060 "EditingTools.c"
+#line 4075 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = closure->data;
-#line 4066 "EditingTools.c"
+#line 4081 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback = (GMarshalFunc_VOID__BOXED_OBJECT_BOXED) (marshal_data ? marshal_data : cc->callback);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback (data1, g_value_get_boxed (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boxed (param_values + 3), data2);
-#line 4072 "EditingTools.c"
+#line 4087 "EditingTools.c"
 }
 
 
 static void editing_tools_value_photo_canvas_init (GValue* value) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	value->data[0].v_pointer = NULL;
-#line 4079 "EditingTools.c"
+#line 4094 "EditingTools.c"
 }
 
 
@@ -4084,7 +4099,7 @@ static void editing_tools_value_photo_canvas_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_unref (value->data[0].v_pointer);
-#line 4088 "EditingTools.c"
+#line 4103 "EditingTools.c"
 	}
 }
 
@@ -4094,11 +4109,11 @@ static void editing_tools_value_photo_canvas_copy_value (const GValue* src_value
 	if (src_value->data[0].v_pointer) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = editing_tools_photo_canvas_ref (src_value->data[0].v_pointer);
-#line 4098 "EditingTools.c"
+#line 4113 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4102 "EditingTools.c"
+#line 4117 "EditingTools.c"
 	}
 }
 
@@ -4106,66 +4121,66 @@ static void editing_tools_value_photo_canvas_copy_value (const GValue* src_value
 static gpointer editing_tools_value_photo_canvas_peek_pointer (const GValue* value) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4110 "EditingTools.c"
+#line 4125 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_value_photo_canvas_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (collect_values[0].v_pointer) {
-#line 4117 "EditingTools.c"
-		EditingToolsPhotoCanvas* object;
+#line 4132 "EditingTools.c"
+		EditingToolsPhotoCanvas * object;
 		object = collect_values[0].v_pointer;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4124 "EditingTools.c"
+#line 4139 "EditingTools.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4128 "EditingTools.c"
+#line 4143 "EditingTools.c"
 		}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = editing_tools_photo_canvas_ref (object);
-#line 4132 "EditingTools.c"
+#line 4147 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4136 "EditingTools.c"
+#line 4151 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4140 "EditingTools.c"
+#line 4155 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_value_photo_canvas_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	EditingToolsPhotoCanvas** object_p;
+	EditingToolsPhotoCanvas ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!object_p) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4151 "EditingTools.c"
+#line 4166 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!value->data[0].v_pointer) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = NULL;
-#line 4157 "EditingTools.c"
+#line 4172 "EditingTools.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4161 "EditingTools.c"
+#line 4176 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = editing_tools_photo_canvas_ref (value->data[0].v_pointer);
-#line 4165 "EditingTools.c"
+#line 4180 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4169 "EditingTools.c"
+#line 4184 "EditingTools.c"
 }
 
 
@@ -4179,7 +4194,7 @@ GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return G_PARAM_SPEC (spec);
-#line 4183 "EditingTools.c"
+#line 4198 "EditingTools.c"
 }
 
 
@@ -4188,12 +4203,12 @@ gpointer editing_tools_value_get_photo_canvas (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS), NULL);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4192 "EditingTools.c"
+#line 4207 "EditingTools.c"
 }
 
 
 void editing_tools_value_set_photo_canvas (GValue* value, gpointer v_object) {
-	EditingToolsPhotoCanvas* old;
+	EditingToolsPhotoCanvas * old;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS));
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4208,23 +4223,23 @@ void editing_tools_value_set_photo_canvas (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_ref (value->data[0].v_pointer);
-#line 4212 "EditingTools.c"
+#line 4227 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4216 "EditingTools.c"
+#line 4231 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_unref (old);
-#line 4222 "EditingTools.c"
+#line 4237 "EditingTools.c"
 	}
 }
 
 
 void editing_tools_value_take_photo_canvas (GValue* value, gpointer v_object) {
-	EditingToolsPhotoCanvas* old;
+	EditingToolsPhotoCanvas * old;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS));
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4237,17 +4252,17 @@ void editing_tools_value_take_photo_canvas (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 4241 "EditingTools.c"
+#line 4256 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4245 "EditingTools.c"
+#line 4260 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_unref (old);
-#line 4251 "EditingTools.c"
+#line 4266 "EditingTools.c"
 	}
 }
 
@@ -4260,12 +4275,12 @@ static void editing_tools_photo_canvas_class_init (EditingToolsPhotoCanvasClass
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsPhotoCanvasPrivate));
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsPhotoCanvasClass *) klass)->repaint = (void (*)(EditingToolsPhotoCanvas*)) editing_tools_photo_canvas_real_repaint;
+	((EditingToolsPhotoCanvasClass *) klass)->repaint = (void (*) (EditingToolsPhotoCanvas *)) editing_tools_photo_canvas_real_repaint;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_new ("new_surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__POINTER_BOXED, G_TYPE_NONE, 2, G_TYPE_POINTER, TYPE_DIMENSIONS);
+	editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_NEW_SURFACE_SIGNAL] = g_signal_new ("new-surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__POINTER_BOXED, G_TYPE_NONE, 2, G_TYPE_POINTER, TYPE_DIMENSIONS);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_new ("resized_scaled_pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED, G_TYPE_NONE, 3, TYPE_DIMENSIONS, gdk_pixbuf_get_type (), gdk_rectangle_get_type ());
-#line 4269 "EditingTools.c"
+	editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_RESIZED_SCALED_PIXBUF_SIGNAL] = g_signal_new ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED, G_TYPE_NONE, 3, TYPE_DIMENSIONS, gdk_pixbuf_get_type (), gdk_rectangle_get_type ());
+#line 4284 "EditingTools.c"
 }
 
 
@@ -4274,11 +4289,11 @@ static void editing_tools_photo_canvas_instance_init (EditingToolsPhotoCanvas *
 	self->priv = EDITING_TOOLS_PHOTO_CANVAS_GET_PRIVATE (self);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ref_count = 1;
-#line 4278 "EditingTools.c"
+#line 4293 "EditingTools.c"
 }
 
 
-static void editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas* obj) {
+static void editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas * obj) {
 	EditingToolsPhotoCanvas * self;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_PHOTO_CANVAS, EditingToolsPhotoCanvas);
@@ -4296,7 +4311,7 @@ static void editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas* obj) {
 	_cairo_surface_destroy0 (self->priv->scaled);
 #line 110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->scaled_pixbuf);
-#line 4300 "EditingTools.c"
+#line 4315 "EditingTools.c"
 }
 
 
@@ -4315,18 +4330,18 @@ GType editing_tools_photo_canvas_get_type (void) {
 
 
 gpointer editing_tools_photo_canvas_ref (gpointer instance) {
-	EditingToolsPhotoCanvas* self;
+	EditingToolsPhotoCanvas * self;
 	self = instance;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return instance;
-#line 4325 "EditingTools.c"
+#line 4340 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_unref (gpointer instance) {
-	EditingToolsPhotoCanvas* self;
+	EditingToolsPhotoCanvas * self;
 	self = instance;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -4334,15 +4349,15 @@ void editing_tools_photo_canvas_unref (gpointer instance) {
 		EDITING_TOOLS_PHOTO_CANVAS_GET_CLASS (self)->finalize (self);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4338 "EditingTools.c"
+#line 4353 "EditingTools.c"
 	}
 }
 
 
 EditingToolsEditingTool* editing_tools_editing_tool_construct (GType object_type, const gchar* name) {
 	EditingToolsEditingTool* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4357,14 +4372,14 @@ EditingToolsEditingTool* editing_tools_editing_tool_construct (GType object_type
 	self->name = _tmp1_;
 #line 490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 4361 "EditingTools.c"
+#line 4376 "EditingTools.c"
 }
 
 
 static gpointer _editing_tools_photo_canvas_ref0 (gpointer self) {
 #line 503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? editing_tools_photo_canvas_ref (self) : NULL;
-#line 4368 "EditingTools.c"
+#line 4383 "EditingTools.c"
 }
 
 
@@ -4373,17 +4388,17 @@ static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_eve
 	result = editing_tools_editing_tool_on_keypress ((EditingToolsEditingTool*) self, event);
 #line 507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4377 "EditingTools.c"
+#line 4392 "EditingTools.c"
 }
 
 
 static void editing_tools_editing_tool_real_activate (EditingToolsEditingTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	EditingToolsEditingToolWindow* _tmp1_ = NULL;
-	EditingToolsPhotoCanvas* _tmp2_ = NULL;
-	EditingToolsPhotoCanvas* _tmp3_ = NULL;
-	EditingToolsEditingToolWindow* _tmp4_ = NULL;
-	EditingToolsEditingToolWindow* _tmp5_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	EditingToolsEditingToolWindow* _tmp1_;
+	EditingToolsPhotoCanvas* _tmp2_;
+	EditingToolsPhotoCanvas* _tmp3_;
+	EditingToolsEditingToolWindow* _tmp4_;
+	EditingToolsEditingToolWindow* _tmp5_;
 #line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
 #line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4412,17 +4427,17 @@ static void editing_tools_editing_tool_real_activate (EditingToolsEditingTool* s
 	_tmp5_ = self->priv->tool_window;
 #line 506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ != NULL) {
-#line 4416 "EditingTools.c"
-		EditingToolsEditingToolWindow* _tmp6_ = NULL;
+#line 4431 "EditingTools.c"
+		EditingToolsEditingToolWindow* _tmp6_;
 #line 507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = self->priv->tool_window;
 #line 507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, self);
-#line 4422 "EditingTools.c"
+#line 4437 "EditingTools.c"
 	}
 #line 509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_emit_by_name (self, "activated");
-#line 4426 "EditingTools.c"
+	g_signal_emit (self, editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_ACTIVATED_SIGNAL], 0);
+#line 4441 "EditingTools.c"
 }
 
 
@@ -4431,35 +4446,35 @@ void editing_tools_editing_tool_activate (EditingToolsEditingTool* self, Editing
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->activate (self, canvas);
-#line 4435 "EditingTools.c"
+#line 4450 "EditingTools.c"
 }
 
 
 static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool* self) {
 	gboolean _tmp0_ = FALSE;
-	EditingToolsPhotoCanvas* _tmp1_ = NULL;
-	EditingToolsEditingToolWindow* _tmp3_ = NULL;
+	EditingToolsPhotoCanvas* _tmp1_;
+	EditingToolsEditingToolWindow* _tmp3_;
 #line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->canvas;
 #line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == NULL) {
-#line 4447 "EditingTools.c"
-		EditingToolsEditingToolWindow* _tmp2_ = NULL;
+#line 4462 "EditingTools.c"
+		EditingToolsEditingToolWindow* _tmp2_;
 #line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->tool_window;
 #line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 4453 "EditingTools.c"
+#line 4468 "EditingTools.c"
 	} else {
 #line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = FALSE;
-#line 4457 "EditingTools.c"
+#line 4472 "EditingTools.c"
 	}
 #line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
 #line 516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 4463 "EditingTools.c"
+#line 4478 "EditingTools.c"
 	}
 #line 518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_photo_canvas_unref0 (self->canvas);
@@ -4469,9 +4484,9 @@ static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool*
 	_tmp3_ = self->priv->tool_window;
 #line 520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp3_ != NULL) {
-#line 4473 "EditingTools.c"
-		EditingToolsEditingToolWindow* _tmp4_ = NULL;
-		guint _tmp5_ = 0U;
+#line 4488 "EditingTools.c"
+		EditingToolsEditingToolWindow* _tmp4_;
+		guint _tmp5_;
 #line 521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->tool_window;
 #line 521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4482,11 +4497,11 @@ static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool*
 		_g_object_unref0 (self->priv->tool_window);
 #line 522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->tool_window = NULL;
-#line 4486 "EditingTools.c"
+#line 4501 "EditingTools.c"
 	}
 #line 525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_emit_by_name (self, "deactivated");
-#line 4490 "EditingTools.c"
+	g_signal_emit (self, editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_DEACTIVATED_SIGNAL], 0);
+#line 4505 "EditingTools.c"
 }
 
 
@@ -4495,13 +4510,13 @@ void editing_tools_editing_tool_deactivate (EditingToolsEditingTool* self) {
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->deactivate (self);
-#line 4499 "EditingTools.c"
+#line 4514 "EditingTools.c"
 }
 
 
 gboolean editing_tools_editing_tool_is_activated (EditingToolsEditingTool* self) {
 	gboolean result = FALSE;
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
 #line 528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE);
 #line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4510,7 +4525,7 @@ gboolean editing_tools_editing_tool_is_activated (EditingToolsEditingTool* self)
 	result = _tmp0_ != NULL;
 #line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4514 "EditingTools.c"
+#line 4529 "EditingTools.c"
 }
 
 
@@ -4520,7 +4535,7 @@ static EditingToolsEditingToolWindow* editing_tools_editing_tool_real_get_tool_w
 	result = NULL;
 #line 533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4524 "EditingTools.c"
+#line 4539 "EditingTools.c"
 }
 
 
@@ -4529,7 +4544,7 @@ EditingToolsEditingToolWindow* editing_tools_editing_tool_get_tool_window (Editi
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), NULL);
 #line 532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->get_tool_window (self);
-#line 4533 "EditingTools.c"
+#line 4548 "EditingTools.c"
 }
 
 
@@ -4548,11 +4563,11 @@ static GdkPixbuf* editing_tools_editing_tool_real_get_display_pixbuf (EditingToo
 	if (max_dim) {
 #line 551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*max_dim = _vala_max_dim;
-#line 4552 "EditingTools.c"
+#line 4567 "EditingTools.c"
 	}
 #line 551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4556 "EditingTools.c"
+#line 4571 "EditingTools.c"
 }
 
 
@@ -4561,7 +4576,7 @@ GdkPixbuf* editing_tools_editing_tool_get_display_pixbuf (EditingToolsEditingToo
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), NULL);
 #line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->get_display_pixbuf (self, scaling, photo, max_dim, error);
-#line 4565 "EditingTools.c"
+#line 4580 "EditingTools.c"
 }
 
 
@@ -4574,7 +4589,7 @@ void editing_tools_editing_tool_on_left_click (EditingToolsEditingTool* self, gi
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_left_click (self, x, y);
-#line 4578 "EditingTools.c"
+#line 4593 "EditingTools.c"
 }
 
 
@@ -4587,7 +4602,7 @@ void editing_tools_editing_tool_on_left_released (EditingToolsEditingTool* self,
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_left_released (self, x, y);
-#line 4591 "EditingTools.c"
+#line 4606 "EditingTools.c"
 }
 
 
@@ -4600,7 +4615,7 @@ void editing_tools_editing_tool_on_motion (EditingToolsEditingTool* self, gint x
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_motion (self, x, y, mask);
-#line 4604 "EditingTools.c"
+#line 4619 "EditingTools.c"
 }
 
 
@@ -4610,7 +4625,7 @@ static gboolean editing_tools_editing_tool_real_on_leave_notify_event (EditingTo
 	result = FALSE;
 #line 564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4614 "EditingTools.c"
+#line 4629 "EditingTools.c"
 }
 
 
@@ -4619,15 +4634,15 @@ gboolean editing_tools_editing_tool_on_leave_notify_event (EditingToolsEditingTo
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE);
 #line 563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_leave_notify_event (self);
-#line 4623 "EditingTools.c"
+#line 4638 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_editing_tool_real_on_keypress (EditingToolsEditingTool* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-	GdkEventKey* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	const gchar* _tmp2_ = NULL;
+	GdkEventKey* _tmp0_;
+	guint _tmp1_;
+	const gchar* _tmp2_;
 #line 567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4644,13 +4659,13 @@ static gboolean editing_tools_editing_tool_real_on_keypress (EditingToolsEditing
 		result = TRUE;
 #line 572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 4648 "EditingTools.c"
+#line 4663 "EditingTools.c"
 	}
 #line 575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
 #line 575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4654 "EditingTools.c"
+#line 4669 "EditingTools.c"
 }
 
 
@@ -4659,14 +4674,14 @@ gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self,
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE);
 #line 567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_keypress (self, event);
-#line 4663 "EditingTools.c"
+#line 4678 "EditingTools.c"
 }
 
 
 static void editing_tools_editing_tool_real_paint (EditingToolsEditingTool* self, cairo_t* ctx) {
 #line 578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 4670 "EditingTools.c"
+#line 4685 "EditingTools.c"
 }
 
 
@@ -4675,7 +4690,7 @@ void editing_tools_editing_tool_paint (EditingToolsEditingTool* self, cairo_t* c
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->paint (self, ctx);
-#line 4679 "EditingTools.c"
+#line 4694 "EditingTools.c"
 }
 
 
@@ -4683,8 +4698,8 @@ void editing_tools_editing_tool_notify_cancel (EditingToolsEditingTool* self) {
 #line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_emit_by_name (self, "cancelled");
-#line 4688 "EditingTools.c"
+	g_signal_emit (self, editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_CANCELLED_SIGNAL], 0);
+#line 4703 "EditingTools.c"
 }
 
 
@@ -4703,26 +4718,26 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN (GClosure
 		data1 = closure->data;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4707 "EditingTools.c"
+#line 4722 "EditingTools.c"
 	} else {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = closure->data;
-#line 4713 "EditingTools.c"
+#line 4728 "EditingTools.c"
 	}
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT_BOXED_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boxed (param_values + 3), g_value_get_boolean (param_values + 4), data2);
-#line 4719 "EditingTools.c"
+#line 4734 "EditingTools.c"
 }
 
 
 static void editing_tools_value_editing_tool_init (GValue* value) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	value->data[0].v_pointer = NULL;
-#line 4726 "EditingTools.c"
+#line 4741 "EditingTools.c"
 }
 
 
@@ -4731,7 +4746,7 @@ static void editing_tools_value_editing_tool_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_unref (value->data[0].v_pointer);
-#line 4735 "EditingTools.c"
+#line 4750 "EditingTools.c"
 	}
 }
 
@@ -4741,11 +4756,11 @@ static void editing_tools_value_editing_tool_copy_value (const GValue* src_value
 	if (src_value->data[0].v_pointer) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = editing_tools_editing_tool_ref (src_value->data[0].v_pointer);
-#line 4745 "EditingTools.c"
+#line 4760 "EditingTools.c"
 	} else {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4749 "EditingTools.c"
+#line 4764 "EditingTools.c"
 	}
 }
 
@@ -4753,66 +4768,66 @@ static void editing_tools_value_editing_tool_copy_value (const GValue* src_value
 static gpointer editing_tools_value_editing_tool_peek_pointer (const GValue* value) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4757 "EditingTools.c"
+#line 4772 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_value_editing_tool_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (collect_values[0].v_pointer) {
-#line 4764 "EditingTools.c"
-		EditingToolsEditingTool* object;
+#line 4779 "EditingTools.c"
+		EditingToolsEditingTool * object;
 		object = collect_values[0].v_pointer;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4771 "EditingTools.c"
+#line 4786 "EditingTools.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4775 "EditingTools.c"
+#line 4790 "EditingTools.c"
 		}
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = editing_tools_editing_tool_ref (object);
-#line 4779 "EditingTools.c"
+#line 4794 "EditingTools.c"
 	} else {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4783 "EditingTools.c"
+#line 4798 "EditingTools.c"
 	}
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4787 "EditingTools.c"
+#line 4802 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_value_editing_tool_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	EditingToolsEditingTool** object_p;
+	EditingToolsEditingTool ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!object_p) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4798 "EditingTools.c"
+#line 4813 "EditingTools.c"
 	}
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!value->data[0].v_pointer) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = NULL;
-#line 4804 "EditingTools.c"
+#line 4819 "EditingTools.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4808 "EditingTools.c"
+#line 4823 "EditingTools.c"
 	} else {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = editing_tools_editing_tool_ref (value->data[0].v_pointer);
-#line 4812 "EditingTools.c"
+#line 4827 "EditingTools.c"
 	}
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4816 "EditingTools.c"
+#line 4831 "EditingTools.c"
 }
 
 
@@ -4826,7 +4841,7 @@ GParamSpec* editing_tools_param_spec_editing_tool (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return G_PARAM_SPEC (spec);
-#line 4830 "EditingTools.c"
+#line 4845 "EditingTools.c"
 }
 
 
@@ -4835,12 +4850,12 @@ gpointer editing_tools_value_get_editing_tool (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL), NULL);
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4839 "EditingTools.c"
+#line 4854 "EditingTools.c"
 }
 
 
 void editing_tools_value_set_editing_tool (GValue* value, gpointer v_object) {
-	EditingToolsEditingTool* old;
+	EditingToolsEditingTool * old;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL));
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4855,23 +4870,23 @@ void editing_tools_value_set_editing_tool (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_ref (value->data[0].v_pointer);
-#line 4859 "EditingTools.c"
+#line 4874 "EditingTools.c"
 	} else {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4863 "EditingTools.c"
+#line 4878 "EditingTools.c"
 	}
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_unref (old);
-#line 4869 "EditingTools.c"
+#line 4884 "EditingTools.c"
 	}
 }
 
 
 void editing_tools_value_take_editing_tool (GValue* value, gpointer v_object) {
-	EditingToolsEditingTool* old;
+	EditingToolsEditingTool * old;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL));
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4884,17 +4899,17 @@ void editing_tools_value_take_editing_tool (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 4888 "EditingTools.c"
+#line 4903 "EditingTools.c"
 	} else {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4892 "EditingTools.c"
+#line 4907 "EditingTools.c"
 	}
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_unref (old);
-#line 4898 "EditingTools.c"
+#line 4913 "EditingTools.c"
 	}
 }
 
@@ -4907,36 +4922,36 @@ static void editing_tools_editing_tool_class_init (EditingToolsEditingToolClass
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsEditingToolPrivate));
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->activate = (void (*)(EditingToolsEditingTool*, EditingToolsPhotoCanvas*)) editing_tools_editing_tool_real_activate;
+	((EditingToolsEditingToolClass *) klass)->activate = (void (*) (EditingToolsEditingTool *, EditingToolsPhotoCanvas*)) editing_tools_editing_tool_real_activate;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->deactivate = (void (*)(EditingToolsEditingTool*)) editing_tools_editing_tool_real_deactivate;
+	((EditingToolsEditingToolClass *) klass)->deactivate = (void (*) (EditingToolsEditingTool *)) editing_tools_editing_tool_real_deactivate;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*)(EditingToolsEditingTool*)) editing_tools_editing_tool_real_get_tool_window;
+	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*) (EditingToolsEditingTool *)) editing_tools_editing_tool_real_get_tool_window;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = (GdkPixbuf* (*)(EditingToolsEditingTool*, Scaling*, Photo*, Dimensions*, GError**)) editing_tools_editing_tool_real_get_display_pixbuf;
+	((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = (GdkPixbuf* (*) (EditingToolsEditingTool *, Scaling*, Photo*, Dimensions*, GError**)) editing_tools_editing_tool_real_get_display_pixbuf;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_left_click = (void (*)(EditingToolsEditingTool*, gint, gint)) editing_tools_editing_tool_real_on_left_click;
+	((EditingToolsEditingToolClass *) klass)->on_left_click = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_editing_tool_real_on_left_click;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_left_released = (void (*)(EditingToolsEditingTool*, gint, gint)) editing_tools_editing_tool_real_on_left_released;
+	((EditingToolsEditingToolClass *) klass)->on_left_released = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_editing_tool_real_on_left_released;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_motion = (void (*)(EditingToolsEditingTool*, gint, gint, GdkModifierType)) editing_tools_editing_tool_real_on_motion;
+	((EditingToolsEditingToolClass *) klass)->on_motion = (void (*) (EditingToolsEditingTool *, gint, gint, GdkModifierType)) editing_tools_editing_tool_real_on_motion;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_leave_notify_event = (gboolean (*)(EditingToolsEditingTool*)) editing_tools_editing_tool_real_on_leave_notify_event;
+	((EditingToolsEditingToolClass *) klass)->on_leave_notify_event = (gboolean (*) (EditingToolsEditingTool *)) editing_tools_editing_tool_real_on_leave_notify_event;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*)(EditingToolsEditingTool*, GdkEventKey*)) editing_tools_editing_tool_real_on_keypress;
+	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*) (EditingToolsEditingTool *, GdkEventKey*)) editing_tools_editing_tool_real_on_keypress;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->paint = (void (*)(EditingToolsEditingTool*, cairo_t*)) editing_tools_editing_tool_real_paint;
+	((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_editing_tool_real_paint;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_new ("activated", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_ACTIVATED_SIGNAL] = g_signal_new ("activated", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_new ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_DEACTIVATED_SIGNAL] = g_signal_new ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_new ("applied", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN, G_TYPE_NONE, 4, TYPE_COMMAND, gdk_pixbuf_get_type (), TYPE_DIMENSIONS, G_TYPE_BOOLEAN);
+	editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL] = g_signal_new ("applied", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN, G_TYPE_NONE, 4, TYPE_COMMAND, gdk_pixbuf_get_type (), TYPE_DIMENSIONS, G_TYPE_BOOLEAN);
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_new ("cancelled", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_CANCELLED_SIGNAL] = g_signal_new ("cancelled", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_new ("aborted", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 4940 "EditingTools.c"
+	editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_ABORTED_SIGNAL] = g_signal_new ("aborted", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 4955 "EditingTools.c"
 }
 
 
@@ -4949,11 +4964,11 @@ static void editing_tools_editing_tool_instance_init (EditingToolsEditingTool *
 	self->priv->tool_window = NULL;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ref_count = 1;
-#line 4953 "EditingTools.c"
+#line 4968 "EditingTools.c"
 }
 
 
-static void editing_tools_editing_tool_finalize (EditingToolsEditingTool* obj) {
+static void editing_tools_editing_tool_finalize (EditingToolsEditingTool * obj) {
 	EditingToolsEditingTool * self;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool);
@@ -4967,7 +4982,7 @@ static void editing_tools_editing_tool_finalize (EditingToolsEditingTool* obj) {
 	_cairo_surface_destroy0 (self->surface);
 #line 474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (self->name);
-#line 4971 "EditingTools.c"
+#line 4986 "EditingTools.c"
 }
 
 
@@ -4986,18 +5001,18 @@ GType editing_tools_editing_tool_get_type (void) {
 
 
 gpointer editing_tools_editing_tool_ref (gpointer instance) {
-	EditingToolsEditingTool* self;
+	EditingToolsEditingTool * self;
 	self = instance;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return instance;
-#line 4996 "EditingTools.c"
+#line 5011 "EditingTools.c"
 }
 
 
 void editing_tools_editing_tool_unref (gpointer instance) {
-	EditingToolsEditingTool* self;
+	EditingToolsEditingTool * self;
 	self = instance;
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -5005,7 +5020,7 @@ void editing_tools_editing_tool_unref (gpointer instance) {
 		EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->finalize (self);
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5009 "EditingTools.c"
+#line 5024 "EditingTools.c"
 	}
 }
 
@@ -5017,17 +5032,17 @@ static EditingToolsCropToolReticleOrientation editing_tools_crop_tool_reticle_or
 	if (self == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE) {
 #line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT;
-#line 5021 "EditingTools.c"
+#line 5036 "EditingTools.c"
 	} else {
 #line 638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 5025 "EditingTools.c"
+#line 5040 "EditingTools.c"
 	}
 #line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
 #line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5031 "EditingTools.c"
+#line 5046 "EditingTools.c"
 }
 
 
@@ -5061,39 +5076,39 @@ static EditingToolsCropTool* editing_tools_crop_tool_construct (GType object_typ
 	self = (EditingToolsCropTool*) editing_tools_editing_tool_construct (object_type, "CropTool");
 #line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 5065 "EditingTools.c"
+#line 5080 "EditingTools.c"
 }
 
 
 static EditingToolsCropTool* editing_tools_crop_tool_new (void) {
 #line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_crop_tool_construct (EDITING_TOOLS_TYPE_CROP_TOOL);
-#line 5072 "EditingTools.c"
+#line 5087 "EditingTools.c"
 }
 
 
 EditingToolsCropTool* editing_tools_crop_tool_factory (void) {
 	EditingToolsCropTool* result = NULL;
-	EditingToolsCropTool* _tmp0_ = NULL;
+	EditingToolsCropTool* _tmp0_;
 #line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_crop_tool_new ();
 #line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
 #line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5085 "EditingTools.c"
+#line 5100 "EditingTools.c"
 }
 
 
 gboolean editing_tools_crop_tool_is_available (Photo* photo, Scaling* scaling) {
 	gboolean result = FALSE;
 	Dimensions dim = {0};
-	Photo* _tmp0_ = NULL;
+	Photo* _tmp0_;
 	Dimensions _tmp1_ = {0};
 	Dimensions _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-	Dimensions _tmp4_ = {0};
-	gint _tmp5_ = 0;
+	Dimensions _tmp4_;
+	gint _tmp5_;
 #line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
 #line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5112,646 +5127,617 @@ gboolean editing_tools_crop_tool_is_available (Photo* photo, Scaling* scaling) {
 	_tmp5_ = _tmp4_.width;
 #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 5116 "EditingTools.c"
-		Dimensions _tmp6_ = {0};
-		gint _tmp7_ = 0;
+#line 5131 "EditingTools.c"
+		Dimensions _tmp6_;
+		gint _tmp7_;
 #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = dim;
 #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = _tmp6_.height;
 #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp7_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 5125 "EditingTools.c"
+#line 5140 "EditingTools.c"
 	} else {
 #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = FALSE;
-#line 5129 "EditingTools.c"
+#line 5144 "EditingTools.c"
 	}
 #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp3_;
 #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5135 "EditingTools.c"
+#line 5150 "EditingTools.c"
 }
 
 
-static void _vala_array_add4 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add4 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5146 "EditingTools.c"
+#line 5161 "EditingTools.c"
 	}
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5152 "EditingTools.c"
+#line 5167 "EditingTools.c"
 }
 
 
-static void _vala_array_add5 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add5 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5163 "EditingTools.c"
+#line 5178 "EditingTools.c"
 	}
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5169 "EditingTools.c"
+#line 5184 "EditingTools.c"
 }
 
 
-static void _vala_array_add6 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add6 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5180 "EditingTools.c"
+#line 5195 "EditingTools.c"
 	}
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5186 "EditingTools.c"
+#line 5201 "EditingTools.c"
 }
 
 
-static void _vala_array_add7 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add7 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5197 "EditingTools.c"
+#line 5212 "EditingTools.c"
 	}
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5203 "EditingTools.c"
+#line 5218 "EditingTools.c"
 }
 
 
-static void _vala_array_add8 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add8 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5214 "EditingTools.c"
+#line 5229 "EditingTools.c"
 	}
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5220 "EditingTools.c"
+#line 5235 "EditingTools.c"
 }
 
 
-static void _vala_array_add9 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add9 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5231 "EditingTools.c"
+#line 5246 "EditingTools.c"
 	}
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5237 "EditingTools.c"
+#line 5252 "EditingTools.c"
 }
 
 
-static void _vala_array_add10 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add10 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5248 "EditingTools.c"
+#line 5263 "EditingTools.c"
 	}
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5254 "EditingTools.c"
+#line 5269 "EditingTools.c"
 }
 
 
-static void _vala_array_add11 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add11 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5265 "EditingTools.c"
+#line 5280 "EditingTools.c"
 	}
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5271 "EditingTools.c"
+#line 5286 "EditingTools.c"
 }
 
 
-static void _vala_array_add12 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add12 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5282 "EditingTools.c"
+#line 5297 "EditingTools.c"
 	}
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5288 "EditingTools.c"
+#line 5303 "EditingTools.c"
 }
 
 
-static void _vala_array_add13 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add13 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5299 "EditingTools.c"
+#line 5314 "EditingTools.c"
 	}
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5305 "EditingTools.c"
+#line 5320 "EditingTools.c"
 }
 
 
-static void _vala_array_add14 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add14 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5316 "EditingTools.c"
+#line 5331 "EditingTools.c"
 	}
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5322 "EditingTools.c"
+#line 5337 "EditingTools.c"
 }
 
 
-static void _vala_array_add15 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add15 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5333 "EditingTools.c"
+#line 5348 "EditingTools.c"
 	}
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5339 "EditingTools.c"
+#line 5354 "EditingTools.c"
 }
 
 
-static void _vala_array_add16 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add16 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5350 "EditingTools.c"
+#line 5365 "EditingTools.c"
 	}
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5356 "EditingTools.c"
+#line 5371 "EditingTools.c"
 }
 
 
-static void _vala_array_add17 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add17 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5367 "EditingTools.c"
+#line 5382 "EditingTools.c"
 	}
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5373 "EditingTools.c"
+#line 5388 "EditingTools.c"
 }
 
 
-static void _vala_array_add18 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add18 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5384 "EditingTools.c"
+#line 5399 "EditingTools.c"
 	}
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5390 "EditingTools.c"
+#line 5405 "EditingTools.c"
 }
 
 
-static void _vala_array_add19 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add19 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5401 "EditingTools.c"
+#line 5416 "EditingTools.c"
 	}
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5407 "EditingTools.c"
+#line 5422 "EditingTools.c"
 }
 
 
-static void _vala_array_add20 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add20 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5418 "EditingTools.c"
+#line 5433 "EditingTools.c"
 	}
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5424 "EditingTools.c"
+#line 5439 "EditingTools.c"
 }
 
 
-static void _vala_array_add21 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add21 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5435 "EditingTools.c"
+#line 5450 "EditingTools.c"
 	}
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5441 "EditingTools.c"
+#line 5456 "EditingTools.c"
 }
 
 
-static void _vala_array_add22 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add22 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5452 "EditingTools.c"
+#line 5467 "EditingTools.c"
 	}
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5458 "EditingTools.c"
+#line 5473 "EditingTools.c"
 }
 
 
-static void _vala_array_add23 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add23 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5469 "EditingTools.c"
+#line 5484 "EditingTools.c"
 	}
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5475 "EditingTools.c"
+#line 5490 "EditingTools.c"
 }
 
 
-static void _vala_array_add24 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add24 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5486 "EditingTools.c"
+#line 5501 "EditingTools.c"
 	}
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5492 "EditingTools.c"
+#line 5507 "EditingTools.c"
 }
 
 
-static void _vala_array_add25 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add25 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5503 "EditingTools.c"
+#line 5518 "EditingTools.c"
 	}
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5509 "EditingTools.c"
+#line 5524 "EditingTools.c"
 }
 
 
-static void _vala_array_add26 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add26 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5520 "EditingTools.c"
+#line 5535 "EditingTools.c"
 	}
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5526 "EditingTools.c"
+#line 5541 "EditingTools.c"
 }
 
 
-static void _vala_array_add27 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add27 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5537 "EditingTools.c"
+#line 5552 "EditingTools.c"
 	}
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5543 "EditingTools.c"
+#line 5558 "EditingTools.c"
 }
 
 
-static void _vala_array_add28 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add28 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5554 "EditingTools.c"
+#line 5569 "EditingTools.c"
 	}
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5560 "EditingTools.c"
+#line 5575 "EditingTools.c"
 }
 
 
-static void _vala_array_add29 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add29 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5571 "EditingTools.c"
+#line 5586 "EditingTools.c"
 	}
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5577 "EditingTools.c"
+#line 5592 "EditingTools.c"
 }
 
 
-static void _vala_array_add30 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add30 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5588 "EditingTools.c"
+#line 5603 "EditingTools.c"
 	}
 #line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5594 "EditingTools.c"
+#line 5609 "EditingTools.c"
 }
 
 
-static void _vala_array_add31 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add31 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5605 "EditingTools.c"
+#line 5620 "EditingTools.c"
 	}
 #line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5611 "EditingTools.c"
+#line 5626 "EditingTools.c"
 }
 
 
-static void _vala_array_add32 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add32 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5622 "EditingTools.c"
+#line 5637 "EditingTools.c"
 	}
 #line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5628 "EditingTools.c"
+#line 5643 "EditingTools.c"
 }
 
 
 static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_create_constraints (int* result_length1) {
 	EditingToolsCropToolConstraintDescription** result = NULL;
 	EditingToolsCropToolConstraintDescription** _result_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp0_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
-	EditingToolsCropToolConstraintDescription** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp3_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	const gchar* _tmp5_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp6_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	const gchar* _tmp8_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp9_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
-	const gchar* _tmp11_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp12_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp13_ = NULL;
-	gint _tmp13__length1 = 0;
-	const gchar* _tmp14_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp15_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
-	const gchar* _tmp17_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp18_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp19_ = NULL;
-	gint _tmp19__length1 = 0;
-	const gchar* _tmp20_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp21_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp22_ = NULL;
-	gint _tmp22__length1 = 0;
-	const gchar* _tmp23_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp24_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp25_ = NULL;
-	gint _tmp25__length1 = 0;
-	const gchar* _tmp26_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp27_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp28_ = NULL;
-	gint _tmp28__length1 = 0;
-	const gchar* _tmp29_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp30_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp31_ = NULL;
-	gint _tmp31__length1 = 0;
-	const gchar* _tmp32_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp33_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp34_ = NULL;
-	gint _tmp34__length1 = 0;
-	const gchar* _tmp35_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp36_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp37_ = NULL;
-	gint _tmp37__length1 = 0;
-	const gchar* _tmp38_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp39_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp40_ = NULL;
-	gint _tmp40__length1 = 0;
-	const gchar* _tmp41_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp42_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp43_ = NULL;
-	gint _tmp43__length1 = 0;
-	const gchar* _tmp44_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp45_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp46_ = NULL;
-	gint _tmp46__length1 = 0;
-	const gchar* _tmp47_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp48_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp49_ = NULL;
-	gint _tmp49__length1 = 0;
-	const gchar* _tmp50_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp51_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp52_ = NULL;
-	gint _tmp52__length1 = 0;
-	const gchar* _tmp53_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp54_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp55_ = NULL;
-	gint _tmp55__length1 = 0;
-	const gchar* _tmp56_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp57_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp58_ = NULL;
-	gint _tmp58__length1 = 0;
-	const gchar* _tmp59_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp60_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp61_ = NULL;
-	gint _tmp61__length1 = 0;
-	const gchar* _tmp62_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp63_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp64_ = NULL;
-	gint _tmp64__length1 = 0;
-	const gchar* _tmp65_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp66_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp67_ = NULL;
-	gint _tmp67__length1 = 0;
-	const gchar* _tmp68_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp69_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp70_ = NULL;
-	gint _tmp70__length1 = 0;
-	const gchar* _tmp71_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp72_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp73_ = NULL;
-	gint _tmp73__length1 = 0;
-	const gchar* _tmp74_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp75_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp76_ = NULL;
-	gint _tmp76__length1 = 0;
-	const gchar* _tmp77_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp78_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp79_ = NULL;
-	gint _tmp79__length1 = 0;
-	const gchar* _tmp80_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp81_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp82_ = NULL;
-	gint _tmp82__length1 = 0;
-	const gchar* _tmp83_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp84_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp85_ = NULL;
-	gint _tmp85__length1 = 0;
-	const gchar* _tmp86_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp87_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp88_ = NULL;
-	gint _tmp88__length1 = 0;
+	EditingToolsCropToolConstraintDescription** _tmp0_;
+	gint _result__length1;
+	gint __result__size_;
+	EditingToolsCropToolConstraintDescription** _tmp1_;
+	gint _tmp1__length1;
+	EditingToolsCropToolConstraintDescription* _tmp2_;
+	EditingToolsCropToolConstraintDescription** _tmp3_;
+	gint _tmp3__length1;
+	EditingToolsCropToolConstraintDescription* _tmp4_;
+	EditingToolsCropToolConstraintDescription** _tmp5_;
+	gint _tmp5__length1;
+	EditingToolsCropToolConstraintDescription* _tmp6_;
+	EditingToolsCropToolConstraintDescription** _tmp7_;
+	gint _tmp7__length1;
+	EditingToolsCropToolConstraintDescription* _tmp8_;
+	EditingToolsCropToolConstraintDescription** _tmp9_;
+	gint _tmp9__length1;
+	EditingToolsCropToolConstraintDescription* _tmp10_;
+	EditingToolsCropToolConstraintDescription** _tmp11_;
+	gint _tmp11__length1;
+	EditingToolsCropToolConstraintDescription* _tmp12_;
+	EditingToolsCropToolConstraintDescription** _tmp13_;
+	gint _tmp13__length1;
+	EditingToolsCropToolConstraintDescription* _tmp14_;
+	EditingToolsCropToolConstraintDescription** _tmp15_;
+	gint _tmp15__length1;
+	EditingToolsCropToolConstraintDescription* _tmp16_;
+	EditingToolsCropToolConstraintDescription** _tmp17_;
+	gint _tmp17__length1;
+	EditingToolsCropToolConstraintDescription* _tmp18_;
+	EditingToolsCropToolConstraintDescription** _tmp19_;
+	gint _tmp19__length1;
+	EditingToolsCropToolConstraintDescription* _tmp20_;
+	EditingToolsCropToolConstraintDescription** _tmp21_;
+	gint _tmp21__length1;
+	EditingToolsCropToolConstraintDescription* _tmp22_;
+	EditingToolsCropToolConstraintDescription** _tmp23_;
+	gint _tmp23__length1;
+	EditingToolsCropToolConstraintDescription* _tmp24_;
+	EditingToolsCropToolConstraintDescription** _tmp25_;
+	gint _tmp25__length1;
+	EditingToolsCropToolConstraintDescription* _tmp26_;
+	EditingToolsCropToolConstraintDescription** _tmp27_;
+	gint _tmp27__length1;
+	EditingToolsCropToolConstraintDescription* _tmp28_;
+	EditingToolsCropToolConstraintDescription** _tmp29_;
+	gint _tmp29__length1;
+	EditingToolsCropToolConstraintDescription* _tmp30_;
+	EditingToolsCropToolConstraintDescription** _tmp31_;
+	gint _tmp31__length1;
+	EditingToolsCropToolConstraintDescription* _tmp32_;
+	EditingToolsCropToolConstraintDescription** _tmp33_;
+	gint _tmp33__length1;
+	EditingToolsCropToolConstraintDescription* _tmp34_;
+	EditingToolsCropToolConstraintDescription** _tmp35_;
+	gint _tmp35__length1;
+	EditingToolsCropToolConstraintDescription* _tmp36_;
+	EditingToolsCropToolConstraintDescription** _tmp37_;
+	gint _tmp37__length1;
+	EditingToolsCropToolConstraintDescription* _tmp38_;
+	EditingToolsCropToolConstraintDescription** _tmp39_;
+	gint _tmp39__length1;
+	EditingToolsCropToolConstraintDescription* _tmp40_;
+	EditingToolsCropToolConstraintDescription** _tmp41_;
+	gint _tmp41__length1;
+	EditingToolsCropToolConstraintDescription* _tmp42_;
+	EditingToolsCropToolConstraintDescription** _tmp43_;
+	gint _tmp43__length1;
+	EditingToolsCropToolConstraintDescription* _tmp44_;
+	EditingToolsCropToolConstraintDescription** _tmp45_;
+	gint _tmp45__length1;
+	EditingToolsCropToolConstraintDescription* _tmp46_;
+	EditingToolsCropToolConstraintDescription** _tmp47_;
+	gint _tmp47__length1;
+	EditingToolsCropToolConstraintDescription* _tmp48_;
+	EditingToolsCropToolConstraintDescription** _tmp49_;
+	gint _tmp49__length1;
+	EditingToolsCropToolConstraintDescription* _tmp50_;
+	EditingToolsCropToolConstraintDescription** _tmp51_;
+	gint _tmp51__length1;
+	EditingToolsCropToolConstraintDescription* _tmp52_;
+	EditingToolsCropToolConstraintDescription** _tmp53_;
+	gint _tmp53__length1;
+	EditingToolsCropToolConstraintDescription* _tmp54_;
+	EditingToolsCropToolConstraintDescription** _tmp55_;
+	gint _tmp55__length1;
+	EditingToolsCropToolConstraintDescription* _tmp56_;
+	EditingToolsCropToolConstraintDescription** _tmp57_;
+	gint _tmp57__length1;
+	EditingToolsCropToolConstraintDescription* _tmp58_;
+	EditingToolsCropToolConstraintDescription** _tmp59_;
+	gint _tmp59__length1;
 #line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = g_new0 (EditingToolsCropToolConstraintDescription*, 0 + 1);
 #line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5765,323 +5751,265 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1__length1 = _result__length1;
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = _ ("Unconstrained");
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = editing_tools_crop_tool_constraint_description_new (_tmp2_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO);
+	_tmp2_ = editing_tools_crop_tool_constraint_description_new (_ ("Unconstrained"), 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO);
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add4 (&_result_, &_result__length1, &__result__size_, _tmp3_);
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _result_;
+	_vala_array_add4 (&_result_, &_result__length1, &__result__size_, _tmp2_);
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4__length1 = _result__length1;
+	_tmp3_ = _result_;
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = _ ("Square");
+	_tmp3__length1 = _result__length1;
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = editing_tools_crop_tool_constraint_description_new (_tmp5_, 1, 1, FALSE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp4_ = editing_tools_crop_tool_constraint_description_new (_ ("Square"), 1, 1, FALSE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add5 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = _result_;
+	_vala_array_add5 (&_result_, &_result__length1, &__result__size_, _tmp4_);
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7__length1 = _result__length1;
+	_tmp5_ = _result_;
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = _ ("Screen");
+	_tmp5__length1 = _result__length1;
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = editing_tools_crop_tool_constraint_description_new (_tmp8_, 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO);
+	_tmp6_ = editing_tools_crop_tool_constraint_description_new (_ ("Screen"), 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO);
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add6 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = _result_;
+	_vala_array_add6 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10__length1 = _result__length1;
+	_tmp7_ = _result_;
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = _ ("Original Size");
+	_tmp7__length1 = _result__length1;
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = editing_tools_crop_tool_constraint_description_new (_tmp11_, 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO);
+	_tmp8_ = editing_tools_crop_tool_constraint_description_new (_ ("Original Size"), 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO);
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add7 (&_result_, &_result__length1, &__result__size_, _tmp12_);
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = _result_;
+	_vala_array_add7 (&_result_, &_result__length1, &__result__size_, _tmp8_);
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13__length1 = _result__length1;
+	_tmp9_ = _result_;
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = _ ("-");
+	_tmp9__length1 = _result__length1;
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = editing_tools_crop_tool_constraint_description_new (_tmp14_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
+	_tmp10_ = editing_tools_crop_tool_constraint_description_new (_ ("-"), 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add8 (&_result_, &_result__length1, &__result__size_, _tmp15_);
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = _result_;
+	_vala_array_add8 (&_result_, &_result__length1, &__result__size_, _tmp10_);
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16__length1 = _result__length1;
+	_tmp11_ = _result_;
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = _ ("SD Video (4 ∶ 3)");
+	_tmp11__length1 = _result__length1;
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = editing_tools_crop_tool_constraint_description_new (_tmp17_, 4, 3, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp12_ = editing_tools_crop_tool_constraint_description_new (_ ("SD Video (4 ∶ 3)"), 4, 3, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add9 (&_result_, &_result__length1, &__result__size_, _tmp18_);
+	_vala_array_add9 (&_result_, &_result__length1, &__result__size_, _tmp12_);
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = _result_;
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19__length1 = _result__length1;
+	_tmp13_ = _result_;
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = _ ("HD Video (16 ∶ 9)");
+	_tmp13__length1 = _result__length1;
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = editing_tools_crop_tool_constraint_description_new (_tmp20_, 16, 9, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp14_ = editing_tools_crop_tool_constraint_description_new (_ ("HD Video (16 ∶ 9)"), 16, 9, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add10 (&_result_, &_result__length1, &__result__size_, _tmp21_);
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = _result_;
+	_vala_array_add10 (&_result_, &_result__length1, &__result__size_, _tmp14_);
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22__length1 = _result__length1;
+	_tmp15_ = _result_;
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = _ ("-");
+	_tmp15__length1 = _result__length1;
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = editing_tools_crop_tool_constraint_description_new (_tmp23_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
+	_tmp16_ = editing_tools_crop_tool_constraint_description_new (_ ("-"), 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add11 (&_result_, &_result__length1, &__result__size_, _tmp24_);
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = _result_;
+	_vala_array_add11 (&_result_, &_result__length1, &__result__size_, _tmp16_);
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25__length1 = _result__length1;
+	_tmp17_ = _result_;
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp26_ = _ ("Wallet (2 × 3 in.)");
+	_tmp17__length1 = _result__length1;
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp27_ = editing_tools_crop_tool_constraint_description_new (_tmp26_, 3, 2, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp18_ = editing_tools_crop_tool_constraint_description_new (_ ("Wallet (2 × 3 in.)"), 3, 2, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add12 (&_result_, &_result__length1, &__result__size_, _tmp27_);
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28_ = _result_;
+	_vala_array_add12 (&_result_, &_result__length1, &__result__size_, _tmp18_);
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28__length1 = _result__length1;
+	_tmp19_ = _result_;
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp29_ = _ ("Notecard (3 × 5 in.)");
+	_tmp19__length1 = _result__length1;
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp30_ = editing_tools_crop_tool_constraint_description_new (_tmp29_, 5, 3, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp20_ = editing_tools_crop_tool_constraint_description_new (_ ("Notecard (3 × 5 in.)"), 5, 3, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp30_);
+	_vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp20_);
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp31_ = _result_;
+	_tmp21_ = _result_;
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp31__length1 = _result__length1;
+	_tmp21__length1 = _result__length1;
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp32_ = _ ("4 × 6 in.");
+	_tmp22_ = editing_tools_crop_tool_constraint_description_new (_ ("4 × 6 in."), 6, 4, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp33_ = editing_tools_crop_tool_constraint_description_new (_tmp32_, 6, 4, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp33_);
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp34_ = _result_;
+	_vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp22_);
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp34__length1 = _result__length1;
+	_tmp23_ = _result_;
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp35_ = _ ("5 × 7 in.");
+	_tmp23__length1 = _result__length1;
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp36_ = editing_tools_crop_tool_constraint_description_new (_tmp35_, 7, 5, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp24_ = editing_tools_crop_tool_constraint_description_new (_ ("5 × 7 in."), 7, 5, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add15 (&_result_, &_result__length1, &__result__size_, _tmp36_);
+	_vala_array_add15 (&_result_, &_result__length1, &__result__size_, _tmp24_);
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp37_ = _result_;
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp37__length1 = _result__length1;
+	_tmp25_ = _result_;
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp38_ = _ ("8 × 10 in.");
+	_tmp25__length1 = _result__length1;
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp39_ = editing_tools_crop_tool_constraint_description_new (_tmp38_, 10, 8, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp26_ = editing_tools_crop_tool_constraint_description_new (_ ("8 × 10 in."), 10, 8, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add16 (&_result_, &_result__length1, &__result__size_, _tmp39_);
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp40_ = _result_;
+	_vala_array_add16 (&_result_, &_result__length1, &__result__size_, _tmp26_);
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp40__length1 = _result__length1;
+	_tmp27_ = _result_;
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp41_ = _ ("Letter (8.5 × 11 in.)");
+	_tmp27__length1 = _result__length1;
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp42_ = editing_tools_crop_tool_constraint_description_new (_tmp41_, 85, 110, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp28_ = editing_tools_crop_tool_constraint_description_new (_ ("Letter (8.5 × 11 in.)"), 85, 110, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add17 (&_result_, &_result__length1, &__result__size_, _tmp42_);
+	_vala_array_add17 (&_result_, &_result__length1, &__result__size_, _tmp28_);
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp43_ = _result_;
+	_tmp29_ = _result_;
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp43__length1 = _result__length1;
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp44_ = _ ("11 × 14 in.");
+	_tmp29__length1 = _result__length1;
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp45_ = editing_tools_crop_tool_constraint_description_new (_tmp44_, 14, 11, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp30_ = editing_tools_crop_tool_constraint_description_new (_ ("11 × 14 in."), 14, 11, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp45_);
+	_vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp30_);
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp46_ = _result_;
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp46__length1 = _result__length1;
+	_tmp31_ = _result_;
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp47_ = _ ("Tabloid (11 × 17 in.)");
+	_tmp31__length1 = _result__length1;
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp48_ = editing_tools_crop_tool_constraint_description_new (_tmp47_, 17, 11, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp32_ = editing_tools_crop_tool_constraint_description_new (_ ("Tabloid (11 × 17 in.)"), 17, 11, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add19 (&_result_, &_result__length1, &__result__size_, _tmp48_);
+	_vala_array_add19 (&_result_, &_result__length1, &__result__size_, _tmp32_);
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp49_ = _result_;
+	_tmp33_ = _result_;
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp49__length1 = _result__length1;
+	_tmp33__length1 = _result__length1;
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp50_ = _ ("16 × 20 in.");
+	_tmp34_ = editing_tools_crop_tool_constraint_description_new (_ ("16 × 20 in."), 20, 16, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp51_ = editing_tools_crop_tool_constraint_description_new (_tmp50_, 20, 16, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp51_);
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp52_ = _result_;
+	_vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp34_);
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp52__length1 = _result__length1;
+	_tmp35_ = _result_;
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp53_ = _ ("-");
+	_tmp35__length1 = _result__length1;
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp54_ = editing_tools_crop_tool_constraint_description_new (_tmp53_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
+	_tmp36_ = editing_tools_crop_tool_constraint_description_new (_ ("-"), 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp54_);
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp55_ = _result_;
+	_vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp36_);
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp55__length1 = _result__length1;
+	_tmp37_ = _result_;
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp56_ = _ ("Metric Wallet (9 × 13 cm)");
+	_tmp37__length1 = _result__length1;
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp57_ = editing_tools_crop_tool_constraint_description_new (_tmp56_, 13, 9, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp38_ = editing_tools_crop_tool_constraint_description_new (_ ("Metric Wallet (9 × 13 cm)"), 13, 9, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp57_);
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp58_ = _result_;
+	_vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp38_);
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp58__length1 = _result__length1;
+	_tmp39_ = _result_;
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp59_ = _ ("Postcard (10 × 15 cm)");
+	_tmp39__length1 = _result__length1;
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp60_ = editing_tools_crop_tool_constraint_description_new (_tmp59_, 15, 10, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp40_ = editing_tools_crop_tool_constraint_description_new (_ ("Postcard (10 × 15 cm)"), 15, 10, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp60_);
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp61_ = _result_;
+	_vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp40_);
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp61__length1 = _result__length1;
+	_tmp41_ = _result_;
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp62_ = _ ("13 × 18 cm");
+	_tmp41__length1 = _result__length1;
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp63_ = editing_tools_crop_tool_constraint_description_new (_tmp62_, 18, 13, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp42_ = editing_tools_crop_tool_constraint_description_new (_ ("13 × 18 cm"), 18, 13, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp63_);
+	_vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp42_);
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp64_ = _result_;
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp64__length1 = _result__length1;
+	_tmp43_ = _result_;
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp65_ = _ ("18 × 24 cm");
+	_tmp43__length1 = _result__length1;
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp66_ = editing_tools_crop_tool_constraint_description_new (_tmp65_, 24, 18, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp44_ = editing_tools_crop_tool_constraint_description_new (_ ("18 × 24 cm"), 24, 18, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp66_);
+	_vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp44_);
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp67_ = _result_;
+	_tmp45_ = _result_;
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp67__length1 = _result__length1;
+	_tmp45__length1 = _result__length1;
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp68_ = _ ("A4 (210 × 297 mm)");
+	_tmp46_ = editing_tools_crop_tool_constraint_description_new (_ ("A4 (210 × 297 mm)"), 210, 297, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp69_ = editing_tools_crop_tool_constraint_description_new (_tmp68_, 210, 297, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp69_);
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp70_ = _result_;
+	_vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp46_);
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp70__length1 = _result__length1;
+	_tmp47_ = _result_;
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp71_ = _ ("20 × 30 cm");
+	_tmp47__length1 = _result__length1;
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp72_ = editing_tools_crop_tool_constraint_description_new (_tmp71_, 30, 20, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp48_ = editing_tools_crop_tool_constraint_description_new (_ ("20 × 30 cm"), 30, 20, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp72_);
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp73_ = _result_;
+	_vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp48_);
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp73__length1 = _result__length1;
+	_tmp49_ = _result_;
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp74_ = _ ("24 × 40 cm");
+	_tmp49__length1 = _result__length1;
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp75_ = editing_tools_crop_tool_constraint_description_new (_tmp74_, 40, 24, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp50_ = editing_tools_crop_tool_constraint_description_new (_ ("24 × 40 cm"), 40, 24, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp75_);
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp76_ = _result_;
+	_vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp50_);
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp76__length1 = _result__length1;
+	_tmp51_ = _result_;
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp77_ = _ ("30 × 40 cm");
+	_tmp51__length1 = _result__length1;
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp78_ = editing_tools_crop_tool_constraint_description_new (_tmp77_, 40, 30, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
+	_tmp52_ = editing_tools_crop_tool_constraint_description_new (_ ("30 × 40 cm"), 40, 30, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp78_);
+	_vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp52_);
 #line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp79_ = _result_;
+	_tmp53_ = _result_;
 #line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp79__length1 = _result__length1;
+	_tmp53__length1 = _result__length1;
 #line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp80_ = _ ("A3 (297 × 420 mm)");
+	_tmp54_ = editing_tools_crop_tool_constraint_description_new (_ ("A3 (297 × 420 mm)"), 420, 297, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp81_ = editing_tools_crop_tool_constraint_description_new (_tmp80_, 420, 297, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add30 (&_result_, &_result__length1, &__result__size_, _tmp81_);
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp82_ = _result_;
+	_vala_array_add30 (&_result_, &_result__length1, &__result__size_, _tmp54_);
 #line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp82__length1 = _result__length1;
+	_tmp55_ = _result_;
 #line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp83_ = _ ("-");
+	_tmp55__length1 = _result__length1;
 #line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp84_ = editing_tools_crop_tool_constraint_description_new (_tmp83_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
+	_tmp56_ = editing_tools_crop_tool_constraint_description_new (_ ("-"), 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
 #line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add31 (&_result_, &_result__length1, &__result__size_, _tmp84_);
+	_vala_array_add31 (&_result_, &_result__length1, &__result__size_, _tmp56_);
 #line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp85_ = _result_;
+	_tmp57_ = _result_;
 #line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp85__length1 = _result__length1;
+	_tmp57__length1 = _result__length1;
 #line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp86_ = _ ("Custom");
+	_tmp58_ = editing_tools_crop_tool_constraint_description_new (_ ("Custom"), 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO);
 #line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp87_ = editing_tools_crop_tool_constraint_description_new (_tmp86_, 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO);
-#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp87_);
+	_vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp58_);
 #line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp88_ = _result_;
+	_tmp59_ = _result_;
 #line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp88__length1 = _result__length1;
+	_tmp59__length1 = _result__length1;
 #line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (result_length1) {
 #line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		*result_length1 = _tmp88__length1;
-#line 6062 "EditingTools.c"
+		*result_length1 = _tmp59__length1;
+#line 5990 "EditingTools.c"
 	}
 #line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	result = _tmp88_;
+	result = _tmp59_;
 #line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6068 "EditingTools.c"
+#line 5996 "EditingTools.c"
 }
 
 
 static gpointer _editing_tools_crop_tool_constraint_description_ref0 (gpointer self) {
 #line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? editing_tools_crop_tool_constraint_description_ref (self) : NULL;
-#line 6075 "EditingTools.c"
+#line 6003 "EditingTools.c"
 }
 
 
 static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingToolsCropToolConstraintDescription** constraint_data, int constraint_data_length1) {
 	GtkListStore* result = NULL;
 	GtkListStore* _result_ = NULL;
-	GtkListStore* _tmp0_ = NULL;
+	GtkListStore* _tmp0_;
 	GtkTreeIter iter = {0};
-	EditingToolsCropToolConstraintDescription** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	EditingToolsCropToolConstraintDescription** _tmp1_;
+	gint _tmp1__length1;
 #line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = gtk_list_store_new (1, G_TYPE_STRING, G_TYPE_STRING, -1);
 #line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6090,7 +6018,7 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool
 	_tmp1_ = constraint_data;
 #line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1__length1 = constraint_data_length1;
-#line 6094 "EditingTools.c"
+#line 6022 "EditingTools.c"
 	{
 		EditingToolsCropToolConstraintDescription** constraint_collection = NULL;
 		gint constraint_collection_length1 = 0;
@@ -6102,21 +6030,21 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool
 		constraint_collection_length1 = _tmp1__length1;
 #line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		for (constraint_it = 0; constraint_it < _tmp1__length1; constraint_it = constraint_it + 1) {
-#line 6106 "EditingTools.c"
-			EditingToolsCropToolConstraintDescription* _tmp2_ = NULL;
+#line 6034 "EditingTools.c"
+			EditingToolsCropToolConstraintDescription* _tmp2_;
 			EditingToolsCropToolConstraintDescription* constraint = NULL;
 #line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = _editing_tools_crop_tool_constraint_description_ref0 (constraint_collection[constraint_it]);
 #line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			constraint = _tmp2_;
-#line 6113 "EditingTools.c"
+#line 6041 "EditingTools.c"
 			{
-				GtkListStore* _tmp3_ = NULL;
+				GtkListStore* _tmp3_;
 				GtkTreeIter _tmp4_ = {0};
-				GtkListStore* _tmp5_ = NULL;
-				GtkTreeIter _tmp6_ = {0};
-				EditingToolsCropToolConstraintDescription* _tmp7_ = NULL;
-				const gchar* _tmp8_ = NULL;
+				GtkListStore* _tmp5_;
+				GtkTreeIter _tmp6_;
+				EditingToolsCropToolConstraintDescription* _tmp7_;
+				const gchar* _tmp8_;
 				GValue _tmp9_ = {0};
 #line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp3_ = _result_;
@@ -6142,7 +6070,7 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool
 				G_IS_VALUE (&_tmp9_) ? (g_value_unset (&_tmp9_), NULL) : NULL;
 #line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_editing_tools_crop_tool_constraint_description_unref0 (constraint);
-#line 6146 "EditingTools.c"
+#line 6074 "EditingTools.c"
 			}
 		}
 	}
@@ -6150,16 +6078,16 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool
 	result = _result_;
 #line 796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6154 "EditingTools.c"
+#line 6082 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_update_pivot_button_state (EditingToolsCropTool* self) {
-	EditingToolsCropToolCropToolWindow* _tmp0_ = NULL;
-	GtkButton* _tmp1_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp2_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	EditingToolsCropToolCropToolWindow* _tmp0_;
+	GtkButton* _tmp1_;
+	EditingToolsCropToolConstraintDescription* _tmp2_;
+	EditingToolsCropToolConstraintDescription* _tmp3_;
+	gboolean _tmp4_;
 #line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6176,22 +6104,22 @@ static void editing_tools_crop_tool_update_pivot_button_state (EditingToolsCropT
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), _tmp4_);
 #line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_crop_tool_constraint_description_unref0 (_tmp3_);
-#line 6180 "EditingTools.c"
+#line 6108 "EditingTools.c"
 }
 
 
 static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_selected_constraint (EditingToolsCropTool* self) {
 	EditingToolsCropToolConstraintDescription* result = NULL;
 	EditingToolsCropToolConstraintDescription* _result_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	EditingToolsCropToolCropToolWindow* _tmp1_ = NULL;
-	GtkComboBox* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	EditingToolsCropToolConstraintDescription* _tmp4_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp5_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp6_ = NULL;
-	gfloat _tmp7_ = 0.0F;
+	EditingToolsCropToolConstraintDescription** _tmp0_;
+	gint _tmp0__length1;
+	EditingToolsCropToolCropToolWindow* _tmp1_;
+	GtkComboBox* _tmp2_;
+	gint _tmp3_;
+	EditingToolsCropToolConstraintDescription* _tmp4_;
+	EditingToolsCropToolConstraintDescription* _tmp5_;
+	EditingToolsCropToolConstraintDescription* _tmp6_;
+	gfloat _tmp7_;
 #line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), NULL);
 #line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6216,15 +6144,15 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se
 	_tmp7_ = _tmp6_->aspect_ratio;
 #line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp7_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 6220 "EditingTools.c"
-		EditingToolsCropToolConstraintDescription* _tmp8_ = NULL;
-		EditingToolsPhotoCanvas* _tmp9_ = NULL;
+#line 6148 "EditingTools.c"
+		EditingToolsCropToolConstraintDescription* _tmp8_;
+		EditingToolsPhotoCanvas* _tmp9_;
 		GdkRectangle _tmp10_ = {0};
-		gint _tmp11_ = 0;
-		EditingToolsCropToolConstraintDescription* _tmp12_ = NULL;
-		EditingToolsPhotoCanvas* _tmp13_ = NULL;
+		gint _tmp11_;
+		EditingToolsCropToolConstraintDescription* _tmp12_;
+		EditingToolsPhotoCanvas* _tmp13_;
 		GdkRectangle _tmp14_ = {0};
-		gint _tmp15_ = 0;
+		gint _tmp15_;
 #line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = _result_;
 #line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6245,26 +6173,26 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se
 		_tmp15_ = _tmp14_.height;
 #line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_->basis_height = _tmp15_;
-#line 6249 "EditingTools.c"
+#line 6177 "EditingTools.c"
 	} else {
-		EditingToolsCropToolConstraintDescription* _tmp16_ = NULL;
-		gfloat _tmp17_ = 0.0F;
+		EditingToolsCropToolConstraintDescription* _tmp16_;
+		gfloat _tmp17_;
 #line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = _result_;
 #line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = _tmp16_->aspect_ratio;
 #line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp17_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 6259 "EditingTools.c"
+#line 6187 "EditingTools.c"
 			GdkScreen* screen = NULL;
-			GdkScreen* _tmp18_ = NULL;
-			GdkScreen* _tmp19_ = NULL;
-			EditingToolsCropToolConstraintDescription* _tmp20_ = NULL;
-			GdkScreen* _tmp21_ = NULL;
-			gint _tmp22_ = 0;
-			EditingToolsCropToolConstraintDescription* _tmp23_ = NULL;
-			GdkScreen* _tmp24_ = NULL;
-			gint _tmp25_ = 0;
+			GdkScreen* _tmp18_;
+			GdkScreen* _tmp19_;
+			EditingToolsCropToolConstraintDescription* _tmp20_;
+			GdkScreen* _tmp21_;
+			gint _tmp22_;
+			EditingToolsCropToolConstraintDescription* _tmp23_;
+			GdkScreen* _tmp24_;
+			gint _tmp25_;
 #line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp18_ = gdk_screen_get_default ();
 #line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6289,25 +6217,25 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se
 			_tmp23_->basis_height = _tmp25_;
 #line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (screen);
-#line 6293 "EditingTools.c"
+#line 6221 "EditingTools.c"
 		}
 	}
 #line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
 #line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6300 "EditingTools.c"
+#line 6228 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCropTool* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-	EditingToolsCropToolCropToolWindow* _tmp0_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp1_ = NULL;
-	GtkEntry* _tmp2_ = NULL;
-	GtkEntry* _tmp3_ = NULL;
-	GdkEventFocus* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	EditingToolsCropToolCropToolWindow* _tmp0_;
+	EditingToolsCropToolCropToolWindow* _tmp1_;
+	GtkEntry* _tmp2_;
+	GtkEntry* _tmp3_;
+	GdkEventFocus* _tmp4_;
+	gboolean _tmp5_;
 #line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
 #line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6332,18 +6260,18 @@ static gboolean editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCr
 	result = _tmp5_;
 #line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6336 "EditingTools.c"
+#line 6264 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_crop_tool_on_height_entry_focus_out (EditingToolsCropTool* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-	EditingToolsCropToolCropToolWindow* _tmp0_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp1_ = NULL;
-	GtkEntry* _tmp2_ = NULL;
-	GtkEntry* _tmp3_ = NULL;
-	GdkEventFocus* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	EditingToolsCropToolCropToolWindow* _tmp0_;
+	EditingToolsCropToolCropToolWindow* _tmp1_;
+	GtkEntry* _tmp2_;
+	GtkEntry* _tmp3_;
+	GdkEventFocus* _tmp4_;
+	gboolean _tmp5_;
 #line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
 #line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6368,44 +6296,44 @@ static gboolean editing_tools_crop_tool_on_height_entry_focus_out (EditingToolsC
 	result = _tmp5_;
 #line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6372 "EditingTools.c"
+#line 6300 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsCropTool* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
 	gint width = 0;
-	EditingToolsCropToolCropToolWindow* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
+	EditingToolsCropToolCropToolWindow* _tmp0_;
+	GtkEntry* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gint _tmp4_;
 	gint height = 0;
-	EditingToolsCropToolCropToolWindow* _tmp5_ = NULL;
-	GtkEntry* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	gint _tmp16_ = 0;
+	EditingToolsCropToolCropToolWindow* _tmp5_;
+	GtkEntry* _tmp6_;
+	const gchar* _tmp7_;
+	const gchar* _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
+	gint _tmp16_;
 	gboolean _tmp22_ = FALSE;
-	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
-	gint _tmp27_ = 0;
-	gint _tmp28_ = 0;
-	gfloat _tmp29_ = 0.0F;
-	gint _tmp63_ = 0;
-	gint _tmp64_ = 0;
+	gint _tmp23_;
+	gint _tmp24_;
+	gint _tmp27_;
+	gint _tmp28_;
+	gfloat _tmp29_;
+	gint _tmp63_;
+	gint _tmp64_;
 	Box new_crop = {0};
-	Box _tmp65_ = {0};
+	Box _tmp65_;
 	Box _tmp66_ = {0};
-	Box _tmp67_ = {0};
-	Box _tmp68_ = {0};
-	EditingToolsPhotoCanvas* _tmp69_ = NULL;
-	Box _tmp70_ = {0};
-	EditingToolsPhotoCanvas* _tmp71_ = NULL;
-	gint _tmp72_ = 0;
-	gint _tmp73_ = 0;
+	Box _tmp67_;
+	Box _tmp68_;
+	EditingToolsPhotoCanvas* _tmp69_;
+	Box _tmp70_;
+	EditingToolsPhotoCanvas* _tmp71_;
+	gint _tmp72_;
+	gint _tmp73_;
 #line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
 #line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6438,12 +6366,12 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 	_tmp10_ = width;
 #line 833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ < 1) {
-#line 6442 "EditingTools.c"
-		EditingToolsCropToolCropToolWindow* _tmp11_ = NULL;
-		GtkEntry* _tmp12_ = NULL;
-		gint _tmp13_ = 0;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
+#line 6370 "EditingTools.c"
+		EditingToolsCropToolCropToolWindow* _tmp11_;
+		GtkEntry* _tmp12_;
+		gint _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
 #line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		width = 1;
 #line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6460,18 +6388,18 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 		gtk_entry_set_text (_tmp12_, _tmp15_);
 #line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp15_);
-#line 6464 "EditingTools.c"
+#line 6392 "EditingTools.c"
 	}
 #line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = height;
 #line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp16_ < 1) {
-#line 6470 "EditingTools.c"
-		EditingToolsCropToolCropToolWindow* _tmp17_ = NULL;
-		GtkEntry* _tmp18_ = NULL;
-		gint _tmp19_ = 0;
-		gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
+#line 6398 "EditingTools.c"
+		EditingToolsCropToolCropToolWindow* _tmp17_;
+		GtkEntry* _tmp18_;
+		gint _tmp19_;
+		gchar* _tmp20_;
+		gchar* _tmp21_;
 #line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		height = 1;
 #line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6488,7 +6416,7 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 		gtk_entry_set_text (_tmp18_, _tmp21_);
 #line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp21_);
-#line 6492 "EditingTools.c"
+#line 6420 "EditingTools.c"
 	}
 #line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = width;
@@ -6496,20 +6424,20 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 	_tmp24_ = self->priv->custom_width;
 #line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp23_ == _tmp24_) {
-#line 6500 "EditingTools.c"
-		gint _tmp25_ = 0;
-		gint _tmp26_ = 0;
+#line 6428 "EditingTools.c"
+		gint _tmp25_;
+		gint _tmp26_;
 #line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp25_ = height;
 #line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp26_ = self->priv->custom_height;
 #line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = _tmp25_ == _tmp26_;
-#line 6509 "EditingTools.c"
+#line 6437 "EditingTools.c"
 	} else {
 #line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = FALSE;
-#line 6513 "EditingTools.c"
+#line 6441 "EditingTools.c"
 	}
 #line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp22_) {
@@ -6517,7 +6445,7 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 		result = FALSE;
 #line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 6521 "EditingTools.c"
+#line 6449 "EditingTools.c"
 	}
 #line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = width;
@@ -6529,11 +6457,11 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 	_tmp29_ = self->priv->custom_aspect_ratio;
 #line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp29_ < EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO) {
-#line 6533 "EditingTools.c"
-		EditingToolsCropToolCropToolWindow* _tmp30_ = NULL;
-		GtkEntry* _tmp31_ = NULL;
-		EditingToolsCropToolCropToolWindow* _tmp32_ = NULL;
-		GtkEntry* _tmp33_ = NULL;
+#line 6461 "EditingTools.c"
+		EditingToolsCropToolCropToolWindow* _tmp30_;
+		GtkEntry* _tmp31_;
+		EditingToolsCropToolCropToolWindow* _tmp32_;
+		GtkEntry* _tmp33_;
 #line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp30_ = self->priv->crop_tool_window;
 #line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6544,13 +6472,13 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 		_tmp33_ = _tmp32_->custom_height_entry;
 #line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp31_ == _tmp33_) {
-#line 6548 "EditingTools.c"
-			gint _tmp34_ = 0;
-			EditingToolsCropToolCropToolWindow* _tmp35_ = NULL;
-			GtkEntry* _tmp36_ = NULL;
-			gint _tmp37_ = 0;
-			gchar* _tmp38_ = NULL;
-			gchar* _tmp39_ = NULL;
+#line 6476 "EditingTools.c"
+			gint _tmp34_;
+			EditingToolsCropToolCropToolWindow* _tmp35_;
+			GtkEntry* _tmp36_;
+			gint _tmp37_;
+			gchar* _tmp38_;
+			gchar* _tmp39_;
 #line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp34_ = width;
 #line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6569,14 +6497,14 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 			gtk_entry_set_text (_tmp36_, _tmp39_);
 #line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_free0 (_tmp39_);
-#line 6573 "EditingTools.c"
+#line 6501 "EditingTools.c"
 		} else {
-			gint _tmp40_ = 0;
-			EditingToolsCropToolCropToolWindow* _tmp41_ = NULL;
-			GtkEntry* _tmp42_ = NULL;
-			gint _tmp43_ = 0;
-			gchar* _tmp44_ = NULL;
-			gchar* _tmp45_ = NULL;
+			gint _tmp40_;
+			EditingToolsCropToolCropToolWindow* _tmp41_;
+			GtkEntry* _tmp42_;
+			gint _tmp43_;
+			gchar* _tmp44_;
+			gchar* _tmp45_;
 #line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp40_ = height;
 #line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6595,19 +6523,19 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 			gtk_entry_set_text (_tmp42_, _tmp45_);
 #line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_free0 (_tmp45_);
-#line 6599 "EditingTools.c"
+#line 6527 "EditingTools.c"
 		}
 	} else {
-		gfloat _tmp46_ = 0.0F;
+		gfloat _tmp46_;
 #line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp46_ = self->priv->custom_aspect_ratio;
 #line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp46_ > EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO) {
-#line 6607 "EditingTools.c"
-			EditingToolsCropToolCropToolWindow* _tmp47_ = NULL;
-			GtkEntry* _tmp48_ = NULL;
-			EditingToolsCropToolCropToolWindow* _tmp49_ = NULL;
-			GtkEntry* _tmp50_ = NULL;
+#line 6535 "EditingTools.c"
+			EditingToolsCropToolCropToolWindow* _tmp47_;
+			GtkEntry* _tmp48_;
+			EditingToolsCropToolCropToolWindow* _tmp49_;
+			GtkEntry* _tmp50_;
 #line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp47_ = self->priv->crop_tool_window;
 #line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6618,13 +6546,13 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 			_tmp50_ = _tmp49_->custom_height_entry;
 #line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp48_ == _tmp50_) {
-#line 6622 "EditingTools.c"
-				gint _tmp51_ = 0;
-				EditingToolsCropToolCropToolWindow* _tmp52_ = NULL;
-				GtkEntry* _tmp53_ = NULL;
-				gint _tmp54_ = 0;
-				gchar* _tmp55_ = NULL;
-				gchar* _tmp56_ = NULL;
+#line 6550 "EditingTools.c"
+				gint _tmp51_;
+				EditingToolsCropToolCropToolWindow* _tmp52_;
+				GtkEntry* _tmp53_;
+				gint _tmp54_;
+				gchar* _tmp55_;
+				gchar* _tmp56_;
 #line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp51_ = width;
 #line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6643,14 +6571,14 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 				gtk_entry_set_text (_tmp53_, _tmp56_);
 #line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_g_free0 (_tmp56_);
-#line 6647 "EditingTools.c"
+#line 6575 "EditingTools.c"
 			} else {
-				gint _tmp57_ = 0;
-				EditingToolsCropToolCropToolWindow* _tmp58_ = NULL;
-				GtkEntry* _tmp59_ = NULL;
-				gint _tmp60_ = 0;
-				gchar* _tmp61_ = NULL;
-				gchar* _tmp62_ = NULL;
+				gint _tmp57_;
+				EditingToolsCropToolCropToolWindow* _tmp58_;
+				GtkEntry* _tmp59_;
+				gint _tmp60_;
+				gchar* _tmp61_;
+				gchar* _tmp62_;
 #line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp57_ = height;
 #line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6669,7 +6597,7 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 				gtk_entry_set_text (_tmp59_, _tmp62_);
 #line 862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_g_free0 (_tmp62_);
-#line 6673 "EditingTools.c"
+#line 6601 "EditingTools.c"
 			}
 		}
 	}
@@ -6715,15 +6643,15 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 	result = FALSE;
 #line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6719 "EditingTools.c"
+#line 6647 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_on_width_insert_text (EditingToolsCropTool* self, const gchar* text, gint length, gint* position) {
-	EditingToolsCropToolCropToolWindow* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
+	EditingToolsCropToolCropToolWindow* _tmp0_;
+	GtkEntry* _tmp1_;
+	const gchar* _tmp2_;
+	gint _tmp3_;
 #line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6738,15 +6666,15 @@ static void editing_tools_crop_tool_on_width_insert_text (EditingToolsCropTool*
 	_tmp3_ = length;
 #line 882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, _tmp2_, _tmp3_, position);
-#line 6742 "EditingTools.c"
+#line 6670 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_on_height_insert_text (EditingToolsCropTool* self, const gchar* text, gint length, gint* position) {
-	EditingToolsCropToolCropToolWindow* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
+	EditingToolsCropToolCropToolWindow* _tmp0_;
+	GtkEntry* _tmp1_;
+	const gchar* _tmp2_;
+	gint _tmp3_;
 #line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6761,37 +6689,37 @@ static void editing_tools_crop_tool_on_height_insert_text (EditingToolsCropTool*
 	_tmp3_ = length;
 #line 886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, _tmp2_, _tmp3_, position);
-#line 6765 "EditingTools.c"
+#line 6693 "EditingTools.c"
 }
 
 
 static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
-	glong _tmp0_ = 0L;
-	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp0_;
+	gchar _tmp1_;
+#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 6783 "EditingTools.c"
+#line 6711 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool* self, GtkEntry* sender, const gchar* text, gint length, gint* position) {
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	gboolean _tmp0_;
+	gint _tmp1_;
 	gchar* new_text = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp21_ = NULL;
-	gint _tmp22_ = 0;
-	gint _tmp23_ = 0;
-	GtkEntry* _tmp29_ = NULL;
+	gchar* _tmp5_;
+	const gchar* _tmp21_;
+	gint _tmp22_;
+	gint _tmp23_;
+	GtkEntry* _tmp29_;
 #line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6804,7 +6732,7 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 	if (_tmp0_) {
 #line 891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 6808 "EditingTools.c"
+#line 6736 "EditingTools.c"
 	}
 #line 893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->entry_insert_in_progress = TRUE;
@@ -6812,10 +6740,10 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 	_tmp1_ = length;
 #line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == -1) {
-#line 6816 "EditingTools.c"
-		const gchar* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+#line 6744 "EditingTools.c"
+		const gchar* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = text;
 #line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6824,40 +6752,40 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 		_tmp4_ = _tmp3_;
 #line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		length = (gint) _tmp4_;
-#line 6828 "EditingTools.c"
+#line 6756 "EditingTools.c"
 	}
 #line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = g_strdup ("");
 #line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_text = _tmp5_;
-#line 6834 "EditingTools.c"
+#line 6762 "EditingTools.c"
 	{
 		gint ctr = 0;
 #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		ctr = 0;
-#line 6839 "EditingTools.c"
+#line 6767 "EditingTools.c"
 		{
 			gboolean _tmp6_ = FALSE;
 #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp6_ = TRUE;
 #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			while (TRUE) {
-#line 6846 "EditingTools.c"
-				gint _tmp8_ = 0;
-				gint _tmp9_ = 0;
-				const gchar* _tmp10_ = NULL;
-				gint _tmp11_ = 0;
-				gchar _tmp12_ = '\0';
-				gboolean _tmp13_ = FALSE;
+#line 6774 "EditingTools.c"
+				gint _tmp8_;
+				gint _tmp9_;
+				const gchar* _tmp10_;
+				gint _tmp11_;
+				gchar _tmp12_;
+				gboolean _tmp13_;
 #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (!_tmp6_) {
-#line 6855 "EditingTools.c"
-					gint _tmp7_ = 0;
+#line 6783 "EditingTools.c"
+					gint _tmp7_;
 #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp7_ = ctr;
 #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					ctr = _tmp7_ + 1;
-#line 6861 "EditingTools.c"
+#line 6789 "EditingTools.c"
 				}
 #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp6_ = FALSE;
@@ -6869,7 +6797,7 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 				if (!(_tmp8_ < _tmp9_)) {
 #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					break;
-#line 6873 "EditingTools.c"
+#line 6801 "EditingTools.c"
 				}
 #line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp10_ = text;
@@ -6881,14 +6809,14 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 				_tmp13_ = g_ascii_isdigit (_tmp12_);
 #line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp13_) {
-#line 6885 "EditingTools.c"
-					const gchar* _tmp14_ = NULL;
-					const gchar* _tmp15_ = NULL;
-					gint _tmp16_ = 0;
-					gchar _tmp17_ = '\0';
-					gchar* _tmp18_ = NULL;
-					gchar* _tmp19_ = NULL;
-					gchar* _tmp20_ = NULL;
+#line 6813 "EditingTools.c"
+					const gchar* _tmp14_;
+					const gchar* _tmp15_;
+					gint _tmp16_;
+					gchar _tmp17_;
+					gchar* _tmp18_;
+					gchar* _tmp19_;
+					gchar* _tmp20_;
 #line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp14_ = new_text;
 #line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6909,7 +6837,7 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 					new_text = _tmp20_;
 #line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_g_free0 (_tmp19_);
-#line 6913 "EditingTools.c"
+#line 6841 "EditingTools.c"
 				}
 			}
 		}
@@ -6922,12 +6850,12 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 	_tmp23_ = _tmp22_;
 #line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp23_ > 0) {
-#line 6926 "EditingTools.c"
-		GtkEntry* _tmp24_ = NULL;
-		const gchar* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
-		gint _tmp27_ = 0;
-		gint _tmp28_ = 0;
+#line 6854 "EditingTools.c"
+		GtkEntry* _tmp24_;
+		const gchar* _tmp25_;
+		const gchar* _tmp26_;
+		gint _tmp27_;
+		gint _tmp28_;
 #line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp24_ = sender;
 #line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6940,7 +6868,7 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 		_tmp28_ = _tmp27_;
 #line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), _tmp25_, (gint) _tmp28_, position);
-#line 6944 "EditingTools.c"
+#line 6872 "EditingTools.c"
 	}
 #line 909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = sender;
@@ -6950,19 +6878,19 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 	self->priv->entry_insert_in_progress = FALSE;
 #line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (new_text);
-#line 6954 "EditingTools.c"
+#line 6882 "EditingTools.c"
 }
 
 
 static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsCropTool* self) {
 	gfloat result = 0.0F;
 	gfloat _result_ = 0.0F;
-	EditingToolsCropToolConstraintDescription* _tmp0_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp1_ = NULL;
-	gfloat _tmp2_ = 0.0F;
-	gfloat _tmp3_ = 0.0F;
-	gfloat _tmp4_ = 0.0F;
-	EditingToolsCropToolReticleOrientation _tmp20_ = 0;
+	EditingToolsCropToolConstraintDescription* _tmp0_;
+	EditingToolsCropToolConstraintDescription* _tmp1_;
+	gfloat _tmp2_;
+	gfloat _tmp3_;
+	gfloat _tmp4_;
+	EditingToolsCropToolReticleOrientation _tmp20_;
 #line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0.0F);
 #line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6981,13 +6909,13 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
 	_tmp4_ = _result_;
 #line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 6985 "EditingTools.c"
-		EditingToolsPhotoCanvas* _tmp5_ = NULL;
+#line 6913 "EditingTools.c"
+		EditingToolsPhotoCanvas* _tmp5_;
 		GdkRectangle _tmp6_ = {0};
-		gint _tmp7_ = 0;
-		EditingToolsPhotoCanvas* _tmp8_ = NULL;
+		gint _tmp7_;
+		EditingToolsPhotoCanvas* _tmp8_;
 		GdkRectangle _tmp9_ = {0};
-		gint _tmp10_ = 0;
+		gint _tmp10_;
 #line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7002,21 +6930,21 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
 		_tmp10_ = _tmp9_.height;
 #line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = ((gfloat) _tmp7_) / ((gfloat) _tmp10_);
-#line 7006 "EditingTools.c"
+#line 6934 "EditingTools.c"
 	} else {
-		gfloat _tmp11_ = 0.0F;
+		gfloat _tmp11_;
 #line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = _result_;
 #line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp11_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 7013 "EditingTools.c"
+#line 6941 "EditingTools.c"
 			GdkScreen* screen = NULL;
-			GdkScreen* _tmp12_ = NULL;
-			GdkScreen* _tmp13_ = NULL;
-			GdkScreen* _tmp14_ = NULL;
-			gint _tmp15_ = 0;
-			GdkScreen* _tmp16_ = NULL;
-			gint _tmp17_ = 0;
+			GdkScreen* _tmp12_;
+			GdkScreen* _tmp13_;
+			GdkScreen* _tmp14_;
+			gint _tmp15_;
+			GdkScreen* _tmp16_;
+			gint _tmp17_;
 #line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp12_ = gdk_screen_get_default ();
 #line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7035,20 +6963,20 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
 			_result_ = ((gfloat) _tmp15_) / ((gfloat) _tmp17_);
 #line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (screen);
-#line 7039 "EditingTools.c"
+#line 6967 "EditingTools.c"
 		} else {
-			gfloat _tmp18_ = 0.0F;
+			gfloat _tmp18_;
 #line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp18_ = _result_;
 #line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp18_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
-#line 7046 "EditingTools.c"
-				gfloat _tmp19_ = 0.0F;
+#line 6974 "EditingTools.c"
+				gfloat _tmp19_;
 #line 924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp19_ = self->priv->custom_aspect_ratio;
 #line 924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_result_ = _tmp19_;
-#line 7052 "EditingTools.c"
+#line 6980 "EditingTools.c"
 			}
 		}
 	}
@@ -7056,29 +6984,29 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
 	_tmp20_ = self->priv->reticle_orientation;
 #line 926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp20_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) {
-#line 7060 "EditingTools.c"
-		gfloat _tmp21_ = 0.0F;
+#line 6988 "EditingTools.c"
+		gfloat _tmp21_;
 #line 927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = _result_;
 #line 927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = 1.0f / _tmp21_;
-#line 7066 "EditingTools.c"
+#line 6994 "EditingTools.c"
 	}
 #line 929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
 #line 929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 7072 "EditingTools.c"
+#line 7000 "EditingTools.c"
 }
 
 
 static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint (EditingToolsCropTool* self, EditingToolsCropToolConstraintDescription* constraint, Photo* photo) {
 	gfloat result = 0.0F;
 	gfloat _result_ = 0.0F;
-	EditingToolsCropToolConstraintDescription* _tmp0_ = NULL;
-	gfloat _tmp1_ = 0.0F;
-	gfloat _tmp2_ = 0.0F;
-	EditingToolsCropToolReticleOrientation _tmp18_ = 0;
+	EditingToolsCropToolConstraintDescription* _tmp0_;
+	gfloat _tmp1_;
+	gfloat _tmp2_;
+	EditingToolsCropToolReticleOrientation _tmp18_;
 #line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0.0F);
 #line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7095,14 +7023,14 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
 	_tmp2_ = _result_;
 #line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 7099 "EditingTools.c"
+#line 7027 "EditingTools.c"
 		Dimensions orig_dim = {0};
-		Photo* _tmp3_ = NULL;
+		Photo* _tmp3_;
 		Dimensions _tmp4_ = {0};
-		Dimensions _tmp5_ = {0};
-		gint _tmp6_ = 0;
-		Dimensions _tmp7_ = {0};
-		gint _tmp8_ = 0;
+		Dimensions _tmp5_;
+		gint _tmp6_;
+		Dimensions _tmp7_;
+		gint _tmp8_;
 #line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = photo;
 #line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7119,21 +7047,21 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
 		_tmp8_ = _tmp7_.height;
 #line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = ((gfloat) _tmp6_) / ((gfloat) _tmp8_);
-#line 7123 "EditingTools.c"
+#line 7051 "EditingTools.c"
 	} else {
-		gfloat _tmp9_ = 0.0F;
+		gfloat _tmp9_;
 #line 938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _result_;
 #line 938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp9_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 7130 "EditingTools.c"
+#line 7058 "EditingTools.c"
 			GdkScreen* screen = NULL;
-			GdkScreen* _tmp10_ = NULL;
-			GdkScreen* _tmp11_ = NULL;
-			GdkScreen* _tmp12_ = NULL;
-			gint _tmp13_ = 0;
-			GdkScreen* _tmp14_ = NULL;
-			gint _tmp15_ = 0;
+			GdkScreen* _tmp10_;
+			GdkScreen* _tmp11_;
+			GdkScreen* _tmp12_;
+			gint _tmp13_;
+			GdkScreen* _tmp14_;
+			gint _tmp15_;
 #line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp10_ = gdk_screen_get_default ();
 #line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7152,20 +7080,20 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
 			_result_ = ((gfloat) _tmp13_) / ((gfloat) _tmp15_);
 #line 938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (screen);
-#line 7156 "EditingTools.c"
+#line 7084 "EditingTools.c"
 		} else {
-			gfloat _tmp16_ = 0.0F;
+			gfloat _tmp16_;
 #line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp16_ = _result_;
 #line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp16_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
-#line 7163 "EditingTools.c"
-				gfloat _tmp17_ = 0.0F;
+#line 7091 "EditingTools.c"
+				gfloat _tmp17_;
 #line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp17_ = self->priv->custom_aspect_ratio;
 #line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_result_ = _tmp17_;
-#line 7169 "EditingTools.c"
+#line 7097 "EditingTools.c"
 			}
 		}
 	}
@@ -7173,33 +7101,33 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
 	_tmp18_ = self->priv->reticle_orientation;
 #line 944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp18_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) {
-#line 7177 "EditingTools.c"
-		gfloat _tmp19_ = 0.0F;
+#line 7105 "EditingTools.c"
+		gfloat _tmp19_;
 #line 945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = _result_;
 #line 945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = 1.0f / _tmp19_;
-#line 7183 "EditingTools.c"
+#line 7111 "EditingTools.c"
 	}
 #line 947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
 #line 947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 7189 "EditingTools.c"
+#line 7117 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* self) {
 	EditingToolsCropToolConstraintDescription* selected_constraint = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp0_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp1_ = NULL;
-	gfloat _tmp2_ = 0.0F;
-	EditingToolsCropToolConstraintDescription* _tmp13_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
-	gboolean _tmp16_ = FALSE;
-	gfloat _tmp17_ = 0.0F;
-	gfloat _tmp18_ = 0.0F;
+	EditingToolsCropToolConstraintDescription* _tmp0_;
+	EditingToolsCropToolConstraintDescription* _tmp1_;
+	gfloat _tmp2_;
+	EditingToolsCropToolConstraintDescription* _tmp13_;
+	EditingToolsCropToolConstraintDescription* _tmp14_;
+	gboolean _tmp15_;
+	gboolean _tmp16_;
+	gfloat _tmp17_;
+	gfloat _tmp18_;
 #line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7214,10 +7142,10 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 	if (_tmp2_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
 #line 954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_custom_constraint_mode (self);
-#line 7218 "EditingTools.c"
+#line 7146 "EditingTools.c"
 	} else {
-		EditingToolsCropToolConstraintDescription* _tmp3_ = NULL;
-		gfloat _tmp4_ = 0.0F;
+		EditingToolsCropToolConstraintDescription* _tmp3_;
+		gfloat _tmp4_;
 #line 956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_normal_constraint_mode (self);
 #line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7226,15 +7154,15 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 		_tmp4_ = _tmp3_->aspect_ratio;
 #line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp4_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 7230 "EditingTools.c"
-			ConfigFacade* _tmp5_ = NULL;
-			ConfigFacade* _tmp6_ = NULL;
-			gint _tmp7_ = 0;
-			ConfigFacade* _tmp8_ = NULL;
-			ConfigFacade* _tmp9_ = NULL;
-			gint _tmp10_ = 0;
-			gint _tmp11_ = 0;
-			gint _tmp12_ = 0;
+#line 7158 "EditingTools.c"
+			ConfigFacade* _tmp5_;
+			ConfigFacade* _tmp6_;
+			gint _tmp7_;
+			ConfigFacade* _tmp8_;
+			ConfigFacade* _tmp9_;
+			gint _tmp10_;
+			gint _tmp11_;
+			gint _tmp12_;
 #line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp5_ = config_facade_get_instance ();
 #line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7261,7 +7189,7 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 			_tmp12_ = self->priv->custom_init_height;
 #line 964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			self->priv->custom_aspect_ratio = ((gfloat) _tmp11_) / ((gfloat) _tmp12_);
-#line 7265 "EditingTools.c"
+#line 7193 "EditingTools.c"
 		}
 	}
 #line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7280,7 +7208,7 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 	if (_tmp16_) {
 #line 971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->reticle_orientation = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 7284 "EditingTools.c"
+#line 7212 "EditingTools.c"
 	}
 #line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
@@ -7288,16 +7216,16 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 	_tmp18_ = self->priv->pre_aspect_ratio;
 #line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp17_ != _tmp18_) {
-#line 7292 "EditingTools.c"
+#line 7220 "EditingTools.c"
 		Box new_crop = {0};
-		Box _tmp19_ = {0};
+		Box _tmp19_;
 		Box _tmp20_ = {0};
-		Box _tmp21_ = {0};
-		Box _tmp22_ = {0};
-		EditingToolsPhotoCanvas* _tmp23_ = NULL;
-		Box _tmp24_ = {0};
-		EditingToolsPhotoCanvas* _tmp25_ = NULL;
-		gfloat _tmp26_ = 0.0F;
+		Box _tmp21_;
+		Box _tmp22_;
+		EditingToolsPhotoCanvas* _tmp23_;
+		Box _tmp24_;
+		EditingToolsPhotoCanvas* _tmp25_;
+		gfloat _tmp26_;
 #line 974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = self->priv->scaled_crop;
 #line 974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7326,59 +7254,59 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 		_tmp26_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->pre_aspect_ratio = _tmp26_;
-#line 7330 "EditingTools.c"
+#line 7258 "EditingTools.c"
 	}
 #line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_crop_tool_constraint_description_unref0 (selected_constraint);
-#line 7334 "EditingTools.c"
+#line 7262 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCropTool* self) {
-	EditingToolsCropToolConstraintMode _tmp0_ = 0;
+	EditingToolsCropToolConstraintMode _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	EditingToolsCropToolCropToolWindow* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	EditingToolsCropToolCropToolWindow* _tmp11_ = NULL;
-	GtkBox* _tmp12_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp13_ = NULL;
-	GtkComboBox* _tmp14_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp15_ = NULL;
-	GtkBox* _tmp16_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp17_ = NULL;
-	GtkButton* _tmp18_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp19_ = NULL;
-	GtkBox* _tmp20_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp21_ = NULL;
-	GtkBox* _tmp22_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp23_ = NULL;
-	GtkBox* _tmp24_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp25_ = NULL;
-	GtkComboBox* _tmp26_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp27_ = NULL;
-	GtkBox* _tmp28_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp29_ = NULL;
-	GtkEntry* _tmp30_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp31_ = NULL;
-	GtkBox* _tmp32_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp33_ = NULL;
-	GtkLabel* _tmp34_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp35_ = NULL;
-	GtkBox* _tmp36_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp37_ = NULL;
-	GtkEntry* _tmp38_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp39_ = NULL;
-	GtkBox* _tmp40_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp41_ = NULL;
-	GtkButton* _tmp42_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp43_ = NULL;
-	GtkBox* _tmp44_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp45_ = NULL;
-	GtkBox* _tmp46_ = NULL;
-	EditingToolsCropToolReticleOrientation _tmp47_ = 0;
-	gint _tmp68_ = 0;
-	gint _tmp69_ = 0;
-	EditingToolsCropToolCropToolWindow* _tmp70_ = NULL;
+	EditingToolsCropToolCropToolWindow* _tmp2_;
+	gint _tmp3_;
+	EditingToolsCropToolCropToolWindow* _tmp11_;
+	GtkBox* _tmp12_;
+	EditingToolsCropToolCropToolWindow* _tmp13_;
+	GtkComboBox* _tmp14_;
+	EditingToolsCropToolCropToolWindow* _tmp15_;
+	GtkBox* _tmp16_;
+	EditingToolsCropToolCropToolWindow* _tmp17_;
+	GtkButton* _tmp18_;
+	EditingToolsCropToolCropToolWindow* _tmp19_;
+	GtkBox* _tmp20_;
+	EditingToolsCropToolCropToolWindow* _tmp21_;
+	GtkBox* _tmp22_;
+	EditingToolsCropToolCropToolWindow* _tmp23_;
+	GtkBox* _tmp24_;
+	EditingToolsCropToolCropToolWindow* _tmp25_;
+	GtkComboBox* _tmp26_;
+	EditingToolsCropToolCropToolWindow* _tmp27_;
+	GtkBox* _tmp28_;
+	EditingToolsCropToolCropToolWindow* _tmp29_;
+	GtkEntry* _tmp30_;
+	EditingToolsCropToolCropToolWindow* _tmp31_;
+	GtkBox* _tmp32_;
+	EditingToolsCropToolCropToolWindow* _tmp33_;
+	GtkLabel* _tmp34_;
+	EditingToolsCropToolCropToolWindow* _tmp35_;
+	GtkBox* _tmp36_;
+	EditingToolsCropToolCropToolWindow* _tmp37_;
+	GtkEntry* _tmp38_;
+	EditingToolsCropToolCropToolWindow* _tmp39_;
+	GtkBox* _tmp40_;
+	EditingToolsCropToolCropToolWindow* _tmp41_;
+	GtkButton* _tmp42_;
+	EditingToolsCropToolCropToolWindow* _tmp43_;
+	GtkBox* _tmp44_;
+	EditingToolsCropToolCropToolWindow* _tmp45_;
+	GtkBox* _tmp46_;
+	EditingToolsCropToolReticleOrientation _tmp47_;
+	gint _tmp68_;
+	gint _tmp69_;
+	EditingToolsCropToolCropToolWindow* _tmp70_;
 #line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7387,7 +7315,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 	if (_tmp0_ == EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM) {
 #line 987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 7391 "EditingTools.c"
+#line 7319 "EditingTools.c"
 	}
 #line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->crop_tool_window;
@@ -7397,24 +7325,24 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 	if (_tmp3_ == -1) {
 #line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 7401 "EditingTools.c"
+#line 7329 "EditingTools.c"
 	} else {
-		EditingToolsCropToolCropToolWindow* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
+		EditingToolsCropToolCropToolWindow* _tmp4_;
+		gint _tmp5_;
 #line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->crop_tool_window;
 #line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = _tmp4_->normal_height;
 #line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = _tmp5_ == -1;
-#line 7411 "EditingTools.c"
+#line 7339 "EditingTools.c"
 	}
 #line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 7415 "EditingTools.c"
-		EditingToolsCropToolCropToolWindow* _tmp6_ = NULL;
-		EditingToolsCropToolCropToolWindow* _tmp7_ = NULL;
-		EditingToolsCropToolCropToolWindow* _tmp8_ = NULL;
+#line 7343 "EditingTools.c"
+		EditingToolsCropToolCropToolWindow* _tmp6_;
+		EditingToolsCropToolCropToolWindow* _tmp7_;
+		EditingToolsCropToolCropToolWindow* _tmp8_;
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
 #line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7429,7 +7357,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 		_tmp7_->normal_width = _tmp9_;
 #line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_->normal_height = _tmp10_;
-#line 7433 "EditingTools.c"
+#line 7361 "EditingTools.c"
 	}
 #line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->crop_tool_window;
@@ -7525,17 +7453,17 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 	_tmp47_ = self->priv->reticle_orientation;
 #line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp47_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE) {
-#line 7529 "EditingTools.c"
-		EditingToolsCropToolCropToolWindow* _tmp48_ = NULL;
-		GtkEntry* _tmp49_ = NULL;
-		gint _tmp50_ = 0;
-		gchar* _tmp51_ = NULL;
-		gchar* _tmp52_ = NULL;
-		EditingToolsCropToolCropToolWindow* _tmp53_ = NULL;
-		GtkEntry* _tmp54_ = NULL;
-		gint _tmp55_ = 0;
-		gchar* _tmp56_ = NULL;
-		gchar* _tmp57_ = NULL;
+#line 7457 "EditingTools.c"
+		EditingToolsCropToolCropToolWindow* _tmp48_;
+		GtkEntry* _tmp49_;
+		gint _tmp50_;
+		gchar* _tmp51_;
+		gchar* _tmp52_;
+		EditingToolsCropToolCropToolWindow* _tmp53_;
+		GtkEntry* _tmp54_;
+		gint _tmp55_;
+		gchar* _tmp56_;
+		gchar* _tmp57_;
 #line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp48_ = self->priv->crop_tool_window;
 #line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7564,18 +7492,18 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 		gtk_entry_set_text (_tmp54_, _tmp57_);
 #line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp57_);
-#line 7568 "EditingTools.c"
+#line 7496 "EditingTools.c"
 	} else {
-		EditingToolsCropToolCropToolWindow* _tmp58_ = NULL;
-		GtkEntry* _tmp59_ = NULL;
-		gint _tmp60_ = 0;
-		gchar* _tmp61_ = NULL;
-		gchar* _tmp62_ = NULL;
-		EditingToolsCropToolCropToolWindow* _tmp63_ = NULL;
-		GtkEntry* _tmp64_ = NULL;
-		gint _tmp65_ = 0;
-		gchar* _tmp66_ = NULL;
-		gchar* _tmp67_ = NULL;
+		EditingToolsCropToolCropToolWindow* _tmp58_;
+		GtkEntry* _tmp59_;
+		gint _tmp60_;
+		gchar* _tmp61_;
+		gchar* _tmp62_;
+		EditingToolsCropToolCropToolWindow* _tmp63_;
+		GtkEntry* _tmp64_;
+		gint _tmp65_;
+		gchar* _tmp66_;
+		gchar* _tmp67_;
 #line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp58_ = self->priv->crop_tool_window;
 #line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7604,7 +7532,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 		gtk_entry_set_text (_tmp64_, _tmp67_);
 #line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp67_);
-#line 7608 "EditingTools.c"
+#line 7536 "EditingTools.c"
 	}
 #line 1011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp68_ = self->priv->custom_init_width;
@@ -7618,54 +7546,54 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_widget_get_type (), GtkWidget));
 #line 1015 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM;
-#line 7622 "EditingTools.c"
+#line 7550 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_set_normal_constraint_mode (EditingToolsCropTool* self) {
-	EditingToolsCropToolConstraintMode _tmp0_ = 0;
-	EditingToolsCropToolCropToolWindow* _tmp1_ = NULL;
-	GtkBox* _tmp2_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp3_ = NULL;
-	GtkComboBox* _tmp4_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp5_ = NULL;
-	GtkBox* _tmp6_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp7_ = NULL;
-	GtkEntry* _tmp8_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp9_ = NULL;
-	GtkBox* _tmp10_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp11_ = NULL;
-	GtkLabel* _tmp12_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp13_ = NULL;
-	GtkBox* _tmp14_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp15_ = NULL;
-	GtkEntry* _tmp16_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp17_ = NULL;
-	GtkBox* _tmp18_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp19_ = NULL;
-	GtkButton* _tmp20_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp21_ = NULL;
-	GtkBox* _tmp22_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp23_ = NULL;
-	GtkBox* _tmp24_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp25_ = NULL;
-	GtkBox* _tmp26_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp27_ = NULL;
-	GtkComboBox* _tmp28_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp29_ = NULL;
-	GtkBox* _tmp30_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp31_ = NULL;
-	GtkButton* _tmp32_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp33_ = NULL;
-	GtkBox* _tmp34_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp35_ = NULL;
-	GtkBox* _tmp36_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp37_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp38_ = NULL;
-	gint _tmp39_ = 0;
-	EditingToolsCropToolCropToolWindow* _tmp40_ = NULL;
-	gint _tmp41_ = 0;
-	EditingToolsCropToolCropToolWindow* _tmp42_ = NULL;
+	EditingToolsCropToolConstraintMode _tmp0_;
+	EditingToolsCropToolCropToolWindow* _tmp1_;
+	GtkBox* _tmp2_;
+	EditingToolsCropToolCropToolWindow* _tmp3_;
+	GtkComboBox* _tmp4_;
+	EditingToolsCropToolCropToolWindow* _tmp5_;
+	GtkBox* _tmp6_;
+	EditingToolsCropToolCropToolWindow* _tmp7_;
+	GtkEntry* _tmp8_;
+	EditingToolsCropToolCropToolWindow* _tmp9_;
+	GtkBox* _tmp10_;
+	EditingToolsCropToolCropToolWindow* _tmp11_;
+	GtkLabel* _tmp12_;
+	EditingToolsCropToolCropToolWindow* _tmp13_;
+	GtkBox* _tmp14_;
+	EditingToolsCropToolCropToolWindow* _tmp15_;
+	GtkEntry* _tmp16_;
+	EditingToolsCropToolCropToolWindow* _tmp17_;
+	GtkBox* _tmp18_;
+	EditingToolsCropToolCropToolWindow* _tmp19_;
+	GtkButton* _tmp20_;
+	EditingToolsCropToolCropToolWindow* _tmp21_;
+	GtkBox* _tmp22_;
+	EditingToolsCropToolCropToolWindow* _tmp23_;
+	GtkBox* _tmp24_;
+	EditingToolsCropToolCropToolWindow* _tmp25_;
+	GtkBox* _tmp26_;
+	EditingToolsCropToolCropToolWindow* _tmp27_;
+	GtkComboBox* _tmp28_;
+	EditingToolsCropToolCropToolWindow* _tmp29_;
+	GtkBox* _tmp30_;
+	EditingToolsCropToolCropToolWindow* _tmp31_;
+	GtkButton* _tmp32_;
+	EditingToolsCropToolCropToolWindow* _tmp33_;
+	GtkBox* _tmp34_;
+	EditingToolsCropToolCropToolWindow* _tmp35_;
+	GtkBox* _tmp36_;
+	EditingToolsCropToolCropToolWindow* _tmp37_;
+	EditingToolsCropToolCropToolWindow* _tmp38_;
+	gint _tmp39_;
+	EditingToolsCropToolCropToolWindow* _tmp40_;
+	gint _tmp41_;
+	EditingToolsCropToolCropToolWindow* _tmp42_;
 #line 1018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7674,7 +7602,7 @@ static void editing_tools_crop_tool_set_normal_constraint_mode (EditingToolsCrop
 	if (_tmp0_ == EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL) {
 #line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 7678 "EditingTools.c"
+#line 7606 "EditingTools.c"
 	}
 #line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->crop_tool_window;
@@ -7784,41 +7712,41 @@ static void editing_tools_crop_tool_set_normal_constraint_mode (EditingToolsCrop
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
 #line 1038 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL;
-#line 7788 "EditingTools.c"
+#line 7716 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self, Box* crop, Box* result) {
 	gfloat user_aspect_ratio = 0.0F;
-	gfloat _tmp0_ = 0.0F;
-	gfloat _tmp1_ = 0.0F;
+	gfloat _tmp0_;
+	gfloat _tmp1_;
 	gfloat old_area = 0.0F;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gfloat _tmp5_ = 0.0F;
-	gfloat _tmp6_ = 0.0F;
-	gdouble _tmp7_ = 0.0;
-	gfloat _tmp8_ = 0.0F;
-	gfloat _tmp9_ = 0.0F;
-	gdouble _tmp10_ = 0.0;
+	gint _tmp3_;
+	gint _tmp4_;
+	gfloat _tmp5_;
+	gfloat _tmp6_;
+	gdouble _tmp7_;
+	gfloat _tmp8_;
+	gfloat _tmp9_;
+	gdouble _tmp10_;
 	Dimensions image_size = {0};
 	Dimensions _tmp11_ = {0};
 	gdouble angle = 0.0;
-	EditingToolsPhotoCanvas* _tmp12_ = NULL;
-	Photo* _tmp13_ = NULL;
-	Photo* _tmp14_ = NULL;
+	EditingToolsPhotoCanvas* _tmp12_;
+	Photo* _tmp13_;
+	Photo* _tmp14_;
 	gdouble _tmp15_ = 0.0;
-	Box _tmp16_ = {0};
-	Dimensions _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	Dimensions _tmp19_ = {0};
-	gint _tmp20_ = 0;
-	gdouble _tmp21_ = 0.0;
+	Box _tmp16_;
+	Dimensions _tmp17_;
+	gint _tmp18_;
+	Dimensions _tmp19_;
+	gint _tmp20_;
+	gdouble _tmp21_;
 	Box _tmp22_ = {0};
-	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
-	gfloat _tmp25_ = 0.0F;
-	Box _tmp30_ = {0};
+	gint _tmp23_;
+	gint _tmp24_;
+	gfloat _tmp25_;
+	Box _tmp30_;
 #line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7831,15 +7759,15 @@ static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self,
 	_tmp1_ = user_aspect_ratio;
 #line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 7835 "EditingTools.c"
-		Box _tmp2_ = {0};
+#line 7763 "EditingTools.c"
+		Box _tmp2_;
 #line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = *crop;
 #line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*result = _tmp2_;
 #line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 7843 "EditingTools.c"
+#line 7771 "EditingTools.c"
 	}
 #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = box_get_width (crop);
@@ -7903,26 +7831,26 @@ static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self,
 	_tmp25_ = user_aspect_ratio;
 #line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (((gfloat) _tmp23_) >= (_tmp24_ * _tmp25_)) {
-#line 7907 "EditingTools.c"
-		gint _tmp26_ = 0;
-		gfloat _tmp27_ = 0.0F;
+#line 7835 "EditingTools.c"
+		gint _tmp26_;
+		gfloat _tmp27_;
 #line 1059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp26_ = box_get_height (crop);
 #line 1059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp27_ = user_aspect_ratio;
 #line 1059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_adjust_width (crop, (gint) (_tmp26_ * _tmp27_));
-#line 7916 "EditingTools.c"
+#line 7844 "EditingTools.c"
 	} else {
-		gint _tmp28_ = 0;
-		gfloat _tmp29_ = 0.0F;
+		gint _tmp28_;
+		gfloat _tmp29_;
 #line 1061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp28_ = box_get_width (crop);
 #line 1061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp29_ = user_aspect_ratio;
 #line 1061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_adjust_height (crop, (gint) (_tmp28_ / _tmp29_));
-#line 7926 "EditingTools.c"
+#line 7854 "EditingTools.c"
 	}
 #line 1063 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = *crop;
@@ -7930,21 +7858,21 @@ static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self,
 	*result = _tmp30_;
 #line 1063 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 7934 "EditingTools.c"
+#line 7862 "EditingTools.c"
 }
 
 
 static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_last_constraint (EditingToolsCropTool* self, gint* index) {
 	gint _vala_index = 0;
 	EditingToolsCropToolConstraintDescription* result = NULL;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gint _tmp2_;
 	EditingToolsCropToolConstraintDescription* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	EditingToolsCropToolConstraintDescription** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	EditingToolsCropToolConstraintDescription* _tmp9_ = NULL;
+	gint _tmp4_;
+	EditingToolsCropToolConstraintDescription** _tmp5_;
+	gint _tmp5__length1;
+	EditingToolsCropToolConstraintDescription* _tmp9_;
 #line 1066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), NULL);
 #line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7965,11 +7893,11 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_la
 	_tmp5__length1 = self->priv->constraints_length1;
 #line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ < _tmp5__length1) {
-#line 7969 "EditingTools.c"
-		EditingToolsCropToolConstraintDescription** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
-		gint _tmp7_ = 0;
-		EditingToolsCropToolConstraintDescription* _tmp8_ = NULL;
+#line 7897 "EditingTools.c"
+		EditingToolsCropToolConstraintDescription** _tmp6_;
+		gint _tmp6__length1;
+		gint _tmp7_;
+		EditingToolsCropToolConstraintDescription* _tmp8_;
 #line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = self->priv->constraints;
 #line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7980,11 +7908,11 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_la
 		_tmp8_ = _tmp6_[_tmp7_];
 #line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp8_;
-#line 7984 "EditingTools.c"
+#line 7912 "EditingTools.c"
 	} else {
 #line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = NULL;
-#line 7988 "EditingTools.c"
+#line 7916 "EditingTools.c"
 	}
 #line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _editing_tools_crop_tool_constraint_description_ref0 (_tmp3_);
@@ -7994,91 +7922,91 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_la
 	if (index) {
 #line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*index = _vala_index;
-#line 7998 "EditingTools.c"
+#line 7926 "EditingTools.c"
 	}
 #line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8002 "EditingTools.c"
+#line 7930 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsCropTool * self;
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	EditingToolsPhotoCanvas* _tmp1_ = NULL;
-	cairo_t* _tmp2_ = NULL;
-	cairo_t* _tmp3_ = NULL;
-	EditingToolsPhotoCanvas* _tmp4_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	EditingToolsPhotoCanvas* _tmp1_;
+	cairo_t* _tmp2_;
+	cairo_t* _tmp3_;
+	EditingToolsPhotoCanvas* _tmp4_;
 	Dimensions _tmp5_ = {0};
-	cairo_surface_t* _tmp6_ = NULL;
-	EditingToolsPhotoCanvas* _tmp7_ = NULL;
+	cairo_surface_t* _tmp6_;
+	EditingToolsPhotoCanvas* _tmp7_;
 	GdkRectangle _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	EditingToolsPhotoCanvas* _tmp10_ = NULL;
+	gint _tmp9_;
+	EditingToolsPhotoCanvas* _tmp10_;
 	GdkRectangle _tmp11_ = {0};
-	gint _tmp12_ = 0;
-	cairo_surface_t* _tmp13_ = NULL;
+	gint _tmp12_;
+	cairo_surface_t* _tmp13_;
 	cairo_t* ctx = NULL;
-	cairo_surface_t* _tmp14_ = NULL;
-	cairo_t* _tmp15_ = NULL;
-	cairo_t* _tmp16_ = NULL;
-	cairo_t* _tmp17_ = NULL;
-	EditingToolsPhotoCanvas* _tmp18_ = NULL;
-	GtkWindow* _tmp19_ = NULL;
-	GtkWindow* _tmp20_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp21_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp22_ = NULL;
-	GtkComboBox* _tmp23_ = NULL;
-	GtkListStore* _tmp24_ = NULL;
-	EditingToolsPhotoCanvas* _tmp25_ = NULL;
-	Photo* _tmp26_ = NULL;
-	Photo* _tmp27_ = NULL;
-	gboolean _tmp28_ = FALSE;
-	gboolean _tmp29_ = FALSE;
+	cairo_surface_t* _tmp14_;
+	cairo_t* _tmp15_;
+	cairo_t* _tmp16_;
+	cairo_t* _tmp17_;
+	EditingToolsPhotoCanvas* _tmp18_;
+	GtkWindow* _tmp19_;
+	GtkWindow* _tmp20_;
+	EditingToolsCropToolCropToolWindow* _tmp21_;
+	EditingToolsCropToolCropToolWindow* _tmp22_;
+	GtkComboBox* _tmp23_;
+	GtkListStore* _tmp24_;
+	EditingToolsPhotoCanvas* _tmp25_;
+	Photo* _tmp26_;
+	Photo* _tmp27_;
+	gboolean _tmp28_;
+	gboolean _tmp29_;
 	Dimensions uncropped_dim = {0};
-	EditingToolsPhotoCanvas* _tmp61_ = NULL;
-	Photo* _tmp62_ = NULL;
-	Photo* _tmp63_ = NULL;
+	EditingToolsPhotoCanvas* _tmp61_;
+	Photo* _tmp62_;
+	Photo* _tmp63_;
 	Dimensions _tmp64_ = {0};
-	Dimensions _tmp65_ = {0};
+	Dimensions _tmp65_;
 	Box crop = {0};
-	EditingToolsPhotoCanvas* _tmp66_ = NULL;
-	Photo* _tmp67_ = NULL;
-	Photo* _tmp68_ = NULL;
+	EditingToolsPhotoCanvas* _tmp66_;
+	Photo* _tmp67_;
+	Photo* _tmp68_;
 	Box _tmp69_ = {0};
-	gboolean _tmp70_ = FALSE;
-	gboolean _tmp71_ = FALSE;
-	Dimensions _tmp84_ = {0};
-	EditingToolsPhotoCanvas* _tmp85_ = NULL;
+	gboolean _tmp70_;
+	gboolean _tmp71_;
+	Dimensions _tmp84_;
+	EditingToolsPhotoCanvas* _tmp85_;
 	GdkRectangle _tmp86_ = {0};
 	Dimensions _tmp87_ = {0};
 	Box _tmp88_ = {0};
-	ConfigFacade* _tmp89_ = NULL;
-	ConfigFacade* _tmp90_ = NULL;
-	gint _tmp91_ = 0;
-	ConfigFacade* _tmp92_ = NULL;
-	ConfigFacade* _tmp93_ = NULL;
-	gint _tmp94_ = 0;
-	gint _tmp95_ = 0;
-	gint _tmp96_ = 0;
-	gint _tmp97_ = 0;
-	gint _tmp98_ = 0;
-	EditingToolsPhotoCanvas* _tmp99_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp100_ = NULL;
-	EditingToolsPhotoCanvas* _tmp101_ = NULL;
-	Photo* _tmp102_ = NULL;
-	Photo* _tmp103_ = NULL;
-	gboolean _tmp104_ = FALSE;
-	gboolean _tmp105_ = FALSE;
+	ConfigFacade* _tmp89_;
+	ConfigFacade* _tmp90_;
+	gint _tmp91_;
+	ConfigFacade* _tmp92_;
+	ConfigFacade* _tmp93_;
+	gint _tmp94_;
+	gint _tmp95_;
+	gint _tmp96_;
+	gint _tmp97_;
+	gint _tmp98_;
+	EditingToolsPhotoCanvas* _tmp99_;
+	EditingToolsCropToolCropToolWindow* _tmp100_;
+	EditingToolsPhotoCanvas* _tmp101_;
+	Photo* _tmp102_;
+	Photo* _tmp103_;
+	gboolean _tmp104_;
+	gboolean _tmp105_;
 	Box new_crop = {0};
-	Box _tmp114_ = {0};
+	Box _tmp114_;
 	Box _tmp115_ = {0};
-	Box _tmp116_ = {0};
-	Box _tmp117_ = {0};
-	EditingToolsPhotoCanvas* _tmp118_ = NULL;
-	Box _tmp119_ = {0};
-	EditingToolsPhotoCanvas* _tmp120_ = NULL;
-	gfloat _tmp121_ = 0.0F;
+	Box _tmp116_;
+	Box _tmp117_;
+	EditingToolsPhotoCanvas* _tmp118_;
+	Box _tmp119_;
+	EditingToolsPhotoCanvas* _tmp120_;
+	gfloat _tmp121_;
 #line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8109,7 +8037,7 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 		_cairo_surface_destroy0 (self->priv->crop_surface);
 #line 1078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->crop_surface = NULL;
-#line 8113 "EditingTools.c"
+#line 8041 "EditingTools.c"
 	}
 #line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = canvas;
@@ -8181,13 +8109,13 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 	_g_object_unref0 (_tmp27_);
 #line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp29_) {
-#line 8185 "EditingTools.c"
+#line 8113 "EditingTools.c"
 		gint index = 0;
 		EditingToolsCropToolConstraintDescription* desc = NULL;
 		gint _tmp30_ = 0;
-		EditingToolsCropToolConstraintDescription* _tmp31_ = NULL;
+		EditingToolsCropToolConstraintDescription* _tmp31_;
 		gboolean _tmp32_ = FALSE;
-		EditingToolsCropToolConstraintDescription* _tmp33_ = NULL;
+		EditingToolsCropToolConstraintDescription* _tmp33_;
 #line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp31_ = editing_tools_crop_tool_get_last_constraint (self, &_tmp30_);
 #line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8198,27 +8126,27 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 		_tmp33_ = desc;
 #line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp33_ != NULL) {
-#line 8202 "EditingTools.c"
-			EditingToolsCropToolConstraintDescription* _tmp34_ = NULL;
-			gboolean _tmp35_ = FALSE;
+#line 8130 "EditingTools.c"
+			EditingToolsCropToolConstraintDescription* _tmp34_;
+			gboolean _tmp35_;
 #line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp34_ = desc;
 #line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp35_ = editing_tools_crop_tool_constraint_description_is_separator (_tmp34_);
 #line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp32_ = !_tmp35_;
-#line 8211 "EditingTools.c"
+#line 8139 "EditingTools.c"
 		} else {
 #line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp32_ = FALSE;
-#line 8215 "EditingTools.c"
+#line 8143 "EditingTools.c"
 		}
 #line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp32_) {
-#line 8219 "EditingTools.c"
-			EditingToolsCropToolCropToolWindow* _tmp36_ = NULL;
-			GtkComboBox* _tmp37_ = NULL;
-			gint _tmp38_ = 0;
+#line 8147 "EditingTools.c"
+			EditingToolsCropToolCropToolWindow* _tmp36_;
+			GtkComboBox* _tmp37_;
+			gint _tmp38_;
 #line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp36_ = self->priv->crop_tool_window;
 #line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8227,23 +8155,23 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 			_tmp38_ = index;
 #line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_combo_box_set_active (_tmp37_, _tmp38_);
-#line 8231 "EditingTools.c"
+#line 8159 "EditingTools.c"
 		}
 #line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_editing_tools_crop_tool_constraint_description_unref0 (desc);
-#line 8235 "EditingTools.c"
+#line 8163 "EditingTools.c"
 	} else {
 		Photo* photo = NULL;
-		EditingToolsPhotoCanvas* _tmp39_ = NULL;
-		Photo* _tmp40_ = NULL;
+		EditingToolsPhotoCanvas* _tmp39_;
+		Photo* _tmp40_;
 		Dimensions cropped_dim = {0};
-		Photo* _tmp41_ = NULL;
+		Photo* _tmp41_;
 		Dimensions _tmp42_ = {0};
 		gfloat ratio = 0.0F;
-		Dimensions _tmp43_ = {0};
-		gint _tmp44_ = 0;
-		Dimensions _tmp45_ = {0};
-		gint _tmp46_ = 0;
+		Dimensions _tmp43_;
+		gint _tmp44_;
+		Dimensions _tmp45_;
+		gint _tmp46_;
 #line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp39_ = canvas;
 #line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8266,39 +8194,39 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 		_tmp46_ = _tmp45_.height;
 #line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		ratio = ((gfloat) _tmp44_) / ((gfloat) _tmp46_);
-#line 8270 "EditingTools.c"
+#line 8198 "EditingTools.c"
 		{
 			gint index = 0;
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			index = 1;
-#line 8275 "EditingTools.c"
+#line 8203 "EditingTools.c"
 			{
 				gboolean _tmp47_ = FALSE;
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp47_ = TRUE;
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				while (TRUE) {
-#line 8282 "EditingTools.c"
-					gint _tmp49_ = 0;
-					EditingToolsCropToolConstraintDescription** _tmp50_ = NULL;
-					gint _tmp50__length1 = 0;
-					gfloat _tmp51_ = 0.0F;
-					EditingToolsCropToolConstraintDescription** _tmp52_ = NULL;
-					gint _tmp52__length1 = 0;
-					gint _tmp53_ = 0;
-					EditingToolsCropToolConstraintDescription* _tmp54_ = NULL;
-					Photo* _tmp55_ = NULL;
-					gfloat _tmp56_ = 0.0F;
-					gdouble _tmp57_ = 0.0;
+#line 8210 "EditingTools.c"
+					gint _tmp49_;
+					EditingToolsCropToolConstraintDescription** _tmp50_;
+					gint _tmp50__length1;
+					gfloat _tmp51_;
+					EditingToolsCropToolConstraintDescription** _tmp52_;
+					gint _tmp52__length1;
+					gint _tmp53_;
+					EditingToolsCropToolConstraintDescription* _tmp54_;
+					Photo* _tmp55_;
+					gfloat _tmp56_;
+					gdouble _tmp57_;
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					if (!_tmp47_) {
-#line 8296 "EditingTools.c"
-						gint _tmp48_ = 0;
+#line 8224 "EditingTools.c"
+						gint _tmp48_;
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						_tmp48_ = index;
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						index = _tmp48_ + 1;
-#line 8302 "EditingTools.c"
+#line 8230 "EditingTools.c"
 					}
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp47_ = FALSE;
@@ -8312,7 +8240,7 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 					if (!(_tmp49_ < _tmp50__length1)) {
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						break;
-#line 8316 "EditingTools.c"
+#line 8244 "EditingTools.c"
 					}
 #line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp51_ = ratio;
@@ -8332,10 +8260,10 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 					_tmp57_ = fabs ((gdouble) (_tmp51_ - _tmp56_));
 #line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					if (_tmp57_ < 0.005) {
-#line 8336 "EditingTools.c"
-						EditingToolsCropToolCropToolWindow* _tmp58_ = NULL;
-						GtkComboBox* _tmp59_ = NULL;
-						gint _tmp60_ = 0;
+#line 8264 "EditingTools.c"
+						EditingToolsCropToolCropToolWindow* _tmp58_;
+						GtkComboBox* _tmp59_;
+						gint _tmp60_;
 #line 1106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						_tmp58_ = self->priv->crop_tool_window;
 #line 1106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8344,14 +8272,14 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 						_tmp60_ = index;
 #line 1106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						gtk_combo_box_set_active (_tmp59_, _tmp60_);
-#line 8348 "EditingTools.c"
+#line 8276 "EditingTools.c"
 					}
 				}
 			}
 		}
 #line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (photo);
-#line 8355 "EditingTools.c"
+#line 8283 "EditingTools.c"
 	}
 #line 1111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_update_pivot_button_state (self);
@@ -8389,21 +8317,21 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 	_g_object_unref0 (_tmp68_);
 #line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp71_) {
-#line 8393 "EditingTools.c"
+#line 8321 "EditingTools.c"
 		gint xofs = 0;
-		Dimensions _tmp72_ = {0};
-		gint _tmp73_ = 0;
+		Dimensions _tmp72_;
+		gint _tmp73_;
 		gint yofs = 0;
-		Dimensions _tmp74_ = {0};
-		gint _tmp75_ = 0;
-		gint _tmp76_ = 0;
-		gint _tmp77_ = 0;
-		Dimensions _tmp78_ = {0};
-		gint _tmp79_ = 0;
-		gint _tmp80_ = 0;
-		Dimensions _tmp81_ = {0};
-		gint _tmp82_ = 0;
-		gint _tmp83_ = 0;
+		Dimensions _tmp74_;
+		gint _tmp75_;
+		gint _tmp76_;
+		gint _tmp77_;
+		Dimensions _tmp78_;
+		gint _tmp79_;
+		gint _tmp80_;
+		Dimensions _tmp81_;
+		gint _tmp82_;
+		gint _tmp83_;
 #line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp72_ = uncropped_dim;
 #line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8434,7 +8362,7 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 		_tmp83_ = yofs;
 #line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_init (&crop, _tmp76_, _tmp77_, _tmp79_ - _tmp80_, _tmp82_ - _tmp83_);
-#line 8438 "EditingTools.c"
+#line 8366 "EditingTools.c"
 	}
 #line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp84_ = uncropped_dim;
@@ -8506,12 +8434,12 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 	_g_object_unref0 (_tmp103_);
 #line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp105_) {
-#line 8510 "EditingTools.c"
+#line 8438 "EditingTools.c"
 		EditingToolsCropToolConstraintDescription* desc = NULL;
-		EditingToolsCropToolConstraintDescription* _tmp106_ = NULL;
+		EditingToolsCropToolConstraintDescription* _tmp106_;
 		gboolean _tmp107_ = FALSE;
 		gboolean _tmp108_ = FALSE;
-		EditingToolsCropToolConstraintDescription* _tmp109_ = NULL;
+		EditingToolsCropToolConstraintDescription* _tmp109_;
 #line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp106_ = editing_tools_crop_tool_get_last_constraint (self, NULL);
 #line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8520,47 +8448,47 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 		_tmp109_ = desc;
 #line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp109_ != NULL) {
-#line 8524 "EditingTools.c"
-			EditingToolsCropToolConstraintDescription* _tmp110_ = NULL;
-			gboolean _tmp111_ = FALSE;
+#line 8452 "EditingTools.c"
+			EditingToolsCropToolConstraintDescription* _tmp110_;
+			gboolean _tmp111_;
 #line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp110_ = desc;
 #line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp111_ = editing_tools_crop_tool_constraint_description_is_separator (_tmp110_);
 #line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp108_ = !_tmp111_;
-#line 8533 "EditingTools.c"
+#line 8461 "EditingTools.c"
 		} else {
 #line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp108_ = FALSE;
-#line 8537 "EditingTools.c"
+#line 8465 "EditingTools.c"
 		}
 #line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp108_) {
-#line 8541 "EditingTools.c"
-			EditingToolsCropToolConstraintDescription* _tmp112_ = NULL;
-			gfloat _tmp113_ = 0.0F;
+#line 8469 "EditingTools.c"
+			EditingToolsCropToolConstraintDescription* _tmp112_;
+			gfloat _tmp113_;
 #line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp112_ = desc;
 #line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp113_ = _tmp112_->aspect_ratio;
 #line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp107_ = _tmp113_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO;
-#line 8550 "EditingTools.c"
+#line 8478 "EditingTools.c"
 		} else {
 #line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp107_ = FALSE;
-#line 8554 "EditingTools.c"
+#line 8482 "EditingTools.c"
 		}
 #line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp107_) {
 #line 1152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			editing_tools_crop_tool_set_custom_constraint_mode (self);
-#line 8560 "EditingTools.c"
+#line 8488 "EditingTools.c"
 		}
 #line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_editing_tools_crop_tool_constraint_description_unref0 (desc);
-#line 8564 "EditingTools.c"
+#line 8492 "EditingTools.c"
 	}
 #line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp114_ = self->priv->scaled_crop;
@@ -8592,27 +8520,27 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 	self->priv->pre_aspect_ratio = _tmp121_;
 #line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 8596 "EditingTools.c"
+#line 8524 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, cairo_t* ctx, Dimensions* dim, gpointer self) {
 #line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_prepare_ctx ((EditingToolsCropTool*) self, ctx, dim);
-#line 8603 "EditingTools.c"
+#line 8531 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
 #line 1171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_resized_pixbuf ((EditingToolsCropTool*) self, old_dim, scaled, scaled_position);
-#line 8610 "EditingTools.c"
+#line 8538 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_bind_canvas_handlers (EditingToolsCropTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	EditingToolsPhotoCanvas* _tmp1_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	EditingToolsPhotoCanvas* _tmp1_;
 #line 1169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8625,15 +8553,15 @@ static void editing_tools_crop_tool_bind_canvas_handlers (EditingToolsCropTool*
 	_tmp1_ = canvas;
 #line 1171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp1_, "resized-scaled-pixbuf", (GCallback) _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 8629 "EditingTools.c"
+#line 8557 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_unbind_canvas_handlers (EditingToolsCropTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	EditingToolsPhotoCanvas* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	EditingToolsPhotoCanvas* _tmp0_;
+	guint _tmp1_;
+	EditingToolsPhotoCanvas* _tmp2_;
+	guint _tmp3_;
 #line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8650,35 +8578,35 @@ static void editing_tools_crop_tool_unbind_canvas_handlers (EditingToolsCropTool
 	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp3_, NULL, FALSE);
 #line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 8654 "EditingTools.c"
+#line 8582 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_crop_ok_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_crop_ok ((EditingToolsCropTool*) self);
-#line 8661 "EditingTools.c"
+#line 8589 "EditingTools.c"
 }
 
 
 static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_editing_tool_notify_cancel ((EditingToolsEditingTool*) self);
-#line 8668 "EditingTools.c"
+#line 8596 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constraint_changed ((EditingToolsCropTool*) self);
-#line 8675 "EditingTools.c"
+#line 8603 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_pivot_button_clicked ((EditingToolsCropTool*) self);
-#line 8682 "EditingTools.c"
+#line 8610 "EditingTools.c"
 }
 
 
@@ -8687,7 +8615,7 @@ static gboolean _editing_tools_crop_tool_on_width_entry_focus_out_gtk_widget_foc
 	result = editing_tools_crop_tool_on_width_entry_focus_out ((EditingToolsCropTool*) self, event);
 #line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8691 "EditingTools.c"
+#line 8619 "EditingTools.c"
 }
 
 
@@ -8696,42 +8624,42 @@ static gboolean _editing_tools_crop_tool_on_height_entry_focus_out_gtk_widget_fo
 	result = editing_tools_crop_tool_on_height_entry_focus_out ((EditingToolsCropTool*) self, event);
 #line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8700 "EditingTools.c"
+#line 8628 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
 #line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_width_insert_text ((EditingToolsCropTool*) self, new_text, new_text_length, position);
-#line 8707 "EditingTools.c"
+#line 8635 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
 #line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_height_insert_text ((EditingToolsCropTool*) self, new_text, new_text_length, position);
-#line 8714 "EditingTools.c"
+#line 8642 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_bind_window_handlers (EditingToolsCropTool* self) {
-	EditingToolsCropToolCropToolWindow* _tmp0_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp1_ = NULL;
-	GtkButton* _tmp2_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp3_ = NULL;
-	GtkButton* _tmp4_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp5_ = NULL;
-	GtkComboBox* _tmp6_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp7_ = NULL;
-	GtkButton* _tmp8_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp9_ = NULL;
-	GtkEntry* _tmp10_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp11_ = NULL;
-	GtkEntry* _tmp12_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp13_ = NULL;
-	GtkEntry* _tmp14_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp15_ = NULL;
-	GtkEntry* _tmp16_ = NULL;
+	EditingToolsCropToolCropToolWindow* _tmp0_;
+	EditingToolsCropToolCropToolWindow* _tmp1_;
+	GtkButton* _tmp2_;
+	EditingToolsCropToolCropToolWindow* _tmp3_;
+	GtkButton* _tmp4_;
+	EditingToolsCropToolCropToolWindow* _tmp5_;
+	GtkComboBox* _tmp6_;
+	EditingToolsCropToolCropToolWindow* _tmp7_;
+	GtkButton* _tmp8_;
+	EditingToolsCropToolCropToolWindow* _tmp9_;
+	GtkEntry* _tmp10_;
+	EditingToolsCropToolCropToolWindow* _tmp11_;
+	GtkEntry* _tmp12_;
+	EditingToolsCropToolCropToolWindow* _tmp13_;
+	GtkEntry* _tmp14_;
+	EditingToolsCropToolCropToolWindow* _tmp15_;
+	GtkEntry* _tmp16_;
 #line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8786,34 +8714,34 @@ static void editing_tools_crop_tool_bind_window_handlers (EditingToolsCropTool*
 	_tmp16_ = _tmp15_->custom_height_entry;
 #line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text, self);
-#line 8790 "EditingTools.c"
+#line 8718 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_unbind_window_handlers (EditingToolsCropTool* self) {
-	EditingToolsCropToolCropToolWindow* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	EditingToolsCropToolCropToolWindow* _tmp2_ = NULL;
-	GtkButton* _tmp3_ = NULL;
-	guint _tmp4_ = 0U;
-	EditingToolsCropToolCropToolWindow* _tmp5_ = NULL;
-	GtkButton* _tmp6_ = NULL;
-	guint _tmp7_ = 0U;
-	EditingToolsCropToolCropToolWindow* _tmp8_ = NULL;
-	GtkComboBox* _tmp9_ = NULL;
-	guint _tmp10_ = 0U;
-	EditingToolsCropToolCropToolWindow* _tmp11_ = NULL;
-	GtkButton* _tmp12_ = NULL;
-	guint _tmp13_ = 0U;
-	EditingToolsCropToolCropToolWindow* _tmp14_ = NULL;
-	GtkEntry* _tmp15_ = NULL;
-	guint _tmp16_ = 0U;
-	EditingToolsCropToolCropToolWindow* _tmp17_ = NULL;
-	GtkEntry* _tmp18_ = NULL;
-	guint _tmp19_ = 0U;
-	EditingToolsCropToolCropToolWindow* _tmp20_ = NULL;
-	GtkEntry* _tmp21_ = NULL;
-	guint _tmp22_ = 0U;
+	EditingToolsCropToolCropToolWindow* _tmp0_;
+	guint _tmp1_;
+	EditingToolsCropToolCropToolWindow* _tmp2_;
+	GtkButton* _tmp3_;
+	guint _tmp4_;
+	EditingToolsCropToolCropToolWindow* _tmp5_;
+	GtkButton* _tmp6_;
+	guint _tmp7_;
+	EditingToolsCropToolCropToolWindow* _tmp8_;
+	GtkComboBox* _tmp9_;
+	guint _tmp10_;
+	EditingToolsCropToolCropToolWindow* _tmp11_;
+	GtkButton* _tmp12_;
+	guint _tmp13_;
+	EditingToolsCropToolCropToolWindow* _tmp14_;
+	GtkEntry* _tmp15_;
+	guint _tmp16_;
+	EditingToolsCropToolCropToolWindow* _tmp17_;
+	GtkEntry* _tmp18_;
+	guint _tmp19_;
+	EditingToolsCropToolCropToolWindow* _tmp20_;
+	GtkEntry* _tmp21_;
+	guint _tmp22_;
 #line 1193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8878,7 +8806,7 @@ static void editing_tools_crop_tool_unbind_window_handlers (EditingToolsCropTool
 	g_signal_parse_name ("insert-text", GTK_TYPE_EDITABLE, &_tmp22_, NULL, FALSE);
 #line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp22_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text, self);
-#line 8882 "EditingTools.c"
+#line 8810 "EditingTools.c"
 }
 
 
@@ -8887,11 +8815,11 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	GdkEventKey* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	const gchar* _tmp4_ = NULL;
-	GdkEventKey* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	GdkEventKey* _tmp2_;
+	guint _tmp3_;
+	const gchar* _tmp4_;
+	GdkEventKey* _tmp11_;
+	gboolean _tmp12_;
 #line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8906,11 +8834,11 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo
 	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
 #line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 8910 "EditingTools.c"
+#line 8838 "EditingTools.c"
 	} else {
-		GdkEventKey* _tmp5_ = NULL;
-		guint _tmp6_ = 0U;
-		const gchar* _tmp7_ = NULL;
+		GdkEventKey* _tmp5_;
+		guint _tmp6_;
+		const gchar* _tmp7_;
 #line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = event;
 #line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8919,17 +8847,17 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo
 		_tmp7_ = gdk_keyval_name (_tmp6_);
 #line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 8923 "EditingTools.c"
+#line 8851 "EditingTools.c"
 	}
 #line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
 #line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = TRUE;
-#line 8929 "EditingTools.c"
+#line 8857 "EditingTools.c"
 	} else {
-		GdkEventKey* _tmp8_ = NULL;
-		guint _tmp9_ = 0U;
-		const gchar* _tmp10_ = NULL;
+		GdkEventKey* _tmp8_;
+		guint _tmp9_;
+		const gchar* _tmp10_;
 #line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = event;
 #line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8938,7 +8866,7 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo
 		_tmp10_ = gdk_keyval_name (_tmp9_);
 #line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 8942 "EditingTools.c"
+#line 8870 "EditingTools.c"
 	}
 #line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
@@ -8948,7 +8876,7 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo
 		result = TRUE;
 #line 1211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 8952 "EditingTools.c"
+#line 8880 "EditingTools.c"
 	}
 #line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = event;
@@ -8958,17 +8886,17 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo
 	result = _tmp12_;
 #line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8962 "EditingTools.c"
+#line 8890 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropTool* self) {
-	EditingToolsCropToolConstraintDescription* _tmp0_ = NULL;
-	EditingToolsCropToolConstraintDescription* _tmp1_ = NULL;
-	gfloat _tmp2_ = 0.0F;
-	gboolean _tmp3_ = FALSE;
-	EditingToolsCropToolReticleOrientation _tmp21_ = 0;
-	EditingToolsCropToolReticleOrientation _tmp22_ = 0;
+	EditingToolsCropToolConstraintDescription* _tmp0_;
+	EditingToolsCropToolConstraintDescription* _tmp1_;
+	gfloat _tmp2_;
+	gboolean _tmp3_;
+	EditingToolsCropToolReticleOrientation _tmp21_;
+	EditingToolsCropToolReticleOrientation _tmp22_;
 #line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8983,27 +8911,27 @@ static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropToo
 	_editing_tools_crop_tool_constraint_description_unref0 (_tmp1_);
 #line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp3_) {
-#line 8987 "EditingTools.c"
+#line 8915 "EditingTools.c"
 		gchar* width_text = NULL;
-		EditingToolsCropToolCropToolWindow* _tmp4_ = NULL;
-		GtkEntry* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		EditingToolsCropToolCropToolWindow* _tmp4_;
+		GtkEntry* _tmp5_;
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
 		gchar* height_text = NULL;
-		EditingToolsCropToolCropToolWindow* _tmp8_ = NULL;
-		GtkEntry* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		EditingToolsCropToolCropToolWindow* _tmp12_ = NULL;
-		GtkEntry* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-		EditingToolsCropToolCropToolWindow* _tmp15_ = NULL;
-		GtkEntry* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
+		EditingToolsCropToolCropToolWindow* _tmp8_;
+		GtkEntry* _tmp9_;
+		const gchar* _tmp10_;
+		gchar* _tmp11_;
+		EditingToolsCropToolCropToolWindow* _tmp12_;
+		GtkEntry* _tmp13_;
+		const gchar* _tmp14_;
+		EditingToolsCropToolCropToolWindow* _tmp15_;
+		GtkEntry* _tmp16_;
+		const gchar* _tmp17_;
 		gint temp = 0;
-		gint _tmp18_ = 0;
-		gint _tmp19_ = 0;
-		gint _tmp20_ = 0;
+		gint _tmp18_;
+		gint _tmp19_;
+		gint _tmp20_;
 #line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->crop_tool_window;
 #line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9056,7 +8984,7 @@ static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropToo
 		_g_free0 (height_text);
 #line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (width_text);
-#line 9060 "EditingTools.c"
+#line 8988 "EditingTools.c"
 	}
 #line 1228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->reticle_orientation;
@@ -9066,36 +8994,36 @@ static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropToo
 	self->priv->reticle_orientation = _tmp22_;
 #line 1229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constraint_changed (self);
-#line 9070 "EditingTools.c"
+#line 8998 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* base) {
 	EditingToolsCropTool * self;
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp2_ = NULL;
-	EditingToolsPhotoCanvas* _tmp5_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	EditingToolsCropToolCropToolWindow* _tmp2_;
+	EditingToolsPhotoCanvas* _tmp5_;
 #line 1232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 9085 "EditingTools.c"
-		EditingToolsPhotoCanvas* _tmp1_ = NULL;
+#line 9013 "EditingTools.c"
+		EditingToolsPhotoCanvas* _tmp1_;
 #line 1234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_unbind_canvas_handlers (self, _tmp1_);
-#line 9091 "EditingTools.c"
+#line 9019 "EditingTools.c"
 	}
 #line 1236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->crop_tool_window;
 #line 1236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ != NULL) {
-#line 9097 "EditingTools.c"
-		EditingToolsCropToolCropToolWindow* _tmp3_ = NULL;
-		EditingToolsCropToolCropToolWindow* _tmp4_ = NULL;
+#line 9025 "EditingTools.c"
+		EditingToolsCropToolCropToolWindow* _tmp3_;
+		EditingToolsCropToolCropToolWindow* _tmp4_;
 #line 1237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_unbind_window_handlers (self);
 #line 1238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9110,25 +9038,25 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba
 		_g_object_unref0 (self->priv->crop_tool_window);
 #line 1240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->crop_tool_window = NULL;
-#line 9114 "EditingTools.c"
+#line 9042 "EditingTools.c"
 	}
 #line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ != NULL) {
-#line 9120 "EditingTools.c"
+#line 9048 "EditingTools.c"
 		GdkWindow* drawing_window = NULL;
-		EditingToolsPhotoCanvas* _tmp6_ = NULL;
-		GdkWindow* _tmp7_ = NULL;
+		EditingToolsPhotoCanvas* _tmp6_;
+		GdkWindow* _tmp7_;
 		GdkDisplay* display = NULL;
-		GdkWindow* _tmp8_ = NULL;
-		GdkDisplay* _tmp9_ = NULL;
-		GdkDisplay* _tmp10_ = NULL;
+		GdkWindow* _tmp8_;
+		GdkDisplay* _tmp9_;
+		GdkDisplay* _tmp10_;
 		GdkCursor* cursor = NULL;
-		GdkDisplay* _tmp11_ = NULL;
-		GdkCursor* _tmp12_ = NULL;
-		GdkWindow* _tmp13_ = NULL;
-		GdkCursor* _tmp14_ = NULL;
+		GdkDisplay* _tmp11_;
+		GdkCursor* _tmp12_;
+		GdkWindow* _tmp13_;
+		GdkCursor* _tmp14_;
 #line 1245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9161,7 +9089,7 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba
 		_g_object_unref0 (display);
 #line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (drawing_window);
-#line 9165 "EditingTools.c"
+#line 9093 "EditingTools.c"
 	}
 #line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->crop_surface);
@@ -9169,15 +9097,15 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba
 	self->priv->crop_surface = NULL;
 #line 1254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 9173 "EditingTools.c"
+#line 9101 "EditingTools.c"
 }
 
 
 static EditingToolsEditingToolWindow* editing_tools_crop_tool_real_get_tool_window (EditingToolsEditingTool* base) {
 	EditingToolsCropTool * self;
 	EditingToolsEditingToolWindow* result = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp0_ = NULL;
-	EditingToolsEditingToolWindow* _tmp1_ = NULL;
+	EditingToolsCropToolCropToolWindow* _tmp0_;
+	EditingToolsEditingToolWindow* _tmp1_;
 #line 1257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9188,7 +9116,7 @@ static EditingToolsEditingToolWindow* editing_tools_crop_tool_real_get_tool_wind
 	result = _tmp1_;
 #line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 9192 "EditingTools.c"
+#line 9120 "EditingTools.c"
 }
 
 
@@ -9196,13 +9124,13 @@ static GdkPixbuf* editing_tools_crop_tool_real_get_display_pixbuf (EditingToolsE
 	EditingToolsCropTool * self;
 	Dimensions _vala_max_dim = {0};
 	GdkPixbuf* result = NULL;
-	Photo* _tmp0_ = NULL;
+	Photo* _tmp0_;
 	Dimensions _tmp1_ = {0};
 	GdkPixbuf* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
-	Scaling _tmp4_ = {0};
-	GdkPixbuf* _tmp5_ = NULL;
-	GdkPixbuf* _tmp6_ = NULL;
+	Photo* _tmp3_;
+	Scaling _tmp4_;
+	GdkPixbuf* _tmp5_;
+	GdkPixbuf* _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 1261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
@@ -9230,7 +9158,7 @@ static GdkPixbuf* editing_tools_crop_tool_real_get_display_pixbuf (EditingToolsE
 		g_propagate_error (error, _inner_error_);
 #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return NULL;
-#line 9234 "EditingTools.c"
+#line 9162 "EditingTools.c"
 	}
 #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp2_;
@@ -9244,34 +9172,34 @@ static GdkPixbuf* editing_tools_crop_tool_real_get_display_pixbuf (EditingToolsE
 	if (max_dim) {
 #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*max_dim = _vala_max_dim;
-#line 9248 "EditingTools.c"
+#line 9176 "EditingTools.c"
 	}
 #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 9252 "EditingTools.c"
+#line 9180 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_prepare_ctx (EditingToolsCropTool* self, cairo_t* ctx, Dimensions* dim) {
-	cairo_t* _tmp0_ = NULL;
-	cairo_surface_t* _tmp1_ = NULL;
-	cairo_t* _tmp2_ = NULL;
-	cairo_t* _tmp3_ = NULL;
-	cairo_t* _tmp4_ = NULL;
-	cairo_t* _tmp5_ = NULL;
-	cairo_surface_t* _tmp6_ = NULL;
-	cairo_t* _tmp7_ = NULL;
-	cairo_t* _tmp8_ = NULL;
-	cairo_t* _tmp9_ = NULL;
-	cairo_t* _tmp10_ = NULL;
-	cairo_surface_t* _tmp11_ = NULL;
-	cairo_t* _tmp12_ = NULL;
-	cairo_t* _tmp13_ = NULL;
-	cairo_t* _tmp14_ = NULL;
-	cairo_t* _tmp15_ = NULL;
-	cairo_surface_t* _tmp16_ = NULL;
-	cairo_t* _tmp17_ = NULL;
-	cairo_t* _tmp18_ = NULL;
+	cairo_t* _tmp0_;
+	cairo_surface_t* _tmp1_;
+	cairo_t* _tmp2_;
+	cairo_t* _tmp3_;
+	cairo_t* _tmp4_;
+	cairo_t* _tmp5_;
+	cairo_surface_t* _tmp6_;
+	cairo_t* _tmp7_;
+	cairo_t* _tmp8_;
+	cairo_t* _tmp9_;
+	cairo_t* _tmp10_;
+	cairo_surface_t* _tmp11_;
+	cairo_t* _tmp12_;
+	cairo_t* _tmp13_;
+	cairo_t* _tmp14_;
+	cairo_t* _tmp15_;
+	cairo_surface_t* _tmp16_;
+	cairo_t* _tmp17_;
+	cairo_t* _tmp18_;
 #line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9346,38 +9274,38 @@ static void editing_tools_crop_tool_prepare_ctx (EditingToolsCropTool* self, cai
 	_tmp18_ = self->priv->text_ctx;
 #line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_select_font_face (_tmp18_, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
-#line 9350 "EditingTools.c"
+#line 9278 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_on_resized_pixbuf (EditingToolsCropTool* self, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position) {
 	Dimensions new_dim = {0};
-	GdkPixbuf* _tmp0_ = NULL;
+	GdkPixbuf* _tmp0_;
 	Dimensions _tmp1_ = {0};
 	Dimensions uncropped_dim = {0};
-	EditingToolsPhotoCanvas* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
-	Photo* _tmp4_ = NULL;
+	EditingToolsPhotoCanvas* _tmp2_;
+	Photo* _tmp3_;
+	Photo* _tmp4_;
 	Dimensions _tmp5_ = {0};
-	Dimensions _tmp6_ = {0};
+	Dimensions _tmp6_;
 	Box crop = {0};
-	Dimensions _tmp7_ = {0};
-	Dimensions _tmp8_ = {0};
+	Dimensions _tmp7_;
+	Dimensions _tmp8_;
 	Box _tmp9_ = {0};
-	Dimensions _tmp10_ = {0};
-	Dimensions _tmp11_ = {0};
+	Dimensions _tmp10_;
+	Dimensions _tmp11_;
 	Box _tmp12_ = {0};
-	cairo_surface_t* _tmp13_ = NULL;
-	GdkPixbuf* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	GdkPixbuf* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	cairo_surface_t* _tmp20_ = NULL;
+	cairo_surface_t* _tmp13_;
+	GdkPixbuf* _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	GdkPixbuf* _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
+	cairo_surface_t* _tmp20_;
 	cairo_t* ctx = NULL;
-	cairo_surface_t* _tmp21_ = NULL;
-	cairo_t* _tmp22_ = NULL;
+	cairo_surface_t* _tmp21_;
+	cairo_t* _tmp22_;
 #line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9430,7 +9358,7 @@ static void editing_tools_crop_tool_on_resized_pixbuf (EditingToolsCropTool* sel
 		_cairo_surface_destroy0 (self->priv->crop_surface);
 #line 1295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->crop_surface = NULL;
-#line 9434 "EditingTools.c"
+#line 9362 "EditingTools.c"
 	}
 #line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = scaled;
@@ -9462,33 +9390,33 @@ static void editing_tools_crop_tool_on_resized_pixbuf (EditingToolsCropTool* sel
 	cairo_paint (ctx);
 #line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 9466 "EditingTools.c"
+#line 9394 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_real_on_left_click (EditingToolsEditingTool* base, gint x, gint y) {
 	EditingToolsCropTool * self;
 	GdkRectangle scaled_pixbuf_pos = {0};
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
 	GdkRectangle _tmp1_ = {0};
 	Box offset_scaled_crop = {0};
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
 	Box _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	BoxLocation _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	GdkRectangle _tmp11_ = {0};
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	GdkRectangle _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	EditingToolsPhotoCanvas* _tmp18_ = NULL;
+	gint _tmp7_;
+	gint _tmp8_;
+	BoxLocation _tmp9_;
+	gint _tmp10_;
+	GdkRectangle _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
+	GdkRectangle _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	EditingToolsPhotoCanvas* _tmp18_;
 #line 1304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9545,16 +9473,16 @@ static void editing_tools_crop_tool_real_on_left_click (EditingToolsEditingTool*
 	_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp18_);
-#line 9549 "EditingTools.c"
+#line 9477 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTool* base, gint x, gint y) {
 	EditingToolsCropTool * self;
-	BoxLocation _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	EditingToolsPhotoCanvas* _tmp3_ = NULL;
+	BoxLocation _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	EditingToolsPhotoCanvas* _tmp3_;
 #line 1319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9563,7 +9491,7 @@ static void editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTo
 	if (_tmp0_ == BOX_LOCATION_OUTSIDE) {
 #line 1322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 9567 "EditingTools.c"
+#line 9495 "EditingTools.c"
 	}
 #line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->in_manipulation = BOX_LOCATION_OUTSIDE;
@@ -9581,32 +9509,32 @@ static void editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTo
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp3_);
-#line 9585 "EditingTools.c"
+#line 9513 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask) {
 	EditingToolsCropTool * self;
-	BoxLocation _tmp0_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	EditingToolsPhotoCanvas* _tmp5_ = NULL;
+	BoxLocation _tmp0_;
+	gint _tmp3_;
+	gint _tmp4_;
+	EditingToolsPhotoCanvas* _tmp5_;
 #line 1335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->in_manipulation;
 #line 1338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != BOX_LOCATION_OUTSIDE) {
-#line 9601 "EditingTools.c"
-		gint _tmp1_ = 0;
-		gint _tmp2_ = 0;
+#line 9529 "EditingTools.c"
+		gint _tmp1_;
+		gint _tmp2_;
 #line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = x;
 #line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = y;
 #line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_on_canvas_manipulation (self, _tmp1_, _tmp2_);
-#line 9610 "EditingTools.c"
+#line 9538 "EditingTools.c"
 	}
 #line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = x;
@@ -9618,40 +9546,40 @@ static void editing_tools_crop_tool_real_on_motion (EditingToolsEditingTool* bas
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp5_);
-#line 9622 "EditingTools.c"
+#line 9550 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_real_paint (EditingToolsEditingTool* base, cairo_t* default_ctx) {
 	EditingToolsCropTool * self;
 	gint w = 0;
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	GdkWindow* _tmp1_ = NULL;
-	GdkWindow* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	EditingToolsPhotoCanvas* _tmp0_;
+	GdkWindow* _tmp1_;
+	GdkWindow* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 	gint h = 0;
-	EditingToolsPhotoCanvas* _tmp5_ = NULL;
-	GdkWindow* _tmp6_ = NULL;
-	GdkWindow* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	cairo_t* _tmp10_ = NULL;
-	cairo_t* _tmp11_ = NULL;
-	cairo_t* _tmp12_ = NULL;
-	cairo_t* _tmp13_ = NULL;
+	EditingToolsPhotoCanvas* _tmp5_;
+	GdkWindow* _tmp6_;
+	GdkWindow* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	cairo_t* _tmp10_;
+	cairo_t* _tmp11_;
+	cairo_t* _tmp12_;
+	cairo_t* _tmp13_;
 	cairo_t* ctx = NULL;
-	cairo_surface_t* _tmp14_ = NULL;
-	cairo_t* _tmp15_ = NULL;
-	Box _tmp16_ = {0};
-	gint _tmp17_ = 0;
-	Box _tmp18_ = {0};
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
-	gint _tmp21_ = 0;
-	EditingToolsPhotoCanvas* _tmp22_ = NULL;
-	cairo_surface_t* _tmp23_ = NULL;
-	Box _tmp24_ = {0};
+	cairo_surface_t* _tmp14_;
+	cairo_t* _tmp15_;
+	Box _tmp16_;
+	gint _tmp17_;
+	Box _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
+	gint _tmp21_;
+	EditingToolsPhotoCanvas* _tmp22_;
+	cairo_surface_t* _tmp23_;
+	Box _tmp24_;
 #line 1345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9742,50 +9670,50 @@ static void editing_tools_crop_tool_real_paint (EditingToolsEditingTool* base, c
 	editing_tools_crop_tool_paint_crop_tool (self, &_tmp24_);
 #line 1345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 9746 "EditingTools.c"
+#line 9674 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_on_crop_ok (EditingToolsCropTool* self) {
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	EditingToolsCropToolCropToolWindow* _tmp2_ = NULL;
-	GtkComboBox* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	ConfigFacade* _tmp5_ = NULL;
-	ConfigFacade* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	ConfigFacade* _tmp8_ = NULL;
-	ConfigFacade* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	EditingToolsCropToolCropToolWindow* _tmp2_;
+	GtkComboBox* _tmp3_;
+	gint _tmp4_;
+	ConfigFacade* _tmp5_;
+	ConfigFacade* _tmp6_;
+	gint _tmp7_;
+	ConfigFacade* _tmp8_;
+	ConfigFacade* _tmp9_;
+	gint _tmp10_;
 	Box crop = {0};
-	EditingToolsPhotoCanvas* _tmp11_ = NULL;
+	EditingToolsPhotoCanvas* _tmp11_;
 	GdkRectangle _tmp12_ = {0};
 	Dimensions _tmp13_ = {0};
-	EditingToolsPhotoCanvas* _tmp14_ = NULL;
-	Photo* _tmp15_ = NULL;
-	Photo* _tmp16_ = NULL;
+	EditingToolsPhotoCanvas* _tmp14_;
+	Photo* _tmp15_;
+	Photo* _tmp16_;
 	Dimensions _tmp17_ = {0};
 	Box _tmp18_ = {0};
-	Box _tmp19_ = {0};
+	Box _tmp19_;
 	GdkPixbuf* cropped = NULL;
-	EditingToolsPhotoCanvas* _tmp20_ = NULL;
-	GdkPixbuf* _tmp21_ = NULL;
-	GdkPixbuf* _tmp22_ = NULL;
-	Box _tmp23_ = {0};
-	gint _tmp24_ = 0;
-	Box _tmp25_ = {0};
-	gint _tmp26_ = 0;
-	gint _tmp27_ = 0;
-	gint _tmp28_ = 0;
-	GdkPixbuf* _tmp29_ = NULL;
-	GdkPixbuf* _tmp30_ = NULL;
-	EditingToolsPhotoCanvas* _tmp31_ = NULL;
-	Photo* _tmp32_ = NULL;
-	Photo* _tmp33_ = NULL;
-	Box _tmp34_ = {0};
-	CropCommand* _tmp35_ = NULL;
-	CropCommand* _tmp36_ = NULL;
+	EditingToolsPhotoCanvas* _tmp20_;
+	GdkPixbuf* _tmp21_;
+	GdkPixbuf* _tmp22_;
+	Box _tmp23_;
+	gint _tmp24_;
+	Box _tmp25_;
+	gint _tmp26_;
+	gint _tmp27_;
+	gint _tmp28_;
+	GdkPixbuf* _tmp29_;
+	GdkPixbuf* _tmp30_;
+	EditingToolsPhotoCanvas* _tmp31_;
+	Photo* _tmp32_;
+	Photo* _tmp33_;
+	Box _tmp34_;
+	CropCommand* _tmp35_;
+	CropCommand* _tmp36_;
 	Dimensions _tmp37_ = {0};
 #line 1371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
@@ -9886,33 +9814,33 @@ static void editing_tools_crop_tool_on_crop_ok (EditingToolsCropTool* self) {
 #line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_dimensions (&crop, &_tmp37_);
 #line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_COMMAND, Command), cropped, &_tmp37_, TRUE);
+	g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_COMMAND, Command), cropped, &_tmp37_, TRUE);
 #line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp36_);
 #line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp33_);
 #line 1371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (cropped);
-#line 9897 "EditingTools.c"
+#line 9825 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, gint x, gint y) {
 	GdkRectangle scaled_pos = {0};
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
 	GdkRectangle _tmp1_ = {0};
 	Box offset_scaled_crop = {0};
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
 	Box _tmp6_ = {0};
 	GdkCursorType cursor_type = 0;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	BoxLocation _tmp9_ = 0;
-	GdkCursorType _tmp10_ = 0;
-	GdkCursorType _tmp11_ = 0;
+	gint _tmp7_;
+	gint _tmp8_;
+	BoxLocation _tmp9_;
+	GdkCursorType _tmp10_;
+	GdkCursorType _tmp11_;
 #line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9945,99 +9873,99 @@ static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, g
 	switch (_tmp9_) {
 #line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_LEFT_SIDE:
-#line 9949 "EditingTools.c"
+#line 9877 "EditingTools.c"
 		{
 #line 1403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_LEFT_SIDE;
 #line 1404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9955 "EditingTools.c"
+#line 9883 "EditingTools.c"
 		}
 #line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_SIDE:
-#line 9959 "EditingTools.c"
+#line 9887 "EditingTools.c"
 		{
 #line 1407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_TOP_SIDE;
 #line 1408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9965 "EditingTools.c"
+#line 9893 "EditingTools.c"
 		}
 #line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_RIGHT_SIDE:
-#line 9969 "EditingTools.c"
+#line 9897 "EditingTools.c"
 		{
 #line 1411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_RIGHT_SIDE;
 #line 1412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9975 "EditingTools.c"
+#line 9903 "EditingTools.c"
 		}
 #line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_SIDE:
-#line 9979 "EditingTools.c"
+#line 9907 "EditingTools.c"
 		{
 #line 1415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_BOTTOM_SIDE;
 #line 1416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9985 "EditingTools.c"
+#line 9913 "EditingTools.c"
 		}
 #line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_LEFT:
-#line 9989 "EditingTools.c"
+#line 9917 "EditingTools.c"
 		{
 #line 1419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_TOP_LEFT_CORNER;
 #line 1420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9995 "EditingTools.c"
+#line 9923 "EditingTools.c"
 		}
 #line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_LEFT:
-#line 9999 "EditingTools.c"
+#line 9927 "EditingTools.c"
 		{
 #line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_BOTTOM_LEFT_CORNER;
 #line 1424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10005 "EditingTools.c"
+#line 9933 "EditingTools.c"
 		}
 #line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_RIGHT:
-#line 10009 "EditingTools.c"
+#line 9937 "EditingTools.c"
 		{
 #line 1427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_TOP_RIGHT_CORNER;
 #line 1428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10015 "EditingTools.c"
+#line 9943 "EditingTools.c"
 		}
 #line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_RIGHT:
-#line 10019 "EditingTools.c"
+#line 9947 "EditingTools.c"
 		{
 #line 1431 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_BOTTOM_RIGHT_CORNER;
 #line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10025 "EditingTools.c"
+#line 9953 "EditingTools.c"
 		}
 #line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_INSIDE:
-#line 10029 "EditingTools.c"
+#line 9957 "EditingTools.c"
 		{
 #line 1435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_FLEUR;
 #line 1436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10035 "EditingTools.c"
+#line 9963 "EditingTools.c"
 		}
 		default:
 		{
 #line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10041 "EditingTools.c"
+#line 9969 "EditingTools.c"
 		}
 	}
 #line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10046,21 +9974,21 @@ static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, g
 	_tmp11_ = self->priv->current_cursor_type;
 #line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ != _tmp11_) {
-#line 10050 "EditingTools.c"
+#line 9978 "EditingTools.c"
 		GdkWindow* drawing_window = NULL;
-		EditingToolsPhotoCanvas* _tmp12_ = NULL;
-		GdkWindow* _tmp13_ = NULL;
+		EditingToolsPhotoCanvas* _tmp12_;
+		GdkWindow* _tmp13_;
 		GdkDisplay* display = NULL;
-		GdkWindow* _tmp14_ = NULL;
-		GdkDisplay* _tmp15_ = NULL;
-		GdkDisplay* _tmp16_ = NULL;
+		GdkWindow* _tmp14_;
+		GdkDisplay* _tmp15_;
+		GdkDisplay* _tmp16_;
 		GdkCursor* cursor = NULL;
-		GdkDisplay* _tmp17_ = NULL;
-		GdkCursorType _tmp18_ = 0;
-		GdkCursor* _tmp19_ = NULL;
-		GdkWindow* _tmp20_ = NULL;
-		GdkCursor* _tmp21_ = NULL;
-		GdkCursorType _tmp22_ = 0;
+		GdkDisplay* _tmp17_;
+		GdkCursorType _tmp18_;
+		GdkCursor* _tmp19_;
+		GdkWindow* _tmp20_;
+		GdkCursor* _tmp21_;
+		GdkCursorType _tmp22_;
 #line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10099,7 +10027,7 @@ static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, g
 		_g_object_unref0 (display);
 #line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (drawing_window);
-#line 10103 "EditingTools.c"
+#line 10031 "EditingTools.c"
 	}
 }
 
@@ -10107,14 +10035,14 @@ static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, g
 static gint editing_tools_crop_tool_eval_radial_line (EditingToolsCropTool* self, gdouble center_x, gdouble center_y, gdouble bounds_x, gdouble bounds_y, gdouble user_x) {
 	gint result = 0;
 	gdouble decision_slope = 0.0;
-	gdouble _tmp0_ = 0.0;
-	gdouble _tmp1_ = 0.0;
-	gdouble _tmp2_ = 0.0;
-	gdouble _tmp3_ = 0.0;
+	gdouble _tmp0_;
+	gdouble _tmp1_;
+	gdouble _tmp2_;
+	gdouble _tmp3_;
 	gdouble decision_intercept = 0.0;
-	gdouble _tmp4_ = 0.0;
-	gdouble _tmp5_ = 0.0;
-	gdouble _tmp6_ = 0.0;
+	gdouble _tmp4_;
+	gdouble _tmp5_;
+	gdouble _tmp6_;
 #line 1452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0);
 #line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10139,42 +10067,42 @@ static gint editing_tools_crop_tool_eval_radial_line (EditingToolsCropTool* self
 	result = (gint) ((decision_slope * _tmp6_) + decision_intercept);
 #line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 10143 "EditingTools.c"
+#line 10071 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_get_photo_dimensions (EditingToolsCropTool* self, Dimensions* result) {
 	Dimensions photo_dims = {0};
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
 	Dimensions _tmp3_ = {0};
-	Dimensions _tmp4_ = {0};
+	Dimensions _tmp4_;
 	Dimensions surface_dims = {0};
-	EditingToolsPhotoCanvas* _tmp5_ = NULL;
+	EditingToolsPhotoCanvas* _tmp5_;
 	Dimensions _tmp6_ = {0};
 	gdouble scale_factor = 0.0;
-	Dimensions _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	Dimensions _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	Dimensions _tmp11_ = {0};
-	gint _tmp12_ = 0;
-	Dimensions _tmp13_ = {0};
-	gint _tmp14_ = 0;
-	gdouble _tmp15_ = 0.0;
-	gdouble _tmp16_ = 0.0;
-	gdouble _tmp17_ = 0.0;
-	EditingToolsPhotoCanvas* _tmp18_ = NULL;
-	Photo* _tmp19_ = NULL;
-	Photo* _tmp20_ = NULL;
+	Dimensions _tmp7_;
+	gint _tmp8_;
+	Dimensions _tmp9_;
+	gint _tmp10_;
+	Dimensions _tmp11_;
+	gint _tmp12_;
+	Dimensions _tmp13_;
+	gint _tmp14_;
+	gdouble _tmp15_;
+	gdouble _tmp16_;
+	gdouble _tmp17_;
+	EditingToolsPhotoCanvas* _tmp18_;
+	Photo* _tmp19_;
+	Photo* _tmp20_;
 	Dimensions _tmp21_ = {0};
-	Dimensions _tmp22_ = {0};
-	gint _tmp23_ = 0;
-	gdouble _tmp24_ = 0.0;
-	Dimensions _tmp25_ = {0};
-	gint _tmp26_ = 0;
-	gdouble _tmp27_ = 0.0;
+	Dimensions _tmp22_;
+	gint _tmp23_;
+	gdouble _tmp24_;
+	Dimensions _tmp25_;
+	gint _tmp26_;
+	gdouble _tmp27_;
 	Dimensions _tmp28_ = {0};
 #line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
@@ -10256,109 +10184,109 @@ static void editing_tools_crop_tool_get_photo_dimensions (EditingToolsCropTool*
 	*result = _tmp28_;
 #line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 10260 "EditingTools.c"
+#line 10188 "EditingTools.c"
 }
 
 
-static gboolean _box_equal (const Box* s1, const Box* s2) {
+static gboolean _box_equal (const Box * s1, const Box * s2) {
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1 == s2) {
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return TRUE;
-#line 10269 "EditingTools.c"
+#line 10197 "EditingTools.c"
 	}
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1 == NULL) {
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10275 "EditingTools.c"
+#line 10203 "EditingTools.c"
 	}
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s2 == NULL) {
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10281 "EditingTools.c"
+#line 10209 "EditingTools.c"
 	}
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->left != s2->left) {
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10287 "EditingTools.c"
+#line 10215 "EditingTools.c"
 	}
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->top != s2->top) {
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10293 "EditingTools.c"
+#line 10221 "EditingTools.c"
 	}
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->right != s2->right) {
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10299 "EditingTools.c"
+#line 10227 "EditingTools.c"
 	}
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->bottom != s2->bottom) {
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10305 "EditingTools.c"
+#line 10233 "EditingTools.c"
 	}
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return TRUE;
-#line 10309 "EditingTools.c"
+#line 10237 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCropTool* self, gint x, gint y) {
 	gboolean result = FALSE;
 	GdkRectangle scaled_pos = {0};
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
 	GdkRectangle _tmp1_ = {0};
-	gint _tmp2_ = 0;
-	GdkRectangle _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp11_ = 0;
-	GdkRectangle _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
+	gint _tmp2_;
+	GdkRectangle _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp11_;
+	GdkRectangle _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
 	gint left = 0;
-	Box _tmp20_ = {0};
-	gint _tmp21_ = 0;
+	Box _tmp20_;
+	gint _tmp21_;
 	gint top = 0;
-	Box _tmp22_ = {0};
-	gint _tmp23_ = 0;
+	Box _tmp22_;
+	gint _tmp23_;
 	gint right = 0;
-	Box _tmp24_ = {0};
-	gint _tmp25_ = 0;
+	Box _tmp24_;
+	gint _tmp25_;
 	gint bottom = 0;
-	Box _tmp26_ = {0};
-	gint _tmp27_ = 0;
+	Box _tmp26_;
+	gint _tmp27_;
 	gint center_x = 0;
-	gint _tmp28_ = 0;
-	gint _tmp29_ = 0;
+	gint _tmp28_;
+	gint _tmp29_;
 	gint center_y = 0;
-	gint _tmp30_ = 0;
-	gint _tmp31_ = 0;
-	BoxLocation _tmp32_ = 0;
+	gint _tmp30_;
+	gint _tmp31_;
+	BoxLocation _tmp32_;
 	gint width = 0;
-	gint _tmp199_ = 0;
-	gint _tmp200_ = 0;
+	gint _tmp199_;
+	gint _tmp200_;
 	gint height = 0;
-	gint _tmp201_ = 0;
-	gint _tmp202_ = 0;
+	gint _tmp201_;
+	gint _tmp202_;
 	Dimensions photo_dims = {0};
 	Dimensions _tmp203_ = {0};
 	gdouble angle = 0.0;
-	EditingToolsPhotoCanvas* _tmp204_ = NULL;
-	Photo* _tmp205_ = NULL;
-	Photo* _tmp206_ = NULL;
+	EditingToolsPhotoCanvas* _tmp204_;
+	Photo* _tmp205_;
+	Photo* _tmp206_;
 	gdouble _tmp207_ = 0.0;
 	Box new_crop = {0};
-	gfloat _tmp208_ = 0.0F;
-	BoxLocation _tmp254_ = 0;
-	Box _tmp257_ = {0};
-	gfloat _tmp258_ = 0.0F;
+	gfloat _tmp208_;
+	BoxLocation _tmp254_;
+	Box _tmp257_;
+	gfloat _tmp258_;
 #line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
 #line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10381,11 +10309,11 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 	if (_tmp5_ < 0) {
 #line 1482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x = 0;
-#line 10385 "EditingTools.c"
+#line 10313 "EditingTools.c"
 	} else {
-		gint _tmp6_ = 0;
-		GdkRectangle _tmp7_ = {0};
-		gint _tmp8_ = 0;
+		gint _tmp6_;
+		GdkRectangle _tmp7_;
+		gint _tmp8_;
 #line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = x;
 #line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10394,16 +10322,16 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 		_tmp8_ = _tmp7_.width;
 #line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp6_ >= _tmp8_) {
-#line 10398 "EditingTools.c"
-			GdkRectangle _tmp9_ = {0};
-			gint _tmp10_ = 0;
+#line 10326 "EditingTools.c"
+			GdkRectangle _tmp9_;
+			gint _tmp10_;
 #line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp9_ = scaled_pos;
 #line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp10_ = _tmp9_.width;
 #line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			x = _tmp10_ - 1;
-#line 10407 "EditingTools.c"
+#line 10335 "EditingTools.c"
 		}
 	}
 #line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10420,11 +10348,11 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 	if (_tmp14_ < 0) {
 #line 1488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = 0;
-#line 10424 "EditingTools.c"
+#line 10352 "EditingTools.c"
 	} else {
-		gint _tmp15_ = 0;
-		GdkRectangle _tmp16_ = {0};
-		gint _tmp17_ = 0;
+		gint _tmp15_;
+		GdkRectangle _tmp16_;
+		gint _tmp17_;
 #line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = y;
 #line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10433,16 +10361,16 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 		_tmp17_ = _tmp16_.height;
 #line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp15_ >= _tmp17_) {
-#line 10437 "EditingTools.c"
-			GdkRectangle _tmp18_ = {0};
-			gint _tmp19_ = 0;
+#line 10365 "EditingTools.c"
+			GdkRectangle _tmp18_;
+			gint _tmp19_;
 #line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp18_ = scaled_pos;
 #line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp19_ = _tmp18_.height;
 #line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			y = _tmp19_ - 1;
-#line 10446 "EditingTools.c"
+#line 10374 "EditingTools.c"
 		}
 	}
 #line 1494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10487,10 +10415,10 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 	switch (_tmp32_) {
 #line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_LEFT_SIDE:
-#line 10491 "EditingTools.c"
+#line 10419 "EditingTools.c"
 		{
-			gint _tmp33_ = 0;
-			gfloat _tmp34_ = 0.0F;
+			gint _tmp33_;
+			gfloat _tmp34_;
 #line 1505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp33_ = x;
 #line 1505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10499,13 +10427,13 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp34_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp34_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10503 "EditingTools.c"
+#line 10431 "EditingTools.c"
 				gfloat new_height = 0.0F;
-				gint _tmp35_ = 0;
-				gint _tmp36_ = 0;
-				gfloat _tmp37_ = 0.0F;
-				gint _tmp38_ = 0;
-				gfloat _tmp39_ = 0.0F;
+				gint _tmp35_;
+				gint _tmp36_;
+				gfloat _tmp37_;
+				gint _tmp38_;
+				gfloat _tmp39_;
 #line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp35_ = right;
 #line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10520,18 +10448,18 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp39_ = new_height;
 #line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp38_ + ((gint) _tmp39_);
-#line 10524 "EditingTools.c"
+#line 10452 "EditingTools.c"
 			}
 #line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10528 "EditingTools.c"
+#line 10456 "EditingTools.c"
 		}
 #line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_SIDE:
-#line 10532 "EditingTools.c"
+#line 10460 "EditingTools.c"
 		{
-			gint _tmp40_ = 0;
-			gfloat _tmp41_ = 0.0F;
+			gint _tmp40_;
+			gfloat _tmp41_;
 #line 1513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp40_ = y;
 #line 1513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10540,13 +10468,13 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp41_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp41_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10544 "EditingTools.c"
+#line 10472 "EditingTools.c"
 				gfloat new_width = 0.0F;
-				gint _tmp42_ = 0;
-				gint _tmp43_ = 0;
-				gfloat _tmp44_ = 0.0F;
-				gint _tmp45_ = 0;
-				gfloat _tmp46_ = 0.0F;
+				gint _tmp42_;
+				gint _tmp43_;
+				gfloat _tmp44_;
+				gint _tmp45_;
+				gfloat _tmp46_;
 #line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp42_ = bottom;
 #line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10561,18 +10489,18 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp46_ = new_width;
 #line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp45_ + ((gint) _tmp46_);
-#line 10565 "EditingTools.c"
+#line 10493 "EditingTools.c"
 			}
 #line 1518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10569 "EditingTools.c"
+#line 10497 "EditingTools.c"
 		}
 #line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_RIGHT_SIDE:
-#line 10573 "EditingTools.c"
+#line 10501 "EditingTools.c"
 		{
-			gint _tmp47_ = 0;
-			gfloat _tmp48_ = 0.0F;
+			gint _tmp47_;
+			gfloat _tmp48_;
 #line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp47_ = x;
 #line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10581,13 +10509,13 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp48_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp48_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10585 "EditingTools.c"
+#line 10513 "EditingTools.c"
 				gfloat new_height = 0.0F;
-				gint _tmp49_ = 0;
-				gint _tmp50_ = 0;
-				gfloat _tmp51_ = 0.0F;
-				gint _tmp52_ = 0;
-				gfloat _tmp53_ = 0.0F;
+				gint _tmp49_;
+				gint _tmp50_;
+				gfloat _tmp51_;
+				gint _tmp52_;
+				gfloat _tmp53_;
 #line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp49_ = right;
 #line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10602,18 +10530,18 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp53_ = new_height;
 #line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp52_ + ((gint) _tmp53_);
-#line 10606 "EditingTools.c"
+#line 10534 "EditingTools.c"
 			}
 #line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10610 "EditingTools.c"
+#line 10538 "EditingTools.c"
 		}
 #line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_SIDE:
-#line 10614 "EditingTools.c"
+#line 10542 "EditingTools.c"
 		{
-			gint _tmp54_ = 0;
-			gfloat _tmp55_ = 0.0F;
+			gint _tmp54_;
+			gfloat _tmp55_;
 #line 1529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp54_ = y;
 #line 1529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10622,13 +10550,13 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp55_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp55_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10626 "EditingTools.c"
+#line 10554 "EditingTools.c"
 				gfloat new_width = 0.0F;
-				gint _tmp56_ = 0;
-				gint _tmp57_ = 0;
-				gfloat _tmp58_ = 0.0F;
-				gint _tmp59_ = 0;
-				gfloat _tmp60_ = 0.0F;
+				gint _tmp56_;
+				gint _tmp57_;
+				gfloat _tmp58_;
+				gint _tmp59_;
+				gfloat _tmp60_;
 #line 1531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp56_ = bottom;
 #line 1531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10643,24 +10571,24 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp60_ = new_width;
 #line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp59_ + ((gint) _tmp60_);
-#line 10647 "EditingTools.c"
+#line 10575 "EditingTools.c"
 			}
 #line 1534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10651 "EditingTools.c"
+#line 10579 "EditingTools.c"
 		}
 #line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_LEFT:
-#line 10655 "EditingTools.c"
+#line 10583 "EditingTools.c"
 		{
-			gfloat _tmp61_ = 0.0F;
+			gfloat _tmp61_;
 #line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp61_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp61_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10662 "EditingTools.c"
-				gint _tmp62_ = 0;
-				gint _tmp63_ = 0;
+#line 10590 "EditingTools.c"
+				gint _tmp62_;
+				gint _tmp63_;
 #line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp62_ = y;
 #line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10669,15 +10597,15 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp63_ = x;
 #line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				left = _tmp63_;
-#line 10673 "EditingTools.c"
+#line 10601 "EditingTools.c"
 			} else {
-				gint _tmp64_ = 0;
-				gint _tmp65_ = 0;
-				gint _tmp66_ = 0;
-				gint _tmp67_ = 0;
-				gint _tmp68_ = 0;
-				gint _tmp69_ = 0;
-				gint _tmp70_ = 0;
+				gint _tmp64_;
+				gint _tmp65_;
+				gint _tmp66_;
+				gint _tmp67_;
+				gint _tmp68_;
+				gint _tmp69_;
+				gint _tmp70_;
 #line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp64_ = y;
 #line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10694,14 +10622,14 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp70_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp65_, (gdouble) _tmp66_, (gdouble) _tmp67_, (gdouble) _tmp68_, (gdouble) _tmp69_);
 #line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp64_ < _tmp70_) {
-#line 10698 "EditingTools.c"
-					gint _tmp71_ = 0;
+#line 10626 "EditingTools.c"
+					gint _tmp71_;
 					gfloat new_width = 0.0F;
-					gint _tmp72_ = 0;
-					gint _tmp73_ = 0;
-					gfloat _tmp74_ = 0.0F;
-					gint _tmp75_ = 0;
-					gfloat _tmp76_ = 0.0F;
+					gint _tmp72_;
+					gint _tmp73_;
+					gfloat _tmp74_;
+					gint _tmp75_;
+					gfloat _tmp76_;
 #line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp71_ = y;
 #line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10720,15 +10648,15 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp76_ = new_width;
 #line 1544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp75_ - ((gint) _tmp76_);
-#line 10724 "EditingTools.c"
+#line 10652 "EditingTools.c"
 				} else {
-					gint _tmp77_ = 0;
+					gint _tmp77_;
 					gfloat new_height = 0.0F;
-					gint _tmp78_ = 0;
-					gint _tmp79_ = 0;
-					gfloat _tmp80_ = 0.0F;
-					gint _tmp81_ = 0;
-					gfloat _tmp82_ = 0.0F;
+					gint _tmp78_;
+					gint _tmp79_;
+					gfloat _tmp80_;
+					gint _tmp81_;
+					gfloat _tmp82_;
 #line 1546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp77_ = x;
 #line 1546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10747,25 +10675,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp82_ = new_height;
 #line 1548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp81_ - ((gint) _tmp82_);
-#line 10751 "EditingTools.c"
+#line 10679 "EditingTools.c"
 				}
 			}
 #line 1551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10756 "EditingTools.c"
+#line 10684 "EditingTools.c"
 		}
 #line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_LEFT:
-#line 10760 "EditingTools.c"
+#line 10688 "EditingTools.c"
 		{
-			gfloat _tmp83_ = 0.0F;
+			gfloat _tmp83_;
 #line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp83_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp83_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10767 "EditingTools.c"
-				gint _tmp84_ = 0;
-				gint _tmp85_ = 0;
+#line 10695 "EditingTools.c"
+				gint _tmp84_;
+				gint _tmp85_;
 #line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp84_ = y;
 #line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10774,15 +10702,15 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp85_ = x;
 #line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				left = _tmp85_;
-#line 10778 "EditingTools.c"
+#line 10706 "EditingTools.c"
 			} else {
-				gint _tmp86_ = 0;
-				gint _tmp87_ = 0;
-				gint _tmp88_ = 0;
-				gint _tmp89_ = 0;
-				gint _tmp90_ = 0;
-				gint _tmp91_ = 0;
-				gint _tmp92_ = 0;
+				gint _tmp86_;
+				gint _tmp87_;
+				gint _tmp88_;
+				gint _tmp89_;
+				gint _tmp90_;
+				gint _tmp91_;
+				gint _tmp92_;
 #line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp86_ = y;
 #line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10799,14 +10727,14 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp92_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp87_, (gdouble) _tmp88_, (gdouble) _tmp89_, (gdouble) _tmp90_, (gdouble) _tmp91_);
 #line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp86_ < _tmp92_) {
-#line 10803 "EditingTools.c"
-					gint _tmp93_ = 0;
+#line 10731 "EditingTools.c"
+					gint _tmp93_;
 					gfloat new_height = 0.0F;
-					gint _tmp94_ = 0;
-					gint _tmp95_ = 0;
-					gfloat _tmp96_ = 0.0F;
-					gint _tmp97_ = 0;
-					gfloat _tmp98_ = 0.0F;
+					gint _tmp94_;
+					gint _tmp95_;
+					gfloat _tmp96_;
+					gint _tmp97_;
+					gfloat _tmp98_;
 #line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp93_ = x;
 #line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10825,15 +10753,15 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp98_ = new_height;
 #line 1561 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp97_ + ((gint) _tmp98_);
-#line 10829 "EditingTools.c"
+#line 10757 "EditingTools.c"
 				} else {
-					gint _tmp99_ = 0;
+					gint _tmp99_;
 					gfloat new_width = 0.0F;
-					gint _tmp100_ = 0;
-					gint _tmp101_ = 0;
-					gfloat _tmp102_ = 0.0F;
-					gint _tmp103_ = 0;
-					gfloat _tmp104_ = 0.0F;
+					gint _tmp100_;
+					gint _tmp101_;
+					gfloat _tmp102_;
+					gint _tmp103_;
+					gfloat _tmp104_;
 #line 1563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp99_ = y;
 #line 1563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10852,25 +10780,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp104_ = new_width;
 #line 1565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp103_ - ((gint) _tmp104_);
-#line 10856 "EditingTools.c"
+#line 10784 "EditingTools.c"
 				}
 			}
 #line 1568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10861 "EditingTools.c"
+#line 10789 "EditingTools.c"
 		}
 #line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_RIGHT:
-#line 10865 "EditingTools.c"
+#line 10793 "EditingTools.c"
 		{
-			gfloat _tmp105_ = 0.0F;
+			gfloat _tmp105_;
 #line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp105_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp105_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10872 "EditingTools.c"
-				gint _tmp106_ = 0;
-				gint _tmp107_ = 0;
+#line 10800 "EditingTools.c"
+				gint _tmp106_;
+				gint _tmp107_;
 #line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp106_ = y;
 #line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10879,15 +10807,15 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp107_ = x;
 #line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp107_;
-#line 10883 "EditingTools.c"
+#line 10811 "EditingTools.c"
 			} else {
-				gint _tmp108_ = 0;
-				gint _tmp109_ = 0;
-				gint _tmp110_ = 0;
-				gint _tmp111_ = 0;
-				gint _tmp112_ = 0;
-				gint _tmp113_ = 0;
-				gint _tmp114_ = 0;
+				gint _tmp108_;
+				gint _tmp109_;
+				gint _tmp110_;
+				gint _tmp111_;
+				gint _tmp112_;
+				gint _tmp113_;
+				gint _tmp114_;
 #line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp108_ = y;
 #line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10904,14 +10832,14 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp114_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp109_, (gdouble) _tmp110_, (gdouble) _tmp111_, (gdouble) _tmp112_, (gdouble) _tmp113_);
 #line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp108_ < _tmp114_) {
-#line 10908 "EditingTools.c"
-					gint _tmp115_ = 0;
+#line 10836 "EditingTools.c"
+					gint _tmp115_;
 					gfloat new_width = 0.0F;
-					gint _tmp116_ = 0;
-					gint _tmp117_ = 0;
-					gfloat _tmp118_ = 0.0F;
-					gint _tmp119_ = 0;
-					gfloat _tmp120_ = 0.0F;
+					gint _tmp116_;
+					gint _tmp117_;
+					gfloat _tmp118_;
+					gint _tmp119_;
+					gfloat _tmp120_;
 #line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp115_ = y;
 #line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10930,15 +10858,15 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp120_ = new_width;
 #line 1578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp119_ + ((gint) _tmp120_);
-#line 10934 "EditingTools.c"
+#line 10862 "EditingTools.c"
 				} else {
-					gint _tmp121_ = 0;
+					gint _tmp121_;
 					gfloat new_height = 0.0F;
-					gint _tmp122_ = 0;
-					gint _tmp123_ = 0;
-					gfloat _tmp124_ = 0.0F;
-					gint _tmp125_ = 0;
-					gfloat _tmp126_ = 0.0F;
+					gint _tmp122_;
+					gint _tmp123_;
+					gfloat _tmp124_;
+					gint _tmp125_;
+					gfloat _tmp126_;
 #line 1580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp121_ = x;
 #line 1580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10957,25 +10885,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp126_ = new_height;
 #line 1582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp125_ - ((gint) _tmp126_);
-#line 10961 "EditingTools.c"
+#line 10889 "EditingTools.c"
 				}
 			}
 #line 1585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10966 "EditingTools.c"
+#line 10894 "EditingTools.c"
 		}
 #line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_RIGHT:
-#line 10970 "EditingTools.c"
+#line 10898 "EditingTools.c"
 		{
-			gfloat _tmp127_ = 0.0F;
+			gfloat _tmp127_;
 #line 1588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp127_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp127_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10977 "EditingTools.c"
-				gint _tmp128_ = 0;
-				gint _tmp129_ = 0;
+#line 10905 "EditingTools.c"
+				gint _tmp128_;
+				gint _tmp129_;
 #line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp128_ = y;
 #line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10984,15 +10912,15 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp129_ = x;
 #line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp129_;
-#line 10988 "EditingTools.c"
+#line 10916 "EditingTools.c"
 			} else {
-				gint _tmp130_ = 0;
-				gint _tmp131_ = 0;
-				gint _tmp132_ = 0;
-				gint _tmp133_ = 0;
-				gint _tmp134_ = 0;
-				gint _tmp135_ = 0;
-				gint _tmp136_ = 0;
+				gint _tmp130_;
+				gint _tmp131_;
+				gint _tmp132_;
+				gint _tmp133_;
+				gint _tmp134_;
+				gint _tmp135_;
+				gint _tmp136_;
 #line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp130_ = y;
 #line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11009,14 +10937,14 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp136_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp131_, (gdouble) _tmp132_, (gdouble) _tmp133_, (gdouble) _tmp134_, (gdouble) _tmp135_);
 #line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp130_ < _tmp136_) {
-#line 11013 "EditingTools.c"
-					gint _tmp137_ = 0;
+#line 10941 "EditingTools.c"
+					gint _tmp137_;
 					gfloat new_height = 0.0F;
-					gint _tmp138_ = 0;
-					gint _tmp139_ = 0;
-					gfloat _tmp140_ = 0.0F;
-					gint _tmp141_ = 0;
-					gfloat _tmp142_ = 0.0F;
+					gint _tmp138_;
+					gint _tmp139_;
+					gfloat _tmp140_;
+					gint _tmp141_;
+					gfloat _tmp142_;
 #line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp137_ = x;
 #line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11035,15 +10963,15 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp142_ = new_height;
 #line 1595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp141_ + ((gint) _tmp142_);
-#line 11039 "EditingTools.c"
+#line 10967 "EditingTools.c"
 				} else {
-					gint _tmp143_ = 0;
+					gint _tmp143_;
 					gfloat new_width = 0.0F;
-					gint _tmp144_ = 0;
-					gint _tmp145_ = 0;
-					gfloat _tmp146_ = 0.0F;
-					gint _tmp147_ = 0;
-					gfloat _tmp148_ = 0.0F;
+					gint _tmp144_;
+					gint _tmp145_;
+					gfloat _tmp146_;
+					gint _tmp147_;
+					gfloat _tmp148_;
 #line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp143_ = y;
 #line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11062,59 +10990,59 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp148_ = new_width;
 #line 1599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp147_ + ((gint) _tmp148_);
-#line 11066 "EditingTools.c"
+#line 10994 "EditingTools.c"
 				}
 			}
 #line 1602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 11071 "EditingTools.c"
+#line 10999 "EditingTools.c"
 		}
 #line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_INSIDE:
-#line 11075 "EditingTools.c"
+#line 11003 "EditingTools.c"
 		{
-			gint _tmp149_ = 0;
-			gint _tmp150_ = 0;
+			gint _tmp149_;
+			gint _tmp150_;
 			gint delta_x = 0;
-			gint _tmp151_ = 0;
-			gint _tmp152_ = 0;
+			gint _tmp151_;
+			gint _tmp152_;
 			gint delta_y = 0;
-			gint _tmp153_ = 0;
-			gint _tmp154_ = 0;
-			gint _tmp155_ = 0;
-			gint _tmp156_ = 0;
+			gint _tmp153_;
+			gint _tmp154_;
+			gint _tmp155_;
+			gint _tmp156_;
 			gint width = 0;
-			gint _tmp157_ = 0;
-			gint _tmp158_ = 0;
+			gint _tmp157_;
+			gint _tmp158_;
 			gint height = 0;
-			gint _tmp159_ = 0;
-			gint _tmp160_ = 0;
-			gint _tmp161_ = 0;
-			gint _tmp162_ = 0;
-			gint _tmp163_ = 0;
-			gint _tmp164_ = 0;
-			gint _tmp165_ = 0;
-			gint _tmp166_ = 0;
-			gint _tmp167_ = 0;
-			gint _tmp168_ = 0;
-			gint _tmp169_ = 0;
-			gint _tmp170_ = 0;
-			gint _tmp171_ = 0;
-			GdkRectangle _tmp172_ = {0};
-			gint _tmp173_ = 0;
-			gint _tmp176_ = 0;
-			GdkRectangle _tmp177_ = {0};
-			gint _tmp178_ = 0;
+			gint _tmp159_;
+			gint _tmp160_;
+			gint _tmp161_;
+			gint _tmp162_;
+			gint _tmp163_;
+			gint _tmp164_;
+			gint _tmp165_;
+			gint _tmp166_;
+			gint _tmp167_;
+			gint _tmp168_;
+			gint _tmp169_;
+			gint _tmp170_;
+			gint _tmp171_;
+			GdkRectangle _tmp172_;
+			gint _tmp173_;
+			gint _tmp176_;
+			GdkRectangle _tmp177_;
+			gint _tmp178_;
 			gint adj_width = 0;
-			gint _tmp181_ = 0;
-			gint _tmp182_ = 0;
+			gint _tmp181_;
+			gint _tmp182_;
 			gint adj_height = 0;
-			gint _tmp183_ = 0;
-			gint _tmp184_ = 0;
-			gint _tmp185_ = 0;
-			gint _tmp186_ = 0;
-			gint _tmp192_ = 0;
-			gint _tmp193_ = 0;
+			gint _tmp183_;
+			gint _tmp184_;
+			gint _tmp185_;
+			gint _tmp186_;
+			gint _tmp192_;
+			gint _tmp193_;
 #line 1605 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp149_ = self->priv->last_grab_x;
 #line 1605 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11185,7 +11113,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			if (_tmp169_ < 0) {
 #line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				left = 0;
-#line 11189 "EditingTools.c"
+#line 11117 "EditingTools.c"
 			}
 #line 1626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp170_ = top;
@@ -11193,7 +11121,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			if (_tmp170_ < 0) {
 #line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				top = 0;
-#line 11197 "EditingTools.c"
+#line 11125 "EditingTools.c"
 			}
 #line 1629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp171_ = right;
@@ -11203,16 +11131,16 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp173_ = _tmp172_.width;
 #line 1629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp171_ >= _tmp173_) {
-#line 11207 "EditingTools.c"
-				GdkRectangle _tmp174_ = {0};
-				gint _tmp175_ = 0;
+#line 11135 "EditingTools.c"
+				GdkRectangle _tmp174_;
+				gint _tmp175_;
 #line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp174_ = scaled_pos;
 #line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp175_ = _tmp174_.width;
 #line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp175_ - 1;
-#line 11216 "EditingTools.c"
+#line 11144 "EditingTools.c"
 			}
 #line 1632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp176_ = bottom;
@@ -11222,16 +11150,16 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp178_ = _tmp177_.height;
 #line 1632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp176_ >= _tmp178_) {
-#line 11226 "EditingTools.c"
-				GdkRectangle _tmp179_ = {0};
-				gint _tmp180_ = 0;
+#line 11154 "EditingTools.c"
+				GdkRectangle _tmp179_;
+				gint _tmp180_;
 #line 1633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp179_ = scaled_pos;
 #line 1633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp180_ = _tmp179_.height;
 #line 1633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp180_ - 1;
-#line 11235 "EditingTools.c"
+#line 11163 "EditingTools.c"
 			}
 #line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp181_ = right;
@@ -11251,32 +11179,32 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp186_ = width;
 #line 1639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp185_ != _tmp186_) {
-#line 11255 "EditingTools.c"
-				gint _tmp187_ = 0;
+#line 11183 "EditingTools.c"
+				gint _tmp187_;
 #line 1640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp187_ = delta_x;
 #line 1640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp187_ < 0) {
-#line 11261 "EditingTools.c"
-					gint _tmp188_ = 0;
-					gint _tmp189_ = 0;
+#line 11189 "EditingTools.c"
+					gint _tmp188_;
+					gint _tmp189_;
 #line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp188_ = left;
 #line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp189_ = width;
 #line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = (_tmp188_ + _tmp189_) - 1;
-#line 11270 "EditingTools.c"
+#line 11198 "EditingTools.c"
 				} else {
-					gint _tmp190_ = 0;
-					gint _tmp191_ = 0;
+					gint _tmp190_;
+					gint _tmp191_;
 #line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp190_ = right;
 #line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp191_ = width;
 #line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = (_tmp190_ - _tmp191_) + 1;
-#line 11280 "EditingTools.c"
+#line 11208 "EditingTools.c"
 				}
 			}
 #line 1646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11285,37 +11213,37 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp193_ = height;
 #line 1646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp192_ != _tmp193_) {
-#line 11289 "EditingTools.c"
-				gint _tmp194_ = 0;
+#line 11217 "EditingTools.c"
+				gint _tmp194_;
 #line 1647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp194_ = delta_y;
 #line 1647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp194_ < 0) {
-#line 11295 "EditingTools.c"
-					gint _tmp195_ = 0;
-					gint _tmp196_ = 0;
+#line 11223 "EditingTools.c"
+					gint _tmp195_;
+					gint _tmp196_;
 #line 1648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp195_ = top;
 #line 1648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp196_ = height;
 #line 1648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = (_tmp195_ + _tmp196_) - 1;
-#line 11304 "EditingTools.c"
+#line 11232 "EditingTools.c"
 				} else {
-					gint _tmp197_ = 0;
-					gint _tmp198_ = 0;
+					gint _tmp197_;
+					gint _tmp198_;
 #line 1650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp197_ = bottom;
 #line 1650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp198_ = height;
 #line 1650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = (_tmp197_ - _tmp198_) + 1;
-#line 11314 "EditingTools.c"
+#line 11242 "EditingTools.c"
 				}
 			}
 #line 1652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 11319 "EditingTools.c"
+#line 11247 "EditingTools.c"
 		}
 		default:
 		{
@@ -11323,7 +11251,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			result = FALSE;
 #line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return result;
-#line 11327 "EditingTools.c"
+#line 11255 "EditingTools.c"
 		}
 	}
 #line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11358,24 +11286,24 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 	_tmp208_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp208_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 11362 "EditingTools.c"
-		gint _tmp209_ = 0;
-		gint _tmp210_ = 0;
-		gint _tmp211_ = 0;
-		gint _tmp212_ = 0;
-		BoxLocation _tmp213_ = 0;
-		BoxLocation _tmp218_ = 0;
-		gint _tmp223_ = 0;
-		gint _tmp224_ = 0;
-		gint _tmp225_ = 0;
-		gint _tmp226_ = 0;
+#line 11290 "EditingTools.c"
+		gint _tmp209_;
+		gint _tmp210_;
+		gint _tmp211_;
+		gint _tmp212_;
+		BoxLocation _tmp213_;
+		BoxLocation _tmp218_;
+		gint _tmp223_;
+		gint _tmp224_;
+		gint _tmp225_;
+		gint _tmp226_;
 		Box _tmp227_ = {0};
-		Dimensions _tmp228_ = {0};
-		gint _tmp229_ = 0;
-		Dimensions _tmp230_ = {0};
-		gint _tmp231_ = 0;
-		gdouble _tmp232_ = 0.0;
-		BoxLocation _tmp233_ = 0;
+		Dimensions _tmp228_;
+		gint _tmp229_;
+		Dimensions _tmp230_;
+		gint _tmp231_;
+		gdouble _tmp232_;
+		BoxLocation _tmp233_;
 		Box _tmp234_ = {0};
 #line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp209_ = right;
@@ -11399,24 +11327,24 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			case BOX_LOCATION_TOP_LEFT:
 #line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_LEFT:
-#line 11403 "EditingTools.c"
+#line 11331 "EditingTools.c"
 			{
-				gint _tmp214_ = 0;
+				gint _tmp214_;
 #line 1682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp214_ = width;
 #line 1682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp214_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11410 "EditingTools.c"
-					gint _tmp215_ = 0;
+#line 11338 "EditingTools.c"
+					gint _tmp215_;
 #line 1683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp215_ = right;
 #line 1683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp215_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11416 "EditingTools.c"
+#line 11344 "EditingTools.c"
 				}
 #line 1684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11420 "EditingTools.c"
+#line 11348 "EditingTools.c"
 			}
 #line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_RIGHT_SIDE:
@@ -11424,30 +11352,30 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			case BOX_LOCATION_TOP_RIGHT:
 #line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_RIGHT:
-#line 11428 "EditingTools.c"
+#line 11356 "EditingTools.c"
 			{
-				gint _tmp216_ = 0;
+				gint _tmp216_;
 #line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp216_ = width;
 #line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp216_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11435 "EditingTools.c"
-					gint _tmp217_ = 0;
+#line 11363 "EditingTools.c"
+					gint _tmp217_;
 #line 1690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp217_ = left;
 #line 1690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp217_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11441 "EditingTools.c"
+#line 11369 "EditingTools.c"
 				}
 #line 1691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11445 "EditingTools.c"
+#line 11373 "EditingTools.c"
 			}
 			default:
 			{
 #line 1694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11451 "EditingTools.c"
+#line 11379 "EditingTools.c"
 			}
 		}
 #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11460,24 +11388,24 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			case BOX_LOCATION_TOP_LEFT:
 #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_TOP_RIGHT:
-#line 11464 "EditingTools.c"
+#line 11392 "EditingTools.c"
 			{
-				gint _tmp219_ = 0;
+				gint _tmp219_;
 #line 1701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp219_ = height;
 #line 1701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp219_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11471 "EditingTools.c"
-					gint _tmp220_ = 0;
+#line 11399 "EditingTools.c"
+					gint _tmp220_;
 #line 1702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp220_ = bottom;
 #line 1702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp220_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11477 "EditingTools.c"
+#line 11405 "EditingTools.c"
 				}
 #line 1703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11481 "EditingTools.c"
+#line 11409 "EditingTools.c"
 			}
 #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_SIDE:
@@ -11485,30 +11413,30 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			case BOX_LOCATION_BOTTOM_LEFT:
 #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_RIGHT:
-#line 11489 "EditingTools.c"
+#line 11417 "EditingTools.c"
 			{
-				gint _tmp221_ = 0;
+				gint _tmp221_;
 #line 1708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp221_ = height;
 #line 1708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp221_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11496 "EditingTools.c"
-					gint _tmp222_ = 0;
+#line 11424 "EditingTools.c"
+					gint _tmp222_;
 #line 1709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp222_ = top;
 #line 1709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp222_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11502 "EditingTools.c"
+#line 11430 "EditingTools.c"
 				}
 #line 1710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11506 "EditingTools.c"
+#line 11434 "EditingTools.c"
 			}
 			default:
 			{
 #line 1713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11512 "EditingTools.c"
+#line 11440 "EditingTools.c"
 			}
 		}
 #line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11537,25 +11465,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 		clamp_inside_rotated_image (&_tmp227_, _tmp229_, _tmp231_, _tmp232_, _tmp233_ == BOX_LOCATION_INSIDE, &_tmp234_);
 #line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		new_crop = _tmp234_;
-#line 11541 "EditingTools.c"
+#line 11469 "EditingTools.c"
 	} else {
-		gint _tmp235_ = 0;
-		gint _tmp236_ = 0;
-		gint _tmp237_ = 0;
-		gint _tmp238_ = 0;
+		gint _tmp235_;
+		gint _tmp236_;
+		gint _tmp237_;
+		gint _tmp238_;
 		Box adjusted = {0};
-		Box _tmp239_ = {0};
-		Dimensions _tmp240_ = {0};
-		gint _tmp241_ = 0;
-		Dimensions _tmp242_ = {0};
-		gint _tmp243_ = 0;
-		gdouble _tmp244_ = 0.0;
-		BoxLocation _tmp245_ = 0;
+		Box _tmp239_;
+		Dimensions _tmp240_;
+		gint _tmp241_;
+		Dimensions _tmp242_;
+		gint _tmp243_;
+		gdouble _tmp244_;
+		BoxLocation _tmp245_;
 		Box _tmp246_ = {0};
 		gboolean _tmp247_ = FALSE;
 		gboolean _tmp248_ = FALSE;
-		Box _tmp249_ = {0};
-		Box _tmp250_ = {0};
+		Box _tmp249_;
+		Box _tmp250_;
 #line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp235_ = left;
 #line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11592,57 +11520,57 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 		if (_box_equal (&_tmp249_, &_tmp250_) != TRUE) {
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp248_ = TRUE;
-#line 11596 "EditingTools.c"
+#line 11524 "EditingTools.c"
 		} else {
-			gint _tmp251_ = 0;
+			gint _tmp251_;
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp251_ = width;
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp248_ = _tmp251_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11603 "EditingTools.c"
+#line 11531 "EditingTools.c"
 		}
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp248_) {
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp247_ = TRUE;
-#line 11609 "EditingTools.c"
+#line 11537 "EditingTools.c"
 		} else {
-			gint _tmp252_ = 0;
+			gint _tmp252_;
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp252_ = height;
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp247_ = _tmp252_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11616 "EditingTools.c"
+#line 11544 "EditingTools.c"
 		}
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp247_) {
-#line 11620 "EditingTools.c"
-			Box _tmp253_ = {0};
+#line 11548 "EditingTools.c"
+			Box _tmp253_;
 #line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp253_ = self->priv->scaled_crop;
 #line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			new_crop = _tmp253_;
-#line 11626 "EditingTools.c"
+#line 11554 "EditingTools.c"
 		}
 	}
 #line 1738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp254_ = self->priv->in_manipulation;
 #line 1738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp254_ != BOX_LOCATION_INSIDE) {
-#line 11633 "EditingTools.c"
-		Box _tmp255_ = {0};
+#line 11561 "EditingTools.c"
+		Box _tmp255_;
 #line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp255_ = new_crop;
 #line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_crop_resized (self, &_tmp255_);
-#line 11639 "EditingTools.c"
+#line 11567 "EditingTools.c"
 	} else {
-		Box _tmp256_ = {0};
+		Box _tmp256_;
 #line 1741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp256_ = new_crop;
 #line 1741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_crop_moved (self, &_tmp256_);
-#line 11646 "EditingTools.c"
+#line 11574 "EditingTools.c"
 	}
 #line 1744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp257_ = new_crop;
@@ -11652,11 +11580,11 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 	_tmp258_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp258_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 11656 "EditingTools.c"
-		gint _tmp259_ = 0;
-		gint _tmp260_ = 0;
-		gint _tmp261_ = 0;
-		gint _tmp262_ = 0;
+#line 11584 "EditingTools.c"
+		gint _tmp259_;
+		gint _tmp260_;
+		gint _tmp261_;
+		gint _tmp262_;
 #line 1747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp259_ = box_get_width (&self->priv->scaled_crop);
 #line 1747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11671,40 +11599,40 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 		_tmp262_ = self->priv->custom_init_height;
 #line 1749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->custom_aspect_ratio = ((gfloat) _tmp261_) / ((gfloat) _tmp262_);
-#line 11675 "EditingTools.c"
+#line 11603 "EditingTools.c"
 	}
 #line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
 #line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 11681 "EditingTools.c"
+#line 11609 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Box* new_crop) {
-	Box _tmp0_ = {0};
-	gboolean _tmp1_ = FALSE;
-	EditingToolsPhotoCanvas* _tmp2_ = NULL;
-	Box _tmp3_ = {0};
+	Box _tmp0_;
+	gboolean _tmp1_;
+	EditingToolsPhotoCanvas* _tmp2_;
+	Box _tmp3_;
 	Box horizontal = {0};
 	gboolean horizontal_enlarged = FALSE;
 	Box vertical = {0};
 	gboolean vertical_enlarged = FALSE;
 	BoxComplements complements = 0;
-	Box _tmp4_ = {0};
+	Box _tmp4_;
 	Box _tmp5_ = {0};
 	gboolean _tmp6_ = FALSE;
 	Box _tmp7_ = {0};
 	gboolean _tmp8_ = FALSE;
-	BoxComplements _tmp9_ = 0;
-	BoxComplements _tmp10_ = 0;
+	BoxComplements _tmp9_;
+	BoxComplements _tmp10_;
 	gboolean _tmp11_ = FALSE;
-	BoxComplements _tmp12_ = 0;
+	BoxComplements _tmp12_;
 	gboolean _tmp17_ = FALSE;
-	BoxComplements _tmp18_ = 0;
-	Box _tmp23_ = {0};
-	EditingToolsPhotoCanvas* _tmp24_ = NULL;
-	Box _tmp25_ = {0};
+	BoxComplements _tmp18_;
+	Box _tmp23_;
+	EditingToolsPhotoCanvas* _tmp24_;
+	Box _tmp25_;
 #line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11717,7 +11645,7 @@ static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Bo
 	if (_tmp1_) {
 #line 1758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 11721 "EditingTools.c"
+#line 11649 "EditingTools.c"
 	}
 #line 1761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
@@ -11749,38 +11677,38 @@ static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Bo
 	if (_tmp12_ == BOX_COMPLEMENTS_HORIZONTAL) {
 #line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = TRUE;
-#line 11753 "EditingTools.c"
+#line 11681 "EditingTools.c"
 	} else {
-		BoxComplements _tmp13_ = 0;
+		BoxComplements _tmp13_;
 #line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = complements;
 #line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = _tmp13_ == BOX_COMPLEMENTS_BOTH;
-#line 11760 "EditingTools.c"
+#line 11688 "EditingTools.c"
 	}
 #line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp11_) {
-#line 11764 "EditingTools.c"
+#line 11692 "EditingTools.c"
 		gdouble _tmp14_ = 0.0;
-		gboolean _tmp15_ = FALSE;
-		Box _tmp16_ = {0};
+		gboolean _tmp15_;
+		Box _tmp16_;
 #line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = horizontal_enlarged;
 #line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp15_) {
 #line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp14_ = 0.0;
-#line 11774 "EditingTools.c"
+#line 11702 "EditingTools.c"
 		} else {
 #line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp14_ = 0.5;
-#line 11778 "EditingTools.c"
+#line 11706 "EditingTools.c"
 		}
 #line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = horizontal;
 #line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_area_alpha (self, &_tmp16_, _tmp14_);
-#line 11784 "EditingTools.c"
+#line 11712 "EditingTools.c"
 	}
 #line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = complements;
@@ -11788,38 +11716,38 @@ static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Bo
 	if (_tmp18_ == BOX_COMPLEMENTS_VERTICAL) {
 #line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = TRUE;
-#line 11792 "EditingTools.c"
+#line 11720 "EditingTools.c"
 	} else {
-		BoxComplements _tmp19_ = 0;
+		BoxComplements _tmp19_;
 #line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = complements;
 #line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = _tmp19_ == BOX_COMPLEMENTS_BOTH;
-#line 11799 "EditingTools.c"
+#line 11727 "EditingTools.c"
 	}
 #line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp17_) {
-#line 11803 "EditingTools.c"
+#line 11731 "EditingTools.c"
 		gdouble _tmp20_ = 0.0;
-		gboolean _tmp21_ = FALSE;
-		Box _tmp22_ = {0};
+		gboolean _tmp21_;
+		Box _tmp22_;
 #line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = vertical_enlarged;
 #line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp21_) {
 #line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp20_ = 0.0;
-#line 11813 "EditingTools.c"
+#line 11741 "EditingTools.c"
 		} else {
 #line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp20_ = 0.5;
-#line 11817 "EditingTools.c"
+#line 11745 "EditingTools.c"
 		}
 #line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = vertical;
 #line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_area_alpha (self, &_tmp22_, _tmp20_);
-#line 11823 "EditingTools.c"
+#line 11751 "EditingTools.c"
 	}
 #line 1779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = *new_crop;
@@ -11831,20 +11759,20 @@ static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Bo
 	_tmp25_ = *new_crop;
 #line 1780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp24_, &_tmp25_);
-#line 11835 "EditingTools.c"
+#line 11763 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self, Box* new_crop) {
-	Box _tmp0_ = {0};
-	gboolean _tmp1_ = FALSE;
-	EditingToolsPhotoCanvas* _tmp2_ = NULL;
-	Box _tmp3_ = {0};
-	Box _tmp4_ = {0};
-	Box _tmp5_ = {0};
-	Box _tmp6_ = {0};
-	EditingToolsPhotoCanvas* _tmp7_ = NULL;
-	Box _tmp8_ = {0};
+	Box _tmp0_;
+	gboolean _tmp1_;
+	EditingToolsPhotoCanvas* _tmp2_;
+	Box _tmp3_;
+	Box _tmp4_;
+	Box _tmp5_;
+	Box _tmp6_;
+	EditingToolsPhotoCanvas* _tmp7_;
+	Box _tmp8_;
 #line 1783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11857,7 +11785,7 @@ static void editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self, Box*
 	if (_tmp1_) {
 #line 1786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 11861 "EditingTools.c"
+#line 11789 "EditingTools.c"
 	}
 #line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
@@ -11883,24 +11811,24 @@ static void editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self, Box*
 	_tmp8_ = *new_crop;
 #line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp7_, &_tmp8_);
-#line 11887 "EditingTools.c"
+#line 11815 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_set_area_alpha (EditingToolsCropTool* self, Box* area, gdouble alpha) {
 	cairo_t* ctx = NULL;
-	cairo_surface_t* _tmp0_ = NULL;
-	cairo_t* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	Box _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	Box _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	EditingToolsPhotoCanvas* _tmp9_ = NULL;
-	cairo_surface_t* _tmp10_ = NULL;
-	Box _tmp11_ = {0};
+	cairo_surface_t* _tmp0_;
+	cairo_t* _tmp1_;
+	gdouble _tmp2_;
+	Box _tmp3_;
+	gint _tmp4_;
+	Box _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	EditingToolsPhotoCanvas* _tmp9_;
+	cairo_surface_t* _tmp10_;
+	Box _tmp11_;
 #line 1800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11943,20 +11871,20 @@ static void editing_tools_crop_tool_set_area_alpha (EditingToolsCropTool* self,
 	editing_tools_photo_canvas_paint_surface_area (_tmp9_, _tmp10_, &_tmp11_, TRUE);
 #line 1800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 11947 "EditingTools.c"
+#line 11875 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self, Box* crop) {
-	BoxLocation _tmp0_ = 0;
-	EditingToolsPhotoCanvas* _tmp65_ = NULL;
-	cairo_t* _tmp66_ = NULL;
-	Box _tmp67_ = {0};
-	EditingToolsPhotoCanvas* _tmp68_ = NULL;
-	cairo_t* _tmp69_ = NULL;
+	BoxLocation _tmp0_;
+	EditingToolsPhotoCanvas* _tmp65_;
+	cairo_t* _tmp66_;
+	Box _tmp67_;
+	EditingToolsPhotoCanvas* _tmp68_;
+	cairo_t* _tmp69_;
 	Box _tmp70_ = {0};
-	EditingToolsPhotoCanvas* _tmp71_ = NULL;
-	cairo_t* _tmp72_ = NULL;
+	EditingToolsPhotoCanvas* _tmp71_;
+	cairo_t* _tmp72_;
 	Box _tmp73_ = {0};
 #line 1809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
@@ -11966,77 +11894,77 @@ static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self,
 	_tmp0_ = self->priv->in_manipulation;
 #line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != BOX_LOCATION_OUTSIDE) {
-#line 11970 "EditingTools.c"
+#line 11898 "EditingTools.c"
 		gint one_third_x = 0;
-		gint _tmp1_ = 0;
+		gint _tmp1_;
 		gint one_third_y = 0;
-		gint _tmp2_ = 0;
-		EditingToolsPhotoCanvas* _tmp3_ = NULL;
-		cairo_t* _tmp4_ = NULL;
-		Box _tmp5_ = {0};
-		gint _tmp6_ = 0;
-		Box _tmp7_ = {0};
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
-		EditingToolsPhotoCanvas* _tmp11_ = NULL;
-		cairo_t* _tmp12_ = NULL;
-		Box _tmp13_ = {0};
-		gint _tmp14_ = 0;
-		Box _tmp15_ = {0};
-		gint _tmp16_ = 0;
-		gint _tmp17_ = 0;
-		gint _tmp18_ = 0;
-		EditingToolsPhotoCanvas* _tmp19_ = NULL;
-		cairo_t* _tmp20_ = NULL;
-		Box _tmp21_ = {0};
-		gint _tmp22_ = 0;
-		gint _tmp23_ = 0;
-		Box _tmp24_ = {0};
-		gint _tmp25_ = 0;
-		gint _tmp26_ = 0;
-		EditingToolsPhotoCanvas* _tmp27_ = NULL;
-		cairo_t* _tmp28_ = NULL;
-		Box _tmp29_ = {0};
-		gint _tmp30_ = 0;
-		gint _tmp31_ = 0;
-		Box _tmp32_ = {0};
-		gint _tmp33_ = 0;
-		gint _tmp34_ = 0;
+		gint _tmp2_;
+		EditingToolsPhotoCanvas* _tmp3_;
+		cairo_t* _tmp4_;
+		Box _tmp5_;
+		gint _tmp6_;
+		Box _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
+		gint _tmp10_;
+		EditingToolsPhotoCanvas* _tmp11_;
+		cairo_t* _tmp12_;
+		Box _tmp13_;
+		gint _tmp14_;
+		Box _tmp15_;
+		gint _tmp16_;
+		gint _tmp17_;
+		gint _tmp18_;
+		EditingToolsPhotoCanvas* _tmp19_;
+		cairo_t* _tmp20_;
+		Box _tmp21_;
+		gint _tmp22_;
+		gint _tmp23_;
+		Box _tmp24_;
+		gint _tmp25_;
+		gint _tmp26_;
+		EditingToolsPhotoCanvas* _tmp27_;
+		cairo_t* _tmp28_;
+		Box _tmp29_;
+		gint _tmp30_;
+		gint _tmp31_;
+		Box _tmp32_;
+		gint _tmp33_;
+		gint _tmp34_;
 		Box adj_crop = {0};
-		EditingToolsPhotoCanvas* _tmp35_ = NULL;
+		EditingToolsPhotoCanvas* _tmp35_;
 		GdkRectangle _tmp36_ = {0};
 		Dimensions _tmp37_ = {0};
-		EditingToolsPhotoCanvas* _tmp38_ = NULL;
-		Photo* _tmp39_ = NULL;
-		Photo* _tmp40_ = NULL;
+		EditingToolsPhotoCanvas* _tmp38_;
+		Photo* _tmp39_;
+		Photo* _tmp40_;
 		Dimensions _tmp41_ = {0};
 		Box _tmp42_ = {0};
-		Box _tmp43_ = {0};
+		Box _tmp43_;
 		gchar* text = NULL;
-		gint _tmp44_ = 0;
-		gchar* _tmp45_ = NULL;
-		gchar* _tmp46_ = NULL;
-		gchar* _tmp47_ = NULL;
-		gchar* _tmp48_ = NULL;
-		gint _tmp49_ = 0;
-		gchar* _tmp50_ = NULL;
-		gchar* _tmp51_ = NULL;
-		gchar* _tmp52_ = NULL;
-		gchar* _tmp53_ = NULL;
+		gint _tmp44_;
+		gchar* _tmp45_;
+		gchar* _tmp46_;
+		gchar* _tmp47_;
+		gchar* _tmp48_;
+		gint _tmp49_;
+		gchar* _tmp50_;
+		gchar* _tmp51_;
+		gchar* _tmp52_;
+		gchar* _tmp53_;
 		gint x = 0;
-		Box _tmp54_ = {0};
-		gint _tmp55_ = 0;
-		gint _tmp56_ = 0;
+		Box _tmp54_;
+		gint _tmp55_;
+		gint _tmp56_;
 		gint y = 0;
-		Box _tmp57_ = {0};
-		gint _tmp58_ = 0;
-		gint _tmp59_ = 0;
-		EditingToolsPhotoCanvas* _tmp60_ = NULL;
-		cairo_t* _tmp61_ = NULL;
-		const gchar* _tmp62_ = NULL;
-		gint _tmp63_ = 0;
-		gint _tmp64_ = 0;
+		Box _tmp57_;
+		gint _tmp58_;
+		gint _tmp59_;
+		EditingToolsPhotoCanvas* _tmp60_;
+		cairo_t* _tmp61_;
+		const gchar* _tmp62_;
+		gint _tmp63_;
+		gint _tmp64_;
 #line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = box_get_width (crop);
 #line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -12197,7 +12125,7 @@ static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self,
 		editing_tools_photo_canvas_draw_text (_tmp60_, _tmp61_, _tmp62_, _tmp63_, _tmp64_, TRUE);
 #line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (text);
-#line 12201 "EditingTools.c"
+#line 12129 "EditingTools.c"
 	}
 #line 1833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp65_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
@@ -12223,18 +12151,18 @@ static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self,
 	box_get_reduced (crop, 2, &_tmp73_);
 #line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_draw_box (_tmp71_, _tmp72_, &_tmp73_);
-#line 12227 "EditingTools.c"
+#line 12155 "EditingTools.c"
 }
 
 
 static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_construct (GType object_type, const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio) {
 	EditingToolsCropToolConstraintDescription* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gfloat _tmp4_ = 0.0F;
-	gboolean _tmp8_ = FALSE;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gfloat _tmp4_;
+	gboolean _tmp8_;
 #line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (new_name != NULL, NULL);
 #line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -12259,23 +12187,23 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constr
 	_tmp4_ = new_aspect_ratio;
 #line 620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ == EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS) {
-#line 12263 "EditingTools.c"
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+#line 12191 "EditingTools.c"
+		gint _tmp5_;
+		gint _tmp6_;
 #line 621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = self->basis_width;
 #line 621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = self->basis_height;
 #line 621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->aspect_ratio = ((gfloat) _tmp5_) / ((gfloat) _tmp6_);
-#line 12272 "EditingTools.c"
+#line 12200 "EditingTools.c"
 	} else {
-		gfloat _tmp7_ = 0.0F;
+		gfloat _tmp7_;
 #line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = new_aspect_ratio;
 #line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->aspect_ratio = _tmp7_;
-#line 12279 "EditingTools.c"
+#line 12207 "EditingTools.c"
 	}
 #line 624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = new_pivotable;
@@ -12283,51 +12211,51 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constr
 	self->is_pivotable = _tmp8_;
 #line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 12287 "EditingTools.c"
+#line 12215 "EditingTools.c"
 }
 
 
 static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_new (const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio) {
 #line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_crop_tool_constraint_description_construct (EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION, new_name, new_basis_width, new_basis_height, new_pivotable, new_aspect_ratio);
-#line 12294 "EditingTools.c"
+#line 12222 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_crop_tool_constraint_description_is_separator (EditingToolsCropToolConstraintDescription* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_CROP_TOOL_IS_CONSTRAINT_DESCRIPTION (self), FALSE);
 #line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->is_pivotable;
 #line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!_tmp1_) {
-#line 12308 "EditingTools.c"
-		gfloat _tmp2_ = 0.0F;
+#line 12236 "EditingTools.c"
+		gfloat _tmp2_;
 #line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->aspect_ratio;
 #line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp2_ == EDITING_TOOLS_CROP_TOOL_SEPARATOR;
-#line 12314 "EditingTools.c"
+#line 12242 "EditingTools.c"
 	} else {
 #line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = FALSE;
-#line 12318 "EditingTools.c"
+#line 12246 "EditingTools.c"
 	}
 #line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
 #line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 12324 "EditingTools.c"
+#line 12252 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_value_constraint_description_init (GValue* value) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	value->data[0].v_pointer = NULL;
-#line 12331 "EditingTools.c"
+#line 12259 "EditingTools.c"
 }
 
 
@@ -12336,7 +12264,7 @@ static void editing_tools_crop_tool_value_constraint_description_free_value (GVa
 	if (value->data[0].v_pointer) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_unref (value->data[0].v_pointer);
-#line 12340 "EditingTools.c"
+#line 12268 "EditingTools.c"
 	}
 }
 
@@ -12346,11 +12274,11 @@ static void editing_tools_crop_tool_value_constraint_description_copy_value (con
 	if (src_value->data[0].v_pointer) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = editing_tools_crop_tool_constraint_description_ref (src_value->data[0].v_pointer);
-#line 12350 "EditingTools.c"
+#line 12278 "EditingTools.c"
 	} else {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 12354 "EditingTools.c"
+#line 12282 "EditingTools.c"
 	}
 }
 
@@ -12358,66 +12286,66 @@ static void editing_tools_crop_tool_value_constraint_description_copy_value (con
 static gpointer editing_tools_crop_tool_value_constraint_description_peek_pointer (const GValue* value) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 12362 "EditingTools.c"
+#line 12290 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_crop_tool_value_constraint_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (collect_values[0].v_pointer) {
-#line 12369 "EditingTools.c"
-		EditingToolsCropToolConstraintDescription* object;
+#line 12297 "EditingTools.c"
+		EditingToolsCropToolConstraintDescription * object;
 		object = collect_values[0].v_pointer;
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 12376 "EditingTools.c"
+#line 12304 "EditingTools.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 12380 "EditingTools.c"
+#line 12308 "EditingTools.c"
 		}
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = editing_tools_crop_tool_constraint_description_ref (object);
-#line 12384 "EditingTools.c"
+#line 12312 "EditingTools.c"
 	} else {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 12388 "EditingTools.c"
+#line 12316 "EditingTools.c"
 	}
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 12392 "EditingTools.c"
+#line 12320 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_crop_tool_value_constraint_description_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	EditingToolsCropToolConstraintDescription** object_p;
+	EditingToolsCropToolConstraintDescription ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!object_p) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 12403 "EditingTools.c"
+#line 12331 "EditingTools.c"
 	}
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!value->data[0].v_pointer) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = NULL;
-#line 12409 "EditingTools.c"
+#line 12337 "EditingTools.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = value->data[0].v_pointer;
-#line 12413 "EditingTools.c"
+#line 12341 "EditingTools.c"
 	} else {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = editing_tools_crop_tool_constraint_description_ref (value->data[0].v_pointer);
-#line 12417 "EditingTools.c"
+#line 12345 "EditingTools.c"
 	}
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 12421 "EditingTools.c"
+#line 12349 "EditingTools.c"
 }
 
 
@@ -12431,7 +12359,7 @@ static GParamSpec* editing_tools_crop_tool_param_spec_constraint_description (co
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return G_PARAM_SPEC (spec);
-#line 12435 "EditingTools.c"
+#line 12363 "EditingTools.c"
 }
 
 
@@ -12440,12 +12368,12 @@ static gpointer editing_tools_crop_tool_value_get_constraint_description (const
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION), NULL);
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 12444 "EditingTools.c"
+#line 12372 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_value_set_constraint_description (GValue* value, gpointer v_object) {
-	EditingToolsCropToolConstraintDescription* old;
+	EditingToolsCropToolConstraintDescription * old;
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION));
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -12460,23 +12388,23 @@ static void editing_tools_crop_tool_value_set_constraint_description (GValue* va
 		value->data[0].v_pointer = v_object;
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_ref (value->data[0].v_pointer);
-#line 12464 "EditingTools.c"
+#line 12392 "EditingTools.c"
 	} else {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 12468 "EditingTools.c"
+#line 12396 "EditingTools.c"
 	}
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_unref (old);
-#line 12474 "EditingTools.c"
+#line 12402 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_crop_tool_value_take_constraint_description (GValue* value, gpointer v_object) {
-	EditingToolsCropToolConstraintDescription* old;
+	EditingToolsCropToolConstraintDescription * old;
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION));
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -12489,17 +12417,17 @@ static void editing_tools_crop_tool_value_take_constraint_description (GValue* v
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 12493 "EditingTools.c"
+#line 12421 "EditingTools.c"
 	} else {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 12497 "EditingTools.c"
+#line 12425 "EditingTools.c"
 	}
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_unref (old);
-#line 12503 "EditingTools.c"
+#line 12431 "EditingTools.c"
 	}
 }
 
@@ -12509,18 +12437,18 @@ static void editing_tools_crop_tool_constraint_description_class_init (EditingTo
 	editing_tools_crop_tool_constraint_description_parent_class = g_type_class_peek_parent (klass);
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsCropToolConstraintDescriptionClass *) klass)->finalize = editing_tools_crop_tool_constraint_description_finalize;
-#line 12513 "EditingTools.c"
+#line 12441 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_constraint_description_instance_init (EditingToolsCropToolConstraintDescription * self) {
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ref_count = 1;
-#line 12520 "EditingTools.c"
+#line 12448 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_constraint_description_finalize (EditingToolsCropToolConstraintDescription* obj) {
+static void editing_tools_crop_tool_constraint_description_finalize (EditingToolsCropToolConstraintDescription * obj) {
 	EditingToolsCropToolConstraintDescription * self;
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION, EditingToolsCropToolConstraintDescription);
@@ -12528,7 +12456,7 @@ static void editing_tools_crop_tool_constraint_description_finalize (EditingTool
 	g_signal_handlers_destroy (self);
 #line 609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (self->name);
-#line 12532 "EditingTools.c"
+#line 12460 "EditingTools.c"
 }
 
 
@@ -12547,18 +12475,18 @@ static GType editing_tools_crop_tool_constraint_description_get_type (void) {
 
 
 static gpointer editing_tools_crop_tool_constraint_description_ref (gpointer instance) {
-	EditingToolsCropToolConstraintDescription* self;
+	EditingToolsCropToolConstraintDescription * self;
 	self = instance;
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return instance;
-#line 12557 "EditingTools.c"
+#line 12485 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_constraint_description_unref (gpointer instance) {
-	EditingToolsCropToolConstraintDescription* self;
+	EditingToolsCropToolConstraintDescription * self;
 	self = instance;
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -12566,7 +12494,7 @@ static void editing_tools_crop_tool_constraint_description_unref (gpointer insta
 		EDITING_TOOLS_CROP_TOOL_CONSTRAINT_DESCRIPTION_GET_CLASS (self)->finalize (self);
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 12570 "EditingTools.c"
+#line 12498 "EditingTools.c"
 	}
 }
 
@@ -12576,49 +12504,46 @@ static gboolean _editing_tools_crop_tool_crop_tool_window_constraint_combo_separ
 	result = editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func (model, iter);
 #line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 12580 "EditingTools.c"
+#line 12508 "EditingTools.c"
 }
 
 
 static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_window_construct (GType object_type, GtkWindow* container) {
 	EditingToolsCropToolCropToolWindow * self = NULL;
-	GtkWindow* _tmp0_ = NULL;
-	GtkButton* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	GtkButton* _tmp3_ = NULL;
-	GtkButton* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	GtkButton* _tmp6_ = NULL;
-	GtkComboBox* _tmp7_ = NULL;
+	GtkWindow* _tmp0_;
+	GtkButton* _tmp1_;
+	GtkButton* _tmp2_;
+	GtkButton* _tmp3_;
+	GtkButton* _tmp4_;
+	GtkComboBox* _tmp5_;
 	GtkCellRendererText* combo_text_renderer = NULL;
-	GtkCellRendererText* _tmp8_ = NULL;
-	GtkComboBox* _tmp9_ = NULL;
-	GtkComboBox* _tmp10_ = NULL;
-	GtkComboBox* _tmp11_ = NULL;
-	GtkComboBox* _tmp12_ = NULL;
+	GtkCellRendererText* _tmp6_;
+	GtkComboBox* _tmp7_;
+	GtkComboBox* _tmp8_;
+	GtkComboBox* _tmp9_;
+	GtkComboBox* _tmp10_;
 	GtkImage* image = NULL;
-	GtkImage* _tmp13_ = NULL;
-	GtkButton* _tmp14_ = NULL;
-	GtkButton* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	GtkEntry* _tmp17_ = NULL;
-	GtkEntry* _tmp18_ = NULL;
-	GtkEntry* _tmp19_ = NULL;
-	GtkEntry* _tmp20_ = NULL;
-	GtkBox* _tmp21_ = NULL;
-	GtkBox* _tmp22_ = NULL;
-	GtkBox* _tmp23_ = NULL;
-	GtkButton* _tmp24_ = NULL;
-	GtkBox* _tmp25_ = NULL;
-	GtkButton* _tmp26_ = NULL;
-	GtkBox* _tmp27_ = NULL;
-	GtkBox* _tmp28_ = NULL;
-	GtkComboBox* _tmp29_ = NULL;
-	GtkBox* _tmp30_ = NULL;
-	GtkButton* _tmp31_ = NULL;
-	GtkBox* _tmp32_ = NULL;
-	GtkBox* _tmp33_ = NULL;
-	GtkBox* _tmp34_ = NULL;
+	GtkImage* _tmp11_;
+	GtkButton* _tmp12_;
+	GtkButton* _tmp13_;
+	GtkEntry* _tmp14_;
+	GtkEntry* _tmp15_;
+	GtkEntry* _tmp16_;
+	GtkEntry* _tmp17_;
+	GtkBox* _tmp18_;
+	GtkBox* _tmp19_;
+	GtkBox* _tmp20_;
+	GtkButton* _tmp21_;
+	GtkBox* _tmp22_;
+	GtkButton* _tmp23_;
+	GtkBox* _tmp24_;
+	GtkBox* _tmp25_;
+	GtkComboBox* _tmp26_;
+	GtkBox* _tmp27_;
+	GtkButton* _tmp28_;
+	GtkBox* _tmp29_;
+	GtkBox* _tmp30_;
+	GtkBox* _tmp31_;
 #line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
 #line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -12628,165 +12553,159 @@ static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_win
 #line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->cancel_button;
 #line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = _ ("Return to current photo dimensions");
-#line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), _tmp2_);
+	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), _ ("Return to current photo dimensions"));
 #line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = self->cancel_button;
+	_tmp2_ = self->cancel_button;
 #line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_button_set_image_position (_tmp3_, GTK_POS_LEFT);
-#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = self->ok_button;
+	gtk_button_set_image_position (_tmp2_, GTK_POS_LEFT);
 #line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = _ ("Set the crop for this photo");
+	_tmp3_ = self->ok_button;
 #line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), _tmp5_);
+	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), _ ("Set the crop for this photo"));
 #line 670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = self->ok_button;
+	_tmp4_ = self->ok_button;
 #line 670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_button_set_image_position (_tmp6_, GTK_POS_LEFT);
+	gtk_button_set_image_position (_tmp4_, GTK_POS_LEFT);
 #line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = (GtkComboBox*) gtk_combo_box_new ();
+	_tmp5_ = (GtkComboBox*) gtk_combo_box_new ();
 #line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp7_);
+	g_object_ref_sink (_tmp5_);
 #line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->constraint_combo);
 #line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->constraint_combo = _tmp7_;
+	self->constraint_combo = _tmp5_;
 #line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+	_tmp6_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
 #line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp8_);
+	g_object_ref_sink (_tmp6_);
 #line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	combo_text_renderer = _tmp8_;
+	combo_text_renderer = _tmp6_;
 #line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = self->constraint_combo;
+	_tmp7_ = self->constraint_combo;
 #line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
+	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
 #line 675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = self->constraint_combo;
+	_tmp8_ = self->constraint_combo;
 #line 675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 0);
+	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 0);
 #line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = self->constraint_combo;
+	_tmp9_ = self->constraint_combo;
 #line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_combo_box_set_row_separator_func (_tmp11_, _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func, NULL, NULL);
+	gtk_combo_box_set_row_separator_func (_tmp9_, _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func, NULL, NULL);
 #line 677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = self->constraint_combo;
+	_tmp10_ = self->constraint_combo;
 #line 677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_combo_box_set_active (_tmp12_, 0);
+	gtk_combo_box_set_active (_tmp10_, 0);
 #line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = (GtkImage*) gtk_image_new_from_icon_name ("crop-pivot-reticle", GTK_ICON_SIZE_LARGE_TOOLBAR);
+	_tmp11_ = (GtkImage*) gtk_image_new_from_icon_name ("crop-pivot-reticle", GTK_ICON_SIZE_LARGE_TOOLBAR);
 #line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp13_);
+	g_object_ref_sink (_tmp11_);
 #line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	image = _tmp13_;
+	image = _tmp11_;
 #line 680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = self->pivot_reticle_button;
+	_tmp12_ = self->pivot_reticle_button;
 #line 680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_button_set_image (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget));
-#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = self->pivot_reticle_button;
+	gtk_button_set_image (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget));
 #line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = _ ("Pivot the crop rectangle between portrait and landscape orientations");
+	_tmp13_ = self->pivot_reticle_button;
 #line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), _tmp16_);
+	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), _ ("Pivot the crop rectangle between portrait and landscape orientations"));
 #line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = self->custom_width_entry;
+	_tmp14_ = self->custom_width_entry;
 #line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_entry_set_width_chars (_tmp17_, 4);
+	gtk_entry_set_width_chars (_tmp14_, 4);
 #line 684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = self->custom_width_entry;
+	_tmp15_ = self->custom_width_entry;
 #line 684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_set (_tmp18_, "editable", TRUE, NULL);
+	g_object_set (_tmp15_, "editable", TRUE, NULL);
 #line 685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = self->custom_height_entry;
+	_tmp16_ = self->custom_height_entry;
 #line 685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_entry_set_width_chars (_tmp19_, 4);
+	gtk_entry_set_width_chars (_tmp16_, 4);
 #line 686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = self->custom_height_entry;
+	_tmp17_ = self->custom_height_entry;
 #line 686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_set (_tmp20_, "editable", TRUE, NULL);
+	g_object_set (_tmp17_, "editable", TRUE, NULL);
 #line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING);
+	_tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING);
 #line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp21_);
+	g_object_ref_sink (_tmp18_);
 #line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->response_layout);
 #line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->response_layout = _tmp21_;
+	self->response_layout = _tmp18_;
 #line 689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = self->response_layout;
+	_tmp19_ = self->response_layout;
 #line 689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_box_set_homogeneous (_tmp22_, TRUE);
+	gtk_box_set_homogeneous (_tmp19_, TRUE);
 #line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = self->response_layout;
+	_tmp20_ = self->response_layout;
 #line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = self->cancel_button;
+	_tmp21_ = self->cancel_button;
 #line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget));
 #line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = self->response_layout;
+	_tmp22_ = self->response_layout;
 #line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp26_ = self->ok_button;
+	_tmp23_ = self->ok_button;
 #line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget));
 #line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp27_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING);
+	_tmp24_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING);
 #line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp27_);
+	g_object_ref_sink (_tmp24_);
 #line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->layout);
 #line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->layout = _tmp27_;
+	self->layout = _tmp24_;
 #line 694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28_ = self->layout;
+	_tmp25_ = self->layout;
 #line 694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp29_ = self->constraint_combo;
+	_tmp26_ = self->constraint_combo;
 #line 694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
 #line 695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp30_ = self->layout;
+	_tmp27_ = self->layout;
 #line 695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp31_ = self->pivot_reticle_button;
+	_tmp28_ = self->pivot_reticle_button;
 #line 695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget));
 #line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp32_ = self->layout;
+	_tmp29_ = self->layout;
 #line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp33_ = self->response_layout;
+	_tmp30_ = self->response_layout;
 #line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget));
 #line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp34_ = self->layout;
+	_tmp31_ = self->layout;
 #line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget));
 #line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (image);
 #line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (combo_text_renderer);
 #line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 12771 "EditingTools.c"
+#line 12690 "EditingTools.c"
 }
 
 
 static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_window_new (GtkWindow* container) {
 #line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_crop_tool_crop_tool_window_construct (EDITING_TOOLS_CROP_TOOL_TYPE_CROP_TOOL_WINDOW, container);
-#line 12778 "EditingTools.c"
+#line 12697 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func (GtkTreeModel* model, GtkTreeIter* iter) {
 	gboolean result = FALSE;
 	GValue val = {0};
-	GtkTreeModel* _tmp0_ = NULL;
-	GtkTreeIter _tmp1_ = {0};
+	GtkTreeModel* _tmp0_;
+	GtkTreeIter _tmp1_;
 	GValue _tmp2_ = {0};
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gboolean _tmp5_;
 #line 701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE);
 #line 701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -12815,7 +12734,7 @@ static gboolean editing_tools_crop_tool_crop_tool_window_constraint_combo_separa
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
 #line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 12819 "EditingTools.c"
+#line 12738 "EditingTools.c"
 }
 
 
@@ -12824,17 +12743,17 @@ static void editing_tools_crop_tool_crop_tool_window_class_init (EditingToolsCro
 	editing_tools_crop_tool_crop_tool_window_parent_class = g_type_class_peek_parent (klass);
 #line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_crop_tool_crop_tool_window_finalize;
-#line 12828 "EditingTools.c"
+#line 12747 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_crop_tool_window_instance_init (EditingToolsCropToolCropToolWindow * self) {
-	GtkButton* _tmp0_ = NULL;
-	GtkButton* _tmp1_ = NULL;
-	GtkButton* _tmp2_ = NULL;
-	GtkEntry* _tmp3_ = NULL;
-	GtkEntry* _tmp4_ = NULL;
-	GtkLabel* _tmp5_ = NULL;
+	GtkButton* _tmp0_;
+	GtkButton* _tmp1_;
+	GtkButton* _tmp2_;
+	GtkEntry* _tmp3_;
+	GtkEntry* _tmp4_;
+	GtkLabel* _tmp5_;
 #line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = (GtkButton*) gtk_button_new_with_label (RESOURCES_CROP_LABEL);
 #line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -12881,11 +12800,11 @@ static void editing_tools_crop_tool_crop_tool_window_instance_init (EditingTools
 	self->normal_width = -1;
 #line 661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->normal_height = -1;
-#line 12885 "EditingTools.c"
+#line 12804 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_crop_tool_window_finalize (GObject* obj) {
+static void editing_tools_crop_tool_crop_tool_window_finalize (GObject * obj) {
 	EditingToolsCropToolCropToolWindow * self;
 #line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_CROP_TOOL_TYPE_CROP_TOOL_WINDOW, EditingToolsCropToolCropToolWindow);
@@ -12911,7 +12830,7 @@ static void editing_tools_crop_tool_crop_tool_window_finalize (GObject* obj) {
 	_g_object_unref0 (self->layout);
 #line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_crop_tool_crop_tool_window_parent_class)->finalize (obj);
-#line 12915 "EditingTools.c"
+#line 12834 "EditingTools.c"
 }
 
 
@@ -12935,35 +12854,35 @@ static void editing_tools_crop_tool_class_init (EditingToolsCropToolClass * klas
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsCropToolPrivate));
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->activate = (void (*)(EditingToolsEditingTool*, EditingToolsPhotoCanvas*)) editing_tools_crop_tool_real_activate;
+	((EditingToolsEditingToolClass *) klass)->activate = (void (*) (EditingToolsEditingTool *, EditingToolsPhotoCanvas*)) editing_tools_crop_tool_real_activate;
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*)(EditingToolsEditingTool*, GdkEventKey*)) editing_tools_crop_tool_real_on_keypress;
+	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*) (EditingToolsEditingTool *, GdkEventKey*)) editing_tools_crop_tool_real_on_keypress;
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->deactivate = (void (*)(EditingToolsEditingTool*)) editing_tools_crop_tool_real_deactivate;
+	((EditingToolsEditingToolClass *) klass)->deactivate = (void (*) (EditingToolsEditingTool *)) editing_tools_crop_tool_real_deactivate;
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*)(EditingToolsEditingTool*)) editing_tools_crop_tool_real_get_tool_window;
+	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*) (EditingToolsEditingTool *)) editing_tools_crop_tool_real_get_tool_window;
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = (GdkPixbuf* (*)(EditingToolsEditingTool*, Scaling*, Photo*, Dimensions*, GError**)) editing_tools_crop_tool_real_get_display_pixbuf;
+	((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = (GdkPixbuf* (*) (EditingToolsEditingTool *, Scaling*, Photo*, Dimensions*, GError**)) editing_tools_crop_tool_real_get_display_pixbuf;
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_left_click = (void (*)(EditingToolsEditingTool*, gint, gint)) editing_tools_crop_tool_real_on_left_click;
+	((EditingToolsEditingToolClass *) klass)->on_left_click = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_crop_tool_real_on_left_click;
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_left_released = (void (*)(EditingToolsEditingTool*, gint, gint)) editing_tools_crop_tool_real_on_left_released;
+	((EditingToolsEditingToolClass *) klass)->on_left_released = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_crop_tool_real_on_left_released;
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_motion = (void (*)(EditingToolsEditingTool*, gint, gint, GdkModifierType)) editing_tools_crop_tool_real_on_motion;
+	((EditingToolsEditingToolClass *) klass)->on_motion = (void (*) (EditingToolsEditingTool *, gint, gint, GdkModifierType)) editing_tools_crop_tool_real_on_motion;
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->paint = (void (*)(EditingToolsEditingTool*, cairo_t*)) editing_tools_crop_tool_real_paint;
-#line 12956 "EditingTools.c"
+	((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_crop_tool_real_paint;
+#line 12875 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_instance_init (EditingToolsCropTool * self) {
-	gint _tmp0_ = 0;
-	EditingToolsCropToolConstraintDescription** _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	EditingToolsCropToolConstraintDescription** _tmp3_ = NULL;
-	EditingToolsCropToolConstraintDescription** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	GtkListStore* _tmp5_ = NULL;
+	gint _tmp0_;
+	EditingToolsCropToolConstraintDescription** _tmp1_;
+	gint _tmp2_;
+	EditingToolsCropToolConstraintDescription** _tmp3_;
+	EditingToolsCropToolConstraintDescription** _tmp4_;
+	gint _tmp4__length1;
+	GtkListStore* _tmp5_;
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_CROP_TOOL_GET_PRIVATE (self);
 #line 709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13024,11 +12943,11 @@ static void editing_tools_crop_tool_instance_init (EditingToolsCropTool * self)
 	self->priv->custom_init_height = -1;
 #line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->pre_aspect_ratio = EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO;
-#line 13028 "EditingTools.c"
+#line 12947 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_finalize (EditingToolsEditingTool* obj) {
+static void editing_tools_crop_tool_finalize (EditingToolsEditingTool * obj) {
 	EditingToolsCropTool * self;
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
@@ -13050,7 +12969,7 @@ static void editing_tools_crop_tool_finalize (EditingToolsEditingTool* obj) {
 	_g_object_unref0 (self->priv->constraint_list);
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->finalize (obj);
-#line 13054 "EditingTools.c"
+#line 12973 "EditingTools.c"
 }
 
 
@@ -13068,7 +12987,7 @@ GType editing_tools_crop_tool_get_type (void) {
 
 static void editing_tools_redeye_instance_init (EditingToolsRedeyeInstance *self) {
 	GdkPoint default_center = {0};
-	GdkPoint _tmp0_ = {0};
+	GdkPoint _tmp0_;
 #line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	memset (self, 0, sizeof (EditingToolsRedeyeInstance));
 #line 1849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13079,26 +12998,26 @@ static void editing_tools_redeye_instance_init (EditingToolsRedeyeInstance *self
 	(*self).center = _tmp0_;
 #line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*self).radius = EDITING_TOOLS_REDEYE_INSTANCE_DEFAULT_RADIUS;
-#line 13083 "EditingTools.c"
+#line 13002 "EditingTools.c"
 }
 
 
 void editing_tools_redeye_instance_to_bounds_rect (EditingToolsRedeyeInstance* inst, GdkRectangle* result) {
 	GdkRectangle _result_ = {0};
-	EditingToolsRedeyeInstance _tmp0_ = {0};
-	GdkPoint _tmp1_ = {0};
-	gint _tmp2_ = 0;
-	EditingToolsRedeyeInstance _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	EditingToolsRedeyeInstance _tmp5_ = {0};
-	GdkPoint _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	EditingToolsRedeyeInstance _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	EditingToolsRedeyeInstance _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	GdkRectangle _tmp12_ = {0};
-	gint _tmp13_ = 0;
+	EditingToolsRedeyeInstance _tmp0_;
+	GdkPoint _tmp1_;
+	gint _tmp2_;
+	EditingToolsRedeyeInstance _tmp3_;
+	gint _tmp4_;
+	EditingToolsRedeyeInstance _tmp5_;
+	GdkPoint _tmp6_;
+	gint _tmp7_;
+	EditingToolsRedeyeInstance _tmp8_;
+	gint _tmp9_;
+	EditingToolsRedeyeInstance _tmp10_;
+	gint _tmp11_;
+	GdkRectangle _tmp12_;
+	gint _tmp13_;
 #line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (inst != NULL);
 #line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13143,26 +13062,26 @@ void editing_tools_redeye_instance_to_bounds_rect (EditingToolsRedeyeInstance* i
 	*result = _result_;
 #line 1861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 13147 "EditingTools.c"
+#line 13066 "EditingTools.c"
 }
 
 
 void editing_tools_redeye_instance_from_bounds_rect (GdkRectangle* rect, EditingToolsRedeyeInstance* result) {
 	GdkRectangle in_rect = {0};
-	GdkRectangle _tmp0_ = {0};
+	GdkRectangle _tmp0_;
 	EditingToolsRedeyeInstance _result_ = {0};
-	GdkRectangle _tmp1_ = {0};
-	gint _tmp2_ = 0;
-	GdkRectangle _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	GdkRectangle _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	EditingToolsRedeyeInstance _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	GdkRectangle _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	EditingToolsRedeyeInstance _tmp11_ = {0};
-	gint _tmp12_ = 0;
+	GdkRectangle _tmp1_;
+	gint _tmp2_;
+	GdkRectangle _tmp3_;
+	gint _tmp4_;
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
+	EditingToolsRedeyeInstance _tmp7_;
+	gint _tmp8_;
+	GdkRectangle _tmp9_;
+	gint _tmp10_;
+	EditingToolsRedeyeInstance _tmp11_;
+	gint _tmp12_;
 #line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (rect != NULL);
 #line 1865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13205,7 +13124,7 @@ void editing_tools_redeye_instance_from_bounds_rect (GdkRectangle* rect, Editing
 	*result = _result_;
 #line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 13209 "EditingTools.c"
+#line 13128 "EditingTools.c"
 }
 
 
@@ -13217,14 +13136,14 @@ EditingToolsRedeyeInstance* editing_tools_redeye_instance_dup (const EditingTool
 	memcpy (dup, self, sizeof (EditingToolsRedeyeInstance));
 #line 1840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return dup;
-#line 13221 "EditingTools.c"
+#line 13140 "EditingTools.c"
 }
 
 
 void editing_tools_redeye_instance_free (EditingToolsRedeyeInstance* self) {
 #line 1840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_free (self);
-#line 13228 "EditingTools.c"
+#line 13147 "EditingTools.c"
 }
 
 
@@ -13245,39 +13164,39 @@ static EditingToolsRedeyeTool* editing_tools_redeye_tool_construct (GType object
 	self = (EditingToolsRedeyeTool*) editing_tools_editing_tool_construct (object_type, "RedeyeTool");
 #line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 13249 "EditingTools.c"
+#line 13168 "EditingTools.c"
 }
 
 
 static EditingToolsRedeyeTool* editing_tools_redeye_tool_new (void) {
 #line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_redeye_tool_construct (EDITING_TOOLS_TYPE_REDEYE_TOOL);
-#line 13256 "EditingTools.c"
+#line 13175 "EditingTools.c"
 }
 
 
 EditingToolsRedeyeTool* editing_tools_redeye_tool_factory (void) {
 	EditingToolsRedeyeTool* result = NULL;
-	EditingToolsRedeyeTool* _tmp0_ = NULL;
+	EditingToolsRedeyeTool* _tmp0_;
 #line 1928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_redeye_tool_new ();
 #line 1928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
 #line 1928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 13269 "EditingTools.c"
+#line 13188 "EditingTools.c"
 }
 
 
 gboolean editing_tools_redeye_tool_is_available (Photo* photo, Scaling* scaling) {
 	gboolean result = FALSE;
 	Dimensions dim = {0};
-	Photo* _tmp0_ = NULL;
+	Photo* _tmp0_;
 	Dimensions _tmp1_ = {0};
 	Dimensions _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-	Dimensions _tmp4_ = {0};
-	gint _tmp5_ = 0;
+	Dimensions _tmp4_;
+	gint _tmp5_;
 #line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
 #line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13296,48 +13215,48 @@ gboolean editing_tools_redeye_tool_is_available (Photo* photo, Scaling* scaling)
 	_tmp5_ = _tmp4_.width;
 #line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2)) {
-#line 13300 "EditingTools.c"
-		Dimensions _tmp6_ = {0};
-		gint _tmp7_ = 0;
+#line 13219 "EditingTools.c"
+		Dimensions _tmp6_;
+		gint _tmp7_;
 #line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = dim;
 #line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = _tmp6_.height;
 #line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp7_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2);
-#line 13309 "EditingTools.c"
+#line 13228 "EditingTools.c"
 	} else {
 #line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = FALSE;
-#line 13313 "EditingTools.c"
+#line 13232 "EditingTools.c"
 	}
 #line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp3_;
 #line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 13319 "EditingTools.c"
+#line 13238 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_new_interaction_instance (EditingToolsRedeyeTool* self, EditingToolsPhotoCanvas* canvas, EditingToolsRedeyeInstance* result) {
 	GdkRectangle photo_bounds = {0};
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
 	GdkRectangle _tmp1_ = {0};
 	GdkPoint photo_center = {0};
 	GdkPoint _tmp2_ = {0};
-	GdkRectangle _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	GdkRectangle _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	GdkRectangle _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	GdkRectangle _tmp9_ = {0};
-	gint _tmp10_ = 0;
+	GdkRectangle _tmp3_;
+	gint _tmp4_;
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
+	GdkRectangle _tmp7_;
+	gint _tmp8_;
+	GdkRectangle _tmp9_;
+	gint _tmp10_;
 	EditingToolsRedeyeInstance _result_ = {0};
-	GdkPoint _tmp11_ = {0};
-	gint _tmp12_ = 0;
-	GdkPoint _tmp13_ = {0};
-	gint _tmp14_ = 0;
+	GdkPoint _tmp11_;
+	gint _tmp12_;
+	GdkPoint _tmp13_;
+	gint _tmp14_;
 #line 1938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
 #line 1938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13392,21 +13311,21 @@ static void editing_tools_redeye_tool_new_interaction_instance (EditingToolsRede
 	*result = _result_;
 #line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 13396 "EditingTools.c"
+#line 13315 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_prepare_ctx (EditingToolsRedeyeTool* self, cairo_t* ctx, Dimensions* dim) {
-	cairo_t* _tmp0_ = NULL;
-	cairo_surface_t* _tmp1_ = NULL;
-	cairo_t* _tmp2_ = NULL;
-	cairo_t* _tmp3_ = NULL;
-	cairo_t* _tmp4_ = NULL;
-	cairo_t* _tmp5_ = NULL;
-	cairo_surface_t* _tmp6_ = NULL;
-	cairo_t* _tmp7_ = NULL;
-	cairo_t* _tmp8_ = NULL;
-	cairo_t* _tmp9_ = NULL;
+	cairo_t* _tmp0_;
+	cairo_surface_t* _tmp1_;
+	cairo_t* _tmp2_;
+	cairo_t* _tmp3_;
+	cairo_t* _tmp4_;
+	cairo_t* _tmp5_;
+	cairo_surface_t* _tmp6_;
+	cairo_t* _tmp7_;
+	cairo_t* _tmp8_;
+	cairo_t* _tmp9_;
 #line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
 #line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13449,31 +13368,31 @@ static void editing_tools_redeye_tool_prepare_ctx (EditingToolsRedeyeTool* self,
 	_tmp9_ = self->priv->thin_white_ctx;
 #line 1959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_line_width (_tmp9_, (gdouble) 1);
-#line 13453 "EditingTools.c"
+#line 13372 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_draw_redeye_instance (EditingToolsRedeyeTool* self, EditingToolsRedeyeInstance* inst) {
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	cairo_t* _tmp1_ = NULL;
-	EditingToolsRedeyeInstance _tmp2_ = {0};
-	GdkPoint _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	EditingToolsRedeyeInstance _tmp5_ = {0};
-	GdkPoint _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	EditingToolsRedeyeInstance _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	EditingToolsPhotoCanvas* _tmp10_ = NULL;
-	cairo_t* _tmp11_ = NULL;
-	EditingToolsRedeyeInstance _tmp12_ = {0};
-	GdkPoint _tmp13_ = {0};
-	gint _tmp14_ = 0;
-	EditingToolsRedeyeInstance _tmp15_ = {0};
-	GdkPoint _tmp16_ = {0};
-	gint _tmp17_ = 0;
-	EditingToolsRedeyeInstance _tmp18_ = {0};
-	gint _tmp19_ = 0;
+	EditingToolsPhotoCanvas* _tmp0_;
+	cairo_t* _tmp1_;
+	EditingToolsRedeyeInstance _tmp2_;
+	GdkPoint _tmp3_;
+	gint _tmp4_;
+	EditingToolsRedeyeInstance _tmp5_;
+	GdkPoint _tmp6_;
+	gint _tmp7_;
+	EditingToolsRedeyeInstance _tmp8_;
+	gint _tmp9_;
+	EditingToolsPhotoCanvas* _tmp10_;
+	cairo_t* _tmp11_;
+	EditingToolsRedeyeInstance _tmp12_;
+	GdkPoint _tmp13_;
+	gint _tmp14_;
+	EditingToolsRedeyeInstance _tmp15_;
+	GdkPoint _tmp16_;
+	gint _tmp17_;
+	EditingToolsRedeyeInstance _tmp18_;
+	gint _tmp19_;
 #line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
 #line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13522,16 +13441,16 @@ static void editing_tools_redeye_tool_draw_redeye_instance (EditingToolsRedeyeTo
 	_tmp19_ = _tmp18_.radius;
 #line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_draw_circle (_tmp10_, _tmp11_, _tmp14_, _tmp17_, _tmp19_);
-#line 13526 "EditingTools.c"
+#line 13445 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_redeye_tool_on_size_slider_adjust (EditingToolsRedeyeTool* self, GtkScrollType type) {
 	gboolean result = FALSE;
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	EditingToolsPhotoCanvas* _tmp3_ = NULL;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_;
+	GtkScale* _tmp1_;
+	gdouble _tmp2_;
+	EditingToolsPhotoCanvas* _tmp3_;
 #line 1969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self), FALSE);
 #line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13550,57 +13469,57 @@ static gboolean editing_tools_redeye_tool_on_size_slider_adjust (EditingToolsRed
 	result = FALSE;
 #line 1975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 13554 "EditingTools.c"
+#line 13473 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_on_apply (EditingToolsRedeyeTool* self) {
 	GdkRectangle bounds_rect_user = {0};
-	EditingToolsRedeyeInstance _tmp0_ = {0};
+	EditingToolsRedeyeInstance _tmp0_;
 	GdkRectangle _tmp1_ = {0};
 	GdkRectangle bounds_rect_active = {0};
-	EditingToolsPhotoCanvas* _tmp2_ = NULL;
-	GdkRectangle _tmp3_ = {0};
+	EditingToolsPhotoCanvas* _tmp2_;
+	GdkRectangle _tmp3_;
 	GdkRectangle _tmp4_ = {0};
 	GdkRectangle bounds_rect_unscaled = {0};
-	EditingToolsPhotoCanvas* _tmp5_ = NULL;
-	GdkRectangle _tmp6_ = {0};
+	EditingToolsPhotoCanvas* _tmp5_;
+	GdkRectangle _tmp6_;
 	GdkRectangle _tmp7_ = {0};
 	GdkRectangle bounds_rect_raw = {0};
-	EditingToolsPhotoCanvas* _tmp8_ = NULL;
-	GdkRectangle _tmp9_ = {0};
+	EditingToolsPhotoCanvas* _tmp8_;
+	GdkRectangle _tmp9_;
 	GdkRectangle _tmp10_ = {0};
 	EditingToolsRedeyeInstance instance_raw = {0};
-	GdkRectangle _tmp11_ = {0};
+	GdkRectangle _tmp11_;
 	EditingToolsRedeyeInstance _tmp12_ = {0};
 	Dimensions dimensions = {0};
-	EditingToolsPhotoCanvas* _tmp13_ = NULL;
-	Photo* _tmp14_ = NULL;
-	Photo* _tmp15_ = NULL;
+	EditingToolsPhotoCanvas* _tmp13_;
+	Photo* _tmp14_;
+	Photo* _tmp15_;
 	Dimensions _tmp16_ = {0};
-	Dimensions _tmp17_ = {0};
+	Dimensions _tmp17_;
 	gdouble theta = 0.0;
-	EditingToolsPhotoCanvas* _tmp18_ = NULL;
-	Photo* _tmp19_ = NULL;
-	Photo* _tmp20_ = NULL;
+	EditingToolsPhotoCanvas* _tmp18_;
+	Photo* _tmp19_;
+	Photo* _tmp20_;
 	gdouble _tmp21_ = 0.0;
-	EditingToolsRedeyeInstance _tmp22_ = {0};
-	GdkPoint _tmp23_ = {0};
-	Dimensions _tmp24_ = {0};
-	gint _tmp25_ = 0;
-	Dimensions _tmp26_ = {0};
-	gint _tmp27_ = 0;
-	gdouble _tmp28_ = 0.0;
+	EditingToolsRedeyeInstance _tmp22_;
+	GdkPoint _tmp23_;
+	Dimensions _tmp24_;
+	gint _tmp25_;
+	Dimensions _tmp26_;
+	gint _tmp27_;
+	gdouble _tmp28_;
 	GdkPoint _tmp29_ = {0};
 	RedeyeCommand* command = NULL;
-	EditingToolsPhotoCanvas* _tmp30_ = NULL;
-	Photo* _tmp31_ = NULL;
-	Photo* _tmp32_ = NULL;
-	EditingToolsRedeyeInstance _tmp33_ = {0};
-	RedeyeCommand* _tmp34_ = NULL;
-	RedeyeCommand* _tmp35_ = NULL;
-	CommandManager* _tmp36_ = NULL;
-	CommandManager* _tmp37_ = NULL;
+	EditingToolsPhotoCanvas* _tmp30_;
+	Photo* _tmp31_;
+	Photo* _tmp32_;
+	EditingToolsRedeyeInstance _tmp33_;
+	RedeyeCommand* _tmp34_;
+	RedeyeCommand* _tmp35_;
+	CommandManager* _tmp36_;
+	CommandManager* _tmp37_;
 #line 1978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
 #line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13711,18 +13630,18 @@ static void editing_tools_redeye_tool_on_apply (EditingToolsRedeyeTool* self) {
 	_command_manager_unref0 (_tmp37_);
 #line 1978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (command);
-#line 13715 "EditingTools.c"
+#line 13634 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool* self, GeeMap* map) {
-	GeeMap* _tmp0_ = NULL;
-	EditingToolsPhotoCanvas* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	EditingToolsPhotoCanvas* _tmp17_ = NULL;
+	GeeMap* _tmp0_;
+	EditingToolsPhotoCanvas* _tmp1_;
+	Photo* _tmp2_;
+	Photo* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
+	EditingToolsPhotoCanvas* _tmp17_;
 	GError * _inner_error_ = NULL;
 #line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
@@ -13746,18 +13665,18 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 	if (_tmp5_) {
 #line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 13750 "EditingTools.c"
+#line 13669 "EditingTools.c"
 	}
 	{
 		GdkPixbuf* _tmp6_ = NULL;
-		EditingToolsPhotoCanvas* _tmp7_ = NULL;
-		Photo* _tmp8_ = NULL;
-		Photo* _tmp9_ = NULL;
-		EditingToolsPhotoCanvas* _tmp10_ = NULL;
+		EditingToolsPhotoCanvas* _tmp7_;
+		Photo* _tmp8_;
+		Photo* _tmp9_;
+		EditingToolsPhotoCanvas* _tmp10_;
 		Scaling _tmp11_ = {0};
-		GdkPixbuf* _tmp12_ = NULL;
-		GdkPixbuf* _tmp13_ = NULL;
-		GdkPixbuf* _tmp14_ = NULL;
+		GdkPixbuf* _tmp12_;
+		GdkPixbuf* _tmp13_;
+		GdkPixbuf* _tmp14_;
 #line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13778,7 +13697,7 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 		_tmp6_ = _tmp13_;
 #line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13782 "EditingTools.c"
+#line 13701 "EditingTools.c"
 			goto __catch22_g_error;
 		}
 #line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13791,14 +13710,14 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 		self->priv->current_pixbuf = _tmp14_;
 #line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp6_);
-#line 13795 "EditingTools.c"
+#line 13714 "EditingTools.c"
 	}
 	goto __finally22;
 	__catch22_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp15_ = NULL;
-		const gchar* _tmp16_ = NULL;
+		GError* _tmp15_;
+		const gchar* _tmp16_;
 #line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		err = _inner_error_;
 #line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13810,12 +13729,12 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 #line 2016 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_warning ("EditingTools.vala:2016: %s", _tmp16_);
 #line 2017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "aborted");
+		g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_ABORTED_SIGNAL], 0);
 #line 2019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_error_free0 (err);
 #line 2019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 13819 "EditingTools.c"
+#line 13738 "EditingTools.c"
 	}
 	__finally22:
 #line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13826,21 +13745,21 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 		g_clear_error (&_inner_error_);
 #line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 13830 "EditingTools.c"
+#line 13749 "EditingTools.c"
 	}
 #line 2022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp17_);
-#line 13836 "EditingTools.c"
+#line 13755 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_on_close (EditingToolsRedeyeTool* self) {
-	GdkPixbuf* _tmp0_ = NULL;
-	EditingToolsPhotoCanvas* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
+	GdkPixbuf* _tmp0_;
+	EditingToolsPhotoCanvas* _tmp1_;
+	Photo* _tmp2_;
+	Photo* _tmp3_;
 	Dimensions _tmp4_ = {0};
 #line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
@@ -13855,41 +13774,41 @@ static void editing_tools_redeye_tool_on_close (EditingToolsRedeyeTool* self) {
 #line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp4_);
 #line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", NULL, _tmp0_, &_tmp4_, FALSE);
+	g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL], 0, NULL, _tmp0_, &_tmp4_, FALSE);
 #line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp3_);
-#line 13862 "EditingTools.c"
+#line 13781 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_on_canvas_resize (EditingToolsRedeyeTool* self) {
 	GdkRectangle scaled_pixbuf_position = {0};
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
 	GdkRectangle _tmp1_ = {0};
-	gint _tmp2_ = 0;
-	GdkRectangle _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	GdkRectangle _tmp6_ = {0};
-	gint _tmp7_ = 0;
+	gint _tmp2_;
+	GdkRectangle _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	GdkRectangle _tmp6_;
+	gint _tmp7_;
 	gdouble scale_factor = 0.0;
-	GdkRectangle _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	GdkRectangle _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	EditingToolsRedeyeInstance _tmp12_ = {0};
-	GdkPoint _tmp13_ = {0};
-	gint _tmp14_ = 0;
-	EditingToolsRedeyeInstance _tmp15_ = {0};
-	GdkPoint _tmp16_ = {0};
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	GdkRectangle _tmp19_ = {0};
-	gint _tmp20_ = 0;
-	gint _tmp21_ = 0;
-	GdkRectangle _tmp22_ = {0};
-	gint _tmp23_ = 0;
-	GdkRectangle _tmp24_ = {0};
+	GdkRectangle _tmp8_;
+	gint _tmp9_;
+	GdkRectangle _tmp10_;
+	gint _tmp11_;
+	EditingToolsRedeyeInstance _tmp12_;
+	GdkPoint _tmp13_;
+	gint _tmp14_;
+	EditingToolsRedeyeInstance _tmp15_;
+	GdkPoint _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
+	GdkRectangle _tmp19_;
+	gint _tmp20_;
+	gint _tmp21_;
+	GdkRectangle _tmp22_;
+	gint _tmp23_;
+	GdkRectangle _tmp24_;
 #line 2029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
 #line 2030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13964,58 +13883,58 @@ static void editing_tools_redeye_tool_on_canvas_resize (EditingToolsRedeyeTool*
 	_g_object_unref0 (self->priv->current_pixbuf);
 #line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->current_pixbuf = NULL;
-#line 13968 "EditingTools.c"
+#line 13887 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_photos_altered ((EditingToolsRedeyeTool*) self, items);
-#line 13975 "EditingTools.c"
+#line 13894 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsRedeyeTool * self;
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
 	EditingToolsRedeyeInstance _tmp1_ = {0};
-	EditingToolsPhotoCanvas* _tmp2_ = NULL;
-	cairo_t* _tmp3_ = NULL;
-	cairo_t* _tmp4_ = NULL;
-	EditingToolsPhotoCanvas* _tmp5_ = NULL;
+	EditingToolsPhotoCanvas* _tmp2_;
+	cairo_t* _tmp3_;
+	cairo_t* _tmp4_;
+	EditingToolsPhotoCanvas* _tmp5_;
 	Dimensions _tmp6_ = {0};
-	EditingToolsPhotoCanvas* _tmp7_ = NULL;
-	EditingToolsPhotoCanvas* _tmp8_ = NULL;
+	EditingToolsPhotoCanvas* _tmp7_;
+	EditingToolsPhotoCanvas* _tmp8_;
 	GdkRectangle _tmp9_ = {0};
-	EditingToolsPhotoCanvas* _tmp10_ = NULL;
-	GdkPixbuf* _tmp11_ = NULL;
-	EditingToolsPhotoCanvas* _tmp12_ = NULL;
-	GtkWindow* _tmp13_ = NULL;
-	GtkWindow* _tmp14_ = NULL;
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp15_ = NULL;
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp16_ = NULL;
-	GtkScale* _tmp17_ = NULL;
-	EditingToolsRedeyeInstance _tmp18_ = {0};
-	gint _tmp19_ = 0;
+	EditingToolsPhotoCanvas* _tmp10_;
+	GdkPixbuf* _tmp11_;
+	EditingToolsPhotoCanvas* _tmp12_;
+	GtkWindow* _tmp13_;
+	GtkWindow* _tmp14_;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp15_;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp16_;
+	GtkScale* _tmp17_;
+	EditingToolsRedeyeInstance _tmp18_;
+	gint _tmp19_;
 	GdkDisplay* display = NULL;
-	EditingToolsPhotoCanvas* _tmp20_ = NULL;
-	GdkWindow* _tmp21_ = NULL;
-	GdkWindow* _tmp22_ = NULL;
-	GdkDisplay* _tmp23_ = NULL;
-	GdkDisplay* _tmp24_ = NULL;
-	GdkDisplay* _tmp25_ = NULL;
-	GdkDisplay* _tmp26_ = NULL;
-	GdkCursor* _tmp27_ = NULL;
-	GdkDisplay* _tmp28_ = NULL;
-	GdkCursor* _tmp29_ = NULL;
+	EditingToolsPhotoCanvas* _tmp20_;
+	GdkWindow* _tmp21_;
+	GdkWindow* _tmp22_;
+	GdkDisplay* _tmp23_;
+	GdkDisplay* _tmp24_;
+	GdkDisplay* _tmp25_;
+	GdkDisplay* _tmp26_;
+	GdkCursor* _tmp27_;
+	GdkDisplay* _tmp28_;
+	GdkCursor* _tmp29_;
 	DataCollection* owner = NULL;
-	EditingToolsPhotoCanvas* _tmp30_ = NULL;
-	Photo* _tmp31_ = NULL;
-	Photo* _tmp32_ = NULL;
-	DataCollection* _tmp33_ = NULL;
-	DataCollection* _tmp34_ = NULL;
-	DataCollection* _tmp35_ = NULL;
-	EditingToolsPhotoCanvas* _tmp37_ = NULL;
+	EditingToolsPhotoCanvas* _tmp30_;
+	Photo* _tmp31_;
+	Photo* _tmp32_;
+	DataCollection* _tmp33_;
+	DataCollection* _tmp34_;
+	DataCollection* _tmp35_;
+	EditingToolsPhotoCanvas* _tmp37_;
 #line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
 #line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14136,13 +14055,13 @@ static void editing_tools_redeye_tool_real_activate (EditingToolsEditingTool* ba
 	_tmp35_ = owner;
 #line 2074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp35_ != NULL) {
-#line 14140 "EditingTools.c"
-		DataCollection* _tmp36_ = NULL;
+#line 14059 "EditingTools.c"
+		DataCollection* _tmp36_;
 #line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp36_ = owner;
 #line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_connect (_tmp36_, "items-altered", (GCallback) _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered, self);
-#line 14146 "EditingTools.c"
+#line 14065 "EditingTools.c"
 	}
 #line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = canvas;
@@ -14152,29 +14071,29 @@ static void editing_tools_redeye_tool_real_activate (EditingToolsEditingTool* ba
 	_data_collection_unref0 (owner);
 #line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (display);
-#line 14156 "EditingTools.c"
+#line 14075 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool* base) {
 	EditingToolsRedeyeTool * self;
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp10_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp10_;
 #line 2080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
 #line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 14170 "EditingTools.c"
+#line 14089 "EditingTools.c"
 		DataCollection* owner = NULL;
-		EditingToolsPhotoCanvas* _tmp1_ = NULL;
-		Photo* _tmp2_ = NULL;
-		Photo* _tmp3_ = NULL;
-		DataCollection* _tmp4_ = NULL;
-		DataCollection* _tmp5_ = NULL;
-		DataCollection* _tmp6_ = NULL;
-		EditingToolsPhotoCanvas* _tmp9_ = NULL;
+		EditingToolsPhotoCanvas* _tmp1_;
+		Photo* _tmp2_;
+		Photo* _tmp3_;
+		DataCollection* _tmp4_;
+		DataCollection* _tmp5_;
+		DataCollection* _tmp6_;
+		EditingToolsPhotoCanvas* _tmp9_;
 #line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14193,16 +14112,16 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
 		_tmp6_ = owner;
 #line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp6_ != NULL) {
-#line 14197 "EditingTools.c"
-			DataCollection* _tmp7_ = NULL;
-			guint _tmp8_ = 0U;
+#line 14116 "EditingTools.c"
+			DataCollection* _tmp7_;
+			guint _tmp8_;
 #line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = owner;
 #line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp8_, NULL, FALSE);
 #line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered, self);
-#line 14206 "EditingTools.c"
+#line 14125 "EditingTools.c"
 		}
 #line 2086 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
@@ -14210,15 +14129,15 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
 		editing_tools_redeye_tool_unbind_canvas_handlers (self, _tmp9_);
 #line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_data_collection_unref0 (owner);
-#line 14214 "EditingTools.c"
+#line 14133 "EditingTools.c"
 	}
 #line 2089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->redeye_tool_window;
 #line 2089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ != NULL) {
-#line 14220 "EditingTools.c"
-		EditingToolsRedeyeToolRedeyeToolWindow* _tmp11_ = NULL;
-		EditingToolsRedeyeToolRedeyeToolWindow* _tmp12_ = NULL;
+#line 14139 "EditingTools.c"
+		EditingToolsRedeyeToolRedeyeToolWindow* _tmp11_;
+		EditingToolsRedeyeToolRedeyeToolWindow* _tmp12_;
 #line 2090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_redeye_tool_unbind_window_handlers (self);
 #line 2091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14233,31 +14152,31 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
 		_g_object_unref0 (self->priv->redeye_tool_window);
 #line 2093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->redeye_tool_window = NULL;
-#line 14237 "EditingTools.c"
+#line 14156 "EditingTools.c"
 	}
 #line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 14241 "EditingTools.c"
+#line 14160 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, cairo_t* ctx, Dimensions* dim, gpointer self) {
 #line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_prepare_ctx ((EditingToolsRedeyeTool*) self, ctx, dim);
-#line 14248 "EditingTools.c"
+#line 14167 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
 #line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_canvas_resize ((EditingToolsRedeyeTool*) self);
-#line 14255 "EditingTools.c"
+#line 14174 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_bind_canvas_handlers (EditingToolsRedeyeTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	EditingToolsPhotoCanvas* _tmp1_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	EditingToolsPhotoCanvas* _tmp1_;
 #line 2099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
 #line 2099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14270,15 +14189,15 @@ static void editing_tools_redeye_tool_bind_canvas_handlers (EditingToolsRedeyeTo
 	_tmp1_ = canvas;
 #line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp1_, "resized-scaled-pixbuf", (GCallback) _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 14274 "EditingTools.c"
+#line 14193 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_unbind_canvas_handlers (EditingToolsRedeyeTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	EditingToolsPhotoCanvas* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	EditingToolsPhotoCanvas* _tmp0_;
+	guint _tmp1_;
+	EditingToolsPhotoCanvas* _tmp2_;
+	guint _tmp3_;
 #line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
 #line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14295,21 +14214,21 @@ static void editing_tools_redeye_tool_unbind_canvas_handlers (EditingToolsRedeye
 	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp3_, NULL, FALSE);
 #line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 14299 "EditingTools.c"
+#line 14218 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_apply_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 2110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_apply ((EditingToolsRedeyeTool*) self);
-#line 14306 "EditingTools.c"
+#line 14225 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_close_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_close ((EditingToolsRedeyeTool*) self);
-#line 14313 "EditingTools.c"
+#line 14232 "EditingTools.c"
 }
 
 
@@ -14318,17 +14237,17 @@ static gboolean _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_chang
 	result = editing_tools_redeye_tool_on_size_slider_adjust ((EditingToolsRedeyeTool*) self, scroll);
 #line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 14322 "EditingTools.c"
+#line 14241 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_bind_window_handlers (EditingToolsRedeyeTool* self) {
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_ = NULL;
-	GtkButton* _tmp1_ = NULL;
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp2_ = NULL;
-	GtkButton* _tmp3_ = NULL;
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp4_ = NULL;
-	GtkScale* _tmp5_ = NULL;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_;
+	GtkButton* _tmp1_;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp2_;
+	GtkButton* _tmp3_;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp4_;
+	GtkScale* _tmp5_;
 #line 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
 #line 2110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14349,20 +14268,20 @@ static void editing_tools_redeye_tool_bind_window_handlers (EditingToolsRedeyeTo
 	_tmp5_ = _tmp4_->slider;
 #line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_range_get_type (), GtkRange), "change-value", (GCallback) _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value, self);
-#line 14353 "EditingTools.c"
+#line 14272 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_unbind_window_handlers (EditingToolsRedeyeTool* self) {
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_ = NULL;
-	GtkButton* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp3_ = NULL;
-	GtkButton* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp6_ = NULL;
-	GtkScale* _tmp7_ = NULL;
-	guint _tmp8_ = 0U;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_;
+	GtkButton* _tmp1_;
+	guint _tmp2_;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp3_;
+	GtkButton* _tmp4_;
+	guint _tmp5_;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp6_;
+	GtkScale* _tmp7_;
+	guint _tmp8_;
 #line 2115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
 #line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14389,15 +14308,15 @@ static void editing_tools_redeye_tool_unbind_window_handlers (EditingToolsRedeye
 	g_signal_parse_name ("change-value", gtk_range_get_type (), &_tmp8_, NULL, FALSE);
 #line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value, self);
-#line 14393 "EditingTools.c"
+#line 14312 "EditingTools.c"
 }
 
 
 static EditingToolsEditingToolWindow* editing_tools_redeye_tool_real_get_tool_window (EditingToolsEditingTool* base) {
 	EditingToolsRedeyeTool * self;
 	EditingToolsEditingToolWindow* result = NULL;
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_ = NULL;
-	EditingToolsEditingToolWindow* _tmp1_ = NULL;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_;
+	EditingToolsEditingToolWindow* _tmp1_;
 #line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
 #line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14408,22 +14327,22 @@ static EditingToolsEditingToolWindow* editing_tools_redeye_tool_real_get_tool_wi
 	result = _tmp1_;
 #line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 14412 "EditingTools.c"
+#line 14331 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base, cairo_t* ctx) {
 	EditingToolsRedeyeTool * self;
 	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-	EditingToolsPhotoCanvas* _tmp6_ = NULL;
+	GdkPixbuf* _tmp1_;
+	EditingToolsPhotoCanvas* _tmp6_;
 	EditingToolsRedeyeInstance active_inst = {0};
-	EditingToolsRedeyeInstance _tmp7_ = {0};
-	EditingToolsPhotoCanvas* _tmp8_ = NULL;
-	EditingToolsRedeyeInstance _tmp9_ = {0};
-	GdkPoint _tmp10_ = {0};
+	EditingToolsRedeyeInstance _tmp7_;
+	EditingToolsPhotoCanvas* _tmp8_;
+	EditingToolsRedeyeInstance _tmp9_;
+	GdkPoint _tmp10_;
 	GdkPoint _tmp11_ = {0};
-	EditingToolsRedeyeInstance _tmp12_ = {0};
+	EditingToolsRedeyeInstance _tmp12_;
 #line 2125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
 #line 2125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14432,9 +14351,9 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base,
 	_tmp1_ = self->priv->current_pixbuf;
 #line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ != NULL) {
-#line 14436 "EditingTools.c"
-		GdkPixbuf* _tmp2_ = NULL;
-		GdkPixbuf* _tmp3_ = NULL;
+#line 14355 "EditingTools.c"
+		GdkPixbuf* _tmp2_;
+		GdkPixbuf* _tmp3_;
 #line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->current_pixbuf;
 #line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14443,10 +14362,10 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base,
 		_g_object_unref0 (_tmp0_);
 #line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp3_;
-#line 14447 "EditingTools.c"
+#line 14366 "EditingTools.c"
 	} else {
-		EditingToolsPhotoCanvas* _tmp4_ = NULL;
-		GdkPixbuf* _tmp5_ = NULL;
+		EditingToolsPhotoCanvas* _tmp4_;
+		GdkPixbuf* _tmp5_;
 #line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14455,7 +14374,7 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base,
 		_g_object_unref0 (_tmp0_);
 #line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp5_;
-#line 14459 "EditingTools.c"
+#line 14378 "EditingTools.c"
 	}
 #line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
@@ -14481,19 +14400,19 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base,
 	editing_tools_redeye_tool_draw_redeye_instance (self, &_tmp12_);
 #line 2125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp0_);
-#line 14485 "EditingTools.c"
+#line 14404 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_real_on_left_click (EditingToolsEditingTool* base, gint x, gint y) {
 	EditingToolsRedeyeTool * self;
 	GdkRectangle bounds_rect = {0};
-	EditingToolsRedeyeInstance _tmp0_ = {0};
+	EditingToolsRedeyeInstance _tmp0_;
 	GdkRectangle _tmp1_ = {0};
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	GdkRectangle _tmp4_ = {0};
-	gboolean _tmp5_ = FALSE;
+	gint _tmp2_;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gboolean _tmp5_;
 #line 2136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
 #line 2137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14512,11 +14431,11 @@ static void editing_tools_redeye_tool_real_on_left_click (EditingToolsEditingToo
 	_tmp5_ = coord_in_rectangle (_tmp2_, _tmp3_, &_tmp4_);
 #line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_) {
-#line 14516 "EditingTools.c"
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-		EditingToolsRedeyeInstance _tmp8_ = {0};
-		GdkPoint _tmp9_ = {0};
+#line 14435 "EditingTools.c"
+		gint _tmp6_;
+		gint _tmp7_;
+		EditingToolsRedeyeInstance _tmp8_;
+		GdkPoint _tmp9_;
 #line 2141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->is_reticle_move_in_progress = TRUE;
 #line 2142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14533,7 +14452,7 @@ static void editing_tools_redeye_tool_real_on_left_click (EditingToolsEditingToo
 		_tmp9_ = _tmp8_.center;
 #line 2144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->reticle_move_anchor = _tmp9_;
-#line 14537 "EditingTools.c"
+#line 14456 "EditingTools.c"
 	}
 }
 
@@ -14544,74 +14463,74 @@ static void editing_tools_redeye_tool_real_on_left_released (EditingToolsEditing
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
 #line 2149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->is_reticle_move_in_progress = FALSE;
-#line 14548 "EditingTools.c"
+#line 14467 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask) {
 	EditingToolsRedeyeTool * self;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 2152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
 #line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->is_reticle_move_in_progress;
 #line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 14561 "EditingTools.c"
+#line 14480 "EditingTools.c"
 		GdkRectangle active_region_rect = {0};
-		EditingToolsPhotoCanvas* _tmp1_ = NULL;
+		EditingToolsPhotoCanvas* _tmp1_;
 		GdkRectangle _tmp2_ = {0};
 		gint x_clamp_low = 0;
-		GdkRectangle _tmp3_ = {0};
-		gint _tmp4_ = 0;
-		EditingToolsRedeyeInstance _tmp5_ = {0};
-		gint _tmp6_ = 0;
+		GdkRectangle _tmp3_;
+		gint _tmp4_;
+		EditingToolsRedeyeInstance _tmp5_;
+		gint _tmp6_;
 		gint y_clamp_low = 0;
-		GdkRectangle _tmp7_ = {0};
-		gint _tmp8_ = 0;
-		EditingToolsRedeyeInstance _tmp9_ = {0};
-		gint _tmp10_ = 0;
+		GdkRectangle _tmp7_;
+		gint _tmp8_;
+		EditingToolsRedeyeInstance _tmp9_;
+		gint _tmp10_;
 		gint x_clamp_high = 0;
-		GdkRectangle _tmp11_ = {0};
-		gint _tmp12_ = 0;
-		GdkRectangle _tmp13_ = {0};
-		gint _tmp14_ = 0;
-		EditingToolsRedeyeInstance _tmp15_ = {0};
-		gint _tmp16_ = 0;
+		GdkRectangle _tmp11_;
+		gint _tmp12_;
+		GdkRectangle _tmp13_;
+		gint _tmp14_;
+		EditingToolsRedeyeInstance _tmp15_;
+		gint _tmp16_;
 		gint y_clamp_high = 0;
-		GdkRectangle _tmp17_ = {0};
-		gint _tmp18_ = 0;
-		GdkRectangle _tmp19_ = {0};
-		gint _tmp20_ = 0;
-		EditingToolsRedeyeInstance _tmp21_ = {0};
-		gint _tmp22_ = 0;
+		GdkRectangle _tmp17_;
+		gint _tmp18_;
+		GdkRectangle _tmp19_;
+		gint _tmp20_;
+		EditingToolsRedeyeInstance _tmp21_;
+		gint _tmp22_;
 		gint delta_x = 0;
-		gint _tmp23_ = 0;
-		GdkPoint _tmp24_ = {0};
-		gint _tmp25_ = 0;
+		gint _tmp23_;
+		GdkPoint _tmp24_;
+		gint _tmp25_;
 		gint delta_y = 0;
-		gint _tmp26_ = 0;
-		GdkPoint _tmp27_ = {0};
-		gint _tmp28_ = 0;
-		GdkPoint _tmp29_ = {0};
-		gint _tmp30_ = 0;
-		gint _tmp31_ = 0;
-		GdkPoint _tmp32_ = {0};
-		gint _tmp33_ = 0;
-		gint _tmp34_ = 0;
-		GdkPoint _tmp35_ = {0};
-		gint _tmp36_ = 0;
-		gint _tmp37_ = 0;
-		gint _tmp38_ = 0;
-		gint _tmp39_ = 0;
-		gint _tmp40_ = 0;
-		GdkPoint _tmp41_ = {0};
-		gint _tmp42_ = 0;
-		gint _tmp43_ = 0;
-		gint _tmp44_ = 0;
-		gint _tmp45_ = 0;
-		gint _tmp46_ = 0;
-		EditingToolsPhotoCanvas* _tmp47_ = NULL;
+		gint _tmp26_;
+		GdkPoint _tmp27_;
+		gint _tmp28_;
+		GdkPoint _tmp29_;
+		gint _tmp30_;
+		gint _tmp31_;
+		GdkPoint _tmp32_;
+		gint _tmp33_;
+		gint _tmp34_;
+		GdkPoint _tmp35_;
+		gint _tmp36_;
+		gint _tmp37_;
+		gint _tmp38_;
+		gint _tmp39_;
+		gint _tmp40_;
+		GdkPoint _tmp41_;
+		gint _tmp42_;
+		gint _tmp43_;
+		gint _tmp44_;
+		gint _tmp45_;
+		gint _tmp46_;
+		EditingToolsPhotoCanvas* _tmp47_;
 #line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14730,15 +14649,15 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
 		_tmp47_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_repaint (_tmp47_);
-#line 14734 "EditingTools.c"
+#line 14653 "EditingTools.c"
 	} else {
 		GdkRectangle bounds = {0};
-		EditingToolsRedeyeInstance _tmp48_ = {0};
+		EditingToolsRedeyeInstance _tmp48_;
 		GdkRectangle _tmp49_ = {0};
-		gint _tmp50_ = 0;
-		gint _tmp51_ = 0;
-		GdkRectangle _tmp52_ = {0};
-		gboolean _tmp53_ = FALSE;
+		gint _tmp50_;
+		gint _tmp51_;
+		GdkRectangle _tmp52_;
+		gboolean _tmp53_;
 #line 2186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp48_ = self->priv->user_interaction_instance;
 #line 2186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14755,11 +14674,11 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
 		_tmp53_ = coord_in_rectangle (_tmp50_, _tmp51_, &_tmp52_);
 #line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp53_) {
-#line 14759 "EditingTools.c"
-			EditingToolsPhotoCanvas* _tmp54_ = NULL;
-			GdkWindow* _tmp55_ = NULL;
-			GdkWindow* _tmp56_ = NULL;
-			GdkCursor* _tmp57_ = NULL;
+#line 14678 "EditingTools.c"
+			EditingToolsPhotoCanvas* _tmp54_;
+			GdkWindow* _tmp55_;
+			GdkWindow* _tmp56_;
+			GdkCursor* _tmp57_;
 #line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp54_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14772,12 +14691,12 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
 			gdk_window_set_cursor (_tmp56_, _tmp57_);
 #line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (_tmp56_);
-#line 14776 "EditingTools.c"
+#line 14695 "EditingTools.c"
 		} else {
-			EditingToolsPhotoCanvas* _tmp58_ = NULL;
-			GdkWindow* _tmp59_ = NULL;
-			GdkWindow* _tmp60_ = NULL;
-			GdkCursor* _tmp61_ = NULL;
+			EditingToolsPhotoCanvas* _tmp58_;
+			GdkWindow* _tmp59_;
+			GdkWindow* _tmp60_;
+			GdkCursor* _tmp61_;
 #line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp58_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14790,7 +14709,7 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
 			gdk_window_set_cursor (_tmp60_, _tmp61_);
 #line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (_tmp60_);
-#line 14794 "EditingTools.c"
+#line 14713 "EditingTools.c"
 		}
 	}
 }
@@ -14801,11 +14720,11 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	GdkEventKey* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	const gchar* _tmp4_ = NULL;
-	GdkEventKey* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	GdkEventKey* _tmp2_;
+	guint _tmp3_;
+	const gchar* _tmp4_;
+	GdkEventKey* _tmp11_;
+	gboolean _tmp12_;
 #line 2197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
 #line 2197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14820,11 +14739,11 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT
 	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
 #line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 14824 "EditingTools.c"
+#line 14743 "EditingTools.c"
 	} else {
-		GdkEventKey* _tmp5_ = NULL;
-		guint _tmp6_ = 0U;
-		const gchar* _tmp7_ = NULL;
+		GdkEventKey* _tmp5_;
+		guint _tmp6_;
+		const gchar* _tmp7_;
 #line 2199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = event;
 #line 2199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14833,17 +14752,17 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT
 		_tmp7_ = gdk_keyval_name (_tmp6_);
 #line 2199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 14837 "EditingTools.c"
+#line 14756 "EditingTools.c"
 	}
 #line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
 #line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = TRUE;
-#line 14843 "EditingTools.c"
+#line 14762 "EditingTools.c"
 	} else {
-		GdkEventKey* _tmp8_ = NULL;
-		guint _tmp9_ = 0U;
-		const gchar* _tmp10_ = NULL;
+		GdkEventKey* _tmp8_;
+		guint _tmp9_;
+		const gchar* _tmp10_;
 #line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = event;
 #line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14852,7 +14771,7 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT
 		_tmp10_ = gdk_keyval_name (_tmp9_);
 #line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 14856 "EditingTools.c"
+#line 14775 "EditingTools.c"
 	}
 #line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
@@ -14862,7 +14781,7 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT
 		result = TRUE;
 #line 2202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 14866 "EditingTools.c"
+#line 14785 "EditingTools.c"
 	}
 #line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = event;
@@ -14872,27 +14791,25 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT
 	result = _tmp12_;
 #line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 14876 "EditingTools.c"
+#line 14795 "EditingTools.c"
 }
 
 
 static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_tool_window_construct (GType object_type, GtkWindow* container) {
 	EditingToolsRedeyeToolRedeyeToolWindow * self = NULL;
-	GtkWindow* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	GtkScale* _tmp2_ = NULL;
-	GtkButton* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	GtkButton* _tmp5_ = NULL;
-	GtkButton* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	GtkButton* _tmp8_ = NULL;
+	GtkWindow* _tmp0_;
+	GtkScale* _tmp1_;
+	GtkScale* _tmp2_;
+	GtkButton* _tmp3_;
+	GtkButton* _tmp4_;
+	GtkButton* _tmp5_;
+	GtkButton* _tmp6_;
 	GtkBox* layout = NULL;
-	GtkBox* _tmp9_ = NULL;
-	GtkLabel* _tmp10_ = NULL;
-	GtkScale* _tmp11_ = NULL;
-	GtkButton* _tmp12_ = NULL;
-	GtkButton* _tmp13_ = NULL;
+	GtkBox* _tmp7_;
+	GtkLabel* _tmp8_;
+	GtkScale* _tmp9_;
+	GtkButton* _tmp10_;
+	GtkButton* _tmp11_;
 #line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
 #line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14910,59 +14827,55 @@ static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_
 #line 1895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->close_button;
 #line 1895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _ ("Close the red-eye tool");
-#line 1895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), _tmp4_);
+	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), _ ("Close the red-eye tool"));
 #line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = self->close_button;
+	_tmp4_ = self->close_button;
 #line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_button_set_image_position (_tmp5_, GTK_POS_LEFT);
-#line 1898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = self->apply_button;
+	gtk_button_set_image_position (_tmp4_, GTK_POS_LEFT);
 #line 1898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = _ ("Remove any red-eye effects in the selected region");
+	_tmp5_ = self->apply_button;
 #line 1898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), _tmp7_);
+	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), _ ("Remove any red-eye effects in the selected region"));
 #line 1899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = self->apply_button;
+	_tmp6_ = self->apply_button;
 #line 1899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_button_set_image_position (_tmp8_, GTK_POS_LEFT);
+	gtk_button_set_image_position (_tmp6_, GTK_POS_LEFT);
 #line 1901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_CONTROL_SPACING);
+	_tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_CONTROL_SPACING);
 #line 1901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp9_);
+	g_object_ref_sink (_tmp7_);
 #line 1901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	layout = _tmp9_;
+	layout = _tmp7_;
 #line 1902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = self->priv->slider_label;
+	_tmp8_ = self->priv->slider_label;
 #line 1902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
 #line 1903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = self->slider;
+	_tmp9_ = self->slider;
 #line 1903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
 #line 1904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = self->close_button;
+	_tmp10_ = self->close_button;
 #line 1904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
 #line 1905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = self->apply_button;
+	_tmp11_ = self->apply_button;
 #line 1905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
 #line 1907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_widget_get_type (), GtkWidget));
 #line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (layout);
 #line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 14959 "EditingTools.c"
+#line 14872 "EditingTools.c"
 }
 
 
 static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_tool_window_new (GtkWindow* container) {
 #line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_redeye_tool_redeye_tool_window_construct (EDITING_TOOLS_REDEYE_TOOL_TYPE_REDEYE_TOOL_WINDOW, container);
-#line 14966 "EditingTools.c"
+#line 14879 "EditingTools.c"
 }
 
 
@@ -14973,49 +14886,46 @@ static void editing_tools_redeye_tool_redeye_tool_window_class_init (EditingTool
 	g_type_class_add_private (klass, sizeof (EditingToolsRedeyeToolRedeyeToolWindowPrivate));
 #line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_redeye_tool_redeye_tool_window_finalize;
-#line 14977 "EditingTools.c"
+#line 14890 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_redeye_tool_window_instance_init (EditingToolsRedeyeToolRedeyeToolWindow * self) {
-	const gchar* _tmp0_ = NULL;
-	GtkLabel* _tmp1_ = NULL;
-	GtkButton* _tmp2_ = NULL;
-	GtkButton* _tmp3_ = NULL;
-	GtkScale* _tmp4_ = NULL;
+	GtkLabel* _tmp0_;
+	GtkButton* _tmp1_;
+	GtkButton* _tmp2_;
+	GtkScale* _tmp3_;
 #line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_GET_PRIVATE (self);
 #line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = _ ("Size:");
-#line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp0_);
+	_tmp0_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Size:"));
 #line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp1_);
+	g_object_ref_sink (_tmp0_);
 #line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->slider_label = _tmp1_;
+	self->priv->slider_label = _tmp0_;
 #line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_APPLY_LABEL);
+	_tmp1_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_APPLY_LABEL);
 #line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp2_);
+	g_object_ref_sink (_tmp1_);
 #line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->apply_button = _tmp2_;
+	self->apply_button = _tmp1_;
 #line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
+	_tmp2_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
 #line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp3_);
+	g_object_ref_sink (_tmp2_);
 #line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->close_button = _tmp3_;
+	self->close_button = _tmp2_;
 #line 1886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) EDITING_TOOLS_REDEYE_INSTANCE_MIN_RADIUS, (gdouble) EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS, 1.0);
+	_tmp3_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) EDITING_TOOLS_REDEYE_INSTANCE_MIN_RADIUS, (gdouble) EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS, 1.0);
 #line 1886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp4_);
+	g_object_ref_sink (_tmp3_);
 #line 1886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->slider = _tmp4_;
-#line 15015 "EditingTools.c"
+	self->slider = _tmp3_;
+#line 14925 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject* obj) {
+static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject * obj) {
 	EditingToolsRedeyeToolRedeyeToolWindow * self;
 #line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_REDEYE_TOOL_TYPE_REDEYE_TOOL_WINDOW, EditingToolsRedeyeToolRedeyeToolWindow);
@@ -15029,7 +14939,7 @@ static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject* obj)
 	_g_object_unref0 (self->slider);
 #line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_redeye_tool_redeye_tool_window_parent_class)->finalize (obj);
-#line 15033 "EditingTools.c"
+#line 14943 "EditingTools.c"
 }
 
 
@@ -15053,22 +14963,22 @@ static void editing_tools_redeye_tool_class_init (EditingToolsRedeyeToolClass *
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsRedeyeToolPrivate));
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->activate = (void (*)(EditingToolsEditingTool*, EditingToolsPhotoCanvas*)) editing_tools_redeye_tool_real_activate;
+	((EditingToolsEditingToolClass *) klass)->activate = (void (*) (EditingToolsEditingTool *, EditingToolsPhotoCanvas*)) editing_tools_redeye_tool_real_activate;
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->deactivate = (void (*)(EditingToolsEditingTool*)) editing_tools_redeye_tool_real_deactivate;
+	((EditingToolsEditingToolClass *) klass)->deactivate = (void (*) (EditingToolsEditingTool *)) editing_tools_redeye_tool_real_deactivate;
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*)(EditingToolsEditingTool*)) editing_tools_redeye_tool_real_get_tool_window;
+	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*) (EditingToolsEditingTool *)) editing_tools_redeye_tool_real_get_tool_window;
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->paint = (void (*)(EditingToolsEditingTool*, cairo_t*)) editing_tools_redeye_tool_real_paint;
+	((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_redeye_tool_real_paint;
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_left_click = (void (*)(EditingToolsEditingTool*, gint, gint)) editing_tools_redeye_tool_real_on_left_click;
+	((EditingToolsEditingToolClass *) klass)->on_left_click = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_redeye_tool_real_on_left_click;
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_left_released = (void (*)(EditingToolsEditingTool*, gint, gint)) editing_tools_redeye_tool_real_on_left_released;
+	((EditingToolsEditingToolClass *) klass)->on_left_released = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_redeye_tool_real_on_left_released;
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_motion = (void (*)(EditingToolsEditingTool*, gint, gint, GdkModifierType)) editing_tools_redeye_tool_real_on_motion;
+	((EditingToolsEditingToolClass *) klass)->on_motion = (void (*) (EditingToolsEditingTool *, gint, gint, GdkModifierType)) editing_tools_redeye_tool_real_on_motion;
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*)(EditingToolsEditingTool*, GdkEventKey*)) editing_tools_redeye_tool_real_on_keypress;
-#line 15072 "EditingTools.c"
+	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*) (EditingToolsEditingTool *, GdkEventKey*)) editing_tools_redeye_tool_real_on_keypress;
+#line 14982 "EditingTools.c"
 }
 
 
@@ -15085,11 +14995,11 @@ static void editing_tools_redeye_tool_instance_init (EditingToolsRedeyeTool * se
 	self->priv->is_reticle_move_in_progress = FALSE;
 #line 1921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->current_pixbuf = NULL;
-#line 15089 "EditingTools.c"
+#line 14999 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_finalize (EditingToolsEditingTool* obj) {
+static void editing_tools_redeye_tool_finalize (EditingToolsEditingTool * obj) {
 	EditingToolsRedeyeTool * self;
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
@@ -15107,7 +15017,7 @@ static void editing_tools_redeye_tool_finalize (EditingToolsEditingTool* obj) {
 	_g_object_unref0 (self->priv->current_pixbuf);
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->finalize (obj);
-#line 15111 "EditingTools.c"
+#line 15021 "EditingTools.c"
 }
 
 
@@ -15129,27 +15039,27 @@ static EditingToolsAdjustTool* editing_tools_adjust_tool_construct (GType object
 	self = (EditingToolsAdjustTool*) editing_tools_editing_tool_construct (object_type, "AdjustTool");
 #line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 15133 "EditingTools.c"
+#line 15043 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustTool* editing_tools_adjust_tool_new (void) {
 #line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_construct (EDITING_TOOLS_TYPE_ADJUST_TOOL);
-#line 15140 "EditingTools.c"
+#line 15050 "EditingTools.c"
 }
 
 
 EditingToolsAdjustTool* editing_tools_adjust_tool_factory (void) {
 	EditingToolsAdjustTool* result = NULL;
-	EditingToolsAdjustTool* _tmp0_ = NULL;
+	EditingToolsAdjustTool* _tmp0_;
 #line 2524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_adjust_tool_new ();
 #line 2524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
 #line 2524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15153 "EditingTools.c"
+#line 15063 "EditingTools.c"
 }
 
 
@@ -15163,135 +15073,135 @@ gboolean editing_tools_adjust_tool_is_available (Photo* photo, Scaling* scaling)
 	result = TRUE;
 #line 2528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15167 "EditingTools.c"
+#line 15077 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 2617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_photos_altered ((EditingToolsAdjustTool*) self, items);
-#line 15174 "EditingTools.c"
+#line 15084 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsAdjustTool * self;
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	GtkWindow* _tmp1_ = NULL;
-	GtkWindow* _tmp2_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp3_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	GtkWindow* _tmp1_;
+	GtkWindow* _tmp2_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp3_;
 	Photo* photo = NULL;
-	EditingToolsPhotoCanvas* _tmp4_ = NULL;
-	Photo* _tmp5_ = NULL;
-	Photo* _tmp6_ = NULL;
-	PixelTransformationBundle* _tmp7_ = NULL;
-	PixelTransformationBundle* _tmp8_ = NULL;
-	PixelTransformer* _tmp9_ = NULL;
-	PixelTransformer* _tmp10_ = NULL;
+	EditingToolsPhotoCanvas* _tmp4_;
+	Photo* _tmp5_;
+	Photo* _tmp6_;
+	PixelTransformationBundle* _tmp7_;
+	PixelTransformationBundle* _tmp8_;
+	PixelTransformer* _tmp9_;
+	PixelTransformer* _tmp10_;
 	ExpansionTransformation* expansion_trans = NULL;
-	PixelTransformationBundle* _tmp11_ = NULL;
-	PixelTransformation* _tmp12_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp13_ = NULL;
-	RGBHistogramManipulator* _tmp14_ = NULL;
-	ExpansionTransformation* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp17_ = NULL;
-	RGBHistogramManipulator* _tmp18_ = NULL;
-	ExpansionTransformation* _tmp19_ = NULL;
-	gint _tmp20_ = 0;
+	PixelTransformationBundle* _tmp11_;
+	PixelTransformation* _tmp12_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp13_;
+	RGBHistogramManipulator* _tmp14_;
+	ExpansionTransformation* _tmp15_;
+	gint _tmp16_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp17_;
+	RGBHistogramManipulator* _tmp18_;
+	ExpansionTransformation* _tmp19_;
+	gint _tmp20_;
 	ShadowDetailTransformation* shadows_trans = NULL;
-	PixelTransformationBundle* _tmp21_ = NULL;
-	PixelTransformation* _tmp22_ = NULL;
-	PixelTransformer* _tmp23_ = NULL;
-	ShadowDetailTransformation* _tmp24_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp25_ = NULL;
-	GtkScale* _tmp26_ = NULL;
-	ShadowDetailTransformation* _tmp27_ = NULL;
-	gfloat _tmp28_ = 0.0F;
+	PixelTransformationBundle* _tmp21_;
+	PixelTransformation* _tmp22_;
+	PixelTransformer* _tmp23_;
+	ShadowDetailTransformation* _tmp24_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp25_;
+	GtkScale* _tmp26_;
+	ShadowDetailTransformation* _tmp27_;
+	gfloat _tmp28_;
 	HighlightDetailTransformation* highlights_trans = NULL;
-	PixelTransformationBundle* _tmp29_ = NULL;
-	PixelTransformation* _tmp30_ = NULL;
-	PixelTransformer* _tmp31_ = NULL;
-	HighlightDetailTransformation* _tmp32_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp33_ = NULL;
-	GtkScale* _tmp34_ = NULL;
-	HighlightDetailTransformation* _tmp35_ = NULL;
-	gfloat _tmp36_ = 0.0F;
+	PixelTransformationBundle* _tmp29_;
+	PixelTransformation* _tmp30_;
+	PixelTransformer* _tmp31_;
+	HighlightDetailTransformation* _tmp32_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp33_;
+	GtkScale* _tmp34_;
+	HighlightDetailTransformation* _tmp35_;
+	gfloat _tmp36_;
 	TemperatureTransformation* temp_trans = NULL;
-	PixelTransformationBundle* _tmp37_ = NULL;
-	PixelTransformation* _tmp38_ = NULL;
-	PixelTransformer* _tmp39_ = NULL;
-	TemperatureTransformation* _tmp40_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp41_ = NULL;
-	GtkScale* _tmp42_ = NULL;
-	TemperatureTransformation* _tmp43_ = NULL;
-	gfloat _tmp44_ = 0.0F;
+	PixelTransformationBundle* _tmp37_;
+	PixelTransformation* _tmp38_;
+	PixelTransformer* _tmp39_;
+	TemperatureTransformation* _tmp40_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp41_;
+	GtkScale* _tmp42_;
+	TemperatureTransformation* _tmp43_;
+	gfloat _tmp44_;
 	TintTransformation* tint_trans = NULL;
-	PixelTransformationBundle* _tmp45_ = NULL;
-	PixelTransformation* _tmp46_ = NULL;
-	PixelTransformer* _tmp47_ = NULL;
-	TintTransformation* _tmp48_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp49_ = NULL;
-	GtkScale* _tmp50_ = NULL;
-	TintTransformation* _tmp51_ = NULL;
-	gfloat _tmp52_ = 0.0F;
+	PixelTransformationBundle* _tmp45_;
+	PixelTransformation* _tmp46_;
+	PixelTransformer* _tmp47_;
+	TintTransformation* _tmp48_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp49_;
+	GtkScale* _tmp50_;
+	TintTransformation* _tmp51_;
+	gfloat _tmp52_;
 	SaturationTransformation* sat_trans = NULL;
-	PixelTransformationBundle* _tmp53_ = NULL;
-	PixelTransformation* _tmp54_ = NULL;
-	PixelTransformer* _tmp55_ = NULL;
-	SaturationTransformation* _tmp56_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp57_ = NULL;
-	GtkScale* _tmp58_ = NULL;
-	SaturationTransformation* _tmp59_ = NULL;
-	gfloat _tmp60_ = 0.0F;
+	PixelTransformationBundle* _tmp53_;
+	PixelTransformation* _tmp54_;
+	PixelTransformer* _tmp55_;
+	SaturationTransformation* _tmp56_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp57_;
+	GtkScale* _tmp58_;
+	SaturationTransformation* _tmp59_;
+	gfloat _tmp60_;
 	ExposureTransformation* exposure_trans = NULL;
-	PixelTransformationBundle* _tmp61_ = NULL;
-	PixelTransformation* _tmp62_ = NULL;
-	PixelTransformer* _tmp63_ = NULL;
-	ExposureTransformation* _tmp64_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp65_ = NULL;
-	GtkScale* _tmp66_ = NULL;
-	ExposureTransformation* _tmp67_ = NULL;
-	gfloat _tmp68_ = 0.0F;
+	PixelTransformationBundle* _tmp61_;
+	PixelTransformation* _tmp62_;
+	PixelTransformer* _tmp63_;
+	ExposureTransformation* _tmp64_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp65_;
+	GtkScale* _tmp66_;
+	ExposureTransformation* _tmp67_;
+	gfloat _tmp68_;
 	ContrastTransformation* contrast_trans = NULL;
-	PixelTransformationBundle* _tmp69_ = NULL;
-	PixelTransformation* _tmp70_ = NULL;
-	PixelTransformer* _tmp71_ = NULL;
-	ContrastTransformation* _tmp72_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp73_ = NULL;
-	GtkScale* _tmp74_ = NULL;
-	ContrastTransformation* _tmp75_ = NULL;
-	gfloat _tmp76_ = 0.0F;
-	EditingToolsPhotoCanvas* _tmp77_ = NULL;
-	EditingToolsPhotoCanvas* _tmp78_ = NULL;
-	GdkPixbuf* _tmp79_ = NULL;
-	GdkPixbuf* _tmp80_ = NULL;
-	GdkPixbuf* _tmp81_ = NULL;
-	EditingToolsPhotoCanvas* _tmp82_ = NULL;
-	GdkPixbuf* _tmp83_ = NULL;
-	GdkPixbuf* _tmp84_ = NULL;
+	PixelTransformationBundle* _tmp69_;
+	PixelTransformation* _tmp70_;
+	PixelTransformer* _tmp71_;
+	ContrastTransformation* _tmp72_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp73_;
+	GtkScale* _tmp74_;
+	ContrastTransformation* _tmp75_;
+	gfloat _tmp76_;
+	EditingToolsPhotoCanvas* _tmp77_;
+	EditingToolsPhotoCanvas* _tmp78_;
+	GdkPixbuf* _tmp79_;
+	GdkPixbuf* _tmp80_;
+	GdkPixbuf* _tmp81_;
+	EditingToolsPhotoCanvas* _tmp82_;
+	GdkPixbuf* _tmp83_;
+	GdkPixbuf* _tmp84_;
 	gboolean _tmp85_ = FALSE;
-	GdkPixbuf* _tmp86_ = NULL;
-	gint _tmp87_ = 0;
-	gint _tmp88_ = 0;
+	GdkPixbuf* _tmp86_;
+	gint _tmp87_;
+	gint _tmp88_;
 	gboolean _tmp92_ = FALSE;
 	gboolean _tmp93_ = FALSE;
-	GdkPixbuf* _tmp94_ = NULL;
-	gint _tmp95_ = 0;
-	gint _tmp96_ = 0;
-	GdkPixbuf* _tmp97_ = NULL;
-	gint _tmp98_ = 0;
-	gint _tmp99_ = 0;
-	GdkPixbuf* _tmp116_ = NULL;
-	GdkPixbuf* _tmp117_ = NULL;
+	GdkPixbuf* _tmp94_;
+	gint _tmp95_;
+	gint _tmp96_;
+	GdkPixbuf* _tmp97_;
+	gint _tmp98_;
+	gint _tmp99_;
+	GdkPixbuf* _tmp116_;
+	GdkPixbuf* _tmp117_;
 	DataCollection* owner = NULL;
-	EditingToolsPhotoCanvas* _tmp118_ = NULL;
-	Photo* _tmp119_ = NULL;
-	Photo* _tmp120_ = NULL;
-	DataCollection* _tmp121_ = NULL;
-	DataCollection* _tmp122_ = NULL;
-	DataCollection* _tmp123_ = NULL;
-	EditingToolsPhotoCanvas* _tmp125_ = NULL;
+	EditingToolsPhotoCanvas* _tmp118_;
+	Photo* _tmp119_;
+	Photo* _tmp120_;
+	DataCollection* _tmp121_;
+	DataCollection* _tmp122_;
+	DataCollection* _tmp123_;
+	EditingToolsPhotoCanvas* _tmp125_;
 #line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
 #line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15558,10 +15468,10 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 	_tmp88_ = _tmp87_;
 #line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp88_ == 1) {
-#line 15562 "EditingTools.c"
-		GdkPixbuf* _tmp89_ = NULL;
-		gint _tmp90_ = 0;
-		gint _tmp91_ = 0;
+#line 15472 "EditingTools.c"
+		GdkPixbuf* _tmp89_;
+		gint _tmp90_;
+		gint _tmp91_;
 #line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp89_ = self->priv->draw_to_pixbuf;
 #line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15570,17 +15480,17 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 		_tmp91_ = _tmp90_;
 #line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp85_ = _tmp91_ == 1;
-#line 15574 "EditingTools.c"
+#line 15484 "EditingTools.c"
 	} else {
 #line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp85_ = FALSE;
-#line 15578 "EditingTools.c"
+#line 15488 "EditingTools.c"
 	}
 #line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp85_) {
 #line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->disable_histogram_refresh = TRUE;
-#line 15584 "EditingTools.c"
+#line 15494 "EditingTools.c"
 	}
 #line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp94_ = self->priv->draw_to_pixbuf;
@@ -15596,10 +15506,10 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 	_tmp99_ = _tmp98_;
 #line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((_tmp96_ * _tmp99_) > 8192) {
-#line 15600 "EditingTools.c"
-		GdkPixbuf* _tmp100_ = NULL;
-		gint _tmp101_ = 0;
-		gint _tmp102_ = 0;
+#line 15510 "EditingTools.c"
+		GdkPixbuf* _tmp100_;
+		gint _tmp101_;
+		gint _tmp102_;
 #line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp100_ = self->priv->draw_to_pixbuf;
 #line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15608,18 +15518,18 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 		_tmp102_ = _tmp101_;
 #line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp93_ = _tmp102_ > 1;
-#line 15612 "EditingTools.c"
+#line 15522 "EditingTools.c"
 	} else {
 #line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp93_ = FALSE;
-#line 15616 "EditingTools.c"
+#line 15526 "EditingTools.c"
 	}
 #line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp93_) {
-#line 15620 "EditingTools.c"
-		GdkPixbuf* _tmp103_ = NULL;
-		gint _tmp104_ = 0;
-		gint _tmp105_ = 0;
+#line 15530 "EditingTools.c"
+		GdkPixbuf* _tmp103_;
+		gint _tmp104_;
+		gint _tmp105_;
 #line 2607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp103_ = self->priv->draw_to_pixbuf;
 #line 2607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15628,23 +15538,23 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 		_tmp105_ = _tmp104_;
 #line 2607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp92_ = _tmp105_ > 1;
-#line 15632 "EditingTools.c"
+#line 15542 "EditingTools.c"
 	} else {
 #line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp92_ = FALSE;
-#line 15636 "EditingTools.c"
+#line 15546 "EditingTools.c"
 	}
 #line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp92_) {
-#line 15640 "EditingTools.c"
-		GdkPixbuf* _tmp106_ = NULL;
-		GdkPixbuf* _tmp107_ = NULL;
-		gint _tmp108_ = 0;
-		gint _tmp109_ = 0;
-		GdkPixbuf* _tmp110_ = NULL;
-		gint _tmp111_ = 0;
-		gint _tmp112_ = 0;
-		GdkPixbuf* _tmp113_ = NULL;
+#line 15550 "EditingTools.c"
+		GdkPixbuf* _tmp106_;
+		GdkPixbuf* _tmp107_;
+		gint _tmp108_;
+		gint _tmp109_;
+		GdkPixbuf* _tmp110_;
+		gint _tmp111_;
+		gint _tmp112_;
+		GdkPixbuf* _tmp113_;
 #line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp106_ = self->priv->draw_to_pixbuf;
 #line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15665,10 +15575,10 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 		_g_object_unref0 (self->priv->histogram_pixbuf);
 #line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->histogram_pixbuf = _tmp113_;
-#line 15669 "EditingTools.c"
+#line 15579 "EditingTools.c"
 	} else {
-		GdkPixbuf* _tmp114_ = NULL;
-		GdkPixbuf* _tmp115_ = NULL;
+		GdkPixbuf* _tmp114_;
+		GdkPixbuf* _tmp115_;
 #line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp114_ = self->priv->draw_to_pixbuf;
 #line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15677,7 +15587,7 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 		_g_object_unref0 (self->priv->histogram_pixbuf);
 #line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->histogram_pixbuf = _tmp115_;
-#line 15681 "EditingTools.c"
+#line 15591 "EditingTools.c"
 	}
 #line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp116_ = self->priv->histogram_pixbuf;
@@ -15705,13 +15615,13 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 	_tmp123_ = owner;
 #line 2616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp123_ != NULL) {
-#line 15709 "EditingTools.c"
-		DataCollection* _tmp124_ = NULL;
+#line 15619 "EditingTools.c"
+		DataCollection* _tmp124_;
 #line 2617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp124_ = owner;
 #line 2617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_connect (_tmp124_, "items-altered", (GCallback) _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered, self);
-#line 15715 "EditingTools.c"
+#line 15625 "EditingTools.c"
 	}
 #line 2619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp125_ = canvas;
@@ -15737,15 +15647,15 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 	_pixel_transformation_unref0 (expansion_trans);
 #line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (photo);
-#line 15741 "EditingTools.c"
+#line 15651 "EditingTools.c"
 }
 
 
 static EditingToolsEditingToolWindow* editing_tools_adjust_tool_real_get_tool_window (EditingToolsEditingTool* base) {
 	EditingToolsAdjustTool * self;
 	EditingToolsEditingToolWindow* result = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
-	EditingToolsEditingToolWindow* _tmp1_ = NULL;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
+	EditingToolsEditingToolWindow* _tmp1_;
 #line 2622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
 #line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15756,29 +15666,29 @@ static EditingToolsEditingToolWindow* editing_tools_adjust_tool_real_get_tool_wi
 	result = _tmp1_;
 #line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15760 "EditingTools.c"
+#line 15670 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool* base) {
 	EditingToolsAdjustTool * self;
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp10_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp10_;
 #line 2626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
 #line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 15774 "EditingTools.c"
+#line 15684 "EditingTools.c"
 		DataCollection* owner = NULL;
-		EditingToolsPhotoCanvas* _tmp1_ = NULL;
-		Photo* _tmp2_ = NULL;
-		Photo* _tmp3_ = NULL;
-		DataCollection* _tmp4_ = NULL;
-		DataCollection* _tmp5_ = NULL;
-		DataCollection* _tmp6_ = NULL;
-		EditingToolsPhotoCanvas* _tmp9_ = NULL;
+		EditingToolsPhotoCanvas* _tmp1_;
+		Photo* _tmp2_;
+		Photo* _tmp3_;
+		DataCollection* _tmp4_;
+		DataCollection* _tmp5_;
+		DataCollection* _tmp6_;
+		EditingToolsPhotoCanvas* _tmp9_;
 #line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15797,16 +15707,16 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
 		_tmp6_ = owner;
 #line 2629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp6_ != NULL) {
-#line 15801 "EditingTools.c"
-			DataCollection* _tmp7_ = NULL;
-			guint _tmp8_ = 0U;
+#line 15711 "EditingTools.c"
+			DataCollection* _tmp7_;
+			guint _tmp8_;
 #line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = owner;
 #line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp8_, NULL, FALSE);
 #line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered, self);
-#line 15810 "EditingTools.c"
+#line 15720 "EditingTools.c"
 		}
 #line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
@@ -15814,15 +15724,15 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
 		editing_tools_adjust_tool_unbind_canvas_handlers (self, _tmp9_);
 #line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_data_collection_unref0 (owner);
-#line 15818 "EditingTools.c"
+#line 15728 "EditingTools.c"
 	}
 #line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->adjust_tool_window;
 #line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ != NULL) {
-#line 15824 "EditingTools.c"
-		EditingToolsAdjustToolAdjustToolWindow* _tmp11_ = NULL;
-		EditingToolsAdjustToolAdjustToolWindow* _tmp12_ = NULL;
+#line 15734 "EditingTools.c"
+		EditingToolsAdjustToolAdjustToolWindow* _tmp11_;
+		EditingToolsAdjustToolAdjustToolWindow* _tmp12_;
 #line 2636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_adjust_tool_unbind_window_handlers (self);
 #line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15837,7 +15747,7 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
 		_g_object_unref0 (self->priv->adjust_tool_window);
 #line 2639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->adjust_tool_window = NULL;
-#line 15841 "EditingTools.c"
+#line 15751 "EditingTools.c"
 	}
 #line 2642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->draw_to_pixbuf);
@@ -15853,15 +15763,15 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
 	self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1;
 #line 2645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 15857 "EditingTools.c"
+#line 15767 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base, cairo_t* ctx) {
 	EditingToolsAdjustTool * self;
-	gboolean _tmp0_ = FALSE;
-	EditingToolsPhotoCanvas* _tmp10_ = NULL;
-	GdkPixbuf* _tmp11_ = NULL;
+	gboolean _tmp0_;
+	EditingToolsPhotoCanvas* _tmp10_;
+	GdkPixbuf* _tmp11_;
 #line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
 #line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15870,13 +15780,13 @@ static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base,
 	_tmp0_ = self->priv->suppress_effect_redraw;
 #line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!_tmp0_) {
-#line 15874 "EditingTools.c"
-		PixelTransformer* _tmp1_ = NULL;
-		GdkPixbuf* _tmp2_ = NULL;
-		PixelTransformer* _tmp3_ = NULL;
-		GdkPixbuf* _tmp4_ = NULL;
-		GdkPixbuf* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+#line 15784 "EditingTools.c"
+		PixelTransformer* _tmp1_;
+		GdkPixbuf* _tmp2_;
+		PixelTransformer* _tmp3_;
+		GdkPixbuf* _tmp4_;
+		GdkPixbuf* _tmp5_;
+		gboolean _tmp6_;
 #line 2650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = self->priv->transformer;
 #line 2650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15895,10 +15805,10 @@ static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base,
 		_tmp6_ = self->priv->disable_histogram_refresh;
 #line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (!_tmp6_) {
-#line 15899 "EditingTools.c"
-			EditingToolsAdjustToolAdjustToolWindow* _tmp7_ = NULL;
-			RGBHistogramManipulator* _tmp8_ = NULL;
-			GdkPixbuf* _tmp9_ = NULL;
+#line 15809 "EditingTools.c"
+			EditingToolsAdjustToolAdjustToolWindow* _tmp7_;
+			RGBHistogramManipulator* _tmp8_;
+			GdkPixbuf* _tmp9_;
 #line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = self->priv->adjust_tool_window;
 #line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15907,7 +15817,7 @@ static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base,
 			_tmp9_ = self->priv->histogram_pixbuf;
 #line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			rgb_histogram_manipulator_update_histogram (_tmp8_, _tmp9_);
-#line 15911 "EditingTools.c"
+#line 15821 "EditingTools.c"
 		}
 	}
 #line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15916,7 +15826,7 @@ static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base,
 	_tmp11_ = self->priv->draw_to_pixbuf;
 #line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_paint_pixbuf (_tmp10_, _tmp11_);
-#line 15920 "EditingTools.c"
+#line 15830 "EditingTools.c"
 }
 
 
@@ -15924,15 +15834,15 @@ static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingTool
 	EditingToolsAdjustTool * self;
 	Dimensions _vala_max_dim = {0};
 	GdkPixbuf* result = NULL;
-	Photo* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	Photo* _tmp2_ = NULL;
+	Photo* _tmp0_;
+	gboolean _tmp1_;
+	Photo* _tmp2_;
 	Dimensions _tmp3_ = {0};
 	GdkPixbuf* _tmp4_ = NULL;
-	Photo* _tmp5_ = NULL;
-	Scaling _tmp6_ = {0};
-	GdkPixbuf* _tmp7_ = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
+	Photo* _tmp5_;
+	Scaling _tmp6_;
+	GdkPixbuf* _tmp7_;
+	GdkPixbuf* _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
@@ -15954,11 +15864,11 @@ static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingTool
 		if (max_dim) {
 #line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			*max_dim = _vala_max_dim;
-#line 15958 "EditingTools.c"
+#line 15868 "EditingTools.c"
 		}
 #line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 15962 "EditingTools.c"
+#line 15872 "EditingTools.c"
 	}
 #line 2668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = photo;
@@ -15980,7 +15890,7 @@ static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingTool
 		g_propagate_error (error, _inner_error_);
 #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return NULL;
-#line 15984 "EditingTools.c"
+#line 15894 "EditingTools.c"
 	}
 #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp4_;
@@ -15994,20 +15904,20 @@ static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingTool
 	if (max_dim) {
 #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*max_dim = _vala_max_dim;
-#line 15998 "EditingTools.c"
+#line 15908 "EditingTools.c"
 	}
 #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 16002 "EditingTools.c"
+#line 15912 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_reset (EditingToolsAdjustTool* self) {
 	EditingToolsAdjustToolAdjustResetCommand* command = NULL;
-	PixelTransformationBundle* _tmp0_ = NULL;
-	EditingToolsAdjustToolAdjustResetCommand* _tmp1_ = NULL;
-	CommandManager* _tmp2_ = NULL;
-	CommandManager* _tmp3_ = NULL;
+	PixelTransformationBundle* _tmp0_;
+	EditingToolsAdjustToolAdjustResetCommand* _tmp1_;
+	CommandManager* _tmp2_;
+	CommandManager* _tmp3_;
 #line 2673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16026,23 +15936,23 @@ static void editing_tools_adjust_tool_on_reset (EditingToolsAdjustTool* self) {
 	_command_manager_unref0 (_tmp3_);
 #line 2673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (command);
-#line 16030 "EditingTools.c"
+#line 15940 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_ok (EditingToolsAdjustTool* self) {
-	EditingToolsEditingToolWindow* _tmp0_ = NULL;
-	EditingToolsEditingToolWindow* _tmp1_ = NULL;
-	EditingToolsPhotoCanvas* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
-	Photo* _tmp4_ = NULL;
-	PixelTransformationBundle* _tmp5_ = NULL;
-	AdjustColorsSingleCommand* _tmp6_ = NULL;
-	AdjustColorsSingleCommand* _tmp7_ = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
-	EditingToolsPhotoCanvas* _tmp9_ = NULL;
-	Photo* _tmp10_ = NULL;
-	Photo* _tmp11_ = NULL;
+	EditingToolsEditingToolWindow* _tmp0_;
+	EditingToolsEditingToolWindow* _tmp1_;
+	EditingToolsPhotoCanvas* _tmp2_;
+	Photo* _tmp3_;
+	Photo* _tmp4_;
+	PixelTransformationBundle* _tmp5_;
+	AdjustColorsSingleCommand* _tmp6_;
+	AdjustColorsSingleCommand* _tmp7_;
+	GdkPixbuf* _tmp8_;
+	EditingToolsPhotoCanvas* _tmp9_;
+	Photo* _tmp10_;
+	Photo* _tmp11_;
 	Dimensions _tmp12_ = {0};
 #line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
@@ -16079,14 +15989,14 @@ static void editing_tools_adjust_tool_on_ok (EditingToolsAdjustTool* self) {
 #line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp12_);
 #line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_COMMAND, Command), _tmp8_, &_tmp12_, FALSE);
+	g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_COMMAND, Command), _tmp8_, &_tmp12_, FALSE);
 #line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp11_);
 #line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp7_);
 #line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp4_);
-#line 16090 "EditingTools.c"
+#line 16000 "EditingTools.c"
 }
 
 
@@ -16095,14 +16005,14 @@ static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjust
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (new_transformations));
-#line 16099 "EditingTools.c"
+#line 16009 "EditingTools.c"
 	{
 		GeeIterator* _transformation_it = NULL;
-		PixelTransformationBundle* _tmp0_ = NULL;
-		GeeIterable* _tmp1_ = NULL;
-		GeeIterable* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
+		PixelTransformationBundle* _tmp0_;
+		GeeIterable* _tmp1_;
+		GeeIterable* _tmp2_;
+		GeeIterator* _tmp3_;
+		GeeIterator* _tmp4_;
 #line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = new_transformations;
 #line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16119,13 +16029,13 @@ static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjust
 		_transformation_it = _tmp4_;
 #line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		while (TRUE) {
-#line 16123 "EditingTools.c"
-			GeeIterator* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
+#line 16033 "EditingTools.c"
+			GeeIterator* _tmp5_;
+			gboolean _tmp6_;
 			PixelTransformation* transformation = NULL;
-			GeeIterator* _tmp7_ = NULL;
-			gpointer _tmp8_ = NULL;
-			PixelTransformation* _tmp9_ = NULL;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			PixelTransformation* _tmp9_;
 #line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp5_ = _transformation_it;
 #line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16134,7 +16044,7 @@ static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjust
 			if (!_tmp6_) {
 #line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 16138 "EditingTools.c"
+#line 16048 "EditingTools.c"
 			}
 #line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = _transformation_it;
@@ -16148,28 +16058,28 @@ static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjust
 			editing_tools_adjust_tool_update_transformation (self, _tmp9_);
 #line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_pixel_transformation_unref0 (transformation);
-#line 16152 "EditingTools.c"
+#line 16062 "EditingTools.c"
 		}
 #line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_transformation_it);
-#line 16156 "EditingTools.c"
+#line 16066 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustTool* self, PixelTransformation* new_transformation) {
 	PixelTransformation* old_transformation = NULL;
-	PixelTransformationBundle* _tmp0_ = NULL;
-	PixelTransformation* _tmp1_ = NULL;
-	PixelTransformationType _tmp2_ = 0;
-	PixelTransformation* _tmp3_ = NULL;
-	PixelTransformer* _tmp4_ = NULL;
-	PixelTransformation* _tmp5_ = NULL;
-	PixelTransformation* _tmp6_ = NULL;
-	PixelTransformation* _tmp7_ = NULL;
-	PixelTransformationType _tmp8_ = 0;
-	PixelTransformationBundle* _tmp12_ = NULL;
-	PixelTransformation* _tmp13_ = NULL;
+	PixelTransformationBundle* _tmp0_;
+	PixelTransformation* _tmp1_;
+	PixelTransformationType _tmp2_;
+	PixelTransformation* _tmp3_;
+	PixelTransformer* _tmp4_;
+	PixelTransformation* _tmp5_;
+	PixelTransformation* _tmp6_;
+	PixelTransformation* _tmp7_;
+	PixelTransformationType _tmp8_;
+	PixelTransformationBundle* _tmp12_;
+	PixelTransformation* _tmp13_;
 #line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16198,10 +16108,10 @@ static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustT
 	_tmp8_ = pixel_transformation_get_transformation_type (_tmp7_);
 #line 2698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp8_ != PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION) {
-#line 16202 "EditingTools.c"
-		PixelTransformer* _tmp9_ = NULL;
-		PixelTransformation* _tmp10_ = NULL;
-		PixelTransformation* _tmp11_ = NULL;
+#line 16112 "EditingTools.c"
+		PixelTransformer* _tmp9_;
+		PixelTransformation* _tmp10_;
+		PixelTransformation* _tmp11_;
 #line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = self->priv->histogram_transformer;
 #line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16210,7 +16120,7 @@ static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustT
 		_tmp11_ = new_transformation;
 #line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		pixel_transformer_replace_transformation (_tmp9_, _tmp10_, _tmp11_);
-#line 16214 "EditingTools.c"
+#line 16124 "EditingTools.c"
 	}
 #line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->transformations;
@@ -16220,22 +16130,22 @@ static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustT
 	pixel_transformation_bundle_set (_tmp12_, _tmp13_);
 #line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (old_transformation);
-#line 16224 "EditingTools.c"
+#line 16134 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_slider_updated (EditingToolsAdjustTool* self, PixelTransformation* new_transformation, const gchar* name) {
 	PixelTransformation* old_transformation = NULL;
-	PixelTransformationBundle* _tmp0_ = NULL;
-	PixelTransformation* _tmp1_ = NULL;
-	PixelTransformationType _tmp2_ = 0;
-	PixelTransformation* _tmp3_ = NULL;
+	PixelTransformationBundle* _tmp0_;
+	PixelTransformation* _tmp1_;
+	PixelTransformationType _tmp2_;
+	PixelTransformation* _tmp3_;
 	EditingToolsAdjustToolSliderAdjustmentCommand* command = NULL;
-	PixelTransformation* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp6_ = NULL;
-	CommandManager* _tmp7_ = NULL;
-	CommandManager* _tmp8_ = NULL;
+	PixelTransformation* _tmp4_;
+	const gchar* _tmp5_;
+	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp6_;
+	CommandManager* _tmp7_;
+	CommandManager* _tmp8_;
 #line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16272,51 +16182,50 @@ static void editing_tools_adjust_tool_slider_updated (EditingToolsAdjustTool* se
 	_g_object_unref0 (command);
 #line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (old_transformation);
-#line 16276 "EditingTools.c"
+#line 16186 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_shot_callback (gpointer self) {
 #line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_temperature_adjustment ((EditingToolsAdjustTool*) self);
-#line 16283 "EditingTools.c"
+#line 16193 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_temperature_adjustment (EditingToolsAdjustTool* self) {
-	OneShotScheduler* _tmp0_ = NULL;
-	OneShotScheduler* _tmp2_ = NULL;
+	OneShotScheduler* _tmp0_;
+	OneShotScheduler* _tmp2_;
 #line 2712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->temperature_scheduler;
 #line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16296 "EditingTools.c"
-		OneShotScheduler* _tmp1_ = NULL;
+#line 16206 "EditingTools.c"
+		OneShotScheduler* _tmp1_;
 #line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("temperature", _editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_shot_callback, self);
 #line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->temperature_scheduler);
 #line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->temperature_scheduler = _tmp1_;
-#line 16304 "EditingTools.c"
+#line 16214 "EditingTools.c"
 	}
 #line 2716 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->temperature_scheduler;
 #line 2716 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16310 "EditingTools.c"
+#line 16220 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_delayed_temperature_adjustment (EditingToolsAdjustTool* self) {
 	TemperatureTransformation* new_temp_trans = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	TemperatureTransformation* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
+	GtkScale* _tmp1_;
+	gdouble _tmp2_;
+	TemperatureTransformation* _tmp3_;
 #line 2719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16330,56 +16239,53 @@ static void editing_tools_adjust_tool_on_delayed_temperature_adjustment (Editing
 #line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_temp_trans = _tmp3_;
 #line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _ ("Temperature");
-#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_temp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
+	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_temp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Temperature"));
 #line 2719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_temp_trans);
-#line 16339 "EditingTools.c"
+#line 16246 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback (gpointer self) {
 #line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_tint_adjustment ((EditingToolsAdjustTool*) self);
-#line 16346 "EditingTools.c"
+#line 16253 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_tint_adjustment (EditingToolsAdjustTool* self) {
-	OneShotScheduler* _tmp0_ = NULL;
-	OneShotScheduler* _tmp2_ = NULL;
+	OneShotScheduler* _tmp0_;
+	OneShotScheduler* _tmp2_;
 #line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->tint_scheduler;
 #line 2726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16359 "EditingTools.c"
-		OneShotScheduler* _tmp1_ = NULL;
+#line 16266 "EditingTools.c"
+		OneShotScheduler* _tmp1_;
 #line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("tint", _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback, self);
 #line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->tint_scheduler);
 #line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->tint_scheduler = _tmp1_;
-#line 16367 "EditingTools.c"
+#line 16274 "EditingTools.c"
 	}
 #line 2728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->tint_scheduler;
 #line 2728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16373 "EditingTools.c"
+#line 16280 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_delayed_tint_adjustment (EditingToolsAdjustTool* self) {
 	TintTransformation* new_tint_trans = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	TintTransformation* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
+	GtkScale* _tmp1_;
+	gdouble _tmp2_;
+	TintTransformation* _tmp3_;
 #line 2731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16393,56 +16299,53 @@ static void editing_tools_adjust_tool_on_delayed_tint_adjustment (EditingToolsAd
 #line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_tint_trans = _tmp3_;
 #line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _ ("Tint");
-#line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_tint_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
+	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_tint_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Tint"));
 #line 2731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_tint_trans);
-#line 16402 "EditingTools.c"
+#line 16306 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback (gpointer self) {
 #line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_contrast_adjustment ((EditingToolsAdjustTool*) self);
-#line 16409 "EditingTools.c"
+#line 16313 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_contrast_adjustment (EditingToolsAdjustTool* self) {
-	OneShotScheduler* _tmp0_ = NULL;
-	OneShotScheduler* _tmp2_ = NULL;
+	OneShotScheduler* _tmp0_;
+	OneShotScheduler* _tmp2_;
 #line 2737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->contrast_scheduler;
 #line 2738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16422 "EditingTools.c"
-		OneShotScheduler* _tmp1_ = NULL;
+#line 16326 "EditingTools.c"
+		OneShotScheduler* _tmp1_;
 #line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("contrast", _editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback, self);
 #line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->contrast_scheduler);
 #line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->contrast_scheduler = _tmp1_;
-#line 16430 "EditingTools.c"
+#line 16334 "EditingTools.c"
 	}
 #line 2740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->contrast_scheduler;
 #line 2740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16436 "EditingTools.c"
+#line 16340 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_delayed_contrast_adjustment (EditingToolsAdjustTool* self) {
 	ContrastTransformation* new_exp_trans = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	ContrastTransformation* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
+	GtkScale* _tmp1_;
+	gdouble _tmp2_;
+	ContrastTransformation* _tmp3_;
 #line 2743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16456,56 +16359,53 @@ static void editing_tools_adjust_tool_on_delayed_contrast_adjustment (EditingToo
 #line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_exp_trans = _tmp3_;
 #line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _ ("Contrast");
-#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
+	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Contrast"));
 #line 2743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_exp_trans);
-#line 16465 "EditingTools.c"
+#line 16366 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback (gpointer self) {
 #line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_saturation_adjustment ((EditingToolsAdjustTool*) self);
-#line 16472 "EditingTools.c"
+#line 16373 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_saturation_adjustment (EditingToolsAdjustTool* self) {
-	OneShotScheduler* _tmp0_ = NULL;
-	OneShotScheduler* _tmp2_ = NULL;
+	OneShotScheduler* _tmp0_;
+	OneShotScheduler* _tmp2_;
 #line 2750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->saturation_scheduler;
 #line 2751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16485 "EditingTools.c"
-		OneShotScheduler* _tmp1_ = NULL;
+#line 16386 "EditingTools.c"
+		OneShotScheduler* _tmp1_;
 #line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("saturation", _editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback, self);
 #line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->saturation_scheduler);
 #line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->saturation_scheduler = _tmp1_;
-#line 16493 "EditingTools.c"
+#line 16394 "EditingTools.c"
 	}
 #line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->saturation_scheduler;
 #line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16499 "EditingTools.c"
+#line 16400 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_delayed_saturation_adjustment (EditingToolsAdjustTool* self) {
 	SaturationTransformation* new_sat_trans = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	SaturationTransformation* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
+	GtkScale* _tmp1_;
+	gdouble _tmp2_;
+	SaturationTransformation* _tmp3_;
 #line 2757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16519,56 +16419,53 @@ static void editing_tools_adjust_tool_on_delayed_saturation_adjustment (EditingT
 #line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_sat_trans = _tmp3_;
 #line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _ ("Saturation");
-#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_sat_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
+	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_sat_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Saturation"));
 #line 2757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_sat_trans);
-#line 16528 "EditingTools.c"
+#line 16426 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_exposure_adjustment_one_shot_callback (gpointer self) {
 #line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_exposure_adjustment ((EditingToolsAdjustTool*) self);
-#line 16535 "EditingTools.c"
+#line 16433 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_exposure_adjustment (EditingToolsAdjustTool* self) {
-	OneShotScheduler* _tmp0_ = NULL;
-	OneShotScheduler* _tmp2_ = NULL;
+	OneShotScheduler* _tmp0_;
+	OneShotScheduler* _tmp2_;
 #line 2763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->exposure_scheduler;
 #line 2764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16548 "EditingTools.c"
-		OneShotScheduler* _tmp1_ = NULL;
+#line 16446 "EditingTools.c"
+		OneShotScheduler* _tmp1_;
 #line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("exposure", _editing_tools_adjust_tool_on_delayed_exposure_adjustment_one_shot_callback, self);
 #line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->exposure_scheduler);
 #line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->exposure_scheduler = _tmp1_;
-#line 16556 "EditingTools.c"
+#line 16454 "EditingTools.c"
 	}
 #line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->exposure_scheduler;
 #line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16562 "EditingTools.c"
+#line 16460 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_delayed_exposure_adjustment (EditingToolsAdjustTool* self) {
 	ExposureTransformation* new_exp_trans = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	ExposureTransformation* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
+	GtkScale* _tmp1_;
+	gdouble _tmp2_;
+	ExposureTransformation* _tmp3_;
 #line 2770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16582,56 +16479,53 @@ static void editing_tools_adjust_tool_on_delayed_exposure_adjustment (EditingToo
 #line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_exp_trans = _tmp3_;
 #line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _ ("Exposure");
-#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
+	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Exposure"));
 #line 2770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_exp_trans);
-#line 16591 "EditingTools.c"
+#line 16486 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_shadows_adjustment_one_shot_callback (gpointer self) {
 #line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_shadows_adjustment ((EditingToolsAdjustTool*) self);
-#line 16598 "EditingTools.c"
+#line 16493 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_shadows_adjustment (EditingToolsAdjustTool* self) {
-	OneShotScheduler* _tmp0_ = NULL;
-	OneShotScheduler* _tmp2_ = NULL;
+	OneShotScheduler* _tmp0_;
+	OneShotScheduler* _tmp2_;
 #line 2776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->shadows_scheduler;
 #line 2777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16611 "EditingTools.c"
-		OneShotScheduler* _tmp1_ = NULL;
+#line 16506 "EditingTools.c"
+		OneShotScheduler* _tmp1_;
 #line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("shadows", _editing_tools_adjust_tool_on_delayed_shadows_adjustment_one_shot_callback, self);
 #line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->shadows_scheduler);
 #line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->shadows_scheduler = _tmp1_;
-#line 16619 "EditingTools.c"
+#line 16514 "EditingTools.c"
 	}
 #line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->shadows_scheduler;
 #line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16625 "EditingTools.c"
+#line 16520 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_delayed_shadows_adjustment (EditingToolsAdjustTool* self) {
 	ShadowDetailTransformation* new_shadows_trans = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	ShadowDetailTransformation* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
+	GtkScale* _tmp1_;
+	gdouble _tmp2_;
+	ShadowDetailTransformation* _tmp3_;
 #line 2783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16645,56 +16539,53 @@ static void editing_tools_adjust_tool_on_delayed_shadows_adjustment (EditingTool
 #line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_shadows_trans = _tmp3_;
 #line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _ ("Shadows");
-#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_shadows_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
+	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_shadows_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Shadows"));
 #line 2783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_shadows_trans);
-#line 16654 "EditingTools.c"
+#line 16546 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_highlights_adjustment_one_shot_callback (gpointer self) {
 #line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_highlights_adjustment ((EditingToolsAdjustTool*) self);
-#line 16661 "EditingTools.c"
+#line 16553 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_highlights_adjustment (EditingToolsAdjustTool* self) {
-	OneShotScheduler* _tmp0_ = NULL;
-	OneShotScheduler* _tmp2_ = NULL;
+	OneShotScheduler* _tmp0_;
+	OneShotScheduler* _tmp2_;
 #line 2789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->highlights_scheduler;
 #line 2790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16674 "EditingTools.c"
-		OneShotScheduler* _tmp1_ = NULL;
+#line 16566 "EditingTools.c"
+		OneShotScheduler* _tmp1_;
 #line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("highlights", _editing_tools_adjust_tool_on_delayed_highlights_adjustment_one_shot_callback, self);
 #line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->highlights_scheduler);
 #line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->highlights_scheduler = _tmp1_;
-#line 16682 "EditingTools.c"
+#line 16574 "EditingTools.c"
 	}
 #line 2793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->highlights_scheduler;
 #line 2793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16688 "EditingTools.c"
+#line 16580 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_delayed_highlights_adjustment (EditingToolsAdjustTool* self) {
 	HighlightDetailTransformation* new_highlights_trans = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	HighlightDetailTransformation* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
+	GtkScale* _tmp1_;
+	gdouble _tmp2_;
+	HighlightDetailTransformation* _tmp3_;
 #line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16708,27 +16599,24 @@ static void editing_tools_adjust_tool_on_delayed_highlights_adjustment (EditingT
 #line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_highlights_trans = _tmp3_;
 #line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _ ("Highlights");
-#line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_highlights_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
+	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_highlights_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Highlights"));
 #line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_highlights_trans);
-#line 16717 "EditingTools.c"
+#line 16606 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_histogram_constraint (EditingToolsAdjustTool* self) {
 	gint expansion_black_point = 0;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
-	RGBHistogramManipulator* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
+	RGBHistogramManipulator* _tmp1_;
+	gint _tmp2_;
 	gint expansion_white_point = 0;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp3_ = NULL;
-	RGBHistogramManipulator* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp3_;
+	RGBHistogramManipulator* _tmp4_;
+	gint _tmp5_;
 	ExpansionTransformation* new_exp_trans = NULL;
-	ExpansionTransformation* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
+	ExpansionTransformation* _tmp6_;
 #line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16752,23 +16640,21 @@ static void editing_tools_adjust_tool_on_histogram_constraint (EditingToolsAdjus
 #line 2807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_exp_trans = _tmp6_;
 #line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = _ ("Contrast Expansion");
-#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp7_);
+	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Contrast Expansion"));
 #line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_exp_trans);
-#line 16761 "EditingTools.c"
+#line 16647 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_canvas_resize (EditingToolsAdjustTool* self) {
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-	GdkPixbuf* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
-	EditingToolsPhotoCanvas* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
-	GdkPixbuf* _tmp6_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	GdkPixbuf* _tmp1_;
+	GdkPixbuf* _tmp2_;
+	GdkPixbuf* _tmp3_;
+	EditingToolsPhotoCanvas* _tmp4_;
+	GdkPixbuf* _tmp5_;
+	GdkPixbuf* _tmp6_;
 #line 2812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16795,19 +16681,19 @@ static void editing_tools_adjust_tool_on_canvas_resize (EditingToolsAdjustTool*
 	editing_tools_adjust_tool_init_fp_pixel_cache (self, _tmp6_);
 #line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp6_);
-#line 16799 "EditingTools.c"
+#line 16685 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustTool* self, GtkWidget* widget, GdkEventButton* event) {
 	gboolean result = FALSE;
 	GtkScale* source = NULL;
-	GtkWidget* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
+	GtkWidget* _tmp0_;
+	GtkScale* _tmp1_;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-	GdkEventButton* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
+	GdkEventButton* _tmp4_;
+	guint _tmp5_;
 #line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self), FALSE);
 #line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16826,27 +16712,27 @@ static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustToo
 	_tmp5_ = _tmp4_->button;
 #line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ == ((guint) 1)) {
-#line 16830 "EditingTools.c"
-		GdkEventButton* _tmp6_ = NULL;
-		GdkEventType _tmp7_ = 0;
+#line 16716 "EditingTools.c"
+		GdkEventButton* _tmp6_;
+		GdkEventType _tmp7_;
 #line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = event;
 #line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = _tmp6_->type;
 #line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp7_ == GDK_BUTTON_PRESS;
-#line 16839 "EditingTools.c"
+#line 16725 "EditingTools.c"
 	} else {
 #line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = FALSE;
-#line 16843 "EditingTools.c"
+#line 16729 "EditingTools.c"
 	}
 #line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp3_) {
-#line 16847 "EditingTools.c"
-		GdkEventButton* _tmp8_ = NULL;
-		GdkModifierType _tmp9_ = 0;
-		gboolean _tmp10_ = FALSE;
+#line 16733 "EditingTools.c"
+		GdkEventButton* _tmp8_;
+		GdkModifierType _tmp9_;
+		gboolean _tmp10_;
 #line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = event;
 #line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16855,16 +16741,16 @@ static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustToo
 		_tmp10_ = has_only_key_modifier (_tmp9_, GDK_CONTROL_MASK);
 #line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = _tmp10_;
-#line 16859 "EditingTools.c"
+#line 16745 "EditingTools.c"
 	} else {
 #line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = FALSE;
-#line 16863 "EditingTools.c"
+#line 16749 "EditingTools.c"
 	}
 #line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_) {
-#line 16867 "EditingTools.c"
-		GtkScale* _tmp11_ = NULL;
+#line 16753 "EditingTools.c"
+		GtkScale* _tmp11_;
 #line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = source;
 #line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16875,7 +16761,7 @@ static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustToo
 		_g_object_unref0 (source);
 #line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 16879 "EditingTools.c"
+#line 16765 "EditingTools.c"
 	}
 #line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
@@ -16883,19 +16769,19 @@ static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustToo
 	_g_object_unref0 (source);
 #line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 16887 "EditingTools.c"
+#line 16773 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
 #line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_canvas_resize ((EditingToolsAdjustTool*) self);
-#line 16894 "EditingTools.c"
+#line 16780 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_bind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
 #line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16904,13 +16790,13 @@ static void editing_tools_adjust_tool_bind_canvas_handlers (EditingToolsAdjustTo
 	_tmp0_ = canvas;
 #line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp0_, "resized-scaled-pixbuf", (GCallback) _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 16908 "EditingTools.c"
+#line 16794 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_unbind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	EditingToolsPhotoCanvas* _tmp0_;
+	guint _tmp1_;
 #line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16921,77 +16807,77 @@ static void editing_tools_adjust_tool_unbind_canvas_handlers (EditingToolsAdjust
 	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
 #line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 16925 "EditingTools.c"
+#line 16811 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_ok_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_ok ((EditingToolsAdjustTool*) self);
-#line 16932 "EditingTools.c"
+#line 16818 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_reset_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_reset ((EditingToolsAdjustTool*) self);
-#line 16939 "EditingTools.c"
+#line 16825 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
 #line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_exposure_adjustment ((EditingToolsAdjustTool*) self);
-#line 16946 "EditingTools.c"
+#line 16832 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
 #line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_contrast_adjustment ((EditingToolsAdjustTool*) self);
-#line 16953 "EditingTools.c"
+#line 16839 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
 #line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_saturation_adjustment ((EditingToolsAdjustTool*) self);
-#line 16960 "EditingTools.c"
+#line 16846 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
 #line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_tint_adjustment ((EditingToolsAdjustTool*) self);
-#line 16967 "EditingTools.c"
+#line 16853 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
 #line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_temperature_adjustment ((EditingToolsAdjustTool*) self);
-#line 16974 "EditingTools.c"
+#line 16860 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
 #line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_shadows_adjustment ((EditingToolsAdjustTool*) self);
-#line 16981 "EditingTools.c"
+#line 16867 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
 #line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_highlights_adjustment ((EditingToolsAdjustTool*) self);
-#line 16988 "EditingTools.c"
+#line 16874 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed (RGBHistogramManipulator* _sender, gpointer self) {
 #line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_histogram_constraint ((EditingToolsAdjustTool*) self);
-#line 16995 "EditingTools.c"
+#line 16881 "EditingTools.c"
 }
 
 
@@ -17000,47 +16886,47 @@ static gboolean _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_pre
 	result = editing_tools_adjust_tool_on_hscale_reset ((EditingToolsAdjustTool*) self, _sender, event);
 #line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 17004 "EditingTools.c"
+#line 16890 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTool* self) {
-	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
-	GtkButton* _tmp1_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp2_ = NULL;
-	GtkButton* _tmp3_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp4_ = NULL;
-	GtkButton* _tmp5_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp6_ = NULL;
-	GtkScale* _tmp7_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp8_ = NULL;
-	GtkScale* _tmp9_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp10_ = NULL;
-	GtkScale* _tmp11_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp12_ = NULL;
-	GtkScale* _tmp13_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp14_ = NULL;
-	GtkScale* _tmp15_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp16_ = NULL;
-	GtkScale* _tmp17_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp18_ = NULL;
-	GtkScale* _tmp19_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp20_ = NULL;
-	RGBHistogramManipulator* _tmp21_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp22_ = NULL;
-	GtkScale* _tmp23_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp24_ = NULL;
-	GtkScale* _tmp25_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp26_ = NULL;
-	GtkScale* _tmp27_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp28_ = NULL;
-	GtkScale* _tmp29_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp30_ = NULL;
-	GtkScale* _tmp31_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp32_ = NULL;
-	GtkScale* _tmp33_ = NULL;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp34_ = NULL;
-	GtkScale* _tmp35_ = NULL;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
+	GtkButton* _tmp1_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp2_;
+	GtkButton* _tmp3_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp4_;
+	GtkButton* _tmp5_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp6_;
+	GtkScale* _tmp7_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp8_;
+	GtkScale* _tmp9_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp10_;
+	GtkScale* _tmp11_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp12_;
+	GtkScale* _tmp13_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp14_;
+	GtkScale* _tmp15_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp16_;
+	GtkScale* _tmp17_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp18_;
+	GtkScale* _tmp19_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp20_;
+	RGBHistogramManipulator* _tmp21_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp22_;
+	GtkScale* _tmp23_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp24_;
+	GtkScale* _tmp25_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp26_;
+	GtkScale* _tmp27_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp28_;
+	GtkScale* _tmp29_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp30_;
+	GtkScale* _tmp31_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp32_;
+	GtkScale* _tmp33_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp34_;
+	GtkScale* _tmp35_;
 #line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17151,65 +17037,65 @@ static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTo
 	_tmp35_ = _tmp34_->highlights_slider;
 #line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 17155 "EditingTools.c"
+#line 17041 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjustTool* self) {
-	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
-	GtkButton* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp3_ = NULL;
-	GtkButton* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp6_ = NULL;
-	GtkButton* _tmp7_ = NULL;
-	guint _tmp8_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp9_ = NULL;
-	GtkScale* _tmp10_ = NULL;
-	guint _tmp11_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp12_ = NULL;
-	GtkScale* _tmp13_ = NULL;
-	guint _tmp14_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp15_ = NULL;
-	GtkScale* _tmp16_ = NULL;
-	guint _tmp17_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp18_ = NULL;
-	GtkScale* _tmp19_ = NULL;
-	guint _tmp20_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp21_ = NULL;
-	GtkScale* _tmp22_ = NULL;
-	guint _tmp23_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp24_ = NULL;
-	GtkScale* _tmp25_ = NULL;
-	guint _tmp26_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp27_ = NULL;
-	GtkScale* _tmp28_ = NULL;
-	guint _tmp29_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp30_ = NULL;
-	RGBHistogramManipulator* _tmp31_ = NULL;
-	guint _tmp32_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp33_ = NULL;
-	GtkScale* _tmp34_ = NULL;
-	guint _tmp35_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp36_ = NULL;
-	GtkScale* _tmp37_ = NULL;
-	guint _tmp38_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp39_ = NULL;
-	GtkScale* _tmp40_ = NULL;
-	guint _tmp41_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp42_ = NULL;
-	GtkScale* _tmp43_ = NULL;
-	guint _tmp44_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp45_ = NULL;
-	GtkScale* _tmp46_ = NULL;
-	guint _tmp47_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp48_ = NULL;
-	GtkScale* _tmp49_ = NULL;
-	guint _tmp50_ = 0U;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp51_ = NULL;
-	GtkScale* _tmp52_ = NULL;
-	guint _tmp53_ = 0U;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
+	GtkButton* _tmp1_;
+	guint _tmp2_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp3_;
+	GtkButton* _tmp4_;
+	guint _tmp5_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp6_;
+	GtkButton* _tmp7_;
+	guint _tmp8_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp9_;
+	GtkScale* _tmp10_;
+	guint _tmp11_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp12_;
+	GtkScale* _tmp13_;
+	guint _tmp14_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp15_;
+	GtkScale* _tmp16_;
+	guint _tmp17_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp18_;
+	GtkScale* _tmp19_;
+	guint _tmp20_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp21_;
+	GtkScale* _tmp22_;
+	guint _tmp23_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp24_;
+	GtkScale* _tmp25_;
+	guint _tmp26_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp27_;
+	GtkScale* _tmp28_;
+	guint _tmp29_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp30_;
+	RGBHistogramManipulator* _tmp31_;
+	guint _tmp32_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp33_;
+	GtkScale* _tmp34_;
+	guint _tmp35_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp36_;
+	GtkScale* _tmp37_;
+	guint _tmp38_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp39_;
+	GtkScale* _tmp40_;
+	guint _tmp41_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp42_;
+	GtkScale* _tmp43_;
+	guint _tmp44_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp45_;
+	GtkScale* _tmp46_;
+	guint _tmp47_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp48_;
+	GtkScale* _tmp49_;
+	guint _tmp50_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp51_;
+	GtkScale* _tmp52_;
+	guint _tmp53_;
 #line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17356,20 +17242,20 @@ static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjust
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp53_, NULL, FALSE);
 #line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp53_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 17360 "EditingTools.c"
+#line 17246 "EditingTools.c"
 }
 
 
 gboolean editing_tools_adjust_tool_enhance (EditingToolsAdjustTool* self) {
 	gboolean result = FALSE;
 	EditingToolsAdjustToolAdjustEnhanceCommand* command = NULL;
-	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp3_ = NULL;
-	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp4_ = NULL;
-	CommandManager* _tmp5_ = NULL;
-	CommandManager* _tmp6_ = NULL;
+	EditingToolsPhotoCanvas* _tmp0_;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
+	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp3_;
+	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp4_;
+	CommandManager* _tmp5_;
+	CommandManager* _tmp6_;
 #line 2883 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self), FALSE);
 #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17400,24 +17286,24 @@ gboolean editing_tools_adjust_tool_enhance (EditingToolsAdjustTool* self) {
 	_g_object_unref0 (command);
 #line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 17404 "EditingTools.c"
+#line 17290 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_photos_altered (EditingToolsAdjustTool* self, GeeMap* map) {
-	GeeMap* _tmp0_ = NULL;
-	EditingToolsPhotoCanvas* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
+	GeeMap* _tmp0_;
+	EditingToolsPhotoCanvas* _tmp1_;
+	Photo* _tmp2_;
+	Photo* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
 	PixelTransformationBundle* adjustments = NULL;
-	EditingToolsPhotoCanvas* _tmp6_ = NULL;
-	Photo* _tmp7_ = NULL;
-	Photo* _tmp8_ = NULL;
-	PixelTransformationBundle* _tmp9_ = NULL;
-	PixelTransformationBundle* _tmp10_ = NULL;
-	PixelTransformationBundle* _tmp11_ = NULL;
+	EditingToolsPhotoCanvas* _tmp6_;
+	Photo* _tmp7_;
+	Photo* _tmp8_;
+	PixelTransformationBundle* _tmp9_;
+	PixelTransformationBundle* _tmp10_;
+	PixelTransformationBundle* _tmp11_;
 #line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17440,7 +17326,7 @@ static void editing_tools_adjust_tool_on_photos_altered (EditingToolsAdjustTool*
 	if (_tmp5_) {
 #line 2892 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 17444 "EditingTools.c"
+#line 17330 "EditingTools.c"
 	}
 #line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
@@ -17462,13 +17348,13 @@ static void editing_tools_adjust_tool_on_photos_altered (EditingToolsAdjustTool*
 	editing_tools_adjust_tool_set_adjustments (self, _tmp11_);
 #line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (adjustments);
-#line 17466 "EditingTools.c"
+#line 17352 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* self, PixelTransformationBundle* new_adjustments) {
-	PixelTransformationBundle* _tmp0_ = NULL;
-	EditingToolsPhotoCanvas* _tmp11_ = NULL;
+	PixelTransformationBundle* _tmp0_;
+	EditingToolsPhotoCanvas* _tmp11_;
 #line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17479,14 +17365,14 @@ static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* s
 	_tmp0_ = new_adjustments;
 #line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_transformations (self, _tmp0_);
-#line 17483 "EditingTools.c"
+#line 17369 "EditingTools.c"
 	{
 		GeeIterator* _adjustment_it = NULL;
-		PixelTransformationBundle* _tmp1_ = NULL;
-		GeeIterable* _tmp2_ = NULL;
-		GeeIterable* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		PixelTransformationBundle* _tmp1_;
+		GeeIterable* _tmp2_;
+		GeeIterable* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = new_adjustments;
 #line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17503,13 +17389,13 @@ static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* s
 		_adjustment_it = _tmp5_;
 #line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		while (TRUE) {
-#line 17507 "EditingTools.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 17393 "EditingTools.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			PixelTransformation* adjustment = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			PixelTransformation* _tmp10_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			PixelTransformation* _tmp10_;
 #line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp6_ = _adjustment_it;
 #line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17518,7 +17404,7 @@ static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* s
 			if (!_tmp7_) {
 #line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 17522 "EditingTools.c"
+#line 17408 "EditingTools.c"
 			}
 #line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp8_ = _adjustment_it;
@@ -17532,11 +17418,11 @@ static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* s
 			editing_tools_adjust_tool_update_slider (self, _tmp10_);
 #line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_pixel_transformation_unref0 (adjustment);
-#line 17536 "EditingTools.c"
+#line 17422 "EditingTools.c"
 		}
 #line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_adjustment_it);
-#line 17540 "EditingTools.c"
+#line 17426 "EditingTools.c"
 	}
 #line 2906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_bind_window_handlers (self);
@@ -17544,20 +17430,20 @@ static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* s
 	_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp11_);
-#line 17548 "EditingTools.c"
+#line 17434 "EditingTools.c"
 }
 
 
 static gpointer _pixel_transformation_ref0 (gpointer self) {
 #line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? pixel_transformation_ref (self) : NULL;
-#line 17555 "EditingTools.c"
+#line 17441 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* self, PixelTransformation* transformation) {
-	PixelTransformation* _tmp0_ = NULL;
-	PixelTransformationType _tmp1_ = 0;
+	PixelTransformation* _tmp0_;
+	PixelTransformationType _tmp1_;
 #line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17570,12 +17456,12 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 	switch (_tmp1_) {
 #line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION:
-#line 17574 "EditingTools.c"
+#line 17460 "EditingTools.c"
 		{
 			ExpansionTransformation* expansion = NULL;
-			PixelTransformation* _tmp2_ = NULL;
-			ExpansionTransformation* _tmp3_ = NULL;
-			gboolean _tmp4_ = FALSE;
+			PixelTransformation* _tmp2_;
+			ExpansionTransformation* _tmp3_;
+			gboolean _tmp4_;
 #line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = transformation;
 #line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17586,15 +17472,15 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 			_tmp4_ = self->priv->disable_histogram_refresh;
 #line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (!_tmp4_) {
-#line 17590 "EditingTools.c"
-				EditingToolsAdjustToolAdjustToolWindow* _tmp5_ = NULL;
-				RGBHistogramManipulator* _tmp6_ = NULL;
-				ExpansionTransformation* _tmp7_ = NULL;
-				gint _tmp8_ = 0;
-				EditingToolsAdjustToolAdjustToolWindow* _tmp9_ = NULL;
-				RGBHistogramManipulator* _tmp10_ = NULL;
-				ExpansionTransformation* _tmp11_ = NULL;
-				gint _tmp12_ = 0;
+#line 17476 "EditingTools.c"
+				EditingToolsAdjustToolAdjustToolWindow* _tmp5_;
+				RGBHistogramManipulator* _tmp6_;
+				ExpansionTransformation* _tmp7_;
+				gint _tmp8_;
+				EditingToolsAdjustToolAdjustToolWindow* _tmp9_;
+				RGBHistogramManipulator* _tmp10_;
+				ExpansionTransformation* _tmp11_;
+				gint _tmp12_;
 #line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp5_ = self->priv->adjust_tool_window;
 #line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17615,22 +17501,22 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 				_tmp12_ = expansion_transformation_get_white_point (_tmp11_);
 #line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				rgb_histogram_manipulator_set_right_nub_position (_tmp10_, _tmp12_);
-#line 17619 "EditingTools.c"
+#line 17505 "EditingTools.c"
 			}
 #line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_pixel_transformation_unref0 (expansion);
 #line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17625 "EditingTools.c"
+#line 17511 "EditingTools.c"
 		}
 #line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_SHADOWS:
-#line 17629 "EditingTools.c"
+#line 17515 "EditingTools.c"
 		{
-			EditingToolsAdjustToolAdjustToolWindow* _tmp13_ = NULL;
-			GtkScale* _tmp14_ = NULL;
-			PixelTransformation* _tmp15_ = NULL;
-			gfloat _tmp16_ = 0.0F;
+			EditingToolsAdjustToolAdjustToolWindow* _tmp13_;
+			GtkScale* _tmp14_;
+			PixelTransformation* _tmp15_;
+			gfloat _tmp16_;
 #line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp13_ = self->priv->adjust_tool_window;
 #line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17643,16 +17529,16 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_range_get_type (), GtkRange), (gdouble) _tmp16_);
 #line 2928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17647 "EditingTools.c"
+#line 17533 "EditingTools.c"
 		}
 #line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_CONTRAST:
-#line 17651 "EditingTools.c"
+#line 17537 "EditingTools.c"
 		{
-			EditingToolsAdjustToolAdjustToolWindow* _tmp17_ = NULL;
-			GtkScale* _tmp18_ = NULL;
-			PixelTransformation* _tmp19_ = NULL;
-			gfloat _tmp20_ = 0.0F;
+			EditingToolsAdjustToolAdjustToolWindow* _tmp17_;
+			GtkScale* _tmp18_;
+			PixelTransformation* _tmp19_;
+			gfloat _tmp20_;
 #line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp17_ = self->priv->adjust_tool_window;
 #line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17665,16 +17551,16 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_range_get_type (), GtkRange), (gdouble) _tmp20_);
 #line 2933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17669 "EditingTools.c"
+#line 17555 "EditingTools.c"
 		}
 #line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS:
-#line 17673 "EditingTools.c"
+#line 17559 "EditingTools.c"
 		{
-			EditingToolsAdjustToolAdjustToolWindow* _tmp21_ = NULL;
-			GtkScale* _tmp22_ = NULL;
-			PixelTransformation* _tmp23_ = NULL;
-			gfloat _tmp24_ = 0.0F;
+			EditingToolsAdjustToolAdjustToolWindow* _tmp21_;
+			GtkScale* _tmp22_;
+			PixelTransformation* _tmp23_;
+			gfloat _tmp24_;
 #line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp21_ = self->priv->adjust_tool_window;
 #line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17687,16 +17573,16 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_range_get_type (), GtkRange), (gdouble) _tmp24_);
 #line 2938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17691 "EditingTools.c"
+#line 17577 "EditingTools.c"
 		}
 #line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_EXPOSURE:
-#line 17695 "EditingTools.c"
+#line 17581 "EditingTools.c"
 		{
-			EditingToolsAdjustToolAdjustToolWindow* _tmp25_ = NULL;
-			GtkScale* _tmp26_ = NULL;
-			PixelTransformation* _tmp27_ = NULL;
-			gfloat _tmp28_ = 0.0F;
+			EditingToolsAdjustToolAdjustToolWindow* _tmp25_;
+			GtkScale* _tmp26_;
+			PixelTransformation* _tmp27_;
+			gfloat _tmp28_;
 #line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp25_ = self->priv->adjust_tool_window;
 #line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17709,16 +17595,16 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_range_get_type (), GtkRange), (gdouble) _tmp28_);
 #line 2943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17713 "EditingTools.c"
+#line 17599 "EditingTools.c"
 		}
 #line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_SATURATION:
-#line 17717 "EditingTools.c"
+#line 17603 "EditingTools.c"
 		{
-			EditingToolsAdjustToolAdjustToolWindow* _tmp29_ = NULL;
-			GtkScale* _tmp30_ = NULL;
-			PixelTransformation* _tmp31_ = NULL;
-			gfloat _tmp32_ = 0.0F;
+			EditingToolsAdjustToolAdjustToolWindow* _tmp29_;
+			GtkScale* _tmp30_;
+			PixelTransformation* _tmp31_;
+			gfloat _tmp32_;
 #line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp29_ = self->priv->adjust_tool_window;
 #line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17731,16 +17617,16 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_range_get_type (), GtkRange), (gdouble) _tmp32_);
 #line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17735 "EditingTools.c"
+#line 17621 "EditingTools.c"
 		}
 #line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_TINT:
-#line 17739 "EditingTools.c"
+#line 17625 "EditingTools.c"
 		{
-			EditingToolsAdjustToolAdjustToolWindow* _tmp33_ = NULL;
-			GtkScale* _tmp34_ = NULL;
-			PixelTransformation* _tmp35_ = NULL;
-			gfloat _tmp36_ = 0.0F;
+			EditingToolsAdjustToolAdjustToolWindow* _tmp33_;
+			GtkScale* _tmp34_;
+			PixelTransformation* _tmp35_;
+			gfloat _tmp36_;
 #line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp33_ = self->priv->adjust_tool_window;
 #line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17753,16 +17639,16 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_range_get_type (), GtkRange), (gdouble) _tmp36_);
 #line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17757 "EditingTools.c"
+#line 17643 "EditingTools.c"
 		}
 #line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_TEMPERATURE:
-#line 17761 "EditingTools.c"
+#line 17647 "EditingTools.c"
 		{
-			EditingToolsAdjustToolAdjustToolWindow* _tmp37_ = NULL;
-			GtkScale* _tmp38_ = NULL;
-			PixelTransformation* _tmp39_ = NULL;
-			gfloat _tmp40_ = 0.0F;
+			EditingToolsAdjustToolAdjustToolWindow* _tmp37_;
+			GtkScale* _tmp38_;
+			PixelTransformation* _tmp39_;
+			gfloat _tmp40_;
 #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp37_ = self->priv->adjust_tool_window;
 #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17775,19 +17661,19 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_range_get_type (), GtkRange), (gdouble) _tmp40_);
 #line 2958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17779 "EditingTools.c"
+#line 17665 "EditingTools.c"
 		}
 		default:
 		{
-			PixelTransformation* _tmp41_ = NULL;
-			PixelTransformationType _tmp42_ = 0;
+			PixelTransformation* _tmp41_;
+			PixelTransformationType _tmp42_;
 #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp41_ = transformation;
 #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp42_ = pixel_transformation_get_transformation_type (_tmp41_);
 #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_error ("EditingTools.vala:2961: Unknown adjustment: %d", (gint) _tmp42_);
-#line 17791 "EditingTools.c"
+#line 17677 "EditingTools.c"
 		}
 	}
 }
@@ -17795,25 +17681,25 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 
 static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustTool* self, GdkPixbuf* source) {
 	gint source_width = 0;
-	GdkPixbuf* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	GdkPixbuf* _tmp0_;
+	gint _tmp1_;
 	gint source_height = 0;
-	GdkPixbuf* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
+	GdkPixbuf* _tmp2_;
+	gint _tmp3_;
 	gint source_num_channels = 0;
-	GdkPixbuf* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
+	GdkPixbuf* _tmp4_;
+	gint _tmp5_;
 	gint source_rowstride = 0;
-	GdkPixbuf* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
+	GdkPixbuf* _tmp6_;
+	gint _tmp7_;
 	guchar* source_pixels = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
-	guint8* _tmp9_ = NULL;
-	gint source_pixels_length1 = 0;
-	gint _source_pixels_size_ = 0;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	gfloat* _tmp12_ = NULL;
+	GdkPixbuf* _tmp8_;
+	guint8* _tmp9_;
+	gint source_pixels_length1;
+	gint _source_pixels_size_;
+	gint _tmp10_;
+	gint _tmp11_;
+	gfloat* _tmp12_;
 	gint cache_pixel_index = 0;
 	gfloat INV_255 = 0.0F;
 #line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17872,37 +17758,37 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
 	cache_pixel_index = 0;
 #line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	INV_255 = 1.0f / 255.0f;
-#line 17876 "EditingTools.c"
+#line 17762 "EditingTools.c"
 	{
 		gint j = 0;
 #line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		j = 0;
-#line 17881 "EditingTools.c"
+#line 17767 "EditingTools.c"
 		{
 			gboolean _tmp13_ = FALSE;
 #line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp13_ = TRUE;
 #line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			while (TRUE) {
-#line 17888 "EditingTools.c"
-				gint _tmp15_ = 0;
-				gint _tmp16_ = 0;
+#line 17774 "EditingTools.c"
+				gint _tmp15_;
+				gint _tmp16_;
 				gint row_start_index = 0;
-				gint _tmp17_ = 0;
-				gint _tmp18_ = 0;
+				gint _tmp17_;
+				gint _tmp18_;
 				gint row_end_index = 0;
-				gint _tmp19_ = 0;
-				gint _tmp20_ = 0;
-				gint _tmp21_ = 0;
+				gint _tmp19_;
+				gint _tmp20_;
+				gint _tmp21_;
 #line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (!_tmp13_) {
-#line 17900 "EditingTools.c"
-					gint _tmp14_ = 0;
+#line 17786 "EditingTools.c"
+					gint _tmp14_;
 #line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp14_ = j;
 #line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					j = _tmp14_ + 1;
-#line 17906 "EditingTools.c"
+#line 17792 "EditingTools.c"
 				}
 #line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp13_ = FALSE;
@@ -17914,7 +17800,7 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
 				if (!(_tmp15_ < _tmp16_)) {
 #line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					break;
-#line 17918 "EditingTools.c"
+#line 17804 "EditingTools.c"
 				}
 #line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp17_ = j;
@@ -17930,63 +17816,63 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
 				_tmp21_ = source_num_channels;
 #line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				row_end_index = _tmp19_ + (_tmp20_ * _tmp21_);
-#line 17934 "EditingTools.c"
+#line 17820 "EditingTools.c"
 				{
 					gint i = 0;
-					gint _tmp22_ = 0;
+					gint _tmp22_;
 #line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp22_ = row_start_index;
 #line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					i = _tmp22_;
-#line 17942 "EditingTools.c"
+#line 17828 "EditingTools.c"
 					{
 						gboolean _tmp23_ = FALSE;
 #line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						_tmp23_ = TRUE;
 #line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						while (TRUE) {
-#line 17949 "EditingTools.c"
-							gint _tmp26_ = 0;
-							gint _tmp27_ = 0;
-							gfloat* _tmp28_ = NULL;
-							gint _tmp28__length1 = 0;
-							gint _tmp29_ = 0;
-							guchar* _tmp30_ = NULL;
-							gint _tmp30__length1 = 0;
-							gint _tmp31_ = 0;
-							guchar _tmp32_ = '\0';
-							gfloat _tmp33_ = 0.0F;
-							gfloat _tmp34_ = 0.0F;
-							gfloat* _tmp35_ = NULL;
-							gint _tmp35__length1 = 0;
-							gint _tmp36_ = 0;
-							guchar* _tmp37_ = NULL;
-							gint _tmp37__length1 = 0;
-							gint _tmp38_ = 0;
-							guchar _tmp39_ = '\0';
-							gfloat _tmp40_ = 0.0F;
-							gfloat _tmp41_ = 0.0F;
-							gfloat* _tmp42_ = NULL;
-							gint _tmp42__length1 = 0;
-							gint _tmp43_ = 0;
-							guchar* _tmp44_ = NULL;
-							gint _tmp44__length1 = 0;
-							gint _tmp45_ = 0;
-							guchar _tmp46_ = '\0';
-							gfloat _tmp47_ = 0.0F;
-							gfloat _tmp48_ = 0.0F;
+#line 17835 "EditingTools.c"
+							gint _tmp26_;
+							gint _tmp27_;
+							gfloat* _tmp28_;
+							gint _tmp28__length1;
+							gint _tmp29_;
+							guchar* _tmp30_;
+							gint _tmp30__length1;
+							gint _tmp31_;
+							guchar _tmp32_;
+							gfloat _tmp33_;
+							gfloat _tmp34_;
+							gfloat* _tmp35_;
+							gint _tmp35__length1;
+							gint _tmp36_;
+							guchar* _tmp37_;
+							gint _tmp37__length1;
+							gint _tmp38_;
+							guchar _tmp39_;
+							gfloat _tmp40_;
+							gfloat _tmp41_;
+							gfloat* _tmp42_;
+							gint _tmp42__length1;
+							gint _tmp43_;
+							guchar* _tmp44_;
+							gint _tmp44__length1;
+							gint _tmp45_;
+							guchar _tmp46_;
+							gfloat _tmp47_;
+							gfloat _tmp48_;
 #line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							if (!_tmp23_) {
-#line 17981 "EditingTools.c"
-								gint _tmp24_ = 0;
-								gint _tmp25_ = 0;
+#line 17867 "EditingTools.c"
+								gint _tmp24_;
+								gint _tmp25_;
 #line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								_tmp24_ = i;
 #line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								_tmp25_ = source_num_channels;
 #line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								i = _tmp24_ + _tmp25_;
-#line 17990 "EditingTools.c"
+#line 17876 "EditingTools.c"
 							}
 #line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp23_ = FALSE;
@@ -17998,7 +17884,7 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
 							if (!(_tmp26_ < _tmp27_)) {
 #line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								break;
-#line 18002 "EditingTools.c"
+#line 17888 "EditingTools.c"
 							}
 #line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp28_ = self->priv->fp_pixel_cache;
@@ -18066,7 +17952,7 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
 							_tmp42_[_tmp43_] = ((gfloat) _tmp46_) * _tmp47_;
 #line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp48_ = _tmp42_[_tmp43_];
-#line 18070 "EditingTools.c"
+#line 17956 "EditingTools.c"
 						}
 					}
 				}
@@ -18081,11 +17967,11 @@ static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingT
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	GdkEventKey* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	const gchar* _tmp4_ = NULL;
-	GdkEventKey* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	GdkEventKey* _tmp2_;
+	guint _tmp3_;
+	const gchar* _tmp4_;
+	GdkEventKey* _tmp11_;
+	gboolean _tmp12_;
 #line 2987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
 #line 2987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18100,11 +17986,11 @@ static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingT
 	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
 #line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 18104 "EditingTools.c"
+#line 17990 "EditingTools.c"
 	} else {
-		GdkEventKey* _tmp5_ = NULL;
-		guint _tmp6_ = 0U;
-		const gchar* _tmp7_ = NULL;
+		GdkEventKey* _tmp5_;
+		guint _tmp6_;
+		const gchar* _tmp7_;
 #line 2989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = event;
 #line 2989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18113,17 +17999,17 @@ static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingT
 		_tmp7_ = gdk_keyval_name (_tmp6_);
 #line 2989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 18117 "EditingTools.c"
+#line 18003 "EditingTools.c"
 	}
 #line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
 #line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = TRUE;
-#line 18123 "EditingTools.c"
+#line 18009 "EditingTools.c"
 	} else {
-		GdkEventKey* _tmp8_ = NULL;
-		guint _tmp9_ = 0U;
-		const gchar* _tmp10_ = NULL;
+		GdkEventKey* _tmp8_;
+		guint _tmp9_;
+		const gchar* _tmp10_;
 #line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = event;
 #line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18132,7 +18018,7 @@ static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingT
 		_tmp10_ = gdk_keyval_name (_tmp9_);
 #line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 18136 "EditingTools.c"
+#line 18022 "EditingTools.c"
 	}
 #line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
@@ -18142,7 +18028,7 @@ static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingT
 		result = TRUE;
 #line 2992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18146 "EditingTools.c"
+#line 18032 "EditingTools.c"
 	}
 #line 2995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = event;
@@ -18152,76 +18038,69 @@ static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingT
 	result = _tmp12_;
 #line 2995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 18156 "EditingTools.c"
+#line 18042 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_construct (GType object_type, GtkWindow* container) {
 	EditingToolsAdjustToolAdjustToolWindow * self = NULL;
-	GtkWindow* _tmp0_ = NULL;
+	GtkWindow* _tmp0_;
 	GtkGrid* slider_organizer = NULL;
-	GtkGrid* _tmp1_ = NULL;
+	GtkGrid* _tmp1_;
 	GtkLabel* exposure_label = NULL;
-	const gchar* _tmp2_ = NULL;
-	GtkLabel* _tmp3_ = NULL;
-	GtkScale* _tmp4_ = NULL;
-	GtkScale* _tmp5_ = NULL;
-	GtkScale* _tmp6_ = NULL;
-	GtkScale* _tmp7_ = NULL;
+	GtkLabel* _tmp2_;
+	GtkScale* _tmp3_;
+	GtkScale* _tmp4_;
+	GtkScale* _tmp5_;
+	GtkScale* _tmp6_;
 	GtkLabel* contrast_label = NULL;
-	const gchar* _tmp8_ = NULL;
-	GtkLabel* _tmp9_ = NULL;
-	GtkScale* _tmp10_ = NULL;
-	GtkScale* _tmp11_ = NULL;
-	GtkScale* _tmp12_ = NULL;
-	GtkScale* _tmp13_ = NULL;
+	GtkLabel* _tmp7_;
+	GtkScale* _tmp8_;
+	GtkScale* _tmp9_;
+	GtkScale* _tmp10_;
+	GtkScale* _tmp11_;
 	GtkLabel* saturation_label = NULL;
-	const gchar* _tmp14_ = NULL;
-	GtkLabel* _tmp15_ = NULL;
-	GtkScale* _tmp16_ = NULL;
-	GtkScale* _tmp17_ = NULL;
-	GtkScale* _tmp18_ = NULL;
-	GtkScale* _tmp19_ = NULL;
+	GtkLabel* _tmp12_;
+	GtkScale* _tmp13_;
+	GtkScale* _tmp14_;
+	GtkScale* _tmp15_;
+	GtkScale* _tmp16_;
 	GtkLabel* tint_label = NULL;
-	const gchar* _tmp20_ = NULL;
-	GtkLabel* _tmp21_ = NULL;
-	GtkScale* _tmp22_ = NULL;
-	GtkScale* _tmp23_ = NULL;
-	GtkScale* _tmp24_ = NULL;
-	GtkScale* _tmp25_ = NULL;
+	GtkLabel* _tmp17_;
+	GtkScale* _tmp18_;
+	GtkScale* _tmp19_;
+	GtkScale* _tmp20_;
+	GtkScale* _tmp21_;
 	GtkLabel* temperature_label = NULL;
-	const gchar* _tmp26_ = NULL;
-	GtkLabel* _tmp27_ = NULL;
-	GtkScale* _tmp28_ = NULL;
-	GtkScale* _tmp29_ = NULL;
-	GtkScale* _tmp30_ = NULL;
-	GtkScale* _tmp31_ = NULL;
+	GtkLabel* _tmp22_;
+	GtkScale* _tmp23_;
+	GtkScale* _tmp24_;
+	GtkScale* _tmp25_;
+	GtkScale* _tmp26_;
 	GtkLabel* shadows_label = NULL;
-	const gchar* _tmp32_ = NULL;
-	GtkLabel* _tmp33_ = NULL;
-	GtkScale* _tmp34_ = NULL;
-	GtkScale* _tmp35_ = NULL;
-	GtkScale* _tmp36_ = NULL;
-	GtkScale* _tmp37_ = NULL;
+	GtkLabel* _tmp27_;
+	GtkScale* _tmp28_;
+	GtkScale* _tmp29_;
+	GtkScale* _tmp30_;
+	GtkScale* _tmp31_;
 	GtkLabel* highlights_label = NULL;
-	const gchar* _tmp38_ = NULL;
-	GtkLabel* _tmp39_ = NULL;
-	GtkScale* _tmp40_ = NULL;
-	GtkScale* _tmp41_ = NULL;
-	GtkScale* _tmp42_ = NULL;
+	GtkLabel* _tmp32_;
+	GtkScale* _tmp33_;
+	GtkScale* _tmp34_;
+	GtkScale* _tmp35_;
 	GtkBox* button_layouter = NULL;
-	GtkBox* _tmp43_ = NULL;
-	GtkButton* _tmp44_ = NULL;
-	GtkButton* _tmp45_ = NULL;
-	GtkButton* _tmp46_ = NULL;
-	RGBHistogramManipulator* _tmp47_ = NULL;
-	RGBHistogramManipulator* _tmp48_ = NULL;
-	RGBHistogramManipulator* _tmp49_ = NULL;
-	RGBHistogramManipulator* _tmp50_ = NULL;
+	GtkBox* _tmp36_;
+	GtkButton* _tmp37_;
+	GtkButton* _tmp38_;
+	GtkButton* _tmp39_;
+	RGBHistogramManipulator* _tmp40_;
+	RGBHistogramManipulator* _tmp41_;
+	RGBHistogramManipulator* _tmp42_;
+	RGBHistogramManipulator* _tmp43_;
 	GtkBox* pane_layouter = NULL;
-	GtkBox* _tmp51_ = NULL;
-	RGBHistogramManipulator* _tmp52_ = NULL;
-	RGBHistogramManipulator* _tmp53_ = NULL;
+	GtkBox* _tmp44_;
+	RGBHistogramManipulator* _tmp45_;
+	RGBHistogramManipulator* _tmp46_;
 #line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
 #line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18245,13 +18124,11 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2250 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget), 12);
 #line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = _ ("Exposure:");
-#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp2_);
+	_tmp2_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Exposure:"));
 #line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp3_);
+	g_object_ref_sink (_tmp2_);
 #line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	exposure_label = _tmp3_;
+	exposure_label = _tmp2_;
 #line 2253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18259,29 +18136,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_widget_get_type (), GtkWidget), 0, 0, 1, 1);
 #line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = self->exposure_slider;
+	_tmp3_ = self->exposure_slider;
 #line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), 1, 0, 1, 1);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), 1, 0, 1, 1);
 #line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = self->exposure_slider;
+	_tmp4_ = self->exposure_slider;
 #line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = self->exposure_slider;
+	_tmp5_ = self->exposure_slider;
 #line 2258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp6_, FALSE);
+	gtk_scale_set_draw_value (_tmp5_, FALSE);
 #line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = self->exposure_slider;
+	_tmp6_ = self->exposure_slider;
 #line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = _ ("Contrast:");
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), 0);
 #line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp8_);
+	_tmp7_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Contrast:"));
 #line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp9_);
+	g_object_ref_sink (_tmp7_);
 #line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	contrast_label = _tmp9_;
+	contrast_label = _tmp7_;
 #line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18289,29 +18164,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_widget_get_type (), GtkWidget), 0, 1, 1, 1);
 #line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = self->contrast_slider;
+	_tmp8_ = self->contrast_slider;
 #line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), 1, 1, 1, 1);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), 1, 1, 1, 1);
 #line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = self->contrast_slider;
+	_tmp9_ = self->contrast_slider;
 #line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = self->contrast_slider;
+	_tmp10_ = self->contrast_slider;
 #line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp12_, FALSE);
+	gtk_scale_set_draw_value (_tmp10_, FALSE);
 #line 2268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = self->contrast_slider;
+	_tmp11_ = self->contrast_slider;
 #line 2268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = _ ("Saturation:");
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 0);
 #line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp14_);
+	_tmp12_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Saturation:"));
 #line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp15_);
+	g_object_ref_sink (_tmp12_);
 #line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	saturation_label = _tmp15_;
+	saturation_label = _tmp12_;
 #line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18319,29 +18192,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_widget_get_type (), GtkWidget), 0, 2, 1, 1);
 #line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = self->saturation_slider;
+	_tmp13_ = self->saturation_slider;
 #line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), 1, 2, 1, 1);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 1, 2, 1, 1);
 #line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = self->saturation_slider;
+	_tmp14_ = self->saturation_slider;
 #line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = self->saturation_slider;
+	_tmp15_ = self->saturation_slider;
 #line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp18_, FALSE);
+	gtk_scale_set_draw_value (_tmp15_, FALSE);
 #line 2277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = self->saturation_slider;
+	_tmp16_ = self->saturation_slider;
 #line 2277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), 0);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), 0);
 #line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = _ ("Tint:");
+	_tmp17_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Tint:"));
 #line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp20_);
+	g_object_ref_sink (_tmp17_);
 #line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp21_);
-#line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	tint_label = _tmp21_;
+	tint_label = _tmp17_;
 #line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18349,29 +18220,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_widget_get_type (), GtkWidget), 0, 3, 1, 1);
 #line 2283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = self->tint_slider;
+	_tmp18_ = self->tint_slider;
 #line 2283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), 1, 3, 1, 1);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), 1, 3, 1, 1);
 #line 2284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = self->tint_slider;
+	_tmp19_ = self->tint_slider;
 #line 2284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = self->tint_slider;
+	_tmp20_ = self->tint_slider;
 #line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp24_, FALSE);
+	gtk_scale_set_draw_value (_tmp20_, FALSE);
 #line 2286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = self->tint_slider;
+	_tmp21_ = self->tint_slider;
 #line 2286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), 0);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), 0);
 #line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp26_ = _ ("Temperature:");
+	_tmp22_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Temperature:"));
 #line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp27_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp26_);
-#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp27_);
+	g_object_ref_sink (_tmp22_);
 #line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	temperature_label = _tmp27_;
+	temperature_label = _tmp22_;
 #line 2290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 2291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18379,29 +18248,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_widget_get_type (), GtkWidget), 0, 4, 1, 1);
 #line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28_ = self->temperature_slider;
+	_tmp23_ = self->temperature_slider;
 #line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), 1, 4, 1, 1);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), 1, 4, 1, 1);
 #line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp29_ = self->temperature_slider;
+	_tmp24_ = self->temperature_slider;
 #line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp30_ = self->temperature_slider;
+	_tmp25_ = self->temperature_slider;
 #line 2295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp30_, FALSE);
+	gtk_scale_set_draw_value (_tmp25_, FALSE);
 #line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp31_ = self->temperature_slider;
+	_tmp26_ = self->temperature_slider;
 #line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), 0);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), 0);
 #line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp32_ = _ ("Shadows:");
+	_tmp27_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Shadows:"));
 #line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp33_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp32_);
-#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp33_);
+	g_object_ref_sink (_tmp27_);
 #line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	shadows_label = _tmp33_;
+	shadows_label = _tmp27_;
 #line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 2300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18409,29 +18276,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_widget_get_type (), GtkWidget), 0, 5, 1, 1);
 #line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp34_ = self->shadows_slider;
+	_tmp28_ = self->shadows_slider;
 #line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), 1, 5, 1, 1);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), 1, 5, 1, 1);
 #line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp35_ = self->shadows_slider;
+	_tmp29_ = self->shadows_slider;
 #line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp36_ = self->shadows_slider;
+	_tmp30_ = self->shadows_slider;
 #line 2304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp36_, FALSE);
+	gtk_scale_set_draw_value (_tmp30_, FALSE);
 #line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp37_ = self->shadows_slider;
+	_tmp31_ = self->shadows_slider;
 #line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp38_ = _ ("Highlights:");
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), 0);
 #line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp39_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp38_);
+	_tmp32_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Highlights:"));
 #line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp39_);
+	g_object_ref_sink (_tmp32_);
 #line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	highlights_label = _tmp39_;
+	highlights_label = _tmp32_;
 #line 2308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 2309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18439,71 +18304,71 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_widget_get_type (), GtkWidget), 0, 6, 1, 1);
 #line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp40_ = self->highlights_slider;
+	_tmp33_ = self->highlights_slider;
 #line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), 1, 6, 1, 1);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget), 1, 6, 1, 1);
 #line 2312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp41_ = self->highlights_slider;
+	_tmp34_ = self->highlights_slider;
 #line 2312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp42_ = self->highlights_slider;
+	_tmp35_ = self->highlights_slider;
 #line 2313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp42_, FALSE);
+	gtk_scale_set_draw_value (_tmp35_, FALSE);
 #line 2315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp43_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+	_tmp36_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
 #line 2315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp43_);
+	g_object_ref_sink (_tmp36_);
 #line 2315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	button_layouter = _tmp43_;
+	button_layouter = _tmp36_;
 #line 2316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_box_set_homogeneous (button_layouter, TRUE);
 #line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp44_ = self->cancel_button;
+	_tmp37_ = self->cancel_button;
 #line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
+	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
 #line 2318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp45_ = self->reset_button;
+	_tmp38_ = self->reset_button;
 #line 2318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
+	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
 #line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp46_ = self->ok_button;
+	_tmp39_ = self->ok_button;
 #line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
+	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
 #line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp47_ = self->histogram_manipulator;
+	_tmp40_ = self->histogram_manipulator;
 #line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget), 12);
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), 12);
 #line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp48_ = self->histogram_manipulator;
+	_tmp41_ = self->histogram_manipulator;
 #line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget), 12);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), 12);
 #line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp49_ = self->histogram_manipulator;
+	_tmp42_ = self->histogram_manipulator;
 #line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget), 12);
+	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), 12);
 #line 2324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp50_ = self->histogram_manipulator;
+	_tmp43_ = self->histogram_manipulator;
 #line 2324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), 8);
+	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), 8);
 #line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp51_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+	_tmp44_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
 #line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp51_);
+	g_object_ref_sink (_tmp44_);
 #line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	pane_layouter = _tmp51_;
+	pane_layouter = _tmp44_;
 #line 2327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp52_ = self->histogram_manipulator;
+	_tmp45_ = self->histogram_manipulator;
 #line 2327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget));
 #line 2328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget));
 #line 2329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (button_layouter, gtk_widget_get_type (), GtkWidget));
 #line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp53_ = self->histogram_manipulator;
+	_tmp46_ = self->histogram_manipulator;
 #line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_box_set_child_packing (pane_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0, GTK_PACK_START);
+	gtk_box_set_child_packing (pane_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0, GTK_PACK_START);
 #line 2332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_widget_get_type (), GtkWidget));
 #line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18528,14 +18393,14 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 	_g_object_unref0 (slider_organizer);
 #line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18532 "EditingTools.c"
+#line 18397 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_new (GtkWindow* container) {
 #line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_adjust_tool_window_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_WINDOW, container);
-#line 18539 "EditingTools.c"
+#line 18404 "EditingTools.c"
 }
 
 
@@ -18544,23 +18409,22 @@ static void editing_tools_adjust_tool_adjust_tool_window_class_init (EditingTool
 	editing_tools_adjust_tool_adjust_tool_window_parent_class = g_type_class_peek_parent (klass);
 #line 2213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_tool_window_finalize;
-#line 18548 "EditingTools.c"
+#line 18413 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_tool_window_instance_init (EditingToolsAdjustToolAdjustToolWindow * self) {
-	GtkScale* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
-	GtkScale* _tmp2_ = NULL;
-	GtkScale* _tmp3_ = NULL;
-	GtkScale* _tmp4_ = NULL;
-	GtkScale* _tmp5_ = NULL;
-	GtkScale* _tmp6_ = NULL;
-	GtkButton* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	GtkButton* _tmp9_ = NULL;
-	GtkButton* _tmp10_ = NULL;
-	RGBHistogramManipulator* _tmp11_ = NULL;
+	GtkScale* _tmp0_;
+	GtkScale* _tmp1_;
+	GtkScale* _tmp2_;
+	GtkScale* _tmp3_;
+	GtkScale* _tmp4_;
+	GtkScale* _tmp5_;
+	GtkScale* _tmp6_;
+	GtkButton* _tmp7_;
+	GtkButton* _tmp8_;
+	GtkButton* _tmp9_;
+	RGBHistogramManipulator* _tmp10_;
 #line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) EXPOSURE_TRANSFORMATION_MIN_PARAMETER, (gdouble) EXPOSURE_TRANSFORMATION_MAX_PARAMETER, 1.0);
 #line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18610,30 +18474,28 @@ static void editing_tools_adjust_tool_adjust_tool_window_instance_init (EditingT
 #line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ok_button = _tmp7_;
 #line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = _ ("_Reset");
+	_tmp8_ = (GtkButton*) gtk_button_new_with_mnemonic (_ ("_Reset"));
 #line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = (GtkButton*) gtk_button_new_with_mnemonic (_tmp8_);
-#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp9_);
+	g_object_ref_sink (_tmp8_);
 #line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->reset_button = _tmp9_;
+	self->reset_button = _tmp8_;
 #line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
+	_tmp9_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
 #line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp10_);
+	g_object_ref_sink (_tmp9_);
 #line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->cancel_button = _tmp10_;
+	self->cancel_button = _tmp9_;
 #line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = rgb_histogram_manipulator_new ();
+	_tmp10_ = rgb_histogram_manipulator_new ();
 #line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp11_);
+	g_object_ref_sink (_tmp10_);
 #line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->histogram_manipulator = _tmp11_;
-#line 18633 "EditingTools.c"
+	self->histogram_manipulator = _tmp10_;
+#line 18495 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_adjust_tool_window_finalize (GObject* obj) {
+static void editing_tools_adjust_tool_adjust_tool_window_finalize (GObject * obj) {
 	EditingToolsAdjustToolAdjustToolWindow * self;
 #line 2213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_WINDOW, EditingToolsAdjustToolAdjustToolWindow);
@@ -18661,7 +18523,7 @@ static void editing_tools_adjust_tool_adjust_tool_window_finalize (GObject* obj)
 	_g_object_unref0 (self->histogram_manipulator);
 #line 2213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_tool_window_parent_class)->finalize (obj);
-#line 18665 "EditingTools.c"
+#line 18527 "EditingTools.c"
 }
 
 
@@ -18680,16 +18542,16 @@ static GType editing_tools_adjust_tool_adjust_tool_window_get_type (void) {
 static void _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self) {
 #line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated ((EditingToolsAdjustToolAdjustToolCommand*) self);
-#line 18684 "EditingTools.c"
+#line 18546 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolAdjustToolCommand* editing_tools_adjust_tool_adjust_tool_command_construct (GType object_type, EditingToolsAdjustTool* owner, const gchar* name, const gchar* explanation) {
 	EditingToolsAdjustToolAdjustToolCommand * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	EditingToolsAdjustTool* _tmp2_ = NULL;
-	EditingToolsAdjustTool* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	EditingToolsAdjustTool* _tmp2_;
+	EditingToolsAdjustTool* _tmp3_;
 #line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
 #line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18712,13 +18574,13 @@ static EditingToolsAdjustToolAdjustToolCommand* editing_tools_adjust_tool_adjust
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "deactivated", (GCallback) _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated, self, 0);
 #line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18716 "EditingTools.c"
+#line 18578 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated (EditingToolsAdjustToolAdjustToolCommand* self) {
-	CommandManager* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
+	CommandManager* _tmp0_;
+	CommandManager* _tmp1_;
 #line 2351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_ADJUST_TOOL_IS_ADJUST_TOOL_COMMAND (self));
 #line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18729,7 +18591,7 @@ static void editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated (
 	command_manager_reset (_tmp1_);
 #line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 18733 "EditingTools.c"
+#line 18595 "EditingTools.c"
 }
 
 
@@ -18738,7 +18600,7 @@ static void editing_tools_adjust_tool_adjust_tool_command_class_init (EditingToo
 	editing_tools_adjust_tool_adjust_tool_command_parent_class = g_type_class_peek_parent (klass);
 #line 2336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_tool_command_finalize;
-#line 18742 "EditingTools.c"
+#line 18604 "EditingTools.c"
 }
 
 
@@ -18746,29 +18608,29 @@ static void editing_tools_adjust_tool_adjust_tool_command_instance_init (Editing
 }
 
 
-static void editing_tools_adjust_tool_adjust_tool_command_finalize (GObject* obj) {
+static void editing_tools_adjust_tool_adjust_tool_command_finalize (GObject * obj) {
 	EditingToolsAdjustToolAdjustToolCommand * self;
-	EditingToolsAdjustTool* _tmp0_ = NULL;
+	EditingToolsAdjustTool* _tmp0_;
 #line 2336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand);
 #line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->owner;
 #line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 18759 "EditingTools.c"
-		EditingToolsAdjustTool* _tmp1_ = NULL;
-		guint _tmp2_ = 0U;
+#line 18621 "EditingTools.c"
+		EditingToolsAdjustTool* _tmp1_;
+		guint _tmp2_;
 #line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = self->owner;
 #line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_parse_name ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp2_, NULL, FALSE);
 #line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated, self);
-#line 18768 "EditingTools.c"
+#line 18630 "EditingTools.c"
 	}
 #line 2336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_tool_command_parent_class)->finalize (obj);
-#line 18772 "EditingTools.c"
+#line 18634 "EditingTools.c"
 }
 
 
@@ -18786,13 +18648,11 @@ static GType editing_tools_adjust_tool_adjust_tool_command_get_type (void) {
 
 static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjust_reset_command_construct (GType object_type, EditingToolsAdjustTool* owner, PixelTransformationBundle* current) {
 	EditingToolsAdjustToolAdjustResetCommand * self = NULL;
-	EditingToolsAdjustTool* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PixelTransformationBundle* _tmp3_ = NULL;
-	PixelTransformationBundle* _tmp4_ = NULL;
-	PixelTransformationBundle* _tmp5_ = NULL;
-	PixelTransformationBundle* _tmp6_ = NULL;
+	EditingToolsAdjustTool* _tmp0_;
+	PixelTransformationBundle* _tmp1_;
+	PixelTransformationBundle* _tmp2_;
+	PixelTransformationBundle* _tmp3_;
+	PixelTransformationBundle* _tmp4_;
 #line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
 #line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18800,46 +18660,42 @@ static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjus
 #line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = owner;
 #line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = _ ("Reset Colors");
-#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = _ ("Reset all color adjustments to original");
-#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self = (EditingToolsAdjustToolAdjustResetCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_);
+	self = (EditingToolsAdjustToolAdjustResetCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, _ ("Reset Colors"), _ ("Reset all color adjustments to original"));
 #line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = current;
+	_tmp1_ = current;
 #line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = pixel_transformation_bundle_copy (_tmp3_);
+	_tmp2_ = pixel_transformation_bundle_copy (_tmp1_);
 #line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->original);
 #line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->original = _tmp4_;
+	self->priv->original = _tmp2_;
 #line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = pixel_transformation_bundle_new ();
+	_tmp3_ = pixel_transformation_bundle_new ();
 #line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->reset);
 #line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->reset = _tmp5_;
+	self->priv->reset = _tmp3_;
 #line 2367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = self->priv->reset;
+	_tmp4_ = self->priv->reset;
 #line 2367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	pixel_transformation_bundle_set_to_identity (_tmp6_);
+	pixel_transformation_bundle_set_to_identity (_tmp4_);
 #line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18829 "EditingTools.c"
+#line 18685 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjust_reset_command_new (EditingToolsAdjustTool* owner, PixelTransformationBundle* current) {
 #line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_adjust_reset_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, owner, current);
-#line 18836 "EditingTools.c"
+#line 18692 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_reset_command_real_execute (Command* base) {
 	EditingToolsAdjustToolAdjustResetCommand * self;
-	EditingToolsAdjustTool* _tmp0_ = NULL;
-	PixelTransformationBundle* _tmp1_ = NULL;
+	EditingToolsAdjustTool* _tmp0_;
+	PixelTransformationBundle* _tmp1_;
 #line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
 #line 2371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18848,14 +18704,14 @@ static void editing_tools_adjust_tool_adjust_reset_command_real_execute (Command
 	_tmp1_ = self->priv->reset;
 #line 2371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 18852 "EditingTools.c"
+#line 18708 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_reset_command_real_undo (Command* base) {
 	EditingToolsAdjustToolAdjustResetCommand * self;
-	EditingToolsAdjustTool* _tmp0_ = NULL;
-	PixelTransformationBundle* _tmp1_ = NULL;
+	EditingToolsAdjustTool* _tmp0_;
+	PixelTransformationBundle* _tmp1_;
 #line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
 #line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18864,7 +18720,7 @@ static void editing_tools_adjust_tool_adjust_reset_command_real_undo (Command* b
 	_tmp1_ = self->priv->original;
 #line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 18868 "EditingTools.c"
+#line 18724 "EditingTools.c"
 }
 
 
@@ -18872,12 +18728,12 @@ static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Co
 	EditingToolsAdjustToolAdjustResetCommand * self;
 	gboolean result = FALSE;
 	EditingToolsAdjustToolAdjustResetCommand* reset_command = NULL;
-	Command* _tmp0_ = NULL;
-	EditingToolsAdjustToolAdjustResetCommand* _tmp1_ = NULL;
-	EditingToolsAdjustToolAdjustResetCommand* _tmp2_ = NULL;
-	EditingToolsAdjustToolAdjustResetCommand* _tmp3_ = NULL;
-	EditingToolsAdjustTool* _tmp4_ = NULL;
-	EditingToolsAdjustTool* _tmp5_ = NULL;
+	Command* _tmp0_;
+	EditingToolsAdjustToolAdjustResetCommand* _tmp1_;
+	EditingToolsAdjustToolAdjustResetCommand* _tmp2_;
+	EditingToolsAdjustToolAdjustResetCommand* _tmp3_;
+	EditingToolsAdjustTool* _tmp4_;
+	EditingToolsAdjustTool* _tmp5_;
 #line 2378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
 #line 2378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18898,7 +18754,7 @@ static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Co
 		_g_object_unref0 (reset_command);
 #line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18902 "EditingTools.c"
+#line 18758 "EditingTools.c"
 	}
 #line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = reset_command;
@@ -18914,7 +18770,7 @@ static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Co
 		_g_object_unref0 (reset_command);
 #line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18918 "EditingTools.c"
+#line 18774 "EditingTools.c"
 	}
 #line 2387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
@@ -18922,7 +18778,7 @@ static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Co
 	_g_object_unref0 (reset_command);
 #line 2387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 18926 "EditingTools.c"
+#line 18782 "EditingTools.c"
 }
 
 
@@ -18932,25 +18788,25 @@ static void editing_tools_adjust_tool_adjust_reset_command_class_init (EditingTo
 #line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolAdjustResetCommandPrivate));
 #line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) editing_tools_adjust_tool_adjust_reset_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) editing_tools_adjust_tool_adjust_reset_command_real_execute;
 #line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) editing_tools_adjust_tool_adjust_reset_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) editing_tools_adjust_tool_adjust_reset_command_real_undo;
 #line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((CommandClass *) klass)->compress = (gboolean (*)(Command*, Command*)) editing_tools_adjust_tool_adjust_reset_command_real_compress;
+	((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) editing_tools_adjust_tool_adjust_reset_command_real_compress;
 #line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_reset_command_finalize;
-#line 18943 "EditingTools.c"
+#line 18799 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_reset_command_instance_init (EditingToolsAdjustToolAdjustResetCommand * self) {
 #line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_GET_PRIVATE (self);
-#line 18950 "EditingTools.c"
+#line 18806 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_adjust_reset_command_finalize (GObject* obj) {
+static void editing_tools_adjust_tool_adjust_reset_command_finalize (GObject * obj) {
 	EditingToolsAdjustToolAdjustResetCommand * self;
 #line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
@@ -18960,7 +18816,7 @@ static void editing_tools_adjust_tool_adjust_reset_command_finalize (GObject* ob
 	_pixel_transformation_bundle_unref0 (self->priv->reset);
 #line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_reset_command_parent_class)->finalize (obj);
-#line 18964 "EditingTools.c"
+#line 18820 "EditingTools.c"
 }
 
 
@@ -18978,18 +18834,18 @@ static GType editing_tools_adjust_tool_adjust_reset_command_get_type (void) {
 
 static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_construct (GType object_type, EditingToolsAdjustTool* owner, PixelTransformation* old_transformation, PixelTransformation* new_transformation, const gchar* name) {
 	EditingToolsAdjustToolSliderAdjustmentCommand * self = NULL;
-	EditingToolsAdjustTool* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PixelTransformation* _tmp3_ = NULL;
-	PixelTransformation* _tmp4_ = NULL;
-	PixelTransformation* _tmp5_ = NULL;
-	PixelTransformation* _tmp6_ = NULL;
-	PixelTransformation* _tmp7_ = NULL;
-	PixelTransformationType _tmp8_ = 0;
-	PixelTransformation* _tmp9_ = NULL;
-	PixelTransformationType _tmp10_ = 0;
-	PixelTransformationType _tmp11_ = 0;
+	EditingToolsAdjustTool* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	PixelTransformation* _tmp3_;
+	PixelTransformation* _tmp4_;
+	PixelTransformation* _tmp5_;
+	PixelTransformation* _tmp6_;
+	PixelTransformation* _tmp7_;
+	PixelTransformationType _tmp8_;
+	PixelTransformation* _tmp9_;
+	PixelTransformationType _tmp10_;
+	PixelTransformationType _tmp11_;
 #line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
 #line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -19038,23 +18894,23 @@ static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_
 	_vala_assert (_tmp10_ == _tmp11_, "new_transformation.get_transformation_type() == transformation_type");
 #line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 19042 "EditingTools.c"
+#line 18898 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_new (EditingToolsAdjustTool* owner, PixelTransformation* old_transformation, PixelTransformation* new_transformation, const gchar* name) {
 #line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_slider_adjustment_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, owner, old_transformation, new_transformation, name);
-#line 19049 "EditingTools.c"
+#line 18905 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_slider_adjustment_command_real_execute (Command* base) {
 	EditingToolsAdjustToolSliderAdjustmentCommand * self;
-	EditingToolsAdjustTool* _tmp0_ = NULL;
-	PixelTransformation* _tmp1_ = NULL;
-	EditingToolsAdjustTool* _tmp2_ = NULL;
-	EditingToolsPhotoCanvas* _tmp3_ = NULL;
+	EditingToolsAdjustTool* _tmp0_;
+	PixelTransformation* _tmp1_;
+	EditingToolsAdjustTool* _tmp2_;
+	EditingToolsPhotoCanvas* _tmp3_;
 #line 2406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
 #line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -19069,20 +18925,20 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_execute (Co
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp3_);
-#line 19073 "EditingTools.c"
+#line 18929 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_slider_adjustment_command_real_undo (Command* base) {
 	EditingToolsAdjustToolSliderAdjustmentCommand * self;
-	EditingToolsAdjustTool* _tmp0_ = NULL;
-	PixelTransformation* _tmp1_ = NULL;
-	EditingToolsAdjustTool* _tmp2_ = NULL;
-	EditingToolsAdjustTool* _tmp3_ = NULL;
-	PixelTransformation* _tmp4_ = NULL;
-	EditingToolsAdjustTool* _tmp5_ = NULL;
-	EditingToolsAdjustTool* _tmp6_ = NULL;
-	EditingToolsPhotoCanvas* _tmp7_ = NULL;
+	EditingToolsAdjustTool* _tmp0_;
+	PixelTransformation* _tmp1_;
+	EditingToolsAdjustTool* _tmp2_;
+	EditingToolsAdjustTool* _tmp3_;
+	PixelTransformation* _tmp4_;
+	EditingToolsAdjustTool* _tmp5_;
+	EditingToolsAdjustTool* _tmp6_;
+	EditingToolsPhotoCanvas* _tmp7_;
 #line 2412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
 #line 2413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -19111,20 +18967,20 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_undo (Comma
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp7_);
-#line 19115 "EditingTools.c"
+#line 18971 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_slider_adjustment_command_real_redo (Command* base) {
 	EditingToolsAdjustToolSliderAdjustmentCommand * self;
-	EditingToolsAdjustTool* _tmp0_ = NULL;
-	PixelTransformation* _tmp1_ = NULL;
-	EditingToolsAdjustTool* _tmp2_ = NULL;
-	EditingToolsAdjustTool* _tmp3_ = NULL;
-	PixelTransformation* _tmp4_ = NULL;
-	EditingToolsAdjustTool* _tmp5_ = NULL;
-	EditingToolsAdjustTool* _tmp6_ = NULL;
-	EditingToolsPhotoCanvas* _tmp7_ = NULL;
+	EditingToolsAdjustTool* _tmp0_;
+	PixelTransformation* _tmp1_;
+	EditingToolsAdjustTool* _tmp2_;
+	EditingToolsAdjustTool* _tmp3_;
+	PixelTransformation* _tmp4_;
+	EditingToolsAdjustTool* _tmp5_;
+	EditingToolsAdjustTool* _tmp6_;
+	EditingToolsPhotoCanvas* _tmp7_;
 #line 2422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
 #line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -19153,7 +19009,7 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_redo (Comma
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp7_);
-#line 19157 "EditingTools.c"
+#line 19013 "EditingTools.c"
 }
 
 
@@ -19161,19 +19017,19 @@ static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compres
 	EditingToolsAdjustToolSliderAdjustmentCommand * self;
 	gboolean result = FALSE;
 	EditingToolsAdjustToolSliderAdjustmentCommand* slider_adjustment = NULL;
-	Command* _tmp0_ = NULL;
-	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp1_ = NULL;
-	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp2_ = NULL;
-	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp3_ = NULL;
-	EditingToolsAdjustTool* _tmp4_ = NULL;
-	EditingToolsAdjustTool* _tmp5_ = NULL;
-	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp6_ = NULL;
-	PixelTransformationType _tmp7_ = 0;
-	PixelTransformationType _tmp8_ = 0;
-	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp9_ = NULL;
-	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp10_ = NULL;
-	PixelTransformation* _tmp11_ = NULL;
-	PixelTransformation* _tmp12_ = NULL;
+	Command* _tmp0_;
+	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp1_;
+	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp2_;
+	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp3_;
+	EditingToolsAdjustTool* _tmp4_;
+	EditingToolsAdjustTool* _tmp5_;
+	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp6_;
+	PixelTransformationType _tmp7_;
+	PixelTransformationType _tmp8_;
+	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp9_;
+	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp10_;
+	PixelTransformation* _tmp11_;
+	PixelTransformation* _tmp12_;
 #line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
 #line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -19194,7 +19050,7 @@ static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compres
 		_g_object_unref0 (slider_adjustment);
 #line 2435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19198 "EditingTools.c"
+#line 19054 "EditingTools.c"
 	}
 #line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = slider_adjustment;
@@ -19210,7 +19066,7 @@ static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compres
 		_g_object_unref0 (slider_adjustment);
 #line 2439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19214 "EditingTools.c"
+#line 19070 "EditingTools.c"
 	}
 #line 2442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = slider_adjustment;
@@ -19226,7 +19082,7 @@ static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compres
 		_g_object_unref0 (slider_adjustment);
 #line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19230 "EditingTools.c"
+#line 19086 "EditingTools.c"
 	}
 #line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = slider_adjustment;
@@ -19248,7 +19104,7 @@ static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compres
 	_g_object_unref0 (slider_adjustment);
 #line 2451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 19252 "EditingTools.c"
+#line 19108 "EditingTools.c"
 }
 
 
@@ -19258,27 +19114,27 @@ static void editing_tools_adjust_tool_slider_adjustment_command_class_init (Edit
 #line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolSliderAdjustmentCommandPrivate));
 #line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) editing_tools_adjust_tool_slider_adjustment_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) editing_tools_adjust_tool_slider_adjustment_command_real_execute;
 #line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) editing_tools_adjust_tool_slider_adjustment_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) editing_tools_adjust_tool_slider_adjustment_command_real_undo;
 #line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((CommandClass *) klass)->redo = (void (*)(Command*)) editing_tools_adjust_tool_slider_adjustment_command_real_redo;
+	((CommandClass *) klass)->redo = (void (*) (Command *)) editing_tools_adjust_tool_slider_adjustment_command_real_redo;
 #line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((CommandClass *) klass)->compress = (gboolean (*)(Command*, Command*)) editing_tools_adjust_tool_slider_adjustment_command_real_compress;
+	((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) editing_tools_adjust_tool_slider_adjustment_command_real_compress;
 #line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_slider_adjustment_command_finalize;
-#line 19271 "EditingTools.c"
+#line 19127 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_slider_adjustment_command_instance_init (EditingToolsAdjustToolSliderAdjustmentCommand * self) {
 #line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_GET_PRIVATE (self);
-#line 19278 "EditingTools.c"
+#line 19134 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_slider_adjustment_command_finalize (GObject* obj) {
+static void editing_tools_adjust_tool_slider_adjustment_command_finalize (GObject * obj) {
 	EditingToolsAdjustToolSliderAdjustmentCommand * self;
 #line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
@@ -19288,7 +19144,7 @@ static void editing_tools_adjust_tool_slider_adjustment_command_finalize (GObjec
 	_pixel_transformation_unref0 (self->priv->old_transformation);
 #line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_slider_adjustment_command_parent_class)->finalize (obj);
-#line 19292 "EditingTools.c"
+#line 19148 "EditingTools.c"
 }
 
 
@@ -19306,11 +19162,11 @@ static GType editing_tools_adjust_tool_slider_adjustment_command_get_type (void)
 
 static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adjust_enhance_command_construct (GType object_type, EditingToolsAdjustTool* owner, Photo* photo) {
 	EditingToolsAdjustToolAdjustEnhanceCommand * self = NULL;
-	EditingToolsAdjustTool* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	Photo* _tmp3_ = NULL;
-	PixelTransformationBundle* _tmp4_ = NULL;
+	EditingToolsAdjustTool* _tmp0_;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
+	Photo* _tmp3_;
+	PixelTransformationBundle* _tmp4_;
 #line 2460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
 #line 2460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -19337,31 +19193,31 @@ static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adj
 	self->priv->original = _tmp4_;
 #line 2460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 19341 "EditingTools.c"
+#line 19197 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adjust_enhance_command_new (EditingToolsAdjustTool* owner, Photo* photo) {
 #line 2460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_adjust_enhance_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, owner, photo);
-#line 19348 "EditingTools.c"
+#line 19204 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_enhance_command_real_execute (Command* base) {
 	EditingToolsAdjustToolAdjustEnhanceCommand * self;
-	PixelTransformationBundle* _tmp0_ = NULL;
-	EditingToolsAdjustTool* _tmp3_ = NULL;
-	PixelTransformationBundle* _tmp4_ = NULL;
+	PixelTransformationBundle* _tmp0_;
+	EditingToolsAdjustTool* _tmp3_;
+	PixelTransformationBundle* _tmp4_;
 #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
 #line 2468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->enhanced;
 #line 2468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 19363 "EditingTools.c"
-		Photo* _tmp1_ = NULL;
-		PixelTransformationBundle* _tmp2_ = NULL;
+#line 19219 "EditingTools.c"
+		Photo* _tmp1_;
+		PixelTransformationBundle* _tmp2_;
 #line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = self->priv->photo;
 #line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -19370,7 +19226,7 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_execute (Comma
 		_pixel_transformation_bundle_unref0 (self->priv->enhanced);
 #line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->enhanced = _tmp2_;
-#line 19374 "EditingTools.c"
+#line 19230 "EditingTools.c"
 	}
 #line 2471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
@@ -19378,14 +19234,14 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_execute (Comma
 	_tmp4_ = self->priv->enhanced;
 #line 2471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp3_, _tmp4_);
-#line 19382 "EditingTools.c"
+#line 19238 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_enhance_command_real_undo (Command* base) {
 	EditingToolsAdjustToolAdjustEnhanceCommand * self;
-	EditingToolsAdjustTool* _tmp0_ = NULL;
-	PixelTransformationBundle* _tmp1_ = NULL;
+	EditingToolsAdjustTool* _tmp0_;
+	PixelTransformationBundle* _tmp1_;
 #line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
 #line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -19394,7 +19250,7 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_undo (Command*
 	_tmp1_ = self->priv->original;
 #line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 19398 "EditingTools.c"
+#line 19254 "EditingTools.c"
 }
 
 
@@ -19402,16 +19258,16 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 	EditingToolsAdjustToolAdjustEnhanceCommand * self;
 	gboolean result = FALSE;
 	EnhanceSingleCommand* enhance_single = NULL;
-	Command* _tmp0_ = NULL;
-	EnhanceSingleCommand* _tmp1_ = NULL;
-	EnhanceSingleCommand* _tmp2_ = NULL;
+	Command* _tmp0_;
+	EnhanceSingleCommand* _tmp1_;
+	EnhanceSingleCommand* _tmp2_;
 	EditingToolsAdjustToolAdjustEnhanceCommand* enhance_command = NULL;
-	Command* _tmp12_ = NULL;
-	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp13_ = NULL;
-	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp14_ = NULL;
-	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp15_ = NULL;
-	EditingToolsAdjustTool* _tmp16_ = NULL;
-	EditingToolsAdjustTool* _tmp17_ = NULL;
+	Command* _tmp12_;
+	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp13_;
+	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp14_;
+	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp15_;
+	EditingToolsAdjustTool* _tmp16_;
+	EditingToolsAdjustTool* _tmp17_;
 #line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
 #line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -19426,17 +19282,17 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 	_tmp2_ = enhance_single;
 #line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ != NULL) {
-#line 19430 "EditingTools.c"
+#line 19286 "EditingTools.c"
 		Photo* photo = NULL;
-		EnhanceSingleCommand* _tmp3_ = NULL;
-		DataSource* _tmp4_ = NULL;
-		Photo* _tmp5_ = NULL;
-		EditingToolsAdjustTool* _tmp6_ = NULL;
-		EditingToolsPhotoCanvas* _tmp7_ = NULL;
-		Photo* _tmp8_ = NULL;
-		Photo* _tmp9_ = NULL;
-		gboolean _tmp10_ = FALSE;
-		gboolean _tmp11_ = FALSE;
+		EnhanceSingleCommand* _tmp3_;
+		DataSource* _tmp4_;
+		Photo* _tmp5_;
+		EditingToolsAdjustTool* _tmp6_;
+		EditingToolsPhotoCanvas* _tmp7_;
+		Photo* _tmp8_;
+		Photo* _tmp9_;
+		gboolean _tmp10_;
+		gboolean _tmp11_;
 #line 2482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = enhance_single;
 #line 2482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -19467,7 +19323,7 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 		_g_object_unref0 (enhance_single);
 #line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19471 "EditingTools.c"
+#line 19327 "EditingTools.c"
 	}
 #line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = command;
@@ -19487,7 +19343,7 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 		_g_object_unref0 (enhance_single);
 #line 2491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19491 "EditingTools.c"
+#line 19347 "EditingTools.c"
 	}
 #line 2493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = enhance_command;
@@ -19505,7 +19361,7 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 		_g_object_unref0 (enhance_single);
 #line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19509 "EditingTools.c"
+#line 19365 "EditingTools.c"
 	}
 #line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
@@ -19515,7 +19371,7 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 	_g_object_unref0 (enhance_single);
 #line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 19519 "EditingTools.c"
+#line 19375 "EditingTools.c"
 }
 
 
@@ -19525,14 +19381,14 @@ static void editing_tools_adjust_tool_adjust_enhance_command_class_init (Editing
 #line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolAdjustEnhanceCommandPrivate));
 #line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) editing_tools_adjust_tool_adjust_enhance_command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) editing_tools_adjust_tool_adjust_enhance_command_real_execute;
 #line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) editing_tools_adjust_tool_adjust_enhance_command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) editing_tools_adjust_tool_adjust_enhance_command_real_undo;
 #line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((CommandClass *) klass)->compress = (gboolean (*)(Command*, Command*)) editing_tools_adjust_tool_adjust_enhance_command_real_compress;
+	((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) editing_tools_adjust_tool_adjust_enhance_command_real_compress;
 #line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_enhance_command_finalize;
-#line 19536 "EditingTools.c"
+#line 19392 "EditingTools.c"
 }
 
 
@@ -19541,11 +19397,11 @@ static void editing_tools_adjust_tool_adjust_enhance_command_instance_init (Edit
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_GET_PRIVATE (self);
 #line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->enhanced = NULL;
-#line 19545 "EditingTools.c"
+#line 19401 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject* obj) {
+static void editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject * obj) {
 	EditingToolsAdjustToolAdjustEnhanceCommand * self;
 #line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
@@ -19557,7 +19413,7 @@ static void editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject*
 	_pixel_transformation_bundle_unref0 (self->priv->enhanced);
 #line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_enhance_command_parent_class)->finalize (obj);
-#line 19561 "EditingTools.c"
+#line 19417 "EditingTools.c"
 }
 
 
@@ -19581,18 +19437,18 @@ static void editing_tools_adjust_tool_class_init (EditingToolsAdjustToolClass *
 #line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolPrivate));
 #line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->activate = (void (*)(EditingToolsEditingTool*, EditingToolsPhotoCanvas*)) editing_tools_adjust_tool_real_activate;
+	((EditingToolsEditingToolClass *) klass)->activate = (void (*) (EditingToolsEditingTool *, EditingToolsPhotoCanvas*)) editing_tools_adjust_tool_real_activate;
 #line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*)(EditingToolsEditingTool*)) editing_tools_adjust_tool_real_get_tool_window;
+	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*) (EditingToolsEditingTool *)) editing_tools_adjust_tool_real_get_tool_window;
 #line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->deactivate = (void (*)(EditingToolsEditingTool*)) editing_tools_adjust_tool_real_deactivate;
+	((EditingToolsEditingToolClass *) klass)->deactivate = (void (*) (EditingToolsEditingTool *)) editing_tools_adjust_tool_real_deactivate;
 #line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->paint = (void (*)(EditingToolsEditingTool*, cairo_t*)) editing_tools_adjust_tool_real_paint;
+	((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_adjust_tool_real_paint;
 #line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = (GdkPixbuf* (*)(EditingToolsEditingTool*, Scaling*, Photo*, Dimensions*, GError**)) editing_tools_adjust_tool_real_get_display_pixbuf;
+	((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = (GdkPixbuf* (*) (EditingToolsEditingTool *, Scaling*, Photo*, Dimensions*, GError**)) editing_tools_adjust_tool_real_get_display_pixbuf;
 #line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*)(EditingToolsEditingTool*, GdkEventKey*)) editing_tools_adjust_tool_real_on_keypress;
-#line 19596 "EditingTools.c"
+	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*) (EditingToolsEditingTool *, GdkEventKey*)) editing_tools_adjust_tool_real_on_keypress;
+#line 19452 "EditingTools.c"
 }
 
 
@@ -19637,11 +19493,11 @@ static void editing_tools_adjust_tool_instance_init (EditingToolsAdjustTool * se
 	self->priv->shadows_scheduler = NULL;
 #line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->highlights_scheduler = NULL;
-#line 19641 "EditingTools.c"
+#line 19497 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_finalize (EditingToolsEditingTool* obj) {
+static void editing_tools_adjust_tool_finalize (EditingToolsEditingTool * obj) {
 	EditingToolsAdjustTool * self;
 #line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
@@ -19677,7 +19533,7 @@ static void editing_tools_adjust_tool_finalize (EditingToolsEditingTool* obj) {
 	_one_shot_scheduler_unref0 (self->priv->highlights_scheduler);
 #line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->finalize (obj);
-#line 19681 "EditingTools.c"
+#line 19537 "EditingTools.c"
 }