Update upstream source from tag 'upstream/0.26.4'

Update to upstream version '0.26.4'
with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4

1 files changed, 503 insertions, 503 deletions

diff --git a/src/Box.c b/src/Box.c
index eb62af4..331f476 100644
--- a/src/Box.c
+++ b/src/Box.c
@@ -1,4 +1,4 @@
-/* Box.c generated by valac 0.34.7, the Vala compiler
+/* Box.c generated by valac 0.36.6, the Vala compiler
  * generated from Box.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -131,13 +131,13 @@ GType box_location_get_type (void) {
 BoxComplements box_complements_derive (gboolean horizontal_complement, gboolean vertical_complement) {
 	BoxComplements result = 0;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 27 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp1_ = horizontal_complement;
 #line 27 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp1_) {
 #line 140 "Box.c"
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 27 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp2_ = vertical_complement;
 #line 27 "/home/jens/Source/shotwell/src/Box.vala"
@@ -156,7 +156,7 @@ BoxComplements box_complements_derive (gboolean horizontal_complement, gboolean
 		return result;
 #line 158 "Box.c"
 	} else {
-		gboolean _tmp3_ = FALSE;
+		gboolean _tmp3_;
 #line 29 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp3_ = horizontal_complement;
 #line 29 "/home/jens/Source/shotwell/src/Box.vala"
@@ -167,7 +167,7 @@ BoxComplements box_complements_derive (gboolean horizontal_complement, gboolean
 			return result;
 #line 169 "Box.c"
 		} else {
-			gboolean _tmp4_ = FALSE;
+			gboolean _tmp4_;
 #line 31 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp4_ = vertical_complement;
 #line 31 "/home/jens/Source/shotwell/src/Box.vala"
@@ -201,18 +201,18 @@ GType box_complements_get_type (void) {
 
 
 void box_init (Box *self, gint left, gint top, gint right, gint bottom) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp7_;
+	gint _tmp8_;
+	gint _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
 #line 46 "/home/jens/Source/shotwell/src/Box.vala"
 	memset (self, 0, sizeof (Box));
 #line 48 "/home/jens/Source/shotwell/src/Box.vala"
@@ -234,7 +234,7 @@ void box_init (Box *self, gint left, gint top, gint right, gint bottom) {
 #line 53 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp4_ <= _tmp5_) {
 #line 237 "Box.c"
-		gint _tmp6_ = 0;
+		gint _tmp6_;
 #line 54 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp6_ = left;
 #line 54 "/home/jens/Source/shotwell/src/Box.vala"
@@ -248,7 +248,7 @@ void box_init (Box *self, gint left, gint top, gint right, gint bottom) {
 #line 56 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp7_ <= _tmp8_) {
 #line 251 "Box.c"
-		gint _tmp9_ = 0;
+		gint _tmp9_;
 #line 57 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp9_ = top;
 #line 57 "/home/jens/Source/shotwell/src/Box.vala"
@@ -276,18 +276,18 @@ void box_init (Box *self, gint left, gint top, gint right, gint bottom) {
 
 
 void box_from_rectangle (GdkRectangle* rect, Box* result) {
-	GdkRectangle _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	GdkRectangle _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	GdkRectangle _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	GdkRectangle _tmp10_ = {0};
-	gint _tmp11_ = 0;
+	GdkRectangle _tmp0_;
+	gint _tmp1_;
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	GdkRectangle _tmp6_;
+	gint _tmp7_;
+	GdkRectangle _tmp8_;
+	gint _tmp9_;
+	GdkRectangle _tmp10_;
+	gint _tmp11_;
 	Box _tmp12_ = {0};
 #line 65 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_if_fail (rect != NULL);
@@ -326,18 +326,18 @@ void box_from_rectangle (GdkRectangle* rect, Box* result) {
 
 
 void box_from_allocation (GtkAllocation* alloc, Box* result) {
-	GtkAllocation _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	GtkAllocation _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	GtkAllocation _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	GtkAllocation _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	GtkAllocation _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	GtkAllocation _tmp10_ = {0};
-	gint _tmp11_ = 0;
+	GtkAllocation _tmp0_;
+	gint _tmp1_;
+	GtkAllocation _tmp2_;
+	gint _tmp3_;
+	GtkAllocation _tmp4_;
+	gint _tmp5_;
+	GtkAllocation _tmp6_;
+	gint _tmp7_;
+	GtkAllocation _tmp8_;
+	gint _tmp9_;
+	GtkAllocation _tmp10_;
+	gint _tmp11_;
 	Box _tmp12_ = {0};
 #line 69 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_if_fail (alloc != NULL);
@@ -376,26 +376,26 @@ void box_from_allocation (GtkAllocation* alloc, Box* result) {
 
 
 void box_from_points (GdkPoint* corner1, GdkPoint* corner2, Box* result) {
-	GdkPoint _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	GdkPoint _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	GdkPoint _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	GdkPoint _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	GdkPoint _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	GdkPoint _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	GdkPoint _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	GdkPoint _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
+	GdkPoint _tmp0_;
+	gint _tmp1_;
+	GdkPoint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	GdkPoint _tmp5_;
+	gint _tmp6_;
+	GdkPoint _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	GdkPoint _tmp10_;
+	gint _tmp11_;
+	GdkPoint _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
+	GdkPoint _tmp15_;
+	gint _tmp16_;
+	GdkPoint _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
 	Box _tmp20_ = {0};
 #line 75 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_if_fail (corner1 != NULL);
@@ -452,18 +452,18 @@ void box_from_points (GdkPoint* corner1, GdkPoint* corner2, Box* result) {
 
 
 void box_from_center (GdkPoint* center, gint width, gint height, Box* result) {
-	GdkPoint _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	GdkPoint _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	GdkPoint _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	GdkPoint _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
+	GdkPoint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	GdkPoint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	GdkPoint _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	GdkPoint _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
 	Box _tmp12_ = {0};
 #line 80 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_if_fail (center != NULL);
@@ -503,10 +503,10 @@ void box_from_center (GdkPoint* center, gint width, gint height, Box* result) {
 
 gint box_get_width (Box *self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 #line 86 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = (*self).right;
 #line 86 "/home/jens/Source/shotwell/src/Box.vala"
@@ -527,10 +527,10 @@ gint box_get_width (Box *self) {
 
 gint box_get_height (Box *self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 #line 92 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = (*self).bottom;
 #line 92 "/home/jens/Source/shotwell/src/Box.vala"
@@ -554,13 +554,13 @@ gboolean box_is_valid (Box *self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
+	gint _tmp3_;
 #line 98 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp3_ = (*self).left;
 #line 98 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp3_ >= 0) {
 #line 563 "Box.c"
-		gint _tmp4_ = 0;
+		gint _tmp4_;
 #line 98 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp4_ = (*self).top;
 #line 98 "/home/jens/Source/shotwell/src/Box.vala"
@@ -574,8 +574,8 @@ gboolean box_is_valid (Box *self) {
 #line 98 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp2_) {
 #line 577 "Box.c"
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+		gint _tmp5_;
+		gint _tmp6_;
 #line 98 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp5_ = (*self).right;
 #line 98 "/home/jens/Source/shotwell/src/Box.vala"
@@ -591,8 +591,8 @@ gboolean box_is_valid (Box *self) {
 #line 98 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp1_) {
 #line 594 "Box.c"
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
+		gint _tmp7_;
+		gint _tmp8_;
 #line 98 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp7_ = (*self).bottom;
 #line 98 "/home/jens/Source/shotwell/src/Box.vala"
@@ -618,9 +618,9 @@ gboolean box_equals (Box *self, Box* box) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
-	Box _tmp4_ = {0};
-	gint _tmp5_ = 0;
+	gint _tmp3_;
+	Box _tmp4_;
+	gint _tmp5_;
 #line 101 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_val_if_fail (box != NULL, FALSE);
 #line 102 "/home/jens/Source/shotwell/src/Box.vala"
@@ -632,9 +632,9 @@ gboolean box_equals (Box *self, Box* box) {
 #line 102 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp3_ == _tmp5_) {
 #line 635 "Box.c"
-		gint _tmp6_ = 0;
-		Box _tmp7_ = {0};
-		gint _tmp8_ = 0;
+		gint _tmp6_;
+		Box _tmp7_;
+		gint _tmp8_;
 #line 102 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp6_ = (*self).top;
 #line 102 "/home/jens/Source/shotwell/src/Box.vala"
@@ -652,9 +652,9 @@ gboolean box_equals (Box *self, Box* box) {
 #line 102 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp2_) {
 #line 655 "Box.c"
-		gint _tmp9_ = 0;
-		Box _tmp10_ = {0};
-		gint _tmp11_ = 0;
+		gint _tmp9_;
+		Box _tmp10_;
+		gint _tmp11_;
 #line 102 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp9_ = (*self).right;
 #line 102 "/home/jens/Source/shotwell/src/Box.vala"
@@ -672,9 +672,9 @@ gboolean box_equals (Box *self, Box* box) {
 #line 102 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp1_) {
 #line 675 "Box.c"
-		gint _tmp12_ = 0;
-		Box _tmp13_ = {0};
-		gint _tmp14_ = 0;
+		gint _tmp12_;
+		Box _tmp13_;
+		gint _tmp14_;
 #line 102 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp12_ = (*self).bottom;
 #line 102 "/home/jens/Source/shotwell/src/Box.vala"
@@ -699,10 +699,10 @@ gboolean box_equals (Box *self, Box* box) {
 
 void box_adjust_width (Box *self, gint width) {
 	gint center_x = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 #line 107 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = (*self).left;
 #line 107 "/home/jens/Source/shotwell/src/Box.vala"
@@ -723,10 +723,10 @@ void box_adjust_width (Box *self, gint width) {
 
 void box_adjust_height (Box *self, gint height) {
 	gint center_y = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 #line 114 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = (*self).top;
 #line 114 "/home/jens/Source/shotwell/src/Box.vala"
@@ -749,34 +749,34 @@ void box_get_scaled (Box *self, Dimensions* scaled, Box* result) {
 	gdouble x_scale = 0.0;
 	gdouble y_scale = 0.0;
 	Dimensions _tmp0_ = {0};
-	Dimensions _tmp1_ = {0};
+	Dimensions _tmp1_;
 	gdouble _tmp2_ = 0.0;
 	gdouble _tmp3_ = 0.0;
 	gint l = 0;
-	gint _tmp4_ = 0;
-	gdouble _tmp5_ = 0.0;
-	gdouble _tmp6_ = 0.0;
+	gint _tmp4_;
+	gdouble _tmp5_;
+	gdouble _tmp6_;
 	gint t = 0;
-	gint _tmp7_ = 0;
-	gdouble _tmp8_ = 0.0;
-	gdouble _tmp9_ = 0.0;
+	gint _tmp7_;
+	gdouble _tmp8_;
+	gdouble _tmp9_;
 	gint r = 0;
-	gint _tmp10_ = 0;
-	Dimensions _tmp11_ = {0};
-	gint _tmp12_ = 0;
+	gint _tmp10_;
+	Dimensions _tmp11_;
+	gint _tmp12_;
 	gint b = 0;
-	gint _tmp13_ = 0;
-	Dimensions _tmp14_ = {0};
-	gint _tmp15_ = 0;
+	gint _tmp13_;
+	Dimensions _tmp14_;
+	gint _tmp15_;
 	Box box = {0};
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
+	gint _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
 	gboolean _tmp20_ = FALSE;
-	gint _tmp21_ = 0;
-	Dimensions _tmp22_ = {0};
-	gint _tmp23_ = 0;
+	gint _tmp21_;
+	Dimensions _tmp22_;
+	gint _tmp23_;
 #line 119 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_if_fail (scaled != NULL);
 #line 121 "/home/jens/Source/shotwell/src/Box.vala"
@@ -843,9 +843,9 @@ void box_get_scaled (Box *self, Dimensions* scaled, Box* result) {
 		_tmp20_ = TRUE;
 #line 845 "Box.c"
 	} else {
-		gint _tmp24_ = 0;
-		Dimensions _tmp25_ = {0};
-		gint _tmp26_ = 0;
+		gint _tmp24_;
+		Dimensions _tmp25_;
+		gint _tmp26_;
 #line 131 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp24_ = box_get_height (&box);
 #line 131 "/home/jens/Source/shotwell/src/Box.vala"
@@ -869,35 +869,35 @@ void box_get_scaled (Box *self, Dimensions* scaled, Box* result) {
 void box_get_scaled_similar (Box *self, Dimensions* original, Dimensions* scaled, Box* result) {
 	gdouble x_scale = 0.0;
 	gdouble y_scale = 0.0;
-	Dimensions _tmp0_ = {0};
+	Dimensions _tmp0_;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
 	gint l = 0;
-	gint _tmp3_ = 0;
-	gdouble _tmp4_ = 0.0;
-	gdouble _tmp5_ = 0.0;
+	gint _tmp3_;
+	gdouble _tmp4_;
+	gdouble _tmp5_;
 	gint t = 0;
-	gint _tmp6_ = 0;
-	gdouble _tmp7_ = 0.0;
-	gdouble _tmp8_ = 0.0;
+	gint _tmp6_;
+	gdouble _tmp7_;
+	gdouble _tmp8_;
 	gint r = 0;
-	gint _tmp9_ = 0;
-	gdouble _tmp10_ = 0.0;
-	gdouble _tmp11_ = 0.0;
+	gint _tmp9_;
+	gdouble _tmp10_;
+	gdouble _tmp11_;
 	gint b = 0;
-	gint _tmp12_ = 0;
-	gdouble _tmp13_ = 0.0;
-	gdouble _tmp14_ = 0.0;
-	gint _tmp15_ = 0;
-	Dimensions _tmp16_ = {0};
-	gint _tmp17_ = 0;
-	gint _tmp20_ = 0;
-	Dimensions _tmp21_ = {0};
-	gint _tmp22_ = 0;
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
-	gint _tmp27_ = 0;
-	gint _tmp28_ = 0;
+	gint _tmp12_;
+	gdouble _tmp13_;
+	gdouble _tmp14_;
+	gint _tmp15_;
+	Dimensions _tmp16_;
+	gint _tmp17_;
+	gint _tmp20_;
+	Dimensions _tmp21_;
+	gint _tmp22_;
+	gint _tmp25_;
+	gint _tmp26_;
+	gint _tmp27_;
+	gint _tmp28_;
 	Box _tmp29_ = {0};
 #line 136 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_if_fail (original != NULL);
@@ -952,8 +952,8 @@ void box_get_scaled_similar (Box *self, Dimensions* original, Dimensions* scaled
 #line 146 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp15_ >= _tmp17_) {
 #line 955 "Box.c"
-		Dimensions _tmp18_ = {0};
-		gint _tmp19_ = 0;
+		Dimensions _tmp18_;
+		gint _tmp19_;
 #line 147 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp18_ = *scaled;
 #line 147 "/home/jens/Source/shotwell/src/Box.vala"
@@ -971,8 +971,8 @@ void box_get_scaled_similar (Box *self, Dimensions* original, Dimensions* scaled
 #line 149 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp20_ >= _tmp22_) {
 #line 974 "Box.c"
-		Dimensions _tmp23_ = {0};
-		gint _tmp24_ = 0;
+		Dimensions _tmp23_;
+		gint _tmp24_;
 #line 150 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp23_ = *scaled;
 #line 150 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1000,14 +1000,14 @@ void box_get_scaled_similar (Box *self, Dimensions* original, Dimensions* scaled
 
 
 void box_get_offset (Box *self, gint xofs, gint yofs, Box* result) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 	Box _tmp8_ = {0};
 #line 156 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = (*self).left;
@@ -1036,8 +1036,8 @@ void box_get_offset (Box *self, gint xofs, gint yofs, Box* result) {
 
 
 void box_get_dimensions (Box *self, Dimensions* result) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 	Dimensions _tmp2_ = {0};
 #line 160 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = box_get_width (&(*self));
@@ -1056,11 +1056,11 @@ void box_get_dimensions (Box *self, Dimensions* result) {
 void box_get_points (Box *self, GdkPoint* top_left, GdkPoint* bottom_right) {
 	GdkPoint _vala_top_left = {0};
 	GdkPoint _vala_bottom_right = {0};
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 	GdkPoint _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	gint _tmp3_;
+	gint _tmp4_;
 	GdkPoint _tmp5_ = {0};
 #line 164 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = (*self).left;
@@ -1099,10 +1099,10 @@ void box_get_points (Box *self, GdkPoint* top_left, GdkPoint* bottom_right) {
 
 void box_get_rectangle (Box *self, GdkRectangle* result) {
 	GdkRectangle rect = {0};
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 #line 169 "/home/jens/Source/shotwell/src/Box.vala"
 	memset (&rect, 0, sizeof (GdkRectangle));
 #line 170 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1130,10 +1130,10 @@ void box_get_rectangle (Box *self, GdkRectangle* result) {
 
 
 void box_get_center (Box *self, GdkPoint* result) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 	GdkPoint _tmp4_ = {0};
 #line 179 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = (*self).left;
@@ -1157,17 +1157,17 @@ void box_get_center (Box *self, GdkPoint* result) {
 
 void box_rotate_clockwise (Box *self, Dimensions* space, Box* result) {
 	gint l = 0;
-	Dimensions _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	Dimensions _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gint t = 0;
-	gint _tmp3_ = 0;
+	gint _tmp3_;
 	gint r = 0;
-	Dimensions _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	Dimensions _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
 	gint b = 0;
-	gint _tmp7_ = 0;
+	gint _tmp7_;
 	Box _tmp8_ = {0};
 #line 182 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_if_fail (space != NULL);
@@ -1207,17 +1207,17 @@ void box_rotate_clockwise (Box *self, Dimensions* space, Box* result) {
 
 void box_rotate_counterclockwise (Box *self, Dimensions* space, Box* result) {
 	gint l = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	gint t = 0;
-	Dimensions _tmp1_ = {0};
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	Dimensions _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 	gint r = 0;
-	gint _tmp4_ = 0;
+	gint _tmp4_;
 	gint b = 0;
-	Dimensions _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	Dimensions _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 	Box _tmp8_ = {0};
 #line 191 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_if_fail (space != NULL);
@@ -1257,15 +1257,15 @@ void box_rotate_counterclockwise (Box *self, Dimensions* space, Box* result) {
 
 void box_flip_left_to_right (Box *self, Dimensions* space, Box* result) {
 	gint l = 0;
-	Dimensions _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	Dimensions _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gint r = 0;
-	Dimensions _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	Dimensions _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 	Box _tmp8_ = {0};
 #line 200 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_if_fail (space != NULL);
@@ -1301,15 +1301,15 @@ void box_flip_left_to_right (Box *self, Dimensions* space, Box* result) {
 
 void box_flip_top_to_bottom (Box *self, Dimensions* space, Box* result) {
 	gint t = 0;
-	Dimensions _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	Dimensions _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gint b = 0;
-	Dimensions _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	Dimensions _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 	Box _tmp8_ = {0};
 #line 207 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_if_fail (space != NULL);
@@ -1346,28 +1346,28 @@ void box_flip_top_to_bottom (Box *self, Dimensions* space, Box* result) {
 gboolean box_intersects (Box *self, Box* compare) {
 	gboolean result = FALSE;
 	gint left_intersect = 0;
-	gint _tmp0_ = 0;
-	Box _tmp1_ = {0};
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp0_;
+	Box _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 	gint top_intersect = 0;
-	gint _tmp4_ = 0;
-	Box _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	gint _tmp4_;
+	Box _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 	gint right_intersect = 0;
-	gint _tmp8_ = 0;
-	Box _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
+	gint _tmp8_;
+	Box _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
 	gint bottom_intersect = 0;
-	gint _tmp12_ = 0;
-	Box _tmp13_ = {0};
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
+	gint _tmp12_;
+	Box _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
 	gboolean _tmp16_ = FALSE;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
+	gint _tmp17_;
+	gint _tmp18_;
 #line 214 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_val_if_fail (compare != NULL, FALSE);
 #line 215 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1417,8 +1417,8 @@ gboolean box_intersects (Box *self, Box* compare) {
 #line 220 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp17_ >= _tmp18_) {
 #line 1420 "Box.c"
-		gint _tmp19_ = 0;
-		gint _tmp20_ = 0;
+		gint _tmp19_;
+		gint _tmp20_;
 #line 220 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp19_ = bottom_intersect;
 #line 220 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1440,14 +1440,14 @@ gboolean box_intersects (Box *self, Box* compare) {
 
 
 void box_get_reduced (Box *self, gint amount, Box* result) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 	Box _tmp8_ = {0};
 #line 224 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = (*self).left;
@@ -1476,14 +1476,14 @@ void box_get_reduced (Box *self, gint amount, Box* result) {
 
 
 void box_get_expanded (Box *self, gint amount, Box* result) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 	Box _tmp8_ = {0};
 #line 228 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = (*self).left;
@@ -1516,9 +1516,9 @@ gboolean box_contains (Box *self, GdkPoint* point) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	GdkPoint _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	GdkPoint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 #line 231 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_val_if_fail (point != NULL, FALSE);
 #line 232 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1530,9 +1530,9 @@ gboolean box_contains (Box *self, GdkPoint* point) {
 #line 232 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp4_ >= _tmp5_) {
 #line 1533 "Box.c"
-		GdkPoint _tmp6_ = {0};
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
+		GdkPoint _tmp6_;
+		gint _tmp7_;
+		gint _tmp8_;
 #line 232 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp6_ = *point;
 #line 232 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1550,9 +1550,9 @@ gboolean box_contains (Box *self, GdkPoint* point) {
 #line 232 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp2_) {
 #line 1553 "Box.c"
-		GdkPoint _tmp9_ = {0};
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
+		GdkPoint _tmp9_;
+		gint _tmp10_;
+		gint _tmp11_;
 #line 232 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp9_ = *point;
 #line 232 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1570,9 +1570,9 @@ gboolean box_contains (Box *self, GdkPoint* point) {
 #line 232 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp1_) {
 #line 1573 "Box.c"
-		GdkPoint _tmp12_ = {0};
-		gint _tmp13_ = 0;
-		gint _tmp14_ = 0;
+		GdkPoint _tmp12_;
+		gint _tmp13_;
+		gint _tmp14_;
 #line 232 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp12_ = *point;
 #line 232 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1602,16 +1602,16 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 	gboolean _vala_vertical_enlarged = FALSE;
 	BoxComplements result = 0;
 	gboolean horizontal_complement = FALSE;
-	Box _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	Box _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gboolean vertical_complement = FALSE;
-	Box _tmp36_ = {0};
-	gint _tmp37_ = 0;
-	gint _tmp38_ = 0;
-	gboolean _tmp72_ = FALSE;
-	gboolean _tmp73_ = FALSE;
-	BoxComplements _tmp74_ = 0;
+	Box _tmp36_;
+	gint _tmp37_;
+	gint _tmp38_;
+	gboolean _tmp72_;
+	gboolean _tmp73_;
+	BoxComplements _tmp74_;
 #line 238 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_val_if_fail (resized != NULL, 0);
 #line 241 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1625,13 +1625,13 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 #line 242 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp1_ < _tmp2_) {
 #line 1628 "Box.c"
-		Box _tmp3_ = {0};
-		gint _tmp4_ = 0;
-		Box _tmp5_ = {0};
-		gint _tmp6_ = 0;
-		Box _tmp7_ = {0};
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
+		Box _tmp3_;
+		gint _tmp4_;
+		Box _tmp5_;
+		gint _tmp6_;
+		Box _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
 #line 244 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp3_ = *resized;
 #line 244 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1652,9 +1652,9 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 		_vala_horizontal_enlarged = TRUE;
 #line 1654 "Box.c"
 	} else {
-		Box _tmp10_ = {0};
-		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
+		Box _tmp10_;
+		gint _tmp11_;
+		gint _tmp12_;
 #line 246 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp10_ = *resized;
 #line 246 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1664,11 +1664,11 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 #line 246 "/home/jens/Source/shotwell/src/Box.vala"
 		if (_tmp11_ > _tmp12_) {
 #line 1667 "Box.c"
-			gint _tmp13_ = 0;
-			gint _tmp14_ = 0;
-			gint _tmp15_ = 0;
-			Box _tmp16_ = {0};
-			gint _tmp17_ = 0;
+			gint _tmp13_;
+			gint _tmp14_;
+			gint _tmp15_;
+			Box _tmp16_;
+			gint _tmp17_;
 #line 248 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp13_ = (*self).left;
 #line 248 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1685,9 +1685,9 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 			_vala_horizontal_enlarged = FALSE;
 #line 1687 "Box.c"
 		} else {
-			Box _tmp18_ = {0};
-			gint _tmp19_ = 0;
-			gint _tmp20_ = 0;
+			Box _tmp18_;
+			gint _tmp19_;
+			gint _tmp20_;
 #line 250 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp18_ = *resized;
 #line 250 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1697,11 +1697,11 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 #line 250 "/home/jens/Source/shotwell/src/Box.vala"
 			if (_tmp19_ < _tmp20_) {
 #line 1700 "Box.c"
-				gint _tmp21_ = 0;
-				Box _tmp22_ = {0};
-				gint _tmp23_ = 0;
-				gint _tmp24_ = 0;
-				gint _tmp25_ = 0;
+				gint _tmp21_;
+				Box _tmp22_;
+				gint _tmp23_;
+				gint _tmp24_;
+				gint _tmp25_;
 #line 252 "/home/jens/Source/shotwell/src/Box.vala"
 				_tmp21_ = (*self).left;
 #line 252 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1718,9 +1718,9 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 				_vala_horizontal_enlarged = FALSE;
 #line 1720 "Box.c"
 			} else {
-				Box _tmp26_ = {0};
-				gint _tmp27_ = 0;
-				gint _tmp28_ = 0;
+				Box _tmp26_;
+				gint _tmp27_;
+				gint _tmp28_;
 #line 254 "/home/jens/Source/shotwell/src/Box.vala"
 				_tmp26_ = *resized;
 #line 254 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1730,13 +1730,13 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 #line 254 "/home/jens/Source/shotwell/src/Box.vala"
 				if (_tmp27_ > _tmp28_) {
 #line 1733 "Box.c"
-					Box _tmp29_ = {0};
-					gint _tmp30_ = 0;
-					gint _tmp31_ = 0;
-					Box _tmp32_ = {0};
-					gint _tmp33_ = 0;
-					Box _tmp34_ = {0};
-					gint _tmp35_ = 0;
+					Box _tmp29_;
+					gint _tmp30_;
+					gint _tmp31_;
+					Box _tmp32_;
+					gint _tmp33_;
+					Box _tmp34_;
+					gint _tmp35_;
 #line 256 "/home/jens/Source/shotwell/src/Box.vala"
 					_tmp29_ = *resized;
 #line 256 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1779,13 +1779,13 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 #line 265 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp37_ < _tmp38_) {
 #line 1782 "Box.c"
-		Box _tmp39_ = {0};
-		gint _tmp40_ = 0;
-		Box _tmp41_ = {0};
-		gint _tmp42_ = 0;
-		gint _tmp43_ = 0;
-		Box _tmp44_ = {0};
-		gint _tmp45_ = 0;
+		Box _tmp39_;
+		gint _tmp40_;
+		Box _tmp41_;
+		gint _tmp42_;
+		gint _tmp43_;
+		Box _tmp44_;
+		gint _tmp45_;
 #line 267 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp39_ = *resized;
 #line 267 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1806,9 +1806,9 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 		_vala_vertical_enlarged = TRUE;
 #line 1808 "Box.c"
 	} else {
-		Box _tmp46_ = {0};
-		gint _tmp47_ = 0;
-		gint _tmp48_ = 0;
+		Box _tmp46_;
+		gint _tmp47_;
+		gint _tmp48_;
 #line 269 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp46_ = *resized;
 #line 269 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1818,11 +1818,11 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 #line 269 "/home/jens/Source/shotwell/src/Box.vala"
 		if (_tmp47_ > _tmp48_) {
 #line 1821 "Box.c"
-			gint _tmp49_ = 0;
-			gint _tmp50_ = 0;
-			Box _tmp51_ = {0};
-			gint _tmp52_ = 0;
-			gint _tmp53_ = 0;
+			gint _tmp49_;
+			gint _tmp50_;
+			Box _tmp51_;
+			gint _tmp52_;
+			gint _tmp53_;
 #line 271 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp49_ = (*self).left;
 #line 271 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1839,9 +1839,9 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 			_vala_vertical_enlarged = FALSE;
 #line 1841 "Box.c"
 		} else {
-			Box _tmp54_ = {0};
-			gint _tmp55_ = 0;
-			gint _tmp56_ = 0;
+			Box _tmp54_;
+			gint _tmp55_;
+			gint _tmp56_;
 #line 273 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp54_ = *resized;
 #line 273 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1851,11 +1851,11 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 #line 273 "/home/jens/Source/shotwell/src/Box.vala"
 			if (_tmp55_ < _tmp56_) {
 #line 1854 "Box.c"
-				Box _tmp57_ = {0};
-				gint _tmp58_ = 0;
-				gint _tmp59_ = 0;
-				gint _tmp60_ = 0;
-				gint _tmp61_ = 0;
+				Box _tmp57_;
+				gint _tmp58_;
+				gint _tmp59_;
+				gint _tmp60_;
+				gint _tmp61_;
 #line 275 "/home/jens/Source/shotwell/src/Box.vala"
 				_tmp57_ = *resized;
 #line 275 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1872,9 +1872,9 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 				_vala_vertical_enlarged = FALSE;
 #line 1874 "Box.c"
 			} else {
-				Box _tmp62_ = {0};
-				gint _tmp63_ = 0;
-				gint _tmp64_ = 0;
+				Box _tmp62_;
+				gint _tmp63_;
+				gint _tmp64_;
 #line 277 "/home/jens/Source/shotwell/src/Box.vala"
 				_tmp62_ = *resized;
 #line 277 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1884,13 +1884,13 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal
 #line 277 "/home/jens/Source/shotwell/src/Box.vala"
 				if (_tmp63_ > _tmp64_) {
 #line 1887 "Box.c"
-					gint _tmp65_ = 0;
-					Box _tmp66_ = {0};
-					gint _tmp67_ = 0;
-					Box _tmp68_ = {0};
-					gint _tmp69_ = 0;
-					Box _tmp70_ = {0};
-					gint _tmp71_ = 0;
+					gint _tmp65_;
+					Box _tmp66_;
+					gint _tmp67_;
+					Box _tmp68_;
+					gint _tmp69_;
+					Box _tmp70_;
+					gint _tmp71_;
 #line 279 "/home/jens/Source/shotwell/src/Box.vala"
 					_tmp65_ = (*self).right;
 #line 279 "/home/jens/Source/shotwell/src/Box.vala"
@@ -1966,23 +1966,23 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 	Box _vala_horizontal_shifted = {0};
 	Box _vala_vertical_shifted = {0};
 	BoxComplements result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 	gboolean horizontal_complement = FALSE;
 	gboolean _tmp4_ = FALSE;
-	Box _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	Box _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 	gboolean vertical_complement = FALSE;
 	gboolean _tmp42_ = FALSE;
-	Box _tmp43_ = {0};
-	gint _tmp44_ = 0;
-	gint _tmp45_ = 0;
-	gboolean _tmp80_ = FALSE;
-	gboolean _tmp81_ = FALSE;
-	BoxComplements _tmp82_ = 0;
+	Box _tmp43_;
+	gint _tmp44_;
+	gint _tmp45_;
+	gboolean _tmp80_;
+	gboolean _tmp81_;
+	BoxComplements _tmp82_;
 #line 293 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_val_if_fail (shifted != NULL, 0);
 #line 295 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2008,9 +2008,9 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 #line 299 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp6_ < _tmp7_) {
 #line 2011 "Box.c"
-		Box _tmp8_ = {0};
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
+		Box _tmp8_;
+		gint _tmp9_;
+		gint _tmp10_;
 #line 299 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp8_ = *shifted;
 #line 299 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2028,18 +2028,18 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 #line 299 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp4_) {
 #line 2031 "Box.c"
-		gint _tmp11_ = 0;
-		Box _tmp12_ = {0};
-		gint _tmp13_ = 0;
-		gint _tmp14_ = 0;
-		gint _tmp15_ = 0;
-		Box _tmp16_ = {0};
-		gint _tmp17_ = 0;
-		Box _tmp18_ = {0};
-		gint _tmp19_ = 0;
-		Box _tmp20_ = {0};
-		gint _tmp21_ = 0;
-		gint _tmp22_ = 0;
+		gint _tmp11_;
+		Box _tmp12_;
+		gint _tmp13_;
+		gint _tmp14_;
+		gint _tmp15_;
+		Box _tmp16_;
+		gint _tmp17_;
+		Box _tmp18_;
+		gint _tmp19_;
+		Box _tmp20_;
+		gint _tmp21_;
+		gint _tmp22_;
 #line 301 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp11_ = (*self).left;
 #line 301 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2071,9 +2071,9 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 #line 2072 "Box.c"
 	} else {
 		gboolean _tmp23_ = FALSE;
-		Box _tmp24_ = {0};
-		gint _tmp25_ = 0;
-		gint _tmp26_ = 0;
+		Box _tmp24_;
+		gint _tmp25_;
+		gint _tmp26_;
 #line 303 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp24_ = *shifted;
 #line 303 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2083,9 +2083,9 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 #line 303 "/home/jens/Source/shotwell/src/Box.vala"
 		if (_tmp25_ > _tmp26_) {
 #line 2086 "Box.c"
-			Box _tmp27_ = {0};
-			gint _tmp28_ = 0;
-			gint _tmp29_ = 0;
+			Box _tmp27_;
+			gint _tmp28_;
+			gint _tmp29_;
 #line 303 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp27_ = *shifted;
 #line 303 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2103,18 +2103,18 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 #line 303 "/home/jens/Source/shotwell/src/Box.vala"
 		if (_tmp23_) {
 #line 2106 "Box.c"
-			gint _tmp30_ = 0;
-			gint _tmp31_ = 0;
-			gint _tmp32_ = 0;
-			Box _tmp33_ = {0};
-			gint _tmp34_ = 0;
-			Box _tmp35_ = {0};
-			gint _tmp36_ = 0;
-			gint _tmp37_ = 0;
-			Box _tmp38_ = {0};
-			gint _tmp39_ = 0;
-			Box _tmp40_ = {0};
-			gint _tmp41_ = 0;
+			gint _tmp30_;
+			gint _tmp31_;
+			gint _tmp32_;
+			Box _tmp33_;
+			gint _tmp34_;
+			Box _tmp35_;
+			gint _tmp36_;
+			gint _tmp37_;
+			Box _tmp38_;
+			gint _tmp39_;
+			Box _tmp40_;
+			gint _tmp41_;
 #line 305 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp30_ = (*self).left;
 #line 305 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2165,9 +2165,9 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 #line 315 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp44_ < _tmp45_) {
 #line 2168 "Box.c"
-		Box _tmp46_ = {0};
-		gint _tmp47_ = 0;
-		gint _tmp48_ = 0;
+		Box _tmp46_;
+		gint _tmp47_;
+		gint _tmp48_;
 #line 315 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp46_ = *shifted;
 #line 315 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2185,18 +2185,18 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 #line 315 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp42_) {
 #line 2188 "Box.c"
-		Box _tmp49_ = {0};
-		gint _tmp50_ = 0;
-		gint _tmp51_ = 0;
-		gint _tmp52_ = 0;
-		gint _tmp53_ = 0;
-		Box _tmp54_ = {0};
-		gint _tmp55_ = 0;
-		Box _tmp56_ = {0};
-		gint _tmp57_ = 0;
-		gint _tmp58_ = 0;
-		Box _tmp59_ = {0};
-		gint _tmp60_ = 0;
+		Box _tmp49_;
+		gint _tmp50_;
+		gint _tmp51_;
+		gint _tmp52_;
+		gint _tmp53_;
+		Box _tmp54_;
+		gint _tmp55_;
+		Box _tmp56_;
+		gint _tmp57_;
+		gint _tmp58_;
+		Box _tmp59_;
+		gint _tmp60_;
 #line 317 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp49_ = *shifted;
 #line 317 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2228,9 +2228,9 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 #line 2229 "Box.c"
 	} else {
 		gboolean _tmp61_ = FALSE;
-		Box _tmp62_ = {0};
-		gint _tmp63_ = 0;
-		gint _tmp64_ = 0;
+		Box _tmp62_;
+		gint _tmp63_;
+		gint _tmp64_;
 #line 319 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp62_ = *shifted;
 #line 319 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2240,9 +2240,9 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 #line 319 "/home/jens/Source/shotwell/src/Box.vala"
 		if (_tmp63_ > _tmp64_) {
 #line 2243 "Box.c"
-			Box _tmp65_ = {0};
-			gint _tmp66_ = 0;
-			gint _tmp67_ = 0;
+			Box _tmp65_;
+			gint _tmp66_;
+			gint _tmp67_;
 #line 319 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp65_ = *shifted;
 #line 319 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2260,18 +2260,18 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 #line 319 "/home/jens/Source/shotwell/src/Box.vala"
 		if (_tmp61_) {
 #line 2263 "Box.c"
-			gint _tmp68_ = 0;
-			gint _tmp69_ = 0;
-			Box _tmp70_ = {0};
-			gint _tmp71_ = 0;
-			gint _tmp72_ = 0;
-			gint _tmp73_ = 0;
-			Box _tmp74_ = {0};
-			gint _tmp75_ = 0;
-			Box _tmp76_ = {0};
-			gint _tmp77_ = 0;
-			Box _tmp78_ = {0};
-			gint _tmp79_ = 0;
+			gint _tmp68_;
+			gint _tmp69_;
+			Box _tmp70_;
+			gint _tmp71_;
+			gint _tmp72_;
+			gint _tmp73_;
+			Box _tmp74_;
+			gint _tmp75_;
+			Box _tmp76_;
+			gint _tmp77_;
+			Box _tmp78_;
+			gint _tmp79_;
 #line 321 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp68_ = (*self).left;
 #line 321 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2350,30 +2350,30 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal
 
 
 void box_rubber_band (Box *self, GdkPoint* point, Box* result) {
-	GdkPoint _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	GdkPoint _tmp2_ = {0};
-	gint _tmp3_ = 0;
+	GdkPoint _tmp0_;
+	gint _tmp1_;
+	GdkPoint _tmp2_;
+	gint _tmp3_;
 	gint t = 0;
-	gint _tmp4_ = 0;
-	GdkPoint _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	gint _tmp4_;
+	GdkPoint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 	gint b = 0;
-	gint _tmp8_ = 0;
-	GdkPoint _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
+	gint _tmp8_;
+	GdkPoint _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
 	gint l = 0;
-	gint _tmp12_ = 0;
-	GdkPoint _tmp13_ = {0};
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
+	gint _tmp12_;
+	GdkPoint _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
 	gint r = 0;
-	gint _tmp16_ = 0;
-	GdkPoint _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
+	gint _tmp16_;
+	GdkPoint _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
 	Box _tmp20_ = {0};
 #line 333 "/home/jens/Source/shotwell/src/Box.vala"
 	g_return_if_fail (point != NULL);
@@ -2441,15 +2441,15 @@ void box_rubber_band (Box *self, GdkPoint* point, Box* result) {
 
 gchar* box_to_string (Box *self) {
 	gchar* result = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 	Dimensions _tmp4_ = {0};
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
 #line 346 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = (*self).left;
 #line 346 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2481,11 +2481,11 @@ gchar* box_to_string (Box *self) {
 static gboolean box_in_zone (gdouble pos, gint zone) {
 	gboolean result = FALSE;
 	gint top_zone = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	gint bottom_zone = 0;
-	gint _tmp1_ = 0;
-	gdouble _tmp2_ = 0.0;
-	gboolean _tmp3_ = FALSE;
+	gint _tmp1_;
+	gdouble _tmp2_;
+	gboolean _tmp3_;
 #line 350 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = zone;
 #line 350 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2509,10 +2509,10 @@ static gboolean box_in_zone (gdouble pos, gint zone) {
 static gboolean box_in_between (gdouble pos, gint top, gint bottom) {
 	gboolean result = FALSE;
 	gint ipos = 0;
-	gdouble _tmp0_ = 0.0;
+	gdouble _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
 #line 357 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = pos;
 #line 357 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2524,8 +2524,8 @@ static gboolean box_in_between (gdouble pos, gint top, gint bottom) {
 #line 359 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp2_ > _tmp3_) {
 #line 2527 "Box.c"
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
+		gint _tmp4_;
+		gint _tmp5_;
 #line 359 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp4_ = ipos;
 #line 359 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2549,14 +2549,14 @@ static gboolean box_in_between (gdouble pos, gint top, gint bottom) {
 static gboolean box_near_in_between (gdouble pos, gint top, gint bottom) {
 	gboolean result = FALSE;
 	gint ipos = 0;
-	gdouble _tmp0_ = 0.0;
+	gdouble _tmp0_;
 	gint top_zone = 0;
-	gint _tmp1_ = 0;
+	gint _tmp1_;
 	gint bottom_zone = 0;
-	gint _tmp2_ = 0;
+	gint _tmp2_;
 	gboolean _tmp3_ = FALSE;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	gint _tmp4_;
+	gint _tmp5_;
 #line 363 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = pos;
 #line 363 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2576,8 +2576,8 @@ static gboolean box_near_in_between (gdouble pos, gint top, gint bottom) {
 #line 367 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp4_ > _tmp5_) {
 #line 2579 "Box.c"
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
+		gint _tmp6_;
+		gint _tmp7_;
 #line 367 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp6_ = ipos;
 #line 367 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2601,19 +2601,19 @@ static gboolean box_near_in_between (gdouble pos, gint top, gint bottom) {
 BoxLocation box_approx_location (Box *self, gint x, gint y) {
 	BoxLocation result = 0;
 	gboolean near_width = FALSE;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	gboolean near_height = FALSE;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gboolean _tmp7_ = FALSE;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gboolean _tmp7_;
 	gboolean _tmp8_ = FALSE;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	gboolean _tmp11_ = FALSE;
+	gint _tmp9_;
+	gint _tmp10_;
+	gboolean _tmp11_;
 #line 371 "/home/jens/Source/shotwell/src/Box.vala"
 	_tmp0_ = x;
 #line 371 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2643,7 +2643,7 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 #line 374 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp11_) {
 #line 2646 "Box.c"
-		gboolean _tmp12_ = FALSE;
+		gboolean _tmp12_;
 #line 374 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp12_ = near_height;
 #line 374 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2657,9 +2657,9 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 #line 374 "/home/jens/Source/shotwell/src/Box.vala"
 	if (_tmp8_) {
 #line 2660 "Box.c"
-		gint _tmp13_ = 0;
-		gint _tmp14_ = 0;
-		gboolean _tmp15_ = FALSE;
+		gint _tmp13_;
+		gint _tmp14_;
+		gboolean _tmp15_;
 #line 375 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp13_ = y;
 #line 375 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2674,9 +2674,9 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 			return result;
 #line 2676 "Box.c"
 		} else {
-			gint _tmp16_ = 0;
-			gint _tmp17_ = 0;
-			gboolean _tmp18_ = FALSE;
+			gint _tmp16_;
+			gint _tmp17_;
+			gboolean _tmp18_;
 #line 377 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp16_ = y;
 #line 377 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2700,9 +2700,9 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 		}
 	} else {
 		gboolean _tmp19_ = FALSE;
-		gint _tmp20_ = 0;
-		gint _tmp21_ = 0;
-		gboolean _tmp22_ = FALSE;
+		gint _tmp20_;
+		gint _tmp21_;
+		gboolean _tmp22_;
 #line 382 "/home/jens/Source/shotwell/src/Box.vala"
 		_tmp20_ = x;
 #line 382 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2712,7 +2712,7 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 #line 382 "/home/jens/Source/shotwell/src/Box.vala"
 		if (_tmp22_) {
 #line 2715 "Box.c"
-			gboolean _tmp23_ = FALSE;
+			gboolean _tmp23_;
 #line 382 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp23_ = near_height;
 #line 382 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2726,9 +2726,9 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 #line 382 "/home/jens/Source/shotwell/src/Box.vala"
 		if (_tmp19_) {
 #line 2729 "Box.c"
-			gint _tmp24_ = 0;
-			gint _tmp25_ = 0;
-			gboolean _tmp26_ = FALSE;
+			gint _tmp24_;
+			gint _tmp25_;
+			gboolean _tmp26_;
 #line 383 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp24_ = y;
 #line 383 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2743,9 +2743,9 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 				return result;
 #line 2745 "Box.c"
 			} else {
-				gint _tmp27_ = 0;
-				gint _tmp28_ = 0;
-				gboolean _tmp29_ = FALSE;
+				gint _tmp27_;
+				gint _tmp28_;
+				gboolean _tmp29_;
 #line 385 "/home/jens/Source/shotwell/src/Box.vala"
 				_tmp27_ = y;
 #line 385 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2769,9 +2769,9 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 			}
 		} else {
 			gboolean _tmp30_ = FALSE;
-			gint _tmp31_ = 0;
-			gint _tmp32_ = 0;
-			gboolean _tmp33_ = FALSE;
+			gint _tmp31_;
+			gint _tmp32_;
+			gboolean _tmp33_;
 #line 390 "/home/jens/Source/shotwell/src/Box.vala"
 			_tmp31_ = y;
 #line 390 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2781,7 +2781,7 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 #line 390 "/home/jens/Source/shotwell/src/Box.vala"
 			if (_tmp33_) {
 #line 2784 "Box.c"
-				gboolean _tmp34_ = FALSE;
+				gboolean _tmp34_;
 #line 390 "/home/jens/Source/shotwell/src/Box.vala"
 				_tmp34_ = near_width;
 #line 390 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2801,9 +2801,9 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 #line 2802 "Box.c"
 			} else {
 				gboolean _tmp35_ = FALSE;
-				gint _tmp36_ = 0;
-				gint _tmp37_ = 0;
-				gboolean _tmp38_ = FALSE;
+				gint _tmp36_;
+				gint _tmp37_;
+				gboolean _tmp38_;
 #line 393 "/home/jens/Source/shotwell/src/Box.vala"
 				_tmp36_ = y;
 #line 393 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2813,7 +2813,7 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 #line 393 "/home/jens/Source/shotwell/src/Box.vala"
 				if (_tmp38_) {
 #line 2816 "Box.c"
-					gboolean _tmp39_ = FALSE;
+					gboolean _tmp39_;
 #line 393 "/home/jens/Source/shotwell/src/Box.vala"
 					_tmp39_ = near_width;
 #line 393 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2833,10 +2833,10 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 #line 2834 "Box.c"
 				} else {
 					gboolean _tmp40_ = FALSE;
-					gint _tmp41_ = 0;
-					gint _tmp42_ = 0;
-					gint _tmp43_ = 0;
-					gboolean _tmp44_ = FALSE;
+					gint _tmp41_;
+					gint _tmp42_;
+					gint _tmp43_;
+					gboolean _tmp44_;
 #line 396 "/home/jens/Source/shotwell/src/Box.vala"
 					_tmp41_ = x;
 #line 396 "/home/jens/Source/shotwell/src/Box.vala"
@@ -2848,10 +2848,10 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) {
 #line 396 "/home/jens/Source/shotwell/src/Box.vala"
 					if (_tmp44_) {
 #line 2851 "Box.c"
-						gint _tmp45_ = 0;
-						gint _tmp46_ = 0;
-						gint _tmp47_ = 0;
-						gboolean _tmp48_ = FALSE;
+						gint _tmp45_;
+						gint _tmp46_;
+						gint _tmp47_;
+						gboolean _tmp48_;
 #line 396 "/home/jens/Source/shotwell/src/Box.vala"
 						_tmp45_ = y;
 #line 396 "/home/jens/Source/shotwell/src/Box.vala"