Merge tag 'upstream/0.26.1'

Upstream version 0.26.1

1 files changed, 102 insertions, 118 deletions

diff --git a/src/photos/GRaw.c b/src/photos/GRaw.c
index 12ffba3..27a2ffb 100644
--- a/src/photos/GRaw.c
+++ b/src/photos/GRaw.c
@@ -1,4 +1,4 @@
-/* GRaw.c generated by valac 0.34.4, the Vala compiler
+/* GRaw.c generated by valac 0.34.7, the Vala compiler
  * generated from GRaw.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1095,14 +1095,12 @@ static libraw_imgother_t libraw_get_image_other (libraw_data_t* self) {
 	libraw_imgother_t result = {0};
 	libraw_imgother_t _tmp0_ = {0};
 #line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	g_return_val_if_fail (self != NULL, result);
-#line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	_tmp0_ = self->other;
 #line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	result = _tmp0_;
 #line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	return result;
-#line 1106 "GRaw.c"
+#line 1104 "GRaw.c"
 }
 
 
@@ -1110,8 +1108,6 @@ libraw_imgother_t graw_processor_get_image_other (GRawProcessor* self) {
 	libraw_imgother_t result = {0};
 	libraw_data_t* _tmp0_ = NULL;
 	libraw_imgother_t _tmp1_ = {0};
-#line 171 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
 #line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
 #line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1120,7 +1116,7 @@ libraw_imgother_t graw_processor_get_image_other (GRawProcessor* self) {
 	result = _tmp1_;
 #line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1124 "GRaw.c"
+#line 1120 "GRaw.c"
 }
 
 
@@ -1128,14 +1124,12 @@ static libraw_iparams_t libraw_get_image_params (libraw_data_t* self) {
 	libraw_iparams_t result = {0};
 	libraw_iparams_t _tmp0_ = {0};
 #line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	g_return_val_if_fail (self != NULL, result);
-#line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	_tmp0_ = self->idata;
 #line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	result = _tmp0_;
 #line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	return result;
-#line 1139 "GRaw.c"
+#line 1133 "GRaw.c"
 }
 
 
@@ -1143,8 +1137,6 @@ libraw_iparams_t graw_processor_get_image_params (GRawProcessor* self) {
 	libraw_iparams_t result = {0};
 	libraw_data_t* _tmp0_ = NULL;
 	libraw_iparams_t _tmp1_ = {0};
-#line 175 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
 #line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
 #line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1153,7 +1145,7 @@ libraw_iparams_t graw_processor_get_image_params (GRawProcessor* self) {
 	result = _tmp1_;
 #line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1157 "GRaw.c"
+#line 1149 "GRaw.c"
 }
 
 
@@ -1161,14 +1153,12 @@ static libraw_image_sizes_t libraw_get_sizes (libraw_data_t* self) {
 	libraw_image_sizes_t result = {0};
 	libraw_image_sizes_t _tmp0_ = {0};
 #line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	g_return_val_if_fail (self != NULL, result);
-#line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	_tmp0_ = self->sizes;
 #line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	result = _tmp0_;
 #line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	return result;
-#line 1172 "GRaw.c"
+#line 1162 "GRaw.c"
 }
 
 
@@ -1176,8 +1166,6 @@ libraw_image_sizes_t graw_processor_get_sizes (GRawProcessor* self) {
 	libraw_image_sizes_t result = {0};
 	libraw_data_t* _tmp0_ = NULL;
 	libraw_image_sizes_t _tmp1_ = {0};
-#line 179 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
 #line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
 #line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1186,7 +1174,7 @@ libraw_image_sizes_t graw_processor_get_sizes (GRawProcessor* self) {
 	result = _tmp1_;
 #line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1190 "GRaw.c"
+#line 1178 "GRaw.c"
 }
 
 
@@ -1194,14 +1182,12 @@ static libraw_thumbnail_t libraw_get_thumbnail (libraw_data_t* self) {
 	libraw_thumbnail_t result = {0};
 	libraw_thumbnail_t _tmp0_ = {0};
 #line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	g_return_val_if_fail (self != NULL, result);
-#line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	_tmp0_ = self->thumbnail;
 #line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	result = _tmp0_;
 #line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	return result;
-#line 1205 "GRaw.c"
+#line 1191 "GRaw.c"
 }
 
 
@@ -1209,8 +1195,6 @@ libraw_thumbnail_t graw_processor_get_thumbnail (GRawProcessor* self) {
 	libraw_thumbnail_t result = {0};
 	libraw_data_t* _tmp0_ = NULL;
 	libraw_thumbnail_t _tmp1_ = {0};
-#line 183 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
 #line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
 #line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1219,7 +1203,7 @@ libraw_thumbnail_t graw_processor_get_thumbnail (GRawProcessor* self) {
 	result = _tmp1_;
 #line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1223 "GRaw.c"
+#line 1207 "GRaw.c"
 }
 
 
@@ -1246,7 +1230,7 @@ GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError**
 			g_propagate_error (error, _inner_error_);
 #line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 1250 "GRaw.c"
+#line 1234 "GRaw.c"
 		} else {
 #line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1254,7 +1238,7 @@ GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError**
 			g_clear_error (&_inner_error_);
 #line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 1258 "GRaw.c"
+#line 1242 "GRaw.c"
 		}
 	}
 #line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1267,7 +1251,7 @@ GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError**
 	_graw_processed_image_unref0 (_tmp0_);
 #line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1271 "GRaw.c"
+#line 1255 "GRaw.c"
 }
 
 
@@ -1294,7 +1278,7 @@ GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError
 			g_propagate_error (error, _inner_error_);
 #line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 1298 "GRaw.c"
+#line 1282 "GRaw.c"
 		} else {
 #line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1302,7 +1286,7 @@ GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError
 			g_clear_error (&_inner_error_);
 #line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 1306 "GRaw.c"
+#line 1290 "GRaw.c"
 		}
 	}
 #line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1315,7 +1299,7 @@ GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError
 	_graw_processed_image_unref0 (_tmp0_);
 #line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1319 "GRaw.c"
+#line 1303 "GRaw.c"
 }
 
 
@@ -1345,7 +1329,7 @@ void graw_processor_open_buffer (GRawProcessor* self, guint8* buffer, int buffer
 			g_propagate_error (error, _inner_error_);
 #line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1349 "GRaw.c"
+#line 1333 "GRaw.c"
 		} else {
 #line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1353,7 +1337,7 @@ void graw_processor_open_buffer (GRawProcessor* self, guint8* buffer, int buffer
 			g_clear_error (&_inner_error_);
 #line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1357 "GRaw.c"
+#line 1341 "GRaw.c"
 		}
 	}
 }
@@ -1384,7 +1368,7 @@ void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GErro
 			g_propagate_error (error, _inner_error_);
 #line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1388 "GRaw.c"
+#line 1372 "GRaw.c"
 		} else {
 #line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1392,7 +1376,7 @@ void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GErro
 			g_clear_error (&_inner_error_);
 #line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1396 "GRaw.c"
+#line 1380 "GRaw.c"
 		}
 	}
 }
@@ -1418,7 +1402,7 @@ void graw_processor_process (GRawProcessor* self, GError** error) {
 			g_propagate_error (error, _inner_error_);
 #line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1422 "GRaw.c"
+#line 1406 "GRaw.c"
 		} else {
 #line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1426,7 +1410,7 @@ void graw_processor_process (GRawProcessor* self, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1430 "GRaw.c"
+#line 1414 "GRaw.c"
 		}
 	}
 }
@@ -1457,7 +1441,7 @@ void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename,
 			g_propagate_error (error, _inner_error_);
 #line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1461 "GRaw.c"
+#line 1445 "GRaw.c"
 		} else {
 #line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1465,7 +1449,7 @@ void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename,
 			g_clear_error (&_inner_error_);
 #line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1469 "GRaw.c"
+#line 1453 "GRaw.c"
 		}
 	}
 }
@@ -1496,7 +1480,7 @@ void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GE
 			g_propagate_error (error, _inner_error_);
 #line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1500 "GRaw.c"
+#line 1484 "GRaw.c"
 		} else {
 #line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1504,7 +1488,7 @@ void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GE
 			g_clear_error (&_inner_error_);
 #line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1508 "GRaw.c"
+#line 1492 "GRaw.c"
 		}
 	}
 }
@@ -1518,7 +1502,7 @@ void graw_processor_recycle (GRawProcessor* self) {
 	_tmp0_ = self->priv->proc;
 #line 216 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	libraw_recycle (_tmp0_);
-#line 1522 "GRaw.c"
+#line 1506 "GRaw.c"
 }
 
 
@@ -1542,7 +1526,7 @@ void graw_processor_unpack (GRawProcessor* self, GError** error) {
 			g_propagate_error (error, _inner_error_);
 #line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1546 "GRaw.c"
+#line 1530 "GRaw.c"
 		} else {
 #line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1550,7 +1534,7 @@ void graw_processor_unpack (GRawProcessor* self, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1554 "GRaw.c"
+#line 1538 "GRaw.c"
 		}
 	}
 }
@@ -1576,7 +1560,7 @@ void graw_processor_unpack_thumb (GRawProcessor* self, GError** error) {
 			g_propagate_error (error, _inner_error_);
 #line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1580 "GRaw.c"
+#line 1564 "GRaw.c"
 		} else {
 #line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1584,7 +1568,7 @@ void graw_processor_unpack_thumb (GRawProcessor* self, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1588 "GRaw.c"
+#line 1572 "GRaw.c"
 		}
 	}
 }
@@ -1613,7 +1597,7 @@ static void lib_raw_output_params_set_chromatic_aberrations (libraw_output_param
 	(*_tmp3_).aber[2] = _tmp4_;
 #line 149 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	_tmp5_ = (*_tmp3_).aber[2];
-#line 1617 "GRaw.c"
+#line 1601 "GRaw.c"
 }
 
 
@@ -1640,7 +1624,7 @@ static void lib_raw_output_params_set_gamma_curve (libraw_output_params_t* param
 	(*_tmp3_).gamm[1] = _tmp4_;
 #line 154 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	_tmp5_ = (*_tmp3_).gamm[1];
-#line 1644 "GRaw.c"
+#line 1628 "GRaw.c"
 }
 
 
@@ -1770,7 +1754,7 @@ void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean hal
 	_tmp30_ = _tmp29_;
 #line 262 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp30_).use_fuji_rotate = (gint) GRAW_FUJI_ROTATE_USE;
-#line 1774 "GRaw.c"
+#line 1758 "GRaw.c"
 }
 
 
@@ -1785,14 +1769,14 @@ libraw_output_params_t* graw_processor_get_output_params (GRawProcessor* self) {
 	result = &_tmp0_->params;
 #line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1789 "GRaw.c"
+#line 1773 "GRaw.c"
 }
 
 
 static void graw_value_processor_init (GValue* value) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	value->data[0].v_pointer = NULL;
-#line 1796 "GRaw.c"
+#line 1780 "GRaw.c"
 }
 
 
@@ -1801,7 +1785,7 @@ static void graw_value_processor_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processor_unref (value->data[0].v_pointer);
-#line 1805 "GRaw.c"
+#line 1789 "GRaw.c"
 	}
 }
 
@@ -1811,11 +1795,11 @@ static void graw_value_processor_copy_value (const GValue* src_value, GValue* de
 	if (src_value->data[0].v_pointer) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		dest_value->data[0].v_pointer = graw_processor_ref (src_value->data[0].v_pointer);
-#line 1815 "GRaw.c"
+#line 1799 "GRaw.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1819 "GRaw.c"
+#line 1803 "GRaw.c"
 	}
 }
 
@@ -1823,37 +1807,37 @@ static void graw_value_processor_copy_value (const GValue* src_value, GValue* de
 static gpointer graw_value_processor_peek_pointer (const GValue* value) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return value->data[0].v_pointer;
-#line 1827 "GRaw.c"
+#line 1811 "GRaw.c"
 }
 
 
 static gchar* graw_value_processor_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (collect_values[0].v_pointer) {
-#line 1834 "GRaw.c"
+#line 1818 "GRaw.c"
 		GRawProcessor* object;
 		object = collect_values[0].v_pointer;
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1841 "GRaw.c"
+#line 1825 "GRaw.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.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 1845 "GRaw.c"
+#line 1829 "GRaw.c"
 		}
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = graw_processor_ref (object);
-#line 1849 "GRaw.c"
+#line 1833 "GRaw.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = NULL;
-#line 1853 "GRaw.c"
+#line 1837 "GRaw.c"
 	}
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return NULL;
-#line 1857 "GRaw.c"
+#line 1841 "GRaw.c"
 }
 
 
@@ -1864,25 +1848,25 @@ static gchar* graw_value_processor_lcopy_value (const GValue* value, guint n_col
 	if (!object_p) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1868 "GRaw.c"
+#line 1852 "GRaw.c"
 	}
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (!value->data[0].v_pointer) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		*object_p = NULL;
-#line 1874 "GRaw.c"
+#line 1858 "GRaw.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1878 "GRaw.c"
+#line 1862 "GRaw.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		*object_p = graw_processor_ref (value->data[0].v_pointer);
-#line 1882 "GRaw.c"
+#line 1866 "GRaw.c"
 	}
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return NULL;
-#line 1886 "GRaw.c"
+#line 1870 "GRaw.c"
 }
 
 
@@ -1896,7 +1880,7 @@ GParamSpec* graw_param_spec_processor (const gchar* name, const gchar* nick, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return G_PARAM_SPEC (spec);
-#line 1900 "GRaw.c"
+#line 1884 "GRaw.c"
 }
 
 
@@ -1905,7 +1889,7 @@ gpointer graw_value_get_processor (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR), NULL);
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return value->data[0].v_pointer;
-#line 1909 "GRaw.c"
+#line 1893 "GRaw.c"
 }
 
 
@@ -1925,17 +1909,17 @@ void graw_value_set_processor (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processor_ref (value->data[0].v_pointer);
-#line 1929 "GRaw.c"
+#line 1913 "GRaw.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = NULL;
-#line 1933 "GRaw.c"
+#line 1917 "GRaw.c"
 	}
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (old) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processor_unref (old);
-#line 1939 "GRaw.c"
+#line 1923 "GRaw.c"
 	}
 }
 
@@ -1954,17 +1938,17 @@ void graw_value_take_processor (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = v_object;
-#line 1958 "GRaw.c"
+#line 1942 "GRaw.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = NULL;
-#line 1962 "GRaw.c"
+#line 1946 "GRaw.c"
 	}
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (old) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processor_unref (old);
-#line 1968 "GRaw.c"
+#line 1952 "GRaw.c"
 	}
 }
 
@@ -1976,7 +1960,7 @@ static void graw_processor_class_init (GRawProcessorClass * klass) {
 	((GRawProcessorClass *) klass)->finalize = graw_processor_finalize;
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_type_class_add_private (klass, sizeof (GRawProcessorPrivate));
-#line 1980 "GRaw.c"
+#line 1964 "GRaw.c"
 }
 
 
@@ -1985,7 +1969,7 @@ static void graw_processor_instance_init (GRawProcessor * self) {
 	self->priv = GRAW_PROCESSOR_GET_PRIVATE (self);
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self->ref_count = 1;
-#line 1989 "GRaw.c"
+#line 1973 "GRaw.c"
 }
 
 
@@ -1997,7 +1981,7 @@ static void graw_processor_finalize (GRawProcessor* obj) {
 	g_signal_handlers_destroy (self);
 #line 161 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_libraw_close0 (self->priv->proc);
-#line 2001 "GRaw.c"
+#line 1985 "GRaw.c"
 }
 
 
@@ -2022,7 +2006,7 @@ gpointer graw_processor_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return instance;
-#line 2026 "GRaw.c"
+#line 2010 "GRaw.c"
 }
 
 
@@ -2035,7 +2019,7 @@ void graw_processor_unref (gpointer instance) {
 		GRAW_PROCESSOR_GET_CLASS (self)->finalize (self);
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2039 "GRaw.c"
+#line 2023 "GRaw.c"
 	}
 }
 
@@ -2057,14 +2041,14 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 	if (_tmp0_ == LIBRAW_SUCCESS) {
 #line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		return;
-#line 2061 "GRaw.c"
+#line 2045 "GRaw.c"
 	} else {
 		enum LibRaw_errors _tmp1_ = 0;
 #line 269 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp1_ = _result_;
 #line 269 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_tmp1_ > 0) {
-#line 2068 "GRaw.c"
+#line 2052 "GRaw.c"
 			const gchar* _tmp2_ = NULL;
 			enum LibRaw_errors _tmp3_ = 0;
 			enum LibRaw_errors _tmp4_ = 0;
@@ -2088,7 +2072,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_propagate_error (error, _inner_error_);
 #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2092 "GRaw.c"
+#line 2076 "GRaw.c"
 			} else {
 #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2096,7 +2080,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2100 "GRaw.c"
+#line 2084 "GRaw.c"
 			}
 		}
 	}
@@ -2116,7 +2100,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 	switch (_tmp11_) {
 #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_UNSPECIFIED_ERROR:
-#line 2120 "GRaw.c"
+#line 2104 "GRaw.c"
 		{
 			const gchar* _tmp12_ = NULL;
 			GError* _tmp13_ = NULL;
@@ -2134,7 +2118,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2138 "GRaw.c"
+#line 2122 "GRaw.c"
 			} else {
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2144,12 +2128,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2148 "GRaw.c"
+#line 2132 "GRaw.c"
 			}
 		}
 #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_FILE_UNSUPPORTED:
-#line 2153 "GRaw.c"
+#line 2137 "GRaw.c"
 		{
 			const gchar* _tmp14_ = NULL;
 			GError* _tmp15_ = NULL;
@@ -2167,7 +2151,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2171 "GRaw.c"
+#line 2155 "GRaw.c"
 			} else {
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2177,12 +2161,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2181 "GRaw.c"
+#line 2165 "GRaw.c"
 			}
 		}
 #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_REQUEST_FOR_NONEXISTENT_IMAGE:
-#line 2186 "GRaw.c"
+#line 2170 "GRaw.c"
 		{
 			const gchar* _tmp16_ = NULL;
 			GError* _tmp17_ = NULL;
@@ -2200,7 +2184,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2204 "GRaw.c"
+#line 2188 "GRaw.c"
 			} else {
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2210,12 +2194,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2214 "GRaw.c"
+#line 2198 "GRaw.c"
 			}
 		}
 #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_OUT_OF_ORDER_CALL:
-#line 2219 "GRaw.c"
+#line 2203 "GRaw.c"
 		{
 			const gchar* _tmp18_ = NULL;
 			GError* _tmp19_ = NULL;
@@ -2233,7 +2217,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2237 "GRaw.c"
+#line 2221 "GRaw.c"
 			} else {
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2243,12 +2227,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2247 "GRaw.c"
+#line 2231 "GRaw.c"
 			}
 		}
 #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_NO_THUMBNAIL:
-#line 2252 "GRaw.c"
+#line 2236 "GRaw.c"
 		{
 			const gchar* _tmp20_ = NULL;
 			GError* _tmp21_ = NULL;
@@ -2266,7 +2250,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2270 "GRaw.c"
+#line 2254 "GRaw.c"
 			} else {
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2276,12 +2260,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2280 "GRaw.c"
+#line 2264 "GRaw.c"
 			}
 		}
 #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_UNSUPPORTED_THUMBNAIL:
-#line 2285 "GRaw.c"
+#line 2269 "GRaw.c"
 		{
 			const gchar* _tmp22_ = NULL;
 			GError* _tmp23_ = NULL;
@@ -2299,7 +2283,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2303 "GRaw.c"
+#line 2287 "GRaw.c"
 			} else {
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2309,12 +2293,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2313 "GRaw.c"
+#line 2297 "GRaw.c"
 			}
 		}
 #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_UNSUFFICIENT_MEMORY:
-#line 2318 "GRaw.c"
+#line 2302 "GRaw.c"
 		{
 			const gchar* _tmp24_ = NULL;
 			GError* _tmp25_ = NULL;
@@ -2332,7 +2316,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2336 "GRaw.c"
+#line 2320 "GRaw.c"
 			} else {
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2342,12 +2326,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2346 "GRaw.c"
+#line 2330 "GRaw.c"
 			}
 		}
 #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_DATA_ERROR:
-#line 2351 "GRaw.c"
+#line 2335 "GRaw.c"
 		{
 			const gchar* _tmp26_ = NULL;
 			GError* _tmp27_ = NULL;
@@ -2365,7 +2349,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2369 "GRaw.c"
+#line 2353 "GRaw.c"
 			} else {
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2375,12 +2359,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2379 "GRaw.c"
+#line 2363 "GRaw.c"
 			}
 		}
 #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_IO_ERROR:
-#line 2384 "GRaw.c"
+#line 2368 "GRaw.c"
 		{
 			const gchar* _tmp28_ = NULL;
 			GError* _tmp29_ = NULL;
@@ -2398,7 +2382,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2402 "GRaw.c"
+#line 2386 "GRaw.c"
 			} else {
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2408,12 +2392,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2412 "GRaw.c"
+#line 2396 "GRaw.c"
 			}
 		}
 #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_CANCELLED_BY_CALLBACK:
-#line 2417 "GRaw.c"
+#line 2401 "GRaw.c"
 		{
 			const gchar* _tmp30_ = NULL;
 			GError* _tmp31_ = NULL;
@@ -2431,7 +2415,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2435 "GRaw.c"
+#line 2419 "GRaw.c"
 			} else {
 #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2441,12 +2425,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2445 "GRaw.c"
+#line 2429 "GRaw.c"
 			}
 		}
 #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_BAD_CROP:
-#line 2450 "GRaw.c"
+#line 2434 "GRaw.c"
 		{
 			const gchar* _tmp32_ = NULL;
 			GError* _tmp33_ = NULL;
@@ -2464,7 +2448,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2468 "GRaw.c"
+#line 2452 "GRaw.c"
 			} else {
 #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2474,7 +2458,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2478 "GRaw.c"
+#line 2462 "GRaw.c"
 			}
 		}
 		default:
@@ -2483,12 +2467,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 			_g_free0 (msg);
 #line 309 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 2487 "GRaw.c"
+#line 2471 "GRaw.c"
 		}
 	}
 #line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_g_free0 (msg);
-#line 2492 "GRaw.c"
+#line 2476 "GRaw.c"
 }