Merge branch 'release/0.26.4-1'0.26.4-1

1 files changed, 307 insertions, 302 deletions

diff --git a/src/direct/DirectPhoto.c b/src/direct/DirectPhoto.c
index 5347674..013bb80 100644
--- a/src/direct/DirectPhoto.c
+++ b/src/direct/DirectPhoto.c
@@ -1,4 +1,4 @@
-/* DirectPhoto.c generated by valac 0.34.7, the Vala compiler
+/* DirectPhoto.c generated by valac 0.36.6, the Vala compiler
  * generated from DirectPhoto.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -349,6 +349,11 @@ typedef struct _PhotoPreview PhotoPreview;
 typedef struct _PhotoPreviewClass PhotoPreviewClass;
 #define _photo_preview_unref0(var) ((var == NULL) ? NULL : (var = (photo_preview_unref (var), NULL)))
 #define _media_metadata_unref0(var) ((var == NULL) ? NULL : (var = (media_metadata_unref (var), NULL)))
+enum  {
+	DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL,
+	DIRECT_PHOTO_LAST_SIGNAL
+};
+static guint direct_photo_signals[DIRECT_PHOTO_LAST_SIGNAL] = {0};
 typedef struct _DataCollectionPrivate DataCollectionPrivate;
 
 #define TYPE_MARKER (marker_get_type ())
@@ -975,7 +980,7 @@ void direct_photo_init (GFile* initial_file);
 void photo_init_photo (void);
 DirectPhotoSourceCollection* direct_photo_source_collection_new (GFile* initial_file);
 DirectPhotoSourceCollection* direct_photo_source_collection_construct (GType object_type, GFile* initial_file);
-gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto** photo, gboolean reimport);
+gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto* * photo, gboolean reimport);
 gboolean data_collection_add (DataCollection* self, DataObject* object);
 void direct_photo_terminate (void);
 void photo_terminate_photo (void);
@@ -994,10 +999,10 @@ void photo_value_set_reimport_master_state (GValue* value, gpointer v_object);
 void photo_value_take_reimport_master_state (GValue* value, gpointer v_object);
 gpointer photo_value_get_reimport_master_state (const GValue* value);
 GType photo_reimport_master_state_get_type (void) G_GNUC_CONST;
-gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState** reimport_state, GError** error);
+gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState* * reimport_state, GError** error);
 GQuark database_error_quark (void);
 void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, GError** error);
-ImportResult direct_photo_internal_import (GFile* file, DirectPhoto** photo);
+ImportResult direct_photo_internal_import (GFile* file, DirectPhoto* * photo);
 gpointer photo_import_params_ref (gpointer instance);
 void photo_import_params_unref (gpointer instance);
 GParamSpec* param_spec_photo_import_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -1059,7 +1064,7 @@ static void direct_photo_real_trash (MediaSource* base);
 static void direct_photo_real_untrash (MediaSource* base);
 static void direct_photo_real_mark_offline (MediaSource* base);
 static void direct_photo_real_mark_online (MediaSource* base);
-static void direct_photo_finalize (GObject* obj);
+static void direct_photo_finalize (GObject * obj);
 GType marker_get_type (void) G_GNUC_CONST;
 gpointer source_backlink_ref (gpointer instance);
 void source_backlink_unref (gpointer instance);
@@ -1107,12 +1112,12 @@ PhotoFileFormat photo_get_file_format (Photo* self);
 gchar* import_result_to_string (ImportResult self);
 gboolean direct_photo_source_collection_has_file_source (DirectPhotoSourceCollection* self, GFile* file);
 DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCollection* self, GFile* file);
-static void direct_photo_source_collection_finalize (DataCollection* obj);
+static void direct_photo_source_collection_finalize (DataCollection * obj);
 
 
 static DirectPhoto* direct_photo_construct (GType object_type, PhotoRow* row) {
 	DirectPhoto * self = NULL;
-	PhotoRow* _tmp0_ = NULL;
+	PhotoRow* _tmp0_;
 #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_val_if_fail (IS_PHOTO_ROW (row), NULL);
 #line 18 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1121,14 +1126,14 @@ static DirectPhoto* direct_photo_construct (GType object_type, PhotoRow* row) {
 	self = (DirectPhoto*) photo_construct (object_type, _tmp0_);
 #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return self;
-#line 1125 "DirectPhoto.c"
+#line 1130 "DirectPhoto.c"
 }
 
 
 static DirectPhoto* direct_photo_new (PhotoRow* row) {
 #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return direct_photo_construct (TYPE_DIRECT_PHOTO, row);
-#line 1132 "DirectPhoto.c"
+#line 1137 "DirectPhoto.c"
 }
 
 
@@ -1147,10 +1152,10 @@ static DirectPhoto* direct_photo_new (PhotoRow* row) {
      * obtained by calling get_orientation() prior to export()ing a DirectPhoto.
      */
 void direct_photo_fixup_orientation_after_reimport (DirectPhoto* self, Orientation dest) {
-	PhotoRow* _tmp0_ = NULL;
-	Orientation _tmp1_ = 0;
-	BackingPhotoRow* _tmp2_ = NULL;
-	Orientation _tmp3_ = 0;
+	PhotoRow* _tmp0_;
+	Orientation _tmp1_;
+	BackingPhotoRow* _tmp2_;
+	Orientation _tmp3_;
 #line 35 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO (self));
 #line 36 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1165,22 +1170,22 @@ void direct_photo_fixup_orientation_after_reimport (DirectPhoto* self, Orientati
 	_tmp3_ = dest;
 #line 37 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp2_->original_orientation = _tmp3_;
-#line 1169 "DirectPhoto.c"
+#line 1174 "DirectPhoto.c"
 }
 
 
 void direct_photo_init (GFile* initial_file) {
-	GFile* _tmp0_ = NULL;
-	DirectPhotoSourceCollection* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	DirectPhotoSourceCollection* _tmp1_;
 	DirectPhoto* photo = NULL;
 	gchar* reason = NULL;
-	DirectPhotoSourceCollection* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
+	DirectPhotoSourceCollection* _tmp2_;
+	GFile* _tmp3_;
 	DirectPhoto* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	DirectPhotoSourceCollection* _tmp8_ = NULL;
-	DirectPhoto* _tmp9_ = NULL;
+	gchar* _tmp5_;
+	const gchar* _tmp6_;
+	DirectPhotoSourceCollection* _tmp8_;
+	DirectPhoto* _tmp9_;
 #line 40 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (G_IS_FILE (initial_file));
 #line 41 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1209,13 +1214,13 @@ void direct_photo_init (GFile* initial_file) {
 	_tmp6_ = reason;
 #line 46 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (_tmp6_ != NULL) {
-#line 1213 "DirectPhoto.c"
-		const gchar* _tmp7_ = NULL;
+#line 1218 "DirectPhoto.c"
+		const gchar* _tmp7_;
 #line 47 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp7_ = reason;
 #line 47 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		g_warning ("DirectPhoto.vala:47: fetch error: %s", _tmp7_);
-#line 1219 "DirectPhoto.c"
+#line 1224 "DirectPhoto.c"
 	}
 #line 48 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp8_ = direct_photo_global;
@@ -1227,14 +1232,14 @@ void direct_photo_init (GFile* initial_file) {
 	_g_free0 (reason);
 #line 40 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_g_object_unref0 (photo);
-#line 1231 "DirectPhoto.c"
+#line 1236 "DirectPhoto.c"
 }
 
 
 void direct_photo_terminate (void) {
 #line 52 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	photo_terminate_photo ();
-#line 1238 "DirectPhoto.c"
+#line 1243 "DirectPhoto.c"
 }
 
 
@@ -1242,12 +1247,12 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 	GError * _inner_error_ = NULL;
 #line 57 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO (self));
-#line 1246 "DirectPhoto.c"
+#line 1251 "DirectPhoto.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Scaling _tmp1_ = {0};
-		GdkPixbuf* _tmp2_ = NULL;
-		BackingPhotoRow* _tmp3_ = NULL;
+		GdkPixbuf* _tmp2_;
+		BackingPhotoRow* _tmp3_;
 		Dimensions _tmp4_ = {0};
 #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		scaling_for_original (&_tmp1_);
@@ -1257,7 +1262,7 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 		_tmp0_ = _tmp2_;
 #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1261 "DirectPhoto.c"
+#line 1266 "DirectPhoto.c"
 			goto __catch45_g_error;
 		}
 #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1268,14 +1273,14 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 		_tmp3_->dim = _tmp4_;
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_tmp0_);
-#line 1272 "DirectPhoto.c"
+#line 1277 "DirectPhoto.c"
 	}
 	goto __finally45;
 	__catch45_g_error:
 	{
 		GError* e = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		e = _inner_error_;
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1290,7 +1295,7 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 		_g_free0 (_tmp6_);
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_error_free0 (e);
-#line 1294 "DirectPhoto.c"
+#line 1299 "DirectPhoto.c"
 	}
 	__finally45:
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1301,14 +1306,14 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 		g_clear_error (&_inner_error_);
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return;
-#line 1305 "DirectPhoto.c"
+#line 1310 "DirectPhoto.c"
 	}
 }
 
 
 ImportResult direct_photo_demand_load (DirectPhoto* self) {
 	ImportResult result = 0;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	PhotoReimportMasterState* reimport_state = NULL;
 	GError * _inner_error_ = NULL;
 #line 67 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1323,11 +1328,11 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 		result = IMPORT_RESULT_SUCCESS;
 #line 70 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return result;
-#line 1327 "DirectPhoto.c"
+#line 1332 "DirectPhoto.c"
 	}
 	{
 		PhotoReimportMasterState* _tmp1_ = NULL;
-		PhotoReimportMasterState* _tmp2_ = NULL;
+		PhotoReimportMasterState* _tmp2_;
 #line 75 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		photo_prepare_for_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), &_tmp1_, &_inner_error_);
 #line 75 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1336,7 +1341,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 		reimport_state = _tmp1_;
 #line 75 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1340 "DirectPhoto.c"
+#line 1345 "DirectPhoto.c"
 			goto __catch46_g_error;
 		}
 #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1345,7 +1350,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 		photo_finish_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp2_, &_inner_error_);
 #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1349 "DirectPhoto.c"
+#line 1354 "DirectPhoto.c"
 			goto __catch46_g_error;
 		}
 	}
@@ -1353,8 +1358,8 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 	__catch46_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
+		GError* _tmp3_;
+		const gchar* _tmp4_;
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		err = _inner_error_;
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1373,7 +1378,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 		_photo_reimport_master_state_unref0 (reimport_state);
 #line 79 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return result;
-#line 1377 "DirectPhoto.c"
+#line 1382 "DirectPhoto.c"
 	}
 	__finally46:
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1386,7 +1391,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 		g_clear_error (&_inner_error_);
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return 0;
-#line 1390 "DirectPhoto.c"
+#line 1395 "DirectPhoto.c"
 	}
 #line 82 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self->priv->loaded = TRUE;
@@ -1398,23 +1403,23 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 	_photo_reimport_master_state_unref0 (reimport_state);
 #line 84 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1402 "DirectPhoto.c"
+#line 1407 "DirectPhoto.c"
 }
 
 
-ImportResult direct_photo_internal_import (GFile* file, DirectPhoto** photo) {
+ImportResult direct_photo_internal_import (GFile* file, DirectPhoto* * photo) {
 	DirectPhoto* _vala_photo = NULL;
 	ImportResult result = 0;
 	PhotoImportParams* params = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	ImportID _tmp1_ = {0};
-	PhotoImportParams* _tmp2_ = NULL;
-	PhotoTable* _tmp3_ = NULL;
-	PhotoTable* _tmp4_ = NULL;
-	PhotoRow* _tmp5_ = NULL;
+	PhotoImportParams* _tmp2_;
+	PhotoTable* _tmp3_;
+	PhotoTable* _tmp4_;
+	PhotoRow* _tmp5_;
 	PhotoID _tmp6_ = {0};
-	PhotoRow* _tmp7_ = NULL;
-	DirectPhoto* _tmp8_ = NULL;
+	PhotoRow* _tmp7_;
+	DirectPhoto* _tmp8_;
 #line 89 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_val_if_fail (G_IS_FILE (file), 0);
 #line 90 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1453,24 +1458,24 @@ ImportResult direct_photo_internal_import (GFile* file, DirectPhoto** photo) {
 	if (photo) {
 #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		*photo = _vala_photo;
-#line 1457 "DirectPhoto.c"
+#line 1462 "DirectPhoto.c"
 	} else {
 #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_vala_photo);
-#line 1461 "DirectPhoto.c"
+#line 1466 "DirectPhoto.c"
 	}
 #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1465 "DirectPhoto.c"
+#line 1470 "DirectPhoto.c"
 }
 
 
 static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scaling* scaling, GError** error) {
 	DirectPhoto * self;
 	GdkPixbuf* result = NULL;
-	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp9_ = NULL;
-	GdkPixbuf* _tmp10_ = NULL;
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp9_;
+	GdkPixbuf* _tmp10_;
 	GError * _inner_error_ = NULL;
 #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
@@ -1480,11 +1485,11 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
 	_tmp0_ = self->priv->preview;
 #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (_tmp0_ == NULL) {
-#line 1484 "DirectPhoto.c"
+#line 1489 "DirectPhoto.c"
 		GdkPixbuf* _tmp1_ = NULL;
-		GdkPixbuf* _tmp2_ = NULL;
-		GdkPixbuf* _tmp3_ = NULL;
-		GdkPixbuf* _tmp4_ = NULL;
+		GdkPixbuf* _tmp2_;
+		GdkPixbuf* _tmp3_;
+		GdkPixbuf* _tmp4_;
 #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp2_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), DIRECT_PHOTO_PREVIEW_BEST_FIT, &_inner_error_);
 #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1495,7 +1500,7 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
 			g_propagate_error (error, _inner_error_);
 #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			return NULL;
-#line 1499 "DirectPhoto.c"
+#line 1504 "DirectPhoto.c"
 		}
 #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp3_ = _tmp1_;
@@ -1509,11 +1514,11 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
 		_tmp4_ = self->priv->preview;
 #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (_tmp4_ == NULL) {
-#line 1513 "DirectPhoto.c"
+#line 1518 "DirectPhoto.c"
 			GdkPixbuf* _tmp5_ = NULL;
-			Scaling _tmp6_ = {0};
-			GdkPixbuf* _tmp7_ = NULL;
-			GdkPixbuf* _tmp8_ = NULL;
+			Scaling _tmp6_;
+			GdkPixbuf* _tmp7_;
+			GdkPixbuf* _tmp8_;
 #line 104 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_tmp6_ = *scaling;
 #line 104 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1528,7 +1533,7 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
 				_g_object_unref0 (_tmp1_);
 #line 104 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				return NULL;
-#line 1532 "DirectPhoto.c"
+#line 1537 "DirectPhoto.c"
 			}
 #line 104 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_tmp8_ = _tmp5_;
@@ -1540,11 +1545,11 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
 			self->priv->preview = _tmp8_;
 #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_g_object_unref0 (_tmp5_);
-#line 1544 "DirectPhoto.c"
+#line 1549 "DirectPhoto.c"
 		}
 #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1548 "DirectPhoto.c"
+#line 1553 "DirectPhoto.c"
 	}
 #line 107 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp9_ = self->priv->preview;
@@ -1554,24 +1559,24 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
 	result = _tmp10_;
 #line 107 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1558 "DirectPhoto.c"
+#line 1563 "DirectPhoto.c"
 }
 
 
 static void direct_photo_real_rotate (Photo* base, Rotation rotation) {
 	DirectPhoto * self;
-	Rotation _tmp0_ = 0;
+	Rotation _tmp0_;
 #line 110 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
 #line 111 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)->can_rotate_now = FALSE;
 #line 112 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	g_signal_emit_by_name (self, "can-rotate-changed", FALSE);
+	g_signal_emit (self, direct_photo_signals[DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL], 0, FALSE);
 #line 113 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp0_ = rotation;
 #line 113 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	PHOTO_CLASS (direct_photo_parent_class)->rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_);
-#line 1575 "DirectPhoto.c"
+#line 1580 "DirectPhoto.c"
 }
 
 
@@ -1579,8 +1584,8 @@ static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base, Scaling* scal
 	DirectPhoto * self;
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* ret = NULL;
-	Scaling _tmp0_ = {0};
-	GdkPixbuf* _tmp1_ = NULL;
+	Scaling _tmp0_;
+	GdkPixbuf* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 116 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
@@ -1598,17 +1603,17 @@ static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base, Scaling* scal
 		g_propagate_error (error, _inner_error_);
 #line 117 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return NULL;
-#line 1602 "DirectPhoto.c"
+#line 1607 "DirectPhoto.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	g_signal_emit_by_name (self, "can-rotate-changed", TRUE);
+	g_signal_emit (self, direct_photo_signals[DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL], 0, TRUE);
 #line 119 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)->can_rotate_now = TRUE;
 #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	result = ret;
 #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1612 "DirectPhoto.c"
+#line 1617 "DirectPhoto.c"
 }
 
 
@@ -1616,10 +1621,10 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s
 	DirectPhoto * self;
 	GdkPixbuf* result = NULL;
 	PhotoMetadata* metadata = NULL;
-	PhotoMetadata* _tmp0_ = NULL;
+	PhotoMetadata* _tmp0_;
 	GdkPixbuf* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-	PhotoMetadata* _tmp3_ = NULL;
+	PhotoMetadata* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 123 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
@@ -1633,17 +1638,17 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s
 	if (_tmp3_ == NULL) {
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp2_ = TRUE;
-#line 1637 "DirectPhoto.c"
+#line 1642 "DirectPhoto.c"
 	} else {
-		PhotoMetadata* _tmp4_ = NULL;
-		guint _tmp5_ = 0U;
+		PhotoMetadata* _tmp4_;
+		guint _tmp5_;
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp4_ = metadata;
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp5_ = photo_metadata_get_preview_count (_tmp4_);
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp2_ = _tmp5_ == ((guint) 0);
-#line 1647 "DirectPhoto.c"
+#line 1652 "DirectPhoto.c"
 	}
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (_tmp2_) {
@@ -1651,16 +1656,16 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s
 		_g_object_unref0 (_tmp1_);
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp1_ = NULL;
-#line 1655 "DirectPhoto.c"
+#line 1660 "DirectPhoto.c"
 	} else {
 		GdkPixbuf* _tmp6_ = NULL;
-		PhotoMetadata* _tmp7_ = NULL;
-		PhotoPreview* _tmp8_ = NULL;
-		PhotoPreview* _tmp9_ = NULL;
-		GdkPixbuf* _tmp10_ = NULL;
-		GdkPixbuf* _tmp11_ = NULL;
-		Orientation _tmp12_ = 0;
-		GdkPixbuf* _tmp13_ = NULL;
+		PhotoMetadata* _tmp7_;
+		PhotoPreview* _tmp8_;
+		PhotoPreview* _tmp9_;
+		GdkPixbuf* _tmp10_;
+		GdkPixbuf* _tmp11_;
+		Orientation _tmp12_;
+		GdkPixbuf* _tmp13_;
 #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp7_ = metadata;
 #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1685,7 +1690,7 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s
 			_media_metadata_unref0 (metadata);
 #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			return NULL;
-#line 1689 "DirectPhoto.c"
+#line 1694 "DirectPhoto.c"
 		}
 #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp12_ = photo_get_orientation (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo));
@@ -1697,7 +1702,7 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s
 		_tmp1_ = _tmp13_;
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_tmp6_);
-#line 1701 "DirectPhoto.c"
+#line 1706 "DirectPhoto.c"
 	}
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	result = _tmp1_;
@@ -1705,13 +1710,13 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s
 	_media_metadata_unref0 (metadata);
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1709 "DirectPhoto.c"
+#line 1714 "DirectPhoto.c"
 }
 
 
 static void direct_photo_real_notify_altered (DataObject* base, Alteration* alteration) {
 	DirectPhoto * self;
-	Alteration* _tmp0_ = NULL;
+	Alteration* _tmp0_;
 #line 130 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
 #line 130 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1724,7 +1729,7 @@ static void direct_photo_real_notify_altered (DataObject* base, Alteration* alte
 	_tmp0_ = alteration;
 #line 133 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	DATA_OBJECT_CLASS (direct_photo_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_OBJECT, DataObject), _tmp0_);
-#line 1728 "DirectPhoto.c"
+#line 1733 "DirectPhoto.c"
 }
 
 
@@ -1737,7 +1742,7 @@ static gboolean direct_photo_real_has_user_generated_metadata (Photo* base) {
 	result = FALSE;
 #line 138 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1741 "DirectPhoto.c"
+#line 1746 "DirectPhoto.c"
 }
 
 
@@ -1747,7 +1752,7 @@ static void direct_photo_real_set_user_metadata_for_export (Photo* base, PhotoMe
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
 #line 141 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (metadata));
-#line 1751 "DirectPhoto.c"
+#line 1756 "DirectPhoto.c"
 }
 
 
@@ -1757,7 +1762,7 @@ static void direct_photo_real_apply_user_metadata_for_reimport (Photo* base, Pho
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
 #line 145 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (metadata));
-#line 1761 "DirectPhoto.c"
+#line 1766 "DirectPhoto.c"
 }
 
 
@@ -1770,7 +1775,7 @@ static gboolean direct_photo_real_is_trashed (MediaSource* base) {
 	result = FALSE;
 #line 150 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1774 "DirectPhoto.c"
+#line 1779 "DirectPhoto.c"
 }
 
 
@@ -1783,7 +1788,7 @@ static gboolean direct_photo_real_is_offline (MediaSource* base) {
 	result = FALSE;
 #line 155 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1787 "DirectPhoto.c"
+#line 1792 "DirectPhoto.c"
 }
 
 
@@ -1791,7 +1796,7 @@ static void direct_photo_real_trash (MediaSource* base) {
 	DirectPhoto * self;
 #line 158 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
-#line 1795 "DirectPhoto.c"
+#line 1800 "DirectPhoto.c"
 }
 
 
@@ -1799,7 +1804,7 @@ static void direct_photo_real_untrash (MediaSource* base) {
 	DirectPhoto * self;
 #line 162 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
-#line 1803 "DirectPhoto.c"
+#line 1808 "DirectPhoto.c"
 }
 
 
@@ -1807,7 +1812,7 @@ static void direct_photo_real_mark_offline (MediaSource* base) {
 	DirectPhoto * self;
 #line 166 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
-#line 1811 "DirectPhoto.c"
+#line 1816 "DirectPhoto.c"
 }
 
 
@@ -1815,7 +1820,7 @@ static void direct_photo_real_mark_online (MediaSource* base) {
 	DirectPhoto * self;
 #line 170 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
-#line 1819 "DirectPhoto.c"
+#line 1824 "DirectPhoto.c"
 }
 
 
@@ -1825,38 +1830,38 @@ static void direct_photo_class_init (DirectPhotoClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_type_class_add_private (klass, sizeof (DirectPhotoPrivate));
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((MediaSourceClass *) klass)->get_preview_pixbuf = (GdkPixbuf* (*)(MediaSource*, Scaling*, GError**)) direct_photo_real_get_preview_pixbuf;
+	((MediaSourceClass *) klass)->get_preview_pixbuf = (GdkPixbuf* (*) (MediaSource *, Scaling*, GError**)) direct_photo_real_get_preview_pixbuf;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((PhotoClass *) klass)->rotate = (void (*)(Photo*, Rotation)) direct_photo_real_rotate;
+	((PhotoClass *) klass)->rotate = (void (*) (Photo *, Rotation)) direct_photo_real_rotate;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((PhotoSourceClass *) klass)->get_pixbuf = (GdkPixbuf* (*)(PhotoSource*, Scaling*, GError**)) direct_photo_real_get_pixbuf;
+	((PhotoSourceClass *) klass)->get_pixbuf = (GdkPixbuf* (*) (PhotoSource *, Scaling*, GError**)) direct_photo_real_get_pixbuf;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) direct_photo_real_get_thumbnail;
+	((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*) (ThumbnailSource *, gint, GError**)) direct_photo_real_get_thumbnail;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((DataObjectClass *) klass)->notify_altered = (void (*)(DataObject*, Alteration*)) direct_photo_real_notify_altered;
+	((DataObjectClass *) klass)->notify_altered = (void (*) (DataObject *, Alteration*)) direct_photo_real_notify_altered;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((PhotoClass *) klass)->has_user_generated_metadata = (gboolean (*)(Photo*)) direct_photo_real_has_user_generated_metadata;
+	((PhotoClass *) klass)->has_user_generated_metadata = (gboolean (*) (Photo *)) direct_photo_real_has_user_generated_metadata;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((PhotoClass *) klass)->set_user_metadata_for_export = (void (*)(Photo*, PhotoMetadata*)) direct_photo_real_set_user_metadata_for_export;
+	((PhotoClass *) klass)->set_user_metadata_for_export = (void (*) (Photo *, PhotoMetadata*)) direct_photo_real_set_user_metadata_for_export;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((PhotoClass *) klass)->apply_user_metadata_for_reimport = (void (*)(Photo*, PhotoMetadata*)) direct_photo_real_apply_user_metadata_for_reimport;
+	((PhotoClass *) klass)->apply_user_metadata_for_reimport = (void (*) (Photo *, PhotoMetadata*)) direct_photo_real_apply_user_metadata_for_reimport;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((MediaSourceClass *) klass)->is_trashed = (gboolean (*)(MediaSource*)) direct_photo_real_is_trashed;
+	((MediaSourceClass *) klass)->is_trashed = (gboolean (*) (MediaSource *)) direct_photo_real_is_trashed;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((MediaSourceClass *) klass)->is_offline = (gboolean (*)(MediaSource*)) direct_photo_real_is_offline;
+	((MediaSourceClass *) klass)->is_offline = (gboolean (*) (MediaSource *)) direct_photo_real_is_offline;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((MediaSourceClass *) klass)->trash = (void (*)(MediaSource*)) direct_photo_real_trash;
+	((MediaSourceClass *) klass)->trash = (void (*) (MediaSource *)) direct_photo_real_trash;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((MediaSourceClass *) klass)->untrash = (void (*)(MediaSource*)) direct_photo_real_untrash;
+	((MediaSourceClass *) klass)->untrash = (void (*) (MediaSource *)) direct_photo_real_untrash;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((MediaSourceClass *) klass)->mark_offline = (void (*)(MediaSource*)) direct_photo_real_mark_offline;
+	((MediaSourceClass *) klass)->mark_offline = (void (*) (MediaSource *)) direct_photo_real_mark_offline;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((MediaSourceClass *) klass)->mark_online = (void (*)(MediaSource*)) direct_photo_real_mark_online;
+	((MediaSourceClass *) klass)->mark_online = (void (*) (MediaSource *)) direct_photo_real_mark_online;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	G_OBJECT_CLASS (klass)->finalize = direct_photo_finalize;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	g_signal_new ("can_rotate_changed", TYPE_DIRECT_PHOTO, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 1860 "DirectPhoto.c"
+	direct_photo_signals[DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL] = g_signal_new ("can-rotate-changed", TYPE_DIRECT_PHOTO, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+#line 1865 "DirectPhoto.c"
 }
 
 
@@ -1867,11 +1872,11 @@ static void direct_photo_instance_init (DirectPhoto * self) {
 	self->priv->preview = NULL;
 #line 15 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self->priv->loaded = FALSE;
-#line 1871 "DirectPhoto.c"
+#line 1876 "DirectPhoto.c"
 }
 
 
-static void direct_photo_finalize (GObject* obj) {
+static void direct_photo_finalize (GObject * obj) {
 	DirectPhoto * self;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_PHOTO, DirectPhoto);
@@ -1879,7 +1884,7 @@ static void direct_photo_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->preview);
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	G_OBJECT_CLASS (direct_photo_parent_class)->finalize (obj);
-#line 1883 "DirectPhoto.c"
+#line 1888 "DirectPhoto.c"
 }
 
 
@@ -1900,7 +1905,7 @@ static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
 	result = file_hash ((GFile*) v);
 #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1904 "DirectPhoto.c"
+#line 1909 "DirectPhoto.c"
 }
 
 
@@ -1909,7 +1914,7 @@ static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer
 	result = file_equal ((GFile*) a, (GFile*) b);
 #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1913 "DirectPhoto.c"
+#line 1918 "DirectPhoto.c"
 }
 
 
@@ -1918,33 +1923,33 @@ static gint64 _direct_photo_source_collection_get_direct_key_get_source_database
 	result = direct_photo_source_collection_get_direct_key (source);
 #line 183 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1922 "DirectPhoto.c"
+#line 1927 "DirectPhoto.c"
 }
 
 
 static void _direct_photo_source_collection_on_file_discovered_directory_monitor_file_discovered (DirectoryMonitor* _sender, GFile* file, GFileInfo* info, gpointer self) {
 #line 187 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	direct_photo_source_collection_on_file_discovered ((DirectPhotoSourceCollection*) self, file, info);
-#line 1929 "DirectPhoto.c"
+#line 1934 "DirectPhoto.c"
 }
 
 
 static void _direct_photo_source_collection_on_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self) {
 #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	direct_photo_source_collection_on_discovery_completed ((DirectPhotoSourceCollection*) self);
-#line 1936 "DirectPhoto.c"
+#line 1941 "DirectPhoto.c"
 }
 
 
 DirectPhotoSourceCollection* direct_photo_source_collection_construct (GType object_type, GFile* initial_file) {
 	DirectPhotoSourceCollection* self = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	DirectoryMonitor* _tmp3_ = NULL;
-	DirectoryMonitor* _tmp4_ = NULL;
-	DirectoryMonitor* _tmp5_ = NULL;
-	DirectoryMonitor* _tmp6_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	DirectoryMonitor* _tmp3_;
+	DirectoryMonitor* _tmp4_;
+	DirectoryMonitor* _tmp5_;
+	DirectoryMonitor* _tmp6_;
 #line 182 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_val_if_fail (G_IS_FILE (initial_file), NULL);
 #line 183 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1977,21 +1982,21 @@ DirectPhotoSourceCollection* direct_photo_source_collection_construct (GType obj
 	directory_monitor_start_discovery (_tmp6_);
 #line 182 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return self;
-#line 1981 "DirectPhoto.c"
+#line 1986 "DirectPhoto.c"
 }
 
 
 DirectPhotoSourceCollection* direct_photo_source_collection_new (GFile* initial_file) {
 #line 182 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return direct_photo_source_collection_construct (TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, initial_file);
-#line 1988 "DirectPhoto.c"
+#line 1993 "DirectPhoto.c"
 }
 
 
 static gboolean direct_photo_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) {
 	DirectPhotoSourceCollection * self;
 	gboolean result = FALSE;
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 193 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection);
 #line 193 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2002,26 +2007,26 @@ static gboolean direct_photo_source_collection_real_holds_type_of_source (Source
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_DIRECT_PHOTO);
 #line 194 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2006 "DirectPhoto.c"
+#line 2011 "DirectPhoto.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 198 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2013 "DirectPhoto.c"
+#line 2018 "DirectPhoto.c"
 }
 
 
 static gint64 direct_photo_source_collection_get_direct_key (DataSource* source) {
 	gint64 result = 0LL;
 	DirectPhoto* photo = NULL;
-	DataSource* _tmp0_ = NULL;
-	DirectPhoto* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	DirectPhoto* _tmp1_;
 	PhotoID photo_id = {0};
 	PhotoID _tmp2_ = {0};
-	PhotoID _tmp3_ = {0};
-	gint64 _tmp4_ = 0LL;
+	PhotoID _tmp3_;
+	gint64 _tmp4_;
 #line 197 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL);
 #line 198 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2044,22 +2049,22 @@ static gint64 direct_photo_source_collection_get_direct_key (DataSource* source)
 	_g_object_unref0 (photo);
 #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2048 "DirectPhoto.c"
+#line 2053 "DirectPhoto.c"
 }
 
 
 static void direct_photo_source_collection_real_notify_items_added (DataCollection* base, GeeIterable* added) {
 	DirectPhotoSourceCollection * self;
-	GeeIterable* _tmp16_ = NULL;
+	GeeIterable* _tmp16_;
 #line 204 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection);
 #line 204 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (added));
-#line 2059 "DirectPhoto.c"
+#line 2064 "DirectPhoto.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeIterable* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeIterable* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp0_ = added;
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2068,24 +2073,24 @@ static void direct_photo_source_collection_real_notify_items_added (DataCollecti
 		_object_it = _tmp1_;
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		while (TRUE) {
-#line 2072 "DirectPhoto.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 2077 "DirectPhoto.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			DirectPhoto* photo = NULL;
-			DataObject* _tmp6_ = NULL;
-			DirectPhoto* _tmp7_ = NULL;
+			DataObject* _tmp6_;
+			DirectPhoto* _tmp7_;
 			GFile* file = NULL;
-			DirectPhoto* _tmp8_ = NULL;
-			GFile* _tmp9_ = NULL;
-			GeeHashMap* _tmp10_ = NULL;
-			GFile* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
-			GeeHashMap* _tmp13_ = NULL;
-			GFile* _tmp14_ = NULL;
-			DirectPhoto* _tmp15_ = NULL;
+			DirectPhoto* _tmp8_;
+			GFile* _tmp9_;
+			GeeHashMap* _tmp10_;
+			GFile* _tmp11_;
+			gboolean _tmp12_;
+			GeeHashMap* _tmp13_;
+			GFile* _tmp14_;
+			DirectPhoto* _tmp15_;
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_tmp2_ = _object_it;
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2094,7 +2099,7 @@ static void direct_photo_source_collection_real_notify_items_added (DataCollecti
 			if (!_tmp3_) {
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				break;
-#line 2098 "DirectPhoto.c"
+#line 2103 "DirectPhoto.c"
 			}
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_tmp4_ = _object_it;
@@ -2136,32 +2141,32 @@ static void direct_photo_source_collection_real_notify_items_added (DataCollecti
 			_g_object_unref0 (photo);
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_g_object_unref0 (object);
-#line 2140 "DirectPhoto.c"
+#line 2145 "DirectPhoto.c"
 		}
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_object_it);
-#line 2144 "DirectPhoto.c"
+#line 2149 "DirectPhoto.c"
 	}
 #line 214 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp16_ = added;
 #line 214 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp16_);
-#line 2150 "DirectPhoto.c"
+#line 2155 "DirectPhoto.c"
 }
 
 
 static void direct_photo_source_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed) {
 	DirectPhotoSourceCollection * self;
-	GeeIterable* _tmp14_ = NULL;
+	GeeIterable* _tmp14_;
 #line 217 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection);
 #line 217 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (removed));
-#line 2161 "DirectPhoto.c"
+#line 2166 "DirectPhoto.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeIterable* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeIterable* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp0_ = removed;
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2170,23 +2175,23 @@ static void direct_photo_source_collection_real_notify_items_removed (DataCollec
 		_object_it = _tmp1_;
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		while (TRUE) {
-#line 2174 "DirectPhoto.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 2179 "DirectPhoto.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			DirectPhoto* photo = NULL;
-			DataObject* _tmp6_ = NULL;
-			DirectPhoto* _tmp7_ = NULL;
+			DataObject* _tmp6_;
+			DirectPhoto* _tmp7_;
 			GFile* file = NULL;
-			DirectPhoto* _tmp8_ = NULL;
-			GFile* _tmp9_ = NULL;
+			DirectPhoto* _tmp8_;
+			GFile* _tmp9_;
 			gboolean is_removed = FALSE;
-			GeeHashMap* _tmp10_ = NULL;
-			GFile* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
-			gboolean _tmp13_ = FALSE;
+			GeeHashMap* _tmp10_;
+			GFile* _tmp11_;
+			gboolean _tmp12_;
+			gboolean _tmp13_;
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_tmp2_ = _object_it;
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2195,7 +2200,7 @@ static void direct_photo_source_collection_real_notify_items_removed (DataCollec
 			if (!_tmp3_) {
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				break;
-#line 2199 "DirectPhoto.c"
+#line 2204 "DirectPhoto.c"
 			}
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_tmp4_ = _object_it;
@@ -2233,25 +2238,25 @@ static void direct_photo_source_collection_real_notify_items_removed (DataCollec
 			_g_object_unref0 (photo);
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_g_object_unref0 (object);
-#line 2237 "DirectPhoto.c"
+#line 2242 "DirectPhoto.c"
 		}
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_object_it);
-#line 2241 "DirectPhoto.c"
+#line 2246 "DirectPhoto.c"
 	}
 #line 226 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp14_ = removed;
 #line 226 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp14_);
-#line 2247 "DirectPhoto.c"
+#line 2252 "DirectPhoto.c"
 }
 
 
 gboolean direct_photo_source_collection_has_source_for_file (DirectPhotoSourceCollection* self, GFile* file) {
 	gboolean result = FALSE;
-	GeeHashMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashMap* _tmp0_;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
 #line 229 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), FALSE);
 #line 229 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2266,26 +2271,26 @@ gboolean direct_photo_source_collection_has_source_for_file (DirectPhotoSourceCo
 	result = _tmp2_;
 #line 230 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2270 "DirectPhoto.c"
+#line 2275 "DirectPhoto.c"
 }
 
 
 static void direct_photo_source_collection_on_file_discovered (DirectPhotoSourceCollection* self, GFile* file, GFileInfo* info) {
-	GFile* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	GFile* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	GFile* _tmp0_;
+	gboolean _tmp1_;
+	GFile* _tmp2_;
+	gboolean _tmp3_;
 	DirectPhoto* photo = NULL;
 	gchar* reason = NULL;
-	GFile* _tmp4_ = NULL;
+	GFile* _tmp4_;
 	DirectPhoto* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	GeeCollection* _tmp9_ = NULL;
-	DirectPhoto* _tmp10_ = NULL;
-	GeeCollection* _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
+	gchar* _tmp6_;
+	const gchar* _tmp7_;
+	GeeCollection* _tmp9_;
+	DirectPhoto* _tmp10_;
+	GeeCollection* _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
 #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self));
 #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2300,7 +2305,7 @@ static void direct_photo_source_collection_on_file_discovered (DirectPhotoSource
 	if (_tmp1_) {
 #line 236 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return;
-#line 2304 "DirectPhoto.c"
+#line 2309 "DirectPhoto.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp2_ = file;
@@ -2310,7 +2315,7 @@ static void direct_photo_source_collection_on_file_discovered (DirectPhotoSource
 	if (!_tmp3_) {
 #line 240 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return;
-#line 2314 "DirectPhoto.c"
+#line 2319 "DirectPhoto.c"
 	}
 #line 243 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp4_ = file;
@@ -2326,13 +2331,13 @@ static void direct_photo_source_collection_on_file_discovered (DirectPhotoSource
 	_tmp7_ = reason;
 #line 244 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (_tmp7_ != NULL) {
-#line 2330 "DirectPhoto.c"
-		const gchar* _tmp8_ = NULL;
+#line 2335 "DirectPhoto.c"
+		const gchar* _tmp8_;
 #line 245 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp8_ = reason;
 #line 245 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		g_warning ("DirectPhoto.vala:245: Error fetching file: %s", _tmp8_);
-#line 2336 "DirectPhoto.c"
+#line 2341 "DirectPhoto.c"
 	}
 #line 246 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp9_ = self->priv->prepared_photos;
@@ -2350,13 +2355,13 @@ static void direct_photo_source_collection_on_file_discovered (DirectPhotoSource
 	if (_tmp13_ >= DIRECT_PHOTO_SOURCE_COLLECTION_DISCOVERED_FILES_BATCH_ADD) {
 #line 248 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		direct_photo_source_collection_flush_prepared_photos (self);
-#line 2354 "DirectPhoto.c"
+#line 2359 "DirectPhoto.c"
 	}
 #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_g_free0 (reason);
 #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_g_object_unref0 (photo);
-#line 2360 "DirectPhoto.c"
+#line 2365 "DirectPhoto.c"
 }
 
 
@@ -2365,15 +2370,15 @@ static void direct_photo_source_collection_on_discovery_completed (DirectPhotoSo
 	g_return_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self));
 #line 252 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	direct_photo_source_collection_flush_prepared_photos (self);
-#line 2369 "DirectPhoto.c"
+#line 2374 "DirectPhoto.c"
 }
 
 
 static void direct_photo_source_collection_flush_prepared_photos (DirectPhotoSourceCollection* self) {
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp1_;
+	GeeCollection* _tmp2_;
+	GeeCollection* _tmp3_;
 #line 255 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self));
 #line 256 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2388,15 +2393,15 @@ static void direct_photo_source_collection_flush_prepared_photos (DirectPhotoSou
 	_tmp3_ = self->priv->prepared_photos;
 #line 257 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	gee_collection_clear (_tmp3_);
-#line 2392 "DirectPhoto.c"
+#line 2397 "DirectPhoto.c"
 }
 
 
 gboolean direct_photo_source_collection_has_file (DirectPhotoSourceCollection* self, GFile* file) {
 	gboolean result = FALSE;
-	GeeHashMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashMap* _tmp0_;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
 #line 260 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), FALSE);
 #line 260 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2411,19 +2416,19 @@ gboolean direct_photo_source_collection_has_file (DirectPhotoSourceCollection* s
 	result = _tmp2_;
 #line 261 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2415 "DirectPhoto.c"
+#line 2420 "DirectPhoto.c"
 }
 
 
 void direct_photo_source_collection_reimport_photo (DirectPhotoSourceCollection* self, DirectPhoto* photo) {
-	DirectPhoto* _tmp0_ = NULL;
+	DirectPhoto* _tmp0_;
 	DirectPhoto* reimported_photo = NULL;
-	DirectPhoto* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
+	DirectPhoto* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
 	DirectPhoto* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 264 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self));
 #line 264 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2452,23 +2457,23 @@ void direct_photo_source_collection_reimport_photo (DirectPhotoSourceCollection*
 	_g_object_unref0 (_tmp3_);
 #line 264 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_g_object_unref0 (reimported_photo);
-#line 2456 "DirectPhoto.c"
+#line 2461 "DirectPhoto.c"
 }
 
 
-gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto** photo, gboolean reimport) {
+gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto* * photo, gboolean reimport) {
 	DirectPhoto* _vala_photo = NULL;
 	gchar* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
-	DirectPhoto* _tmp3_ = NULL;
+	GeeHashMap* _tmp0_;
+	GFile* _tmp1_;
+	gpointer _tmp2_;
+	DirectPhoto* _tmp3_;
 	ImportResult _result_ = 0;
-	GFile* _tmp25_ = NULL;
+	GFile* _tmp25_;
 	DirectPhoto* _tmp26_ = NULL;
-	ImportResult _tmp27_ = 0;
+	ImportResult _tmp27_;
 	gchar* _tmp28_ = NULL;
-	ImportResult _tmp29_ = 0;
+	ImportResult _tmp29_;
 	GError * _inner_error_ = NULL;
 #line 271 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), NULL);
@@ -2488,27 +2493,27 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 	_tmp3_ = _vala_photo;
 #line 274 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (_tmp3_ != NULL) {
-#line 2492 "DirectPhoto.c"
+#line 2497 "DirectPhoto.c"
 		gchar* reason = NULL;
-		gboolean _tmp4_ = FALSE;
+		gboolean _tmp4_;
 #line 275 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		reason = NULL;
 #line 277 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp4_ = reimport;
 #line 277 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (_tmp4_) {
-#line 2501 "DirectPhoto.c"
+#line 2506 "DirectPhoto.c"
 			{
 				Orientation ori_tmp = 0;
 				gboolean should_restore_ori = FALSE;
 				gboolean _tmp5_ = FALSE;
-				DirectPhoto* _tmp6_ = NULL;
-				gboolean _tmp7_ = FALSE;
+				DirectPhoto* _tmp6_;
+				gboolean _tmp7_;
 				PhotoReimportMasterState* reimport_state = NULL;
 				gboolean _tmp12_ = FALSE;
-				DirectPhoto* _tmp13_ = NULL;
+				DirectPhoto* _tmp13_;
 				PhotoReimportMasterState* _tmp14_ = NULL;
-				gboolean _tmp15_ = FALSE;
+				gboolean _tmp15_;
 #line 279 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				ori_tmp = ORIENTATION_TOP_LEFT;
 #line 280 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2521,23 +2526,23 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 				if (_tmp7_) {
 #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp5_ = TRUE;
-#line 2525 "DirectPhoto.c"
+#line 2530 "DirectPhoto.c"
 				} else {
-					DirectPhoto* _tmp8_ = NULL;
-					PhotoFileFormat _tmp9_ = 0;
+					DirectPhoto* _tmp8_;
+					PhotoFileFormat _tmp9_;
 #line 283 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp8_ = _vala_photo;
 #line 283 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp9_ = photo_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo));
 #line 283 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp5_ = _tmp9_ == PHOTO_FILE_FORMAT_JFIF;
-#line 2535 "DirectPhoto.c"
+#line 2540 "DirectPhoto.c"
 				}
 #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				if (_tmp5_) {
-#line 2539 "DirectPhoto.c"
-					DirectPhoto* _tmp10_ = NULL;
-					Orientation _tmp11_ = 0;
+#line 2544 "DirectPhoto.c"
+					DirectPhoto* _tmp10_;
+					Orientation _tmp11_;
 #line 284 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp10_ = _vala_photo;
 #line 284 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2546,7 +2551,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 					ori_tmp = _tmp11_;
 #line 285 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					should_restore_ori = TRUE;
-#line 2550 "DirectPhoto.c"
+#line 2555 "DirectPhoto.c"
 				}
 #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				_tmp13_ = _vala_photo;
@@ -2562,15 +2567,15 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_photo_reimport_master_state_unref0 (reimport_state);
-#line 2566 "DirectPhoto.c"
+#line 2571 "DirectPhoto.c"
 					goto __catch47_g_error;
 				}
 #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				if (_tmp12_) {
-#line 2571 "DirectPhoto.c"
-					DirectPhoto* _tmp16_ = NULL;
-					PhotoReimportMasterState* _tmp17_ = NULL;
-					gboolean _tmp18_ = FALSE;
+#line 2576 "DirectPhoto.c"
+					DirectPhoto* _tmp16_;
+					PhotoReimportMasterState* _tmp17_;
+					gboolean _tmp18_;
 #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp16_ = _vala_photo;
 #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2581,45 +2586,45 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 						_photo_reimport_master_state_unref0 (reimport_state);
-#line 2585 "DirectPhoto.c"
+#line 2590 "DirectPhoto.c"
 						goto __catch47_g_error;
 					}
 #line 291 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp18_ = should_restore_ori;
 #line 291 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					if (_tmp18_) {
-#line 2592 "DirectPhoto.c"
-						DirectPhoto* _tmp19_ = NULL;
-						Orientation _tmp20_ = 0;
+#line 2597 "DirectPhoto.c"
+						DirectPhoto* _tmp19_;
+						Orientation _tmp20_;
 #line 292 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 						_tmp19_ = _vala_photo;
 #line 292 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 						_tmp20_ = ori_tmp;
 #line 292 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 						direct_photo_fixup_orientation_after_reimport (_tmp19_, _tmp20_);
-#line 2601 "DirectPhoto.c"
+#line 2606 "DirectPhoto.c"
 					}
 				} else {
-					gchar* _tmp21_ = NULL;
+					gchar* _tmp21_;
 #line 296 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp21_ = import_result_to_string (IMPORT_RESULT_FILE_ERROR);
 #line 296 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_g_free0 (reason);
 #line 296 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					reason = _tmp21_;
-#line 2611 "DirectPhoto.c"
+#line 2616 "DirectPhoto.c"
 				}
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				_photo_reimport_master_state_unref0 (reimport_state);
-#line 2615 "DirectPhoto.c"
+#line 2620 "DirectPhoto.c"
 			}
 			goto __finally47;
 			__catch47_g_error:
 			{
 				GError* err = NULL;
-				GError* _tmp22_ = NULL;
-				const gchar* _tmp23_ = NULL;
-				gchar* _tmp24_ = NULL;
+				GError* _tmp22_;
+				const gchar* _tmp23_;
+				gchar* _tmp24_;
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				err = _inner_error_;
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2636,7 +2641,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 				reason = _tmp24_;
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				_g_error_free0 (err);
-#line 2640 "DirectPhoto.c"
+#line 2645 "DirectPhoto.c"
 			}
 			__finally47:
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2649,7 +2654,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 				g_clear_error (&_inner_error_);
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				return NULL;
-#line 2653 "DirectPhoto.c"
+#line 2658 "DirectPhoto.c"
 			}
 		}
 #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2658,15 +2663,15 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 		if (photo) {
 #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			*photo = _vala_photo;
-#line 2662 "DirectPhoto.c"
+#line 2667 "DirectPhoto.c"
 		} else {
 #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_g_object_unref0 (_vala_photo);
-#line 2666 "DirectPhoto.c"
+#line 2671 "DirectPhoto.c"
 		}
 #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return result;
-#line 2670 "DirectPhoto.c"
+#line 2675 "DirectPhoto.c"
 	}
 #line 308 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp25_ = file;
@@ -2686,10 +2691,10 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 		_g_free0 (_tmp28_);
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp28_ = NULL;
-#line 2690 "DirectPhoto.c"
+#line 2695 "DirectPhoto.c"
 	} else {
-		ImportResult _tmp30_ = 0;
-		gchar* _tmp31_ = NULL;
+		ImportResult _tmp30_;
+		gchar* _tmp31_;
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp30_ = _result_;
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2698,7 +2703,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 		_g_free0 (_tmp28_);
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp28_ = _tmp31_;
-#line 2702 "DirectPhoto.c"
+#line 2707 "DirectPhoto.c"
 	}
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	result = _tmp28_;
@@ -2706,23 +2711,23 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 	if (photo) {
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		*photo = _vala_photo;
-#line 2710 "DirectPhoto.c"
+#line 2715 "DirectPhoto.c"
 	} else {
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_vala_photo);
-#line 2714 "DirectPhoto.c"
+#line 2719 "DirectPhoto.c"
 	}
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2718 "DirectPhoto.c"
+#line 2723 "DirectPhoto.c"
 }
 
 
 gboolean direct_photo_source_collection_has_file_source (DirectPhotoSourceCollection* self, GFile* file) {
 	gboolean result = FALSE;
-	GeeHashMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashMap* _tmp0_;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
 #line 313 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), FALSE);
 #line 313 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2737,15 +2742,15 @@ gboolean direct_photo_source_collection_has_file_source (DirectPhotoSourceCollec
 	result = _tmp2_;
 #line 314 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2741 "DirectPhoto.c"
+#line 2746 "DirectPhoto.c"
 }
 
 
 DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCollection* self, GFile* file) {
 	DirectPhoto* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	GFile* _tmp1_;
+	gpointer _tmp2_;
 #line 317 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), NULL);
 #line 317 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2760,7 +2765,7 @@ DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCo
 	result = (DirectPhoto*) _tmp2_;
 #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2764 "DirectPhoto.c"
+#line 2769 "DirectPhoto.c"
 }
 
 
@@ -2772,18 +2777,18 @@ static void direct_photo_source_collection_class_init (DirectPhotoSourceCollecti
 #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_type_class_add_private (klass, sizeof (DirectPhotoSourceCollectionPrivate));
 #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*)(SourceCollection*, DataSource*)) direct_photo_source_collection_real_holds_type_of_source;
+	((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*) (SourceCollection *, DataSource*)) direct_photo_source_collection_real_holds_type_of_source;
 #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((DataCollectionClass *) klass)->notify_items_added = (void (*)(DataCollection*, GeeIterable*)) direct_photo_source_collection_real_notify_items_added;
+	((DataCollectionClass *) klass)->notify_items_added = (void (*) (DataCollection *, GeeIterable*)) direct_photo_source_collection_real_notify_items_added;
 #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((DataCollectionClass *) klass)->notify_items_removed = (void (*)(DataCollection*, GeeIterable*)) direct_photo_source_collection_real_notify_items_removed;
-#line 2781 "DirectPhoto.c"
+	((DataCollectionClass *) klass)->notify_items_removed = (void (*) (DataCollection *, GeeIterable*)) direct_photo_source_collection_real_notify_items_removed;
+#line 2786 "DirectPhoto.c"
 }
 
 
 static void direct_photo_source_collection_instance_init (DirectPhotoSourceCollection * self) {
-	GeeArrayList* _tmp0_ = NULL;
-	GeeHashMap* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeHashMap* _tmp1_;
 #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self->priv = DIRECT_PHOTO_SOURCE_COLLECTION_GET_PRIVATE (self);
 #line 177 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2794,11 +2799,11 @@ static void direct_photo_source_collection_instance_init (DirectPhotoSourceColle
 	_tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self->priv->file_map = _tmp1_;
-#line 2798 "DirectPhoto.c"
+#line 2803 "DirectPhoto.c"
 }
 
 
-static void direct_photo_source_collection_finalize (DataCollection* obj) {
+static void direct_photo_source_collection_finalize (DataCollection * obj) {
 	DirectPhotoSourceCollection * self;
 #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection);
@@ -2810,7 +2815,7 @@ static void direct_photo_source_collection_finalize (DataCollection* obj) {
 	_g_object_unref0 (self->priv->monitor);
 #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->finalize (obj);
-#line 2814 "DirectPhoto.c"
+#line 2819 "DirectPhoto.c"
 }