Update upstream source from tag 'upstream/0.26.4'

Update to upstream version '0.26.4'
with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4

1 files changed, 887 insertions, 1001 deletions

diff --git a/src/camera/GPhoto.c b/src/camera/GPhoto.c
index e482a97..6deedf6 100644
--- a/src/camera/GPhoto.c
+++ b/src/camera/GPhoto.c
@@ -1,4 +1,4 @@
-/* GPhoto.c generated by valac 0.34.7, the Vala compiler
+/* GPhoto.c generated by valac 0.36.6, the Vala compiler
  * generated from GPhoto.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -86,8 +86,6 @@ typedef struct _PhotoMetadataClass PhotoMetadataClass;
 typedef struct _PhotoPreview PhotoPreview;
 typedef struct _PhotoPreviewClass PhotoPreviewClass;
 #define _photo_preview_unref0(var) ((var == NULL) ? NULL : (var = (photo_preview_unref (var), NULL)))
-
-#define JPEG_TYPE_MARKER (jpeg_marker_get_type ())
 #define _gp_file_unref0(var) ((var == NULL) ? NULL : (var = (gp_file_unref (var), NULL)))
 
 typedef enum  {
@@ -126,14 +124,6 @@ struct _GPSpinIdleWrapperClass {
 	GPContextWrapperClass parent_class;
 };
 
-typedef enum  {
-	JPEG_MARKER_INVALID = 0x00,
-	JPEG_MARKER_SOI = 0xD8,
-	JPEG_MARKER_EOI = 0xD9,
-	JPEG_MARKER_APP0 = 0xE0,
-	JPEG_MARKER_APP1 = 0xE1
-} JpegMarker;
-
 
 static gpointer gp_context_wrapper_parent_class = NULL;
 static gpointer gp_spin_idle_wrapper_parent_class = NULL;
@@ -179,7 +169,7 @@ void gp_context_wrapper_progress_update (GPContextWrapper* self, gfloat current,
 static void gp_context_wrapper_real_progress_update (GPContextWrapper* self, gfloat current, void* data);
 void gp_context_wrapper_progress_stop (GPContextWrapper* self);
 static void gp_context_wrapper_real_progress_stop (GPContextWrapper* self);
-static void gp_context_wrapper_finalize (GPContextWrapper* obj);
+static void gp_context_wrapper_finalize (GPContextWrapper * obj);
 GType gp_spin_idle_wrapper_get_type (void) G_GNUC_CONST;
 enum  {
 	GP_SPIN_IDLE_WRAPPER_DUMMY_PROPERTY
@@ -216,8 +206,6 @@ gpointer value_get_photo_preview (const GValue* value);
 GType photo_preview_get_type (void) G_GNUC_CONST;
 PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number);
 guint8* photo_preview_flatten (PhotoPreview* self, int* result_length1, GError** error);
-#define JPEG_MARKER_PREFIX ((guint8) 0xFF)
-GType jpeg_marker_get_type (void) G_GNUC_CONST;
 static guint8* _vala_array_dup23 (guint8* self, int length);
 #define IMPORT_PREVIEW_MAX_SCALE 128
 GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error);
@@ -239,28 +227,28 @@ GQuark gphoto_error_quark (void) {
 static void _gp_context_wrapper_on_idle_gp_context_idle_func (GPContext* context, gpointer self) {
 #line 18 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_idle ((GPContextWrapper*) self, context);
-#line 243 "GPhoto.c"
+#line 231 "GPhoto.c"
 }
 
 
 static void _gp_context_wrapper_on_error_gp_context_error_func (GPContext* context, const gchar* text, gpointer self) {
 #line 19 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_error ((GPContextWrapper*) self, context, text);
-#line 250 "GPhoto.c"
+#line 238 "GPhoto.c"
 }
 
 
 static void _gp_context_wrapper_on_status_gp_context_status_func (GPContext* context, const gchar* text, gpointer self) {
 #line 20 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_status ((GPContextWrapper*) self, context, text);
-#line 257 "GPhoto.c"
+#line 245 "GPhoto.c"
 }
 
 
 static void _gp_context_wrapper_on_message_gp_context_message_func (GPContext* context, const gchar* text, gpointer self) {
 #line 21 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_message ((GPContextWrapper*) self, context, text);
-#line 264 "GPhoto.c"
+#line 252 "GPhoto.c"
 }
 
 
@@ -269,31 +257,31 @@ static guint _gp_context_wrapper_on_progress_start_gp_context_progress_start_fun
 	result = gp_context_wrapper_on_progress_start ((GPContextWrapper*) self, context, target, text);
 #line 22 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 273 "GPhoto.c"
+#line 261 "GPhoto.c"
 }
 
 
 static void _gp_context_wrapper_on_progress_update_gp_context_progress_update_func (GPContext* context, guint id, gfloat current, gpointer self) {
 #line 22 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_progress_update ((GPContextWrapper*) self, context, id, current);
-#line 280 "GPhoto.c"
+#line 268 "GPhoto.c"
 }
 
 
 static void _gp_context_wrapper_on_progress_stop_gp_context_progress_stop_func (GPContext* context, guint id, gpointer self) {
 #line 22 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_progress_stop ((GPContextWrapper*) self, context, id);
-#line 287 "GPhoto.c"
+#line 275 "GPhoto.c"
 }
 
 
 GPContextWrapper* gp_context_wrapper_construct (GType object_type) {
 	GPContextWrapper* self = NULL;
-	GPContext* _tmp0_ = NULL;
-	GPContext* _tmp1_ = NULL;
-	GPContext* _tmp2_ = NULL;
-	GPContext* _tmp3_ = NULL;
-	GPContext* _tmp4_ = NULL;
+	GPContext* _tmp0_;
+	GPContext* _tmp1_;
+	GPContext* _tmp2_;
+	GPContext* _tmp3_;
+	GPContext* _tmp4_;
 #line 17 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	self = (GPContextWrapper*) g_type_create_instance (object_type);
 #line 18 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -318,14 +306,14 @@ GPContextWrapper* gp_context_wrapper_construct (GType object_type) {
 	gp_context_set_progress_funcs (_tmp4_, _gp_context_wrapper_on_progress_start_gp_context_progress_start_func, _gp_context_wrapper_on_progress_update_gp_context_progress_update_func, _gp_context_wrapper_on_progress_stop_gp_context_progress_stop_func, self);
 #line 17 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return self;
-#line 322 "GPhoto.c"
+#line 310 "GPhoto.c"
 }
 
 
 GPContextWrapper* gp_context_wrapper_new (void) {
 #line 17 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return gp_context_wrapper_construct (GP_TYPE_CONTEXT_WRAPPER);
-#line 329 "GPhoto.c"
+#line 317 "GPhoto.c"
 }
 
 
@@ -338,14 +326,14 @@ void gp_context_wrapper_idle (GPContextWrapper* self) {
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 25 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->idle (self);
-#line 342 "GPhoto.c"
+#line 330 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_real_error (GPContextWrapper* self, const gchar* text, void* data) {
 #line 28 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (text != NULL);
-#line 349 "GPhoto.c"
+#line 337 "GPhoto.c"
 }
 
 
@@ -354,14 +342,14 @@ void gp_context_wrapper_error (GPContextWrapper* self, const gchar* text, void*
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 28 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->error (self, text, data);
-#line 358 "GPhoto.c"
+#line 346 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_real_status (GPContextWrapper* self, const gchar* text, void* data) {
 #line 31 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (text != NULL);
-#line 365 "GPhoto.c"
+#line 353 "GPhoto.c"
 }
 
 
@@ -370,14 +358,14 @@ void gp_context_wrapper_status (GPContextWrapper* self, const gchar* text, void*
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 31 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->status (self, text, data);
-#line 374 "GPhoto.c"
+#line 362 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_real_message (GPContextWrapper* self, const gchar* text, void* data) {
 #line 34 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (text != NULL);
-#line 381 "GPhoto.c"
+#line 369 "GPhoto.c"
 }
 
 
@@ -386,14 +374,14 @@ void gp_context_wrapper_message (GPContextWrapper* self, const gchar* text, void
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 34 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->message (self, text, data);
-#line 390 "GPhoto.c"
+#line 378 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_real_progress_start (GPContextWrapper* self, gfloat current, const gchar* text, void* data) {
 #line 37 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (text != NULL);
-#line 397 "GPhoto.c"
+#line 385 "GPhoto.c"
 }
 
 
@@ -402,7 +390,7 @@ void gp_context_wrapper_progress_start (GPContextWrapper* self, gfloat current,
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 37 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->progress_start (self, current, text, data);
-#line 406 "GPhoto.c"
+#line 394 "GPhoto.c"
 }
 
 
@@ -415,7 +403,7 @@ void gp_context_wrapper_progress_update (GPContextWrapper* self, gfloat current,
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 40 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->progress_update (self, current, data);
-#line 419 "GPhoto.c"
+#line 407 "GPhoto.c"
 }
 
 
@@ -428,7 +416,7 @@ void gp_context_wrapper_progress_stop (GPContextWrapper* self) {
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 43 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->progress_stop (self);
-#line 432 "GPhoto.c"
+#line 420 "GPhoto.c"
 }
 
 
@@ -439,12 +427,12 @@ static void gp_context_wrapper_on_idle (GPContextWrapper* self, GPContext* conte
 	g_return_if_fail (context != NULL);
 #line 47 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_idle (self);
-#line 443 "GPhoto.c"
+#line 431 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_on_error (GPContextWrapper* self, GPContext* context, const gchar* text) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 50 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 50 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -455,12 +443,12 @@ static void gp_context_wrapper_on_error (GPContextWrapper* self, GPContext* cont
 	_tmp0_ = text;
 #line 51 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_error (self, _tmp0_, NULL);
-#line 459 "GPhoto.c"
+#line 447 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_on_status (GPContextWrapper* self, GPContext* context, const gchar* text) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 54 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 54 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -471,12 +459,12 @@ static void gp_context_wrapper_on_status (GPContextWrapper* self, GPContext* con
 	_tmp0_ = text;
 #line 55 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_status (self, _tmp0_, NULL);
-#line 475 "GPhoto.c"
+#line 463 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_on_message (GPContextWrapper* self, GPContext* context, const gchar* text) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 58 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 58 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -487,14 +475,14 @@ static void gp_context_wrapper_on_message (GPContextWrapper* self, GPContext* co
 	_tmp0_ = text;
 #line 59 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_message (self, _tmp0_, NULL);
-#line 491 "GPhoto.c"
+#line 479 "GPhoto.c"
 }
 
 
 static guint gp_context_wrapper_on_progress_start (GPContextWrapper* self, GPContext* context, gfloat target, const gchar* text) {
 	guint result = 0U;
-	gfloat _tmp0_ = 0.0F;
-	const gchar* _tmp1_ = NULL;
+	gfloat _tmp0_;
+	const gchar* _tmp1_;
 #line 62 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (GP_IS_CONTEXT_WRAPPER (self), 0U);
 #line 62 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -511,12 +499,12 @@ static guint gp_context_wrapper_on_progress_start (GPContextWrapper* self, GPCon
 	result = (guint) 0;
 #line 65 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 515 "GPhoto.c"
+#line 503 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_on_progress_update (GPContextWrapper* self, GPContext* context, guint id, gfloat current) {
-	gfloat _tmp0_ = 0.0F;
+	gfloat _tmp0_;
 #line 68 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 68 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -525,7 +513,7 @@ static void gp_context_wrapper_on_progress_update (GPContextWrapper* self, GPCon
 	_tmp0_ = current;
 #line 69 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_progress_update (self, _tmp0_, NULL);
-#line 529 "GPhoto.c"
+#line 517 "GPhoto.c"
 }
 
 
@@ -536,14 +524,14 @@ static void gp_context_wrapper_on_progress_stop (GPContextWrapper* self, GPConte
 	g_return_if_fail (context != NULL);
 #line 73 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_progress_stop (self);
-#line 540 "GPhoto.c"
+#line 528 "GPhoto.c"
 }
 
 
 static void gp_value_context_wrapper_init (GValue* value) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	value->data[0].v_pointer = NULL;
-#line 547 "GPhoto.c"
+#line 535 "GPhoto.c"
 }
 
 
@@ -552,7 +540,7 @@ static void gp_value_context_wrapper_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		gp_context_wrapper_unref (value->data[0].v_pointer);
-#line 556 "GPhoto.c"
+#line 544 "GPhoto.c"
 	}
 }
 
@@ -562,11 +550,11 @@ static void gp_value_context_wrapper_copy_value (const GValue* src_value, GValue
 	if (src_value->data[0].v_pointer) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		dest_value->data[0].v_pointer = gp_context_wrapper_ref (src_value->data[0].v_pointer);
-#line 566 "GPhoto.c"
+#line 554 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 570 "GPhoto.c"
+#line 558 "GPhoto.c"
 	}
 }
 
@@ -574,66 +562,66 @@ static void gp_value_context_wrapper_copy_value (const GValue* src_value, GValue
 static gpointer gp_value_context_wrapper_peek_pointer (const GValue* value) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return value->data[0].v_pointer;
-#line 578 "GPhoto.c"
+#line 566 "GPhoto.c"
 }
 
 
 static gchar* gp_value_context_wrapper_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (collect_values[0].v_pointer) {
-#line 585 "GPhoto.c"
-		GPContextWrapper* object;
+#line 573 "GPhoto.c"
+		GPContextWrapper * object;
 		object = collect_values[0].v_pointer;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 592 "GPhoto.c"
+#line 580 "GPhoto.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.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 596 "GPhoto.c"
+#line 584 "GPhoto.c"
 		}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = gp_context_wrapper_ref (object);
-#line 600 "GPhoto.c"
+#line 588 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = NULL;
-#line 604 "GPhoto.c"
+#line 592 "GPhoto.c"
 	}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return NULL;
-#line 608 "GPhoto.c"
+#line 596 "GPhoto.c"
 }
 
 
 static gchar* gp_value_context_wrapper_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	GPContextWrapper** object_p;
+	GPContextWrapper ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (!object_p) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 619 "GPhoto.c"
+#line 607 "GPhoto.c"
 	}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (!value->data[0].v_pointer) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*object_p = NULL;
-#line 625 "GPhoto.c"
+#line 613 "GPhoto.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*object_p = value->data[0].v_pointer;
-#line 629 "GPhoto.c"
+#line 617 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*object_p = gp_context_wrapper_ref (value->data[0].v_pointer);
-#line 633 "GPhoto.c"
+#line 621 "GPhoto.c"
 	}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return NULL;
-#line 637 "GPhoto.c"
+#line 625 "GPhoto.c"
 }
 
 
@@ -647,7 +635,7 @@ GParamSpec* gp_param_spec_context_wrapper (const gchar* name, const gchar* nick,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return G_PARAM_SPEC (spec);
-#line 651 "GPhoto.c"
+#line 639 "GPhoto.c"
 }
 
 
@@ -656,12 +644,12 @@ gpointer gp_value_get_context_wrapper (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GP_TYPE_CONTEXT_WRAPPER), NULL);
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return value->data[0].v_pointer;
-#line 660 "GPhoto.c"
+#line 648 "GPhoto.c"
 }
 
 
 void gp_value_set_context_wrapper (GValue* value, gpointer v_object) {
-	GPContextWrapper* old;
+	GPContextWrapper * old;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GP_TYPE_CONTEXT_WRAPPER));
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -676,23 +664,23 @@ void gp_value_set_context_wrapper (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		gp_context_wrapper_ref (value->data[0].v_pointer);
-#line 680 "GPhoto.c"
+#line 668 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = NULL;
-#line 684 "GPhoto.c"
+#line 672 "GPhoto.c"
 	}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (old) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		gp_context_wrapper_unref (old);
-#line 690 "GPhoto.c"
+#line 678 "GPhoto.c"
 	}
 }
 
 
 void gp_value_take_context_wrapper (GValue* value, gpointer v_object) {
-	GPContextWrapper* old;
+	GPContextWrapper * old;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GP_TYPE_CONTEXT_WRAPPER));
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -705,17 +693,17 @@ void gp_value_take_context_wrapper (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = v_object;
-#line 709 "GPhoto.c"
+#line 697 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = NULL;
-#line 713 "GPhoto.c"
+#line 701 "GPhoto.c"
 	}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (old) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		gp_context_wrapper_unref (old);
-#line 719 "GPhoto.c"
+#line 707 "GPhoto.c"
 	}
 }
 
@@ -726,36 +714,36 @@ static void gp_context_wrapper_class_init (GPContextWrapperClass * klass) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	((GPContextWrapperClass *) klass)->finalize = gp_context_wrapper_finalize;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	((GPContextWrapperClass *) klass)->idle = (void (*)(GPContextWrapper*)) gp_context_wrapper_real_idle;
+	((GPContextWrapperClass *) klass)->idle = (void (*) (GPContextWrapper *)) gp_context_wrapper_real_idle;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	((GPContextWrapperClass *) klass)->error = (void (*)(GPContextWrapper*, const gchar*, void*)) gp_context_wrapper_real_error;
+	((GPContextWrapperClass *) klass)->error = (void (*) (GPContextWrapper *, const gchar*, void*)) gp_context_wrapper_real_error;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	((GPContextWrapperClass *) klass)->status = (void (*)(GPContextWrapper*, const gchar*, void*)) gp_context_wrapper_real_status;
+	((GPContextWrapperClass *) klass)->status = (void (*) (GPContextWrapper *, const gchar*, void*)) gp_context_wrapper_real_status;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	((GPContextWrapperClass *) klass)->message = (void (*)(GPContextWrapper*, const gchar*, void*)) gp_context_wrapper_real_message;
+	((GPContextWrapperClass *) klass)->message = (void (*) (GPContextWrapper *, const gchar*, void*)) gp_context_wrapper_real_message;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	((GPContextWrapperClass *) klass)->progress_start = (void (*)(GPContextWrapper*, gfloat, const gchar*, void*)) gp_context_wrapper_real_progress_start;
+	((GPContextWrapperClass *) klass)->progress_start = (void (*) (GPContextWrapper *, gfloat, const gchar*, void*)) gp_context_wrapper_real_progress_start;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	((GPContextWrapperClass *) klass)->progress_update = (void (*)(GPContextWrapper*, gfloat, void*)) gp_context_wrapper_real_progress_update;
+	((GPContextWrapperClass *) klass)->progress_update = (void (*) (GPContextWrapper *, gfloat, void*)) gp_context_wrapper_real_progress_update;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	((GPContextWrapperClass *) klass)->progress_stop = (void (*)(GPContextWrapper*)) gp_context_wrapper_real_progress_stop;
-#line 743 "GPhoto.c"
+	((GPContextWrapperClass *) klass)->progress_stop = (void (*) (GPContextWrapper *)) gp_context_wrapper_real_progress_stop;
+#line 731 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_instance_init (GPContextWrapper * self) {
-	GPContext* _tmp0_ = NULL;
+	GPContext* _tmp0_;
 #line 15 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp0_ = gp_context_new ();
 #line 15 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	self->context = _tmp0_;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	self->ref_count = 1;
-#line 755 "GPhoto.c"
+#line 743 "GPhoto.c"
 }
 
 
-static void gp_context_wrapper_finalize (GPContextWrapper* obj) {
+static void gp_context_wrapper_finalize (GPContextWrapper * obj) {
 	GPContextWrapper * self;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper);
@@ -763,7 +751,7 @@ static void gp_context_wrapper_finalize (GPContextWrapper* obj) {
 	g_signal_handlers_destroy (self);
 #line 15 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_context_unref0 (self->context);
-#line 767 "GPhoto.c"
+#line 755 "GPhoto.c"
 }
 
 
@@ -782,18 +770,18 @@ GType gp_context_wrapper_get_type (void) {
 
 
 gpointer gp_context_wrapper_ref (gpointer instance) {
-	GPContextWrapper* self;
+	GPContextWrapper * self;
 	self = instance;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return instance;
-#line 792 "GPhoto.c"
+#line 780 "GPhoto.c"
 }
 
 
 void gp_context_wrapper_unref (gpointer instance) {
-	GPContextWrapper* self;
+	GPContextWrapper * self;
 	self = instance;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -801,7 +789,7 @@ void gp_context_wrapper_unref (gpointer instance) {
 		GP_CONTEXT_WRAPPER_GET_CLASS (self)->finalize (self);
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 805 "GPhoto.c"
+#line 793 "GPhoto.c"
 	}
 }
 
@@ -812,14 +800,14 @@ GPSpinIdleWrapper* gp_spin_idle_wrapper_construct (GType object_type) {
 	self = (GPSpinIdleWrapper*) gp_context_wrapper_construct (object_type);
 #line 79 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return self;
-#line 816 "GPhoto.c"
+#line 804 "GPhoto.c"
 }
 
 
 GPSpinIdleWrapper* gp_spin_idle_wrapper_new (void) {
 #line 79 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return gp_spin_idle_wrapper_construct (GP_TYPE_SPIN_IDLE_WRAPPER);
-#line 823 "GPhoto.c"
+#line 811 "GPhoto.c"
 }
 
 
@@ -831,14 +819,14 @@ static void gp_spin_idle_wrapper_real_idle (GPContextWrapper* base) {
 	GP_CONTEXT_WRAPPER_CLASS (gp_spin_idle_wrapper_parent_class)->idle (G_TYPE_CHECK_INSTANCE_CAST (self, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper));
 #line 85 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	spin_event_loop ();
-#line 835 "GPhoto.c"
+#line 823 "GPhoto.c"
 }
 
 
 static void gp_spin_idle_wrapper_real_progress_update (GPContextWrapper* base, gfloat current, void* data) {
 	GPSpinIdleWrapper * self;
-	gfloat _tmp0_ = 0.0F;
-	void* _tmp1_ = NULL;
+	gfloat _tmp0_;
+	void* _tmp1_;
 #line 88 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, GP_TYPE_SPIN_IDLE_WRAPPER, GPSpinIdleWrapper);
 #line 89 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -849,7 +837,7 @@ static void gp_spin_idle_wrapper_real_progress_update (GPContextWrapper* base, g
 	GP_CONTEXT_WRAPPER_CLASS (gp_spin_idle_wrapper_parent_class)->progress_update (G_TYPE_CHECK_INSTANCE_CAST (self, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper), _tmp0_, _tmp1_);
 #line 91 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	spin_event_loop ();
-#line 853 "GPhoto.c"
+#line 841 "GPhoto.c"
 }
 
 
@@ -857,10 +845,10 @@ static void gp_spin_idle_wrapper_class_init (GPSpinIdleWrapperClass * klass) {
 #line 78 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_spin_idle_wrapper_parent_class = g_type_class_peek_parent (klass);
 #line 78 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	((GPContextWrapperClass *) klass)->idle = (void (*)(GPContextWrapper*)) gp_spin_idle_wrapper_real_idle;
+	((GPContextWrapperClass *) klass)->idle = (void (*) (GPContextWrapper *)) gp_spin_idle_wrapper_real_idle;
 #line 78 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	((GPContextWrapperClass *) klass)->progress_update = (void (*)(GPContextWrapper*, gfloat, void*)) gp_spin_idle_wrapper_real_progress_update;
-#line 864 "GPhoto.c"
+	((GPContextWrapperClass *) klass)->progress_update = (void (*) (GPContextWrapper *, gfloat, void*)) gp_spin_idle_wrapper_real_progress_update;
+#line 852 "GPhoto.c"
 }
 
 
@@ -884,17 +872,17 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 	CameraFileInfo _vala_info = {0};
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	const gchar* _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
 	int res = 0;
-	Camera* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	GPContext* _tmp11_ = NULL;
+	Camera* _tmp8_;
+	const gchar* _tmp9_;
+	const gchar* _tmp10_;
+	GPContext* _tmp11_;
 	CameraFileInfo _tmp12_ = {0};
-	int _tmp13_ = 0;
-	int _tmp14_ = 0;
+	int _tmp13_;
+	int _tmp14_;
 	GError * _inner_error_ = NULL;
 #line 102 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, FALSE);
@@ -914,11 +902,11 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 	if (_tmp3_ > GP_MAX_BASEDIR_LENGTH) {
 #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = TRUE;
-#line 918 "GPhoto.c"
+#line 906 "GPhoto.c"
 	} else {
-		const gchar* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+		const gchar* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp4_ = filename;
 #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -927,11 +915,11 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 		_tmp6_ = _tmp5_;
 #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = _tmp6_ > GP_MAX_FILENAME_LENGTH;
-#line 931 "GPhoto.c"
+#line 919 "GPhoto.c"
 	}
 #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp0_) {
-#line 935 "GPhoto.c"
+#line 923 "GPhoto.c"
 		CameraFileInfo _tmp7_ = {0};
 #line 105 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		 (_vala_info);
@@ -943,15 +931,15 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 		if (info) {
 #line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			*info = _vala_info;
-#line 947 "GPhoto.c"
+#line 935 "GPhoto.c"
 		} else {
 #line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			 (_vala_info);
-#line 951 "GPhoto.c"
+#line 939 "GPhoto.c"
 		}
 #line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 955 "GPhoto.c"
+#line 943 "GPhoto.c"
 	}
 #line 110 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp8_ = camera;
@@ -973,13 +961,13 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 	_tmp14_ = res;
 #line 111 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp14_ != GP_OK) {
-#line 977 "GPhoto.c"
-		int _tmp15_ = 0;
-		const gchar* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
-		int _tmp18_ = 0;
-		const gchar* _tmp19_ = NULL;
-		GError* _tmp20_ = NULL;
+#line 965 "GPhoto.c"
+		int _tmp15_;
+		const gchar* _tmp16_;
+		const gchar* _tmp17_;
+		int _tmp18_;
+		const gchar* _tmp19_;
+		GError* _tmp20_;
 		gboolean _tmp21_ = FALSE;
 #line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp15_ = res;
@@ -999,7 +987,7 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 		g_propagate_error (error, _inner_error_);
 #line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return _tmp21_;
-#line 1003 "GPhoto.c"
+#line 991 "GPhoto.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = TRUE;
@@ -1007,134 +995,134 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 	if (info) {
 #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*info = _vala_info;
-#line 1011 "GPhoto.c"
+#line 999 "GPhoto.c"
 	} else {
 #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		 (_vala_info);
-#line 1015 "GPhoto.c"
+#line 1003 "GPhoto.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 1019 "GPhoto.c"
+#line 1007 "GPhoto.c"
 }
 
 
 static gchar* string_slice (const gchar* self, glong start, glong end) {
 	gchar* result = NULL;
 	glong string_length = 0L;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	glong _tmp2_ = 0L;
-	glong _tmp5_ = 0L;
+	gint _tmp0_;
+	gint _tmp1_;
+	glong _tmp2_;
+	glong _tmp5_;
 	gboolean _tmp8_ = FALSE;
-	glong _tmp9_ = 0L;
+	glong _tmp9_;
 	gboolean _tmp12_ = FALSE;
-	glong _tmp13_ = 0L;
-	glong _tmp16_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp13_;
+	glong _tmp16_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	gchar* _tmp21_;
+#line 1355 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 1052 "GPhoto.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1040 "GPhoto.c"
+		glong _tmp3_;
+		glong _tmp4_;
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 1061 "GPhoto.c"
+#line 1049 "GPhoto.c"
 	}
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 1067 "GPhoto.c"
-		glong _tmp6_ = 0L;
-		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1055 "GPhoto.c"
+		glong _tmp6_;
+		glong _tmp7_;
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 1076 "GPhoto.c"
+#line 1064 "GPhoto.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 1082 "GPhoto.c"
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1070 "GPhoto.c"
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 1091 "GPhoto.c"
+#line 1079 "GPhoto.c"
 	} else {
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 1095 "GPhoto.c"
+#line 1083 "GPhoto.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 1103 "GPhoto.c"
-		glong _tmp14_ = 0L;
-		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "GPhoto.c"
+		glong _tmp14_;
+		glong _tmp15_;
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 1112 "GPhoto.c"
+#line 1100 "GPhoto.c"
 	} else {
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 1116 "GPhoto.c"
+#line 1104 "GPhoto.c"
 	}
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 1138 "GPhoto.c"
+#line 1126 "GPhoto.c"
 }
 
 
@@ -1142,21 +1130,21 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 	PhotoMetadata* result = NULL;
 	CameraStorageInformation* sifs = NULL;
 	gint count = 0;
-	Camera* _tmp0_ = NULL;
-	GPContext* _tmp1_ = NULL;
+	Camera* _tmp0_;
+	GPContext* _tmp1_;
 	gint _tmp2_ = 0;
 	GPPortInfo port_info = {0};
-	Camera* _tmp3_ = NULL;
+	Camera* _tmp3_;
 	GPPortInfo _tmp4_ = {0};
 	gchar* path = NULL;
 	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	gchar* _tmp6_;
 	gchar* prefix = NULL;
-	gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
+	gchar* _tmp7_;
+	const gchar* _tmp8_;
+	gboolean _tmp9_;
 	PhotoMetadata* metadata = NULL;
-	PhotoMetadata* _tmp17_ = NULL;
+	PhotoMetadata* _tmp17_;
 	GError * _inner_error_ = NULL;
 #line 121 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
@@ -1204,14 +1192,14 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 	_tmp9_ = g_str_has_prefix (_tmp8_, prefix);
 #line 133 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp9_) {
-#line 1208 "GPhoto.c"
-		const gchar* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
-		const gchar* _tmp13_ = NULL;
-		gint _tmp14_ = 0;
-		gint _tmp15_ = 0;
-		gchar* _tmp16_ = NULL;
+#line 1196 "GPhoto.c"
+		const gchar* _tmp10_;
+		gint _tmp11_;
+		gint _tmp12_;
+		const gchar* _tmp13_;
+		gint _tmp14_;
+		gint _tmp15_;
+		gchar* _tmp16_;
 #line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp10_ = path;
 #line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1230,7 +1218,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		_g_free0 (path);
 #line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		path = _tmp16_;
-#line 1234 "GPhoto.c"
+#line 1222 "GPhoto.c"
 	} else {
 #line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = NULL;
@@ -1242,26 +1230,26 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		 (port_info);
 #line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 1246 "GPhoto.c"
+#line 1234 "GPhoto.c"
 	}
 #line 138 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp17_ = photo_metadata_new ();
 #line 138 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	metadata = _tmp17_;
-#line 1252 "GPhoto.c"
+#line 1240 "GPhoto.c"
 	{
-		PhotoMetadata* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
-		gchar* _tmp23_ = NULL;
-		gchar* _tmp24_ = NULL;
-		const gchar* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
-		gchar* _tmp27_ = NULL;
-		GFile* _tmp28_ = NULL;
-		GFile* _tmp29_ = NULL;
+		PhotoMetadata* _tmp18_;
+		const gchar* _tmp19_;
+		const gchar* _tmp20_;
+		gchar* _tmp21_;
+		gchar* _tmp22_;
+		gchar* _tmp23_;
+		gchar* _tmp24_;
+		const gchar* _tmp25_;
+		gchar* _tmp26_;
+		gchar* _tmp27_;
+		GFile* _tmp28_;
+		GFile* _tmp29_;
 #line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp18_ = metadata;
 #line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1298,12 +1286,12 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		_g_free0 (_tmp22_);
 #line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1302 "GPhoto.c"
-			goto __catch61_g_error;
+#line 1290 "GPhoto.c"
+			goto __catch62_g_error;
 		}
 	}
-	goto __finally61;
-	__catch61_g_error:
+	goto __finally62;
+	__catch62_g_error:
 	{
 #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_clear_error (&_inner_error_);
@@ -1313,9 +1301,9 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		_media_metadata_unref0 (metadata);
 #line 142 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		metadata = NULL;
-#line 1317 "GPhoto.c"
+#line 1305 "GPhoto.c"
 	}
-	__finally61:
+	__finally62:
 #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1332,7 +1320,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		g_clear_error (&_inner_error_);
 #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1336 "GPhoto.c"
+#line 1324 "GPhoto.c"
 	}
 #line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = metadata;
@@ -1344,14 +1332,14 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 	 (port_info);
 #line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 1348 "GPhoto.c"
+#line 1336 "GPhoto.c"
 }
 
 
 static guint8* _vala_array_dup23 (guint8* self, int length) {
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 1355 "GPhoto.c"
+#line 1343 "GPhoto.c"
 }
 
 
@@ -1360,21 +1348,20 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 	int _vala_raw_length1 = 0;
 	gsize _vala_raw_length = 0UL;
 	GdkPixbuf* result = NULL;
-	guint8* _tmp25_ = NULL;
-	gint _tmp25__length1 = 0;
-	guint8* _tmp26_ = NULL;
-	gint _tmp26__length1 = 0;
-	gsize _tmp27_ = 0UL;
+	guint8* _tmp25_;
+	gint _tmp25__length1;
+	guint8* _tmp26_;
+	gint _tmp26__length1;
 	GMemoryInputStream* mins = NULL;
-	guint8* _tmp42_ = NULL;
-	gint _tmp42__length1 = 0;
-	guint8* _tmp43_ = NULL;
-	gint _tmp43__length1 = 0;
-	GMemoryInputStream* _tmp44_ = NULL;
-	GdkPixbuf* _tmp45_ = NULL;
-	GMemoryInputStream* _tmp46_ = NULL;
-	GdkPixbuf* _tmp47_ = NULL;
-	GdkPixbuf* _tmp48_ = NULL;
+	guint8* _tmp27_;
+	gint _tmp27__length1;
+	guint8* _tmp28_;
+	gint _tmp28__length1;
+	GMemoryInputStream* _tmp29_;
+	GdkPixbuf* _tmp30_ = NULL;
+	GMemoryInputStream* _tmp31_;
+	GdkPixbuf* _tmp32_;
+	GdkPixbuf* _tmp33_;
 	GError * _inner_error_ = NULL;
 #line 148 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, NULL);
@@ -1392,19 +1379,19 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 	_vala_raw_length1 = 0;
 #line 151 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_vala_raw_length = (gsize) 0;
-#line 1396 "GPhoto.c"
+#line 1383 "GPhoto.c"
 	{
 		guint8* _tmp0_ = NULL;
-		GPContext* _tmp1_ = NULL;
-		Camera* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		guint8* _tmp6_ = NULL;
-		gint _tmp0__length1 = 0;
-		gint __tmp0__size_ = 0;
-		guint8* _tmp7_ = NULL;
-		gint _tmp7__length1 = 0;
+		GPContext* _tmp1_;
+		Camera* _tmp2_;
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+		gint _tmp5_;
+		guint8* _tmp6_;
+		gint _tmp0__length1;
+		gint __tmp0__size_;
+		guint8* _tmp7_;
+		gint _tmp7__length1;
 #line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp1_ = context;
 #line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1423,8 +1410,8 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		__tmp0__size_ = _tmp0__length1;
 #line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1427 "GPhoto.c"
-			goto __catch62_g_error;
+#line 1414 "GPhoto.c"
+			goto __catch63_g_error;
 		}
 #line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp7_ = _tmp0_;
@@ -1442,33 +1429,33 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		_vala_raw_length1 = _tmp7__length1;
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = (g_free (_tmp0_), NULL);
-#line 1446 "GPhoto.c"
+#line 1433 "GPhoto.c"
 	}
-	goto __finally62;
-	__catch62_g_error:
+	goto __finally63;
+	__catch63_g_error:
 	{
 		PhotoMetadata* metadata = NULL;
-		Camera* _tmp8_ = NULL;
-		GPContext* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		PhotoMetadata* _tmp12_ = NULL;
-		PhotoMetadata* _tmp13_ = NULL;
-		PhotoMetadata* _tmp14_ = NULL;
-		guint _tmp15_ = 0U;
+		Camera* _tmp8_;
+		GPContext* _tmp9_;
+		const gchar* _tmp10_;
+		const gchar* _tmp11_;
+		PhotoMetadata* _tmp12_;
+		PhotoMetadata* _tmp13_;
+		PhotoMetadata* _tmp14_;
+		guint _tmp15_;
 		PhotoPreview* preview = NULL;
-		PhotoMetadata* _tmp16_ = NULL;
-		PhotoMetadata* _tmp17_ = NULL;
-		guint _tmp18_ = 0U;
-		PhotoPreview* _tmp19_ = NULL;
+		PhotoMetadata* _tmp16_;
+		PhotoMetadata* _tmp17_;
+		guint _tmp18_;
+		PhotoPreview* _tmp19_;
 		guint8* _tmp20_ = NULL;
-		PhotoPreview* _tmp21_ = NULL;
-		gint _tmp22_ = 0;
-		guint8* _tmp23_ = NULL;
-		gint _tmp20__length1 = 0;
-		gint __tmp20__size_ = 0;
-		guint8* _tmp24_ = NULL;
-		gint _tmp24__length1 = 0;
+		PhotoPreview* _tmp21_;
+		gint _tmp22_;
+		guint8* _tmp23_;
+		gint _tmp20__length1;
+		gint __tmp20__size_;
+		guint8* _tmp24_;
+		gint _tmp24__length1;
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_clear_error (&_inner_error_);
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1497,27 +1484,27 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 			if (raw) {
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				*raw = _vala_raw;
-#line 1501 "GPhoto.c"
+#line 1488 "GPhoto.c"
 			} else {
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				_vala_raw = (g_free (_vala_raw), NULL);
-#line 1505 "GPhoto.c"
+#line 1492 "GPhoto.c"
 			}
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			if (raw_length1) {
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				*raw_length1 = _vala_raw_length1;
-#line 1511 "GPhoto.c"
+#line 1498 "GPhoto.c"
 			}
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			if (raw_length) {
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				*raw_length = _vala_raw_length;
-#line 1517 "GPhoto.c"
+#line 1504 "GPhoto.c"
 			}
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			return result;
-#line 1521 "GPhoto.c"
+#line 1508 "GPhoto.c"
 		}
 #line 159 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp14_ = metadata;
@@ -1533,27 +1520,27 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 			if (raw) {
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				*raw = _vala_raw;
-#line 1537 "GPhoto.c"
+#line 1524 "GPhoto.c"
 			} else {
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				_vala_raw = (g_free (_vala_raw), NULL);
-#line 1541 "GPhoto.c"
+#line 1528 "GPhoto.c"
 			}
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			if (raw_length1) {
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				*raw_length1 = _vala_raw_length1;
-#line 1547 "GPhoto.c"
+#line 1534 "GPhoto.c"
 			}
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			if (raw_length) {
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				*raw_length = _vala_raw_length;
-#line 1553 "GPhoto.c"
+#line 1540 "GPhoto.c"
 			}
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			return result;
-#line 1557 "GPhoto.c"
+#line 1544 "GPhoto.c"
 		}
 #line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp16_ = metadata;
@@ -1581,8 +1568,8 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 			_photo_preview_unref0 (preview);
 #line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			_media_metadata_unref0 (metadata);
-#line 1585 "GPhoto.c"
-			goto __finally62;
+#line 1572 "GPhoto.c"
+			goto __finally63;
 		}
 #line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp24_ = _tmp20_;
@@ -1604,16 +1591,16 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		_photo_preview_unref0 (preview);
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_media_metadata_unref0 (metadata);
-#line 1608 "GPhoto.c"
+#line 1595 "GPhoto.c"
 	}
-	__finally62:
+	__finally63:
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1617 "GPhoto.c"
+#line 1604 "GPhoto.c"
 	}
 #line 165 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp25_ = _vala_raw;
@@ -1629,27 +1616,27 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		if (raw) {
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			*raw = _vala_raw;
-#line 1633 "GPhoto.c"
+#line 1620 "GPhoto.c"
 		} else {
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			_vala_raw = (g_free (_vala_raw), NULL);
-#line 1637 "GPhoto.c"
+#line 1624 "GPhoto.c"
 		}
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (raw_length1) {
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			*raw_length1 = _vala_raw_length1;
-#line 1643 "GPhoto.c"
+#line 1630 "GPhoto.c"
 		}
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (raw_length) {
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			*raw_length = _vala_raw_length;
-#line 1649 "GPhoto.c"
+#line 1636 "GPhoto.c"
 		}
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 1653 "GPhoto.c"
+#line 1640 "GPhoto.c"
 	}
 #line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp26_ = _vala_raw;
@@ -1657,626 +1644,525 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 	_tmp26__length1 = _vala_raw_length1;
 #line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_vala_raw_length = (gsize) _tmp26__length1;
-#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp27_ = _vala_raw_length;
-#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	if (_tmp27_ > ((gsize) 32)) {
-#line 1665 "GPhoto.c"
-		{
-			gsize i = 0UL;
-			gsize _tmp28_ = 0UL;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-			_tmp28_ = _vala_raw_length;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-			i = _tmp28_ - 2;
-#line 1673 "GPhoto.c"
-			{
-				gboolean _tmp29_ = FALSE;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-				_tmp29_ = TRUE;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-				while (TRUE) {
-#line 1680 "GPhoto.c"
-					gsize _tmp31_ = 0UL;
-					gsize _tmp32_ = 0UL;
-					gboolean _tmp33_ = FALSE;
-					guint8* _tmp34_ = NULL;
-					gint _tmp34__length1 = 0;
-					gsize _tmp35_ = 0UL;
-					guint8 _tmp36_ = 0U;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-					if (!_tmp29_) {
-#line 1690 "GPhoto.c"
-						gsize _tmp30_ = 0UL;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						_tmp30_ = i;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						i = _tmp30_ - 1;
-#line 1696 "GPhoto.c"
-					}
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-					_tmp29_ = FALSE;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-					_tmp31_ = i;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-					_tmp32_ = _vala_raw_length;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-					if (!(_tmp31_ > (_tmp32_ - 32))) {
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						break;
-#line 1708 "GPhoto.c"
-					}
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-					_tmp34_ = _vala_raw;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-					_tmp34__length1 = _vala_raw_length1;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-					_tmp35_ = i;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-					_tmp36_ = _tmp34_[_tmp35_];
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-					if (_tmp36_ == JPEG_MARKER_PREFIX) {
-#line 1720 "GPhoto.c"
-						guint8* _tmp37_ = NULL;
-						gint _tmp37__length1 = 0;
-						gsize _tmp38_ = 0UL;
-						guint8 _tmp39_ = 0U;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						_tmp37_ = _vala_raw;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						_tmp37__length1 = _vala_raw_length1;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						_tmp38_ = i;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						_tmp39_ = _tmp37_[_tmp38_ + 1];
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						_tmp33_ = _tmp39_ == JPEG_MARKER_EOI;
-#line 1735 "GPhoto.c"
-					} else {
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						_tmp33_ = FALSE;
-#line 1739 "GPhoto.c"
-					}
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-					if (_tmp33_) {
-#line 1743 "GPhoto.c"
-						const gchar* _tmp40_ = NULL;
-						gsize _tmp41_ = 0UL;
-#line 179 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						_tmp40_ = filename;
-#line 179 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						g_debug ("GPhoto.vala:179: Adjusted length of thumbnail for: %s", _tmp40_);
-#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						_tmp41_ = i;
-#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						_vala_raw_length = _tmp41_ + 2;
-#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-						break;
-#line 1756 "GPhoto.c"
-					}
-				}
-			}
-		}
-	}
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp42_ = _vala_raw;
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp42__length1 = _vala_raw_length1;
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp43_ = (_tmp42_ != NULL) ? _vala_array_dup23 (_tmp42_, _tmp42__length1) : ((gpointer) _tmp42_);
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp43__length1 = _tmp42__length1;
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp44_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp43_, _tmp43__length1, NULL);
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	mins = _tmp44_;
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp46_ = mins;
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp47_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, g_input_stream_get_type (), GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_);
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp45_ = _tmp47_;
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp27_ = _vala_raw;
+#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp27__length1 = _vala_raw_length1;
+#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp28_ = (_tmp27_ != NULL) ? _vala_array_dup23 (_tmp27_, _tmp27__length1) : ((gpointer) _tmp27_);
+#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp28__length1 = _tmp27__length1;
+#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp29_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp28_, _tmp28__length1, NULL);
+#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	mins = _tmp29_;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp31_ = mins;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp32_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_input_stream_get_type (), GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_);
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp30_ = _tmp32_;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_object_unref0 (mins);
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1788 "GPhoto.c"
+#line 1674 "GPhoto.c"
 	}
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp48_ = _tmp45_;
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp45_ = NULL;
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	result = _tmp48_;
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_g_object_unref0 (_tmp45_);
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp33_ = _tmp30_;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp30_ = NULL;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	result = _tmp33_;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_g_object_unref0 (_tmp30_);
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (mins);
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (raw) {
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*raw = _vala_raw;
-#line 1804 "GPhoto.c"
+#line 1690 "GPhoto.c"
 	} else {
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_vala_raw = (g_free (_vala_raw), NULL);
-#line 1808 "GPhoto.c"
+#line 1694 "GPhoto.c"
 	}
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (raw_length1) {
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*raw_length1 = _vala_raw_length1;
-#line 1814 "GPhoto.c"
+#line 1700 "GPhoto.c"
 	}
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (raw_length) {
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*raw_length = _vala_raw_length;
-#line 1820 "GPhoto.c"
+#line 1706 "GPhoto.c"
 	}
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 1824 "GPhoto.c"
+#line 1710 "GPhoto.c"
 }
 
 
 GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error) {
 	GdkPixbuf* result = NULL;
 	GInputStream* ins = NULL;
-	GPContext* _tmp0_ = NULL;
-	Camera* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	GInputStream* _tmp4_ = NULL;
-	GInputStream* _tmp5_ = NULL;
+	GPContext* _tmp0_;
+	Camera* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	GInputStream* _tmp4_;
+	GInputStream* _tmp5_;
 	GdkPixbuf* _tmp6_ = NULL;
-	GInputStream* _tmp7_ = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
-	GdkPixbuf* _tmp9_ = NULL;
+	GInputStream* _tmp7_;
+	GdkPixbuf* _tmp8_;
+	GdkPixbuf* _tmp9_;
 	GError * _inner_error_ = NULL;
-#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, NULL);
-#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (folder != NULL, NULL);
-#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp0_ = context;
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp1_ = camera;
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp2_ = folder;
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp3_ = filename;
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp4_ = gp_load_file_into_stream (_tmp0_, _tmp1_, _tmp2_, _tmp3_, GP_FILE_TYPE_NORMAL, &_inner_error_);
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	ins = _tmp4_;
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1868 "GPhoto.c"
+#line 1754 "GPhoto.c"
 	}
-#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 179 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp5_ = ins;
-#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 179 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp5_ == NULL) {
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = NULL;
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_object_unref0 (ins);
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 1880 "GPhoto.c"
+#line 1766 "GPhoto.c"
 	}
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp7_ = ins;
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp8_ = gdk_pixbuf_new_from_stream (_tmp7_, NULL, &_inner_error_);
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp6_ = _tmp8_;
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_object_unref0 (ins);
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1896 "GPhoto.c"
+#line 1782 "GPhoto.c"
 	}
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp9_ = _tmp6_;
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp6_ = NULL;
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = _tmp9_;
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (_tmp6_);
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (ins);
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 1910 "GPhoto.c"
+#line 1796 "GPhoto.c"
 }
 
 
 void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GFile* dest_file, GError** error) {
 	gint fd = 0;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 	CameraFile* camera_file = NULL;
 	int res = 0;
-	gint _tmp12_ = 0;
+	gint _tmp12_;
 	CameraFile* _tmp13_ = NULL;
-	int _tmp14_ = 0;
-	int _tmp15_ = 0;
-	Camera* _tmp20_ = NULL;
-	const gchar* _tmp21_ = NULL;
-	const gchar* _tmp22_ = NULL;
-	CameraFile* _tmp23_ = NULL;
-	GPContext* _tmp24_ = NULL;
-	int _tmp25_ = 0;
-	int _tmp26_ = 0;
+	int _tmp14_;
+	int _tmp15_;
+	Camera* _tmp20_;
+	const gchar* _tmp21_;
+	const gchar* _tmp22_;
+	CameraFile* _tmp23_;
+	GPContext* _tmp24_;
+	int _tmp25_;
+	int _tmp26_;
 	GError * _inner_error_ = NULL;
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (context != NULL);
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (camera != NULL);
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (folder != NULL);
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (filename != NULL);
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (G_IS_FILE (dest_file));
-#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp0_ = dest_file;
-#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp2_ = _tmp1_;
-#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp3_ = creat (_tmp2_, (mode_t) 0640);
-#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp4_ = _tmp3_;
-#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_free0 (_tmp2_);
-#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	fd = _tmp4_;
-#line 201 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp5_ = fd;
-#line 201 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp5_ < 0) {
-#line 1964 "GPhoto.c"
-		gint _tmp6_ = 0;
-		GFile* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		GError* _tmp10_ = NULL;
-		GError* _tmp11_ = NULL;
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 1850 "GPhoto.c"
+		gint _tmp6_;
+		GFile* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		GError* _tmp10_;
+		GError* _tmp11_;
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp6_ = errno;
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp7_ = dest_file;
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp8_ = g_file_get_path (_tmp7_);
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp9_ = _tmp8_;
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp10_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "[%d] Error creating file %s: %m", _tmp6_, _tmp9_);
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp11_ = _tmp10_;
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_free0 (_tmp9_);
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp11_;
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return;
-#line 1991 "GPhoto.c"
+#line 1877 "GPhoto.c"
 	}
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp12_ = fd;
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp14_ = gp_file_new_from_fd (&_tmp13_, _tmp12_);
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_file = _tmp13_;
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp14_;
-#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp15_ = res;
-#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp15_ != GP_OK) {
-#line 2007 "GPhoto.c"
-		int _tmp16_ = 0;
-		int _tmp17_ = 0;
-		const gchar* _tmp18_ = NULL;
-		GError* _tmp19_ = NULL;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 1893 "GPhoto.c"
+		int _tmp16_;
+		int _tmp17_;
+		const gchar* _tmp18_;
+		GError* _tmp19_;
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp16_ = res;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp17_ = res;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp18_ = gp_port_result_as_string (_tmp17_);
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp19_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp16_, _tmp18_);
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp19_;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return;
-#line 2028 "GPhoto.c"
+#line 1914 "GPhoto.c"
 	}
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp20_ = camera;
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp21_ = folder;
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp22_ = filename;
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp23_ = camera_file;
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp24_ = context;
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp25_ = gp_camera_file_get (_tmp20_, _tmp21_, _tmp22_, GP_FILE_TYPE_NORMAL, _tmp23_, _tmp24_);
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp25_;
-#line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 198 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp26_ = res;
-#line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 198 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp26_ != GP_OK) {
-#line 2048 "GPhoto.c"
-		int _tmp27_ = 0;
-		const gchar* _tmp28_ = NULL;
-		const gchar* _tmp29_ = NULL;
-		int _tmp30_ = 0;
-		const gchar* _tmp31_ = NULL;
-		GError* _tmp32_ = NULL;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 1934 "GPhoto.c"
+		int _tmp27_;
+		const gchar* _tmp28_;
+		const gchar* _tmp29_;
+		int _tmp30_;
+		const gchar* _tmp31_;
+		GError* _tmp32_;
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp27_ = res;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp28_ = folder;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp29_ = filename;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp30_ = res;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp31_ = gp_port_result_as_string (_tmp30_);
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp32_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp27_, _tmp28_, _tmp29_, _tmp31_);
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp32_;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return;
-#line 2075 "GPhoto.c"
+#line 1961 "GPhoto.c"
 	}
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 2079 "GPhoto.c"
+#line 1965 "GPhoto.c"
 }
 
 
 PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error) {
 	PhotoMetadata* result = NULL;
 	guint8* camera_raw = NULL;
-	gint camera_raw_length1 = 0;
-	gint _camera_raw_size_ = 0;
+	gint camera_raw_length1;
+	gint _camera_raw_size_;
 	gboolean _tmp13_ = FALSE;
-	guint8* _tmp14_ = NULL;
-	gint _tmp14__length1 = 0;
+	guint8* _tmp14_;
+	gint _tmp14__length1;
 	PhotoMetadata* metadata = NULL;
-	PhotoMetadata* _tmp16_ = NULL;
-	PhotoMetadata* _tmp17_ = NULL;
-	guint8* _tmp18_ = NULL;
-	gint _tmp18__length1 = 0;
+	PhotoMetadata* _tmp16_;
+	PhotoMetadata* _tmp17_;
+	guint8* _tmp18_;
+	gint _tmp18__length1;
 	GError * _inner_error_ = NULL;
-#line 218 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, NULL);
-#line 218 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 218 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (folder != NULL, NULL);
-#line 218 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_raw = NULL;
-#line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_raw_length1 = 0;
-#line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_camera_raw_size_ = camera_raw_length1;
-#line 2111 "GPhoto.c"
+#line 1997 "GPhoto.c"
 	{
 		guint8* _tmp0_ = NULL;
-		GPContext* _tmp1_ = NULL;
-		Camera* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		guint8* _tmp6_ = NULL;
-		gint _tmp0__length1 = 0;
-		gint __tmp0__size_ = 0;
-		guint8* _tmp7_ = NULL;
-		gint _tmp7__length1 = 0;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		GPContext* _tmp1_;
+		Camera* _tmp2_;
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+		gint _tmp5_;
+		guint8* _tmp6_;
+		gint _tmp0__length1;
+		gint __tmp0__size_;
+		guint8* _tmp7_;
+		gint _tmp7__length1;
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp1_ = context;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp2_ = camera;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp3_ = folder;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp4_ = filename;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp6_ = gp_load_file_into_buffer (_tmp1_, _tmp2_, _tmp3_, _tmp4_, GP_FILE_TYPE_EXIF, &_tmp5_, &_inner_error_);
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = _tmp6_;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0__length1 = _tmp5_;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		__tmp0__size_ = _tmp0__length1;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2142 "GPhoto.c"
-			goto __catch63_g_error;
+#line 2028 "GPhoto.c"
+			goto __catch64_g_error;
 		}
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp7_ = _tmp0_;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp7__length1 = _tmp0__length1;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = NULL;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0__length1 = 0;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = (g_free (camera_raw), NULL);
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = _tmp7_;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw_length1 = _tmp7__length1;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_camera_raw_size_ = camera_raw_length1;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = (g_free (_tmp0_), NULL);
-#line 2163 "GPhoto.c"
+#line 2049 "GPhoto.c"
 	}
-	goto __finally63;
-	__catch63_g_error:
+	goto __finally64;
+	__catch64_g_error:
 	{
-		Camera* _tmp8_ = NULL;
-		GPContext* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		PhotoMetadata* _tmp12_ = NULL;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		Camera* _tmp8_;
+		GPContext* _tmp9_;
+		const gchar* _tmp10_;
+		const gchar* _tmp11_;
+		PhotoMetadata* _tmp12_;
+#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_clear_error (&_inner_error_);
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = NULL;
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp8_ = camera;
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp9_ = context;
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp10_ = folder;
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp11_ = filename;
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp12_ = gp_get_fallback_metadata (_tmp8_, _tmp9_, _tmp10_, _tmp11_);
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = _tmp12_;
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = (g_free (camera_raw), NULL);
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 2193 "GPhoto.c"
+#line 2079 "GPhoto.c"
 	}
-	__finally63:
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	__finally64:
+#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = (g_free (camera_raw), NULL);
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2204 "GPhoto.c"
+#line 2090 "GPhoto.c"
 	}
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp14_ = camera_raw;
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp14__length1 = camera_raw_length1;
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp14_ == NULL) {
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp13_ = TRUE;
-#line 2214 "GPhoto.c"
+#line 2100 "GPhoto.c"
 	} else {
-		guint8* _tmp15_ = NULL;
-		gint _tmp15__length1 = 0;
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		guint8* _tmp15_;
+		gint _tmp15__length1;
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp15_ = camera_raw;
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp15__length1 = camera_raw_length1;
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp13_ = _tmp15__length1 == 0;
-#line 2224 "GPhoto.c"
+#line 2110 "GPhoto.c"
 	}
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp13_) {
-#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = NULL;
-#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = (g_free (camera_raw), NULL);
-#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 2234 "GPhoto.c"
+#line 2120 "GPhoto.c"
 	}
-#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp16_ = photo_metadata_new ();
-#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	metadata = _tmp16_;
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp17_ = metadata;
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp18_ = camera_raw;
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp18__length1 = camera_raw_length1;
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	photo_metadata_read_from_app1_segment (_tmp17_, _tmp18_, _tmp18__length1, 0, &_inner_error_);
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_media_metadata_unref0 (metadata);
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = (g_free (camera_raw), NULL);
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2258 "GPhoto.c"
+#line 2144 "GPhoto.c"
 	}
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = metadata;
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_raw = (g_free (camera_raw), NULL);
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 2266 "GPhoto.c"
+#line 2152 "GPhoto.c"
 }
 
 
 static guint8* _vala_array_dup24 (guint8* self, int length) {
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 2273 "GPhoto.c"
+#line 2159 "GPhoto.c"
 }
 
 
 static void _gp_on_mins_destroyed_gdestroy_notify (void* data) {
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_on_mins_destroyed (data);
-#line 2280 "GPhoto.c"
+#line 2166 "GPhoto.c"
 }
 
 
@@ -2285,312 +2171,312 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
 	CameraFile* camera_file = NULL;
 	int res = 0;
 	CameraFile* _tmp0_ = NULL;
-	int _tmp1_ = 0;
-	int _tmp2_ = 0;
-	Camera* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	CameraFileType _tmp10_ = 0;
-	GPContext* _tmp11_ = NULL;
-	int _tmp12_ = 0;
-	int _tmp13_ = 0;
+	int _tmp1_;
+	int _tmp2_;
+	Camera* _tmp7_;
+	const gchar* _tmp8_;
+	const gchar* _tmp9_;
+	CameraFileType _tmp10_;
+	GPContext* _tmp11_;
+	int _tmp12_;
+	int _tmp13_;
 	guint8* data = NULL;
 	gulong data_len = 0UL;
 	guint8* _tmp20_ = NULL;
 	gulong _tmp21_ = 0UL;
-	int _tmp22_ = 0;
-	int _tmp23_ = 0;
+	int _tmp22_;
+	int _tmp23_;
 	GFile* temp = NULL;
-	GFile* _tmp32_ = NULL;
-	GFile* _tmp33_ = NULL;
-	GFile* _tmp34_ = NULL;
-	GFile* _tmp35_ = NULL;
-	GFile* _tmp36_ = NULL;
-	gchar* _tmp37_ = NULL;
-	gchar* _tmp38_ = NULL;
-	int _tmp39_ = 0;
-	int _tmp40_ = 0;
+	GFile* _tmp32_;
+	GFile* _tmp33_;
+	GFile* _tmp34_;
+	GFile* _tmp35_;
+	GFile* _tmp36_;
+	gchar* _tmp37_;
+	gchar* _tmp38_;
+	int _tmp39_;
+	int _tmp40_;
 	GFileInputStream* _tmp51_ = NULL;
-	GFile* _tmp52_ = NULL;
-	GFileInputStream* _tmp53_ = NULL;
-	GFileInputStream* _tmp54_ = NULL;
+	GFile* _tmp52_;
+	GFileInputStream* _tmp53_;
+	GFileInputStream* _tmp54_;
 	GError * _inner_error_ = NULL;
-#line 238 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, NULL);
-#line 238 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 238 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (folder != NULL, NULL);
-#line 238 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp1_ = gp_file_new (&_tmp0_);
-#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_file = _tmp0_;
-#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp1_;
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp2_ = res;
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp2_ != GP_OK) {
-#line 2339 "GPhoto.c"
-		int _tmp3_ = 0;
-		int _tmp4_ = 0;
-		const gchar* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 2225 "GPhoto.c"
+		int _tmp3_;
+		int _tmp4_;
+		const gchar* _tmp5_;
+		GError* _tmp6_;
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp3_ = res;
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp4_ = res;
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp5_ = gp_port_result_as_string (_tmp4_);
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp6_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp3_, _tmp5_);
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp6_;
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2360 "GPhoto.c"
+#line 2246 "GPhoto.c"
 	}
-#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp7_ = camera;
-#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp8_ = folder;
-#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp9_ = filename;
-#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp10_ = filetype;
-#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp11_ = context;
-#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp12_ = gp_camera_file_get (_tmp7_, _tmp8_, _tmp9_, _tmp10_, camera_file, _tmp11_);
-#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp12_;
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp13_ = res;
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp13_ != GP_OK) {
-#line 2380 "GPhoto.c"
-		int _tmp14_ = 0;
-		const gchar* _tmp15_ = NULL;
-		const gchar* _tmp16_ = NULL;
-		int _tmp17_ = 0;
-		const gchar* _tmp18_ = NULL;
-		GError* _tmp19_ = NULL;
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 2266 "GPhoto.c"
+		int _tmp14_;
+		const gchar* _tmp15_;
+		const gchar* _tmp16_;
+		int _tmp17_;
+		const gchar* _tmp18_;
+		GError* _tmp19_;
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp14_ = res;
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp15_ = folder;
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp16_ = filename;
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp17_ = res;
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp18_ = gp_port_result_as_string (_tmp17_);
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp19_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp14_, _tmp15_, _tmp16_, _tmp18_);
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp19_;
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2407 "GPhoto.c"
+#line 2293 "GPhoto.c"
 	}
-#line 255 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp22_ = gp_file_get_data_and_size (camera_file, &_tmp20_, &_tmp21_);
-#line 255 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	data = _tmp20_;
-#line 255 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	data_len = _tmp21_;
-#line 255 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp22_;
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp23_ = res;
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp23_ == GP_OK) {
-#line 2421 "GPhoto.c"
+#line 2307 "GPhoto.c"
 		guint8* buffer = NULL;
-		gulong _tmp24_ = 0UL;
-		guint8* _tmp25_ = NULL;
-		gint buffer_length1 = 0;
-		gint _buffer_size_ = 0;
-		guint8* _tmp26_ = NULL;
-		gint _tmp26__length1 = 0;
-		guint8* _tmp27_ = NULL;
-		guint8* _tmp28_ = NULL;
-		gint _tmp28__length1 = 0;
-		guint8* _tmp29_ = NULL;
-		gint _tmp29__length1 = 0;
-		guint8* _tmp30_ = NULL;
-		gint _tmp30__length1 = 0;
-		GMemoryInputStream* _tmp31_ = NULL;
-#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		gulong _tmp24_;
+		guint8* _tmp25_;
+		gint buffer_length1;
+		gint _buffer_size_;
+		guint8* _tmp26_;
+		gint _tmp26__length1;
+		guint8* _tmp27_;
+		guint8* _tmp28_;
+		gint _tmp28__length1;
+		guint8* _tmp29_;
+		gint _tmp29__length1;
+		guint8* _tmp30_;
+		gint _tmp30__length1;
+		GMemoryInputStream* _tmp31_;
+#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp24_ = data_len;
-#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp25_ = g_new0 (guint8, _tmp24_);
-#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		buffer = _tmp25_;
-#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		buffer_length1 = _tmp24_;
-#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_buffer_size_ = buffer_length1;
-#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp26_ = buffer;
-#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp26__length1 = buffer_length1;
-#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp27_ = data;
-#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp28_ = buffer;
-#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp28__length1 = buffer_length1;
-#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		memcpy (_tmp26_, _tmp27_, (gsize) _tmp28__length1);
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp29_ = buffer;
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp29__length1 = buffer_length1;
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp30_ = (_tmp29_ != NULL) ? _vala_array_dup24 (_tmp29_, _tmp29__length1) : ((gpointer) _tmp29_);
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp30__length1 = _tmp29__length1;
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp31_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp30_, _tmp30__length1, _gp_on_mins_destroyed_gdestroy_notify);
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_input_stream_get_type (), GInputStream);
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		buffer = (g_free (buffer), NULL);
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 2477 "GPhoto.c"
+#line 2363 "GPhoto.c"
 	}
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp32_ = app_dirs_get_temp_dir ();
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp33_ = _tmp32_;
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp34_ = g_file_get_child (_tmp33_, "import.tmp");
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp35_ = _tmp34_;
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (_tmp33_);
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	temp = _tmp35_;
-#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp36_ = temp;
-#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp37_ = g_file_get_path (_tmp36_);
-#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp38_ = _tmp37_;
-#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp39_ = gp_file_save (camera_file, _tmp38_);
-#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp39_;
-#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_free0 (_tmp38_);
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 252 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp40_ = res;
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 252 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp40_ != GP_OK) {
-#line 2507 "GPhoto.c"
-		int _tmp41_ = 0;
-		const gchar* _tmp42_ = NULL;
-		const gchar* _tmp43_ = NULL;
-		GFile* _tmp44_ = NULL;
-		gchar* _tmp45_ = NULL;
-		gchar* _tmp46_ = NULL;
-		int _tmp47_ = 0;
-		const gchar* _tmp48_ = NULL;
-		GError* _tmp49_ = NULL;
-		GError* _tmp50_ = NULL;
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 2393 "GPhoto.c"
+		int _tmp41_;
+		const gchar* _tmp42_;
+		const gchar* _tmp43_;
+		GFile* _tmp44_;
+		gchar* _tmp45_;
+		gchar* _tmp46_;
+		int _tmp47_;
+		const gchar* _tmp48_;
+		GError* _tmp49_;
+		GError* _tmp50_;
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp41_ = res;
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp42_ = folder;
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp43_ = filename;
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp44_ = temp;
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp45_ = g_file_get_path (_tmp44_);
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp46_ = _tmp45_;
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp47_ = res;
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp48_ = gp_port_result_as_string (_tmp47_);
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp49_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error copying file %s/%s to %s: %s", (gint) _tmp41_, _tmp42_, _tmp43_, _tmp46_, _tmp48_);
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp50_ = _tmp49_;
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_free0 (_tmp46_);
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp50_;
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_object_unref0 (temp);
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2550 "GPhoto.c"
+#line 2436 "GPhoto.c"
 	}
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp52_ = temp;
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp53_ = g_file_read (_tmp52_, NULL, &_inner_error_);
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp51_ = _tmp53_;
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_object_unref0 (temp);
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2568 "GPhoto.c"
+#line 2454 "GPhoto.c"
 	}
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp54_ = _tmp51_;
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp51_ = NULL;
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, g_input_stream_get_type (), GInputStream);
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (_tmp51_);
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (temp);
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 2584 "GPhoto.c"
+#line 2470 "GPhoto.c"
 }
 
 
 void gp_on_mins_destroyed (void* data) {
-	void* _tmp0_ = NULL;
-#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	void* _tmp0_;
+#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp0_ = data;
-#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_free (_tmp0_);
-#line 2594 "GPhoto.c"
+#line 2480 "GPhoto.c"
 }
 
 
@@ -2599,202 +2485,202 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
 	CameraFile* camera_file = NULL;
 	int res = 0;
 	CameraFile* _tmp0_ = NULL;
-	int _tmp1_ = 0;
-	int _tmp2_ = 0;
-	Camera* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	CameraFileType _tmp10_ = 0;
-	CameraFile* _tmp11_ = NULL;
-	GPContext* _tmp12_ = NULL;
-	int _tmp13_ = 0;
-	int _tmp14_ = 0;
+	int _tmp1_;
+	int _tmp2_;
+	Camera* _tmp7_;
+	const gchar* _tmp8_;
+	const gchar* _tmp9_;
+	CameraFileType _tmp10_;
+	CameraFile* _tmp11_;
+	GPContext* _tmp12_;
+	int _tmp13_;
+	int _tmp14_;
 	guint8* data = NULL;
 	gulong data_len = 0UL;
-	CameraFile* _tmp21_ = NULL;
+	CameraFile* _tmp21_;
 	guint8* _tmp22_ = NULL;
 	gulong _tmp23_ = 0UL;
-	int _tmp24_ = 0;
-	int _tmp25_ = 0;
+	int _tmp24_;
+	int _tmp25_;
 	guint8* buffer = NULL;
-	gulong _tmp27_ = 0UL;
-	guint8* _tmp28_ = NULL;
-	gint buffer_length1 = 0;
-	gint _buffer_size_ = 0;
-	guint8* _tmp29_ = NULL;
-	gint _tmp29__length1 = 0;
-	guint8* _tmp30_ = NULL;
-	guint8* _tmp31_ = NULL;
-	gint _tmp31__length1 = 0;
-	guint8* _tmp32_ = NULL;
-	gint _tmp32__length1 = 0;
+	gulong _tmp27_;
+	guint8* _tmp28_;
+	gint buffer_length1;
+	gint _buffer_size_;
+	guint8* _tmp29_;
+	gint _tmp29__length1;
+	guint8* _tmp30_;
+	guint8* _tmp31_;
+	gint _tmp31__length1;
+	guint8* _tmp32_;
+	gint _tmp32__length1;
 	GError * _inner_error_ = NULL;
-#line 278 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, NULL);
-#line 278 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 278 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (folder != NULL, NULL);
-#line 278 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp1_ = gp_file_new (&_tmp0_);
-#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_file = _tmp0_;
-#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp1_;
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp2_ = res;
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp2_ != GP_OK) {
-#line 2653 "GPhoto.c"
-		int _tmp3_ = 0;
-		int _tmp4_ = 0;
-		const gchar* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-#line 283 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 2539 "GPhoto.c"
+		int _tmp3_;
+		int _tmp4_;
+		const gchar* _tmp5_;
+		GError* _tmp6_;
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp3_ = res;
-#line 283 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp4_ = res;
-#line 283 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp5_ = gp_port_result_as_string (_tmp4_);
-#line 283 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp6_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp3_, _tmp5_);
-#line 283 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp6_;
-#line 283 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 283 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 283 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2674 "GPhoto.c"
+#line 2560 "GPhoto.c"
 	}
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp7_ = camera;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp8_ = folder;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp9_ = filename;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp10_ = filetype;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp11_ = camera_file;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp12_ = context;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp13_ = gp_camera_file_get (_tmp7_, _tmp8_, _tmp9_, _tmp10_, _tmp11_, _tmp12_);
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp13_;
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 272 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp14_ = res;
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 272 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp14_ != GP_OK) {
-#line 2696 "GPhoto.c"
-		int _tmp15_ = 0;
-		const gchar* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
-		int _tmp18_ = 0;
-		const gchar* _tmp19_ = NULL;
-		GError* _tmp20_ = NULL;
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 2582 "GPhoto.c"
+		int _tmp15_;
+		const gchar* _tmp16_;
+		const gchar* _tmp17_;
+		int _tmp18_;
+		const gchar* _tmp19_;
+		GError* _tmp20_;
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp15_ = res;
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp16_ = folder;
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp17_ = filename;
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp18_ = res;
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp19_ = gp_port_result_as_string (_tmp18_);
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp20_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp15_, _tmp16_, _tmp17_, _tmp19_);
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp20_;
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2723 "GPhoto.c"
+#line 2609 "GPhoto.c"
 	}
-#line 294 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp21_ = camera_file;
-#line 294 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp24_ = gp_file_get_data_and_size (_tmp21_, &_tmp22_, &_tmp23_);
-#line 294 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	data = _tmp22_;
-#line 294 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	data_len = _tmp23_;
-#line 294 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp24_;
-#line 295 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp25_ = res;
-#line 295 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp25_ != GP_OK) {
-#line 2739 "GPhoto.c"
-		guint8* _tmp26_ = NULL;
-		gint _tmp26__length1 = 0;
-#line 296 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 2625 "GPhoto.c"
+		guint8* _tmp26_;
+		gint _tmp26__length1;
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp26_ = NULL;
-#line 296 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp26__length1 = 0;
-#line 296 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (result_length1) {
-#line 296 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			*result_length1 = _tmp26__length1;
-#line 2750 "GPhoto.c"
+#line 2636 "GPhoto.c"
 		}
-#line 296 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = _tmp26_;
-#line 296 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 296 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 2758 "GPhoto.c"
+#line 2644 "GPhoto.c"
 	}
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp27_ = data_len;
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp28_ = g_new0 (guint8, _tmp27_);
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	buffer = _tmp28_;
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	buffer_length1 = _tmp27_;
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_buffer_size_ = buffer_length1;
-#line 299 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp29_ = buffer;
-#line 299 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp29__length1 = buffer_length1;
-#line 299 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp30_ = data;
-#line 299 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp31_ = buffer;
-#line 299 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp31__length1 = buffer_length1;
-#line 299 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	memcpy (_tmp29_, _tmp30_, (gsize) _tmp31__length1);
-#line 301 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp32_ = buffer;
-#line 301 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp32__length1 = buffer_length1;
-#line 301 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (result_length1) {
-#line 301 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*result_length1 = _tmp32__length1;
-#line 2790 "GPhoto.c"
+#line 2676 "GPhoto.c"
 	}
-#line 301 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = _tmp32_;
-#line 301 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 301 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 2798 "GPhoto.c"
+#line 2684 "GPhoto.c"
 }