New upstream version 0.28.2upstream/0.28.2

1 files changed, 126 insertions, 142 deletions

diff --git a/src/direct/DirectPhoto.c b/src/direct/DirectPhoto.c
index 013bb80..0a51b29 100644
--- a/src/direct/DirectPhoto.c
+++ b/src/direct/DirectPhoto.c
@@ -15,6 +15,7 @@
 #include <gio/gio.h>
 #include <time.h>
 #include <gee.h>
+#include "shotwell-graphics-processor.h"
 
 
 #define TYPE_DATA_OBJECT (data_object_get_type ())
@@ -259,16 +260,6 @@ typedef struct _PhotoRowPrivate PhotoRowPrivate;
 #define TYPE_PHOTO_ID (photo_id_get_type ())
 typedef struct _PhotoID PhotoID;
 
-#define TYPE_KEY_VALUE_MAP (key_value_map_get_type ())
-#define KEY_VALUE_MAP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_KEY_VALUE_MAP, KeyValueMap))
-#define KEY_VALUE_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_KEY_VALUE_MAP, KeyValueMapClass))
-#define IS_KEY_VALUE_MAP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_KEY_VALUE_MAP))
-#define IS_KEY_VALUE_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_KEY_VALUE_MAP))
-#define KEY_VALUE_MAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_KEY_VALUE_MAP, KeyValueMapClass))
-
-typedef struct _KeyValueMap KeyValueMap;
-typedef struct _KeyValueMapClass KeyValueMapClass;
-
 #define TYPE_BACKING_PHOTO_ID (backing_photo_id_get_type ())
 typedef struct _BackingPhotoID BackingPhotoID;
 
@@ -965,13 +956,6 @@ void direct_photo_fixup_orientation_after_reimport (DirectPhoto* self, Orientati
 GType photo_id_get_type (void) G_GNUC_CONST;
 PhotoID* photo_id_dup (const PhotoID* self);
 void photo_id_free (PhotoID* self);
-gpointer key_value_map_ref (gpointer instance);
-void key_value_map_unref (gpointer instance);
-GParamSpec* param_spec_key_value_map (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_key_value_map (GValue* value, gpointer v_object);
-void value_take_key_value_map (GValue* value, gpointer v_object);
-gpointer value_get_key_value_map (const GValue* value);
-GType key_value_map_get_type (void) G_GNUC_CONST;
 GType backing_photo_id_get_type (void) G_GNUC_CONST;
 BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self);
 void backing_photo_id_free (BackingPhotoID* self);
@@ -1126,14 +1110,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 1130 "DirectPhoto.c"
+#line 1114 "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 1137 "DirectPhoto.c"
+#line 1121 "DirectPhoto.c"
 }
 
 
@@ -1170,7 +1154,7 @@ 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 1174 "DirectPhoto.c"
+#line 1158 "DirectPhoto.c"
 }
 
 
@@ -1214,13 +1198,13 @@ void direct_photo_init (GFile* initial_file) {
 	_tmp6_ = reason;
 #line 46 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (_tmp6_ != NULL) {
-#line 1218 "DirectPhoto.c"
+#line 1202 "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 1224 "DirectPhoto.c"
+#line 1208 "DirectPhoto.c"
 	}
 #line 48 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp8_ = direct_photo_global;
@@ -1232,14 +1216,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 1236 "DirectPhoto.c"
+#line 1220 "DirectPhoto.c"
 }
 
 
 void direct_photo_terminate (void) {
 #line 52 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	photo_terminate_photo ();
-#line 1243 "DirectPhoto.c"
+#line 1227 "DirectPhoto.c"
 }
 
 
@@ -1247,7 +1231,7 @@ 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 1251 "DirectPhoto.c"
+#line 1235 "DirectPhoto.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Scaling _tmp1_ = {0};
@@ -1262,8 +1246,8 @@ 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 1266 "DirectPhoto.c"
-			goto __catch45_g_error;
+#line 1250 "DirectPhoto.c"
+			goto __catch49_g_error;
 		}
 #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)->backing_photo_row;
@@ -1273,10 +1257,10 @@ 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 1277 "DirectPhoto.c"
+#line 1261 "DirectPhoto.c"
 	}
-	goto __finally45;
-	__catch45_g_error:
+	goto __finally49;
+	__catch49_g_error:
 	{
 		GError* e = NULL;
 		gchar* _tmp5_;
@@ -1295,9 +1279,9 @@ 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 1299 "DirectPhoto.c"
+#line 1283 "DirectPhoto.c"
 	}
-	__finally45:
+	__finally49:
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1306,7 +1290,7 @@ 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 1310 "DirectPhoto.c"
+#line 1294 "DirectPhoto.c"
 	}
 }
 
@@ -1328,7 +1312,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 		result = IMPORT_RESULT_SUCCESS;
 #line 70 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return result;
-#line 1332 "DirectPhoto.c"
+#line 1316 "DirectPhoto.c"
 	}
 	{
 		PhotoReimportMasterState* _tmp1_ = NULL;
@@ -1341,8 +1325,8 @@ 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 1345 "DirectPhoto.c"
-			goto __catch46_g_error;
+#line 1329 "DirectPhoto.c"
+			goto __catch50_g_error;
 		}
 #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp2_ = reimport_state;
@@ -1350,12 +1334,12 @@ 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 1354 "DirectPhoto.c"
-			goto __catch46_g_error;
+#line 1338 "DirectPhoto.c"
+			goto __catch50_g_error;
 		}
 	}
-	goto __finally46;
-	__catch46_g_error:
+	goto __finally50;
+	__catch50_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
@@ -1378,9 +1362,9 @@ 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 1382 "DirectPhoto.c"
+#line 1366 "DirectPhoto.c"
 	}
-	__finally46:
+	__finally50:
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1391,7 +1375,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 1395 "DirectPhoto.c"
+#line 1379 "DirectPhoto.c"
 	}
 #line 82 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self->priv->loaded = TRUE;
@@ -1403,7 +1387,7 @@ 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 1407 "DirectPhoto.c"
+#line 1391 "DirectPhoto.c"
 }
 
 
@@ -1458,15 +1442,15 @@ 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 1462 "DirectPhoto.c"
+#line 1446 "DirectPhoto.c"
 	} else {
 #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_vala_photo);
-#line 1466 "DirectPhoto.c"
+#line 1450 "DirectPhoto.c"
 	}
 #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1470 "DirectPhoto.c"
+#line 1454 "DirectPhoto.c"
 }
 
 
@@ -1485,7 +1469,7 @@ 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 1489 "DirectPhoto.c"
+#line 1473 "DirectPhoto.c"
 		GdkPixbuf* _tmp1_ = NULL;
 		GdkPixbuf* _tmp2_;
 		GdkPixbuf* _tmp3_;
@@ -1500,7 +1484,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 1504 "DirectPhoto.c"
+#line 1488 "DirectPhoto.c"
 		}
 #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp3_ = _tmp1_;
@@ -1514,7 +1498,7 @@ 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 1518 "DirectPhoto.c"
+#line 1502 "DirectPhoto.c"
 			GdkPixbuf* _tmp5_ = NULL;
 			Scaling _tmp6_;
 			GdkPixbuf* _tmp7_;
@@ -1533,7 +1517,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 1537 "DirectPhoto.c"
+#line 1521 "DirectPhoto.c"
 			}
 #line 104 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_tmp8_ = _tmp5_;
@@ -1545,11 +1529,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 1549 "DirectPhoto.c"
+#line 1533 "DirectPhoto.c"
 		}
 #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1553 "DirectPhoto.c"
+#line 1537 "DirectPhoto.c"
 	}
 #line 107 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp9_ = self->priv->preview;
@@ -1559,7 +1543,7 @@ 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 1563 "DirectPhoto.c"
+#line 1547 "DirectPhoto.c"
 }
 
 
@@ -1576,7 +1560,7 @@ static void direct_photo_real_rotate (Photo* base, Rotation rotation) {
 	_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 1580 "DirectPhoto.c"
+#line 1564 "DirectPhoto.c"
 }
 
 
@@ -1603,7 +1587,7 @@ 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 1607 "DirectPhoto.c"
+#line 1591 "DirectPhoto.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_signal_emit (self, direct_photo_signals[DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL], 0, TRUE);
@@ -1613,7 +1597,7 @@ static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base, Scaling* scal
 	result = ret;
 #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1617 "DirectPhoto.c"
+#line 1601 "DirectPhoto.c"
 }
 
 
@@ -1638,7 +1622,7 @@ 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 1642 "DirectPhoto.c"
+#line 1626 "DirectPhoto.c"
 	} else {
 		PhotoMetadata* _tmp4_;
 		guint _tmp5_;
@@ -1648,7 +1632,7 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s
 		_tmp5_ = photo_metadata_get_preview_count (_tmp4_);
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp2_ = _tmp5_ == ((guint) 0);
-#line 1652 "DirectPhoto.c"
+#line 1636 "DirectPhoto.c"
 	}
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (_tmp2_) {
@@ -1656,7 +1640,7 @@ 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 1660 "DirectPhoto.c"
+#line 1644 "DirectPhoto.c"
 	} else {
 		GdkPixbuf* _tmp6_ = NULL;
 		PhotoMetadata* _tmp7_;
@@ -1690,7 +1674,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 1694 "DirectPhoto.c"
+#line 1678 "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));
@@ -1702,7 +1686,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 1706 "DirectPhoto.c"
+#line 1690 "DirectPhoto.c"
 	}
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	result = _tmp1_;
@@ -1710,7 +1694,7 @@ 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 1714 "DirectPhoto.c"
+#line 1698 "DirectPhoto.c"
 }
 
 
@@ -1729,7 +1713,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 1733 "DirectPhoto.c"
+#line 1717 "DirectPhoto.c"
 }
 
 
@@ -1742,7 +1726,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 1746 "DirectPhoto.c"
+#line 1730 "DirectPhoto.c"
 }
 
 
@@ -1752,7 +1736,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 1756 "DirectPhoto.c"
+#line 1740 "DirectPhoto.c"
 }
 
 
@@ -1762,7 +1746,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 1766 "DirectPhoto.c"
+#line 1750 "DirectPhoto.c"
 }
 
 
@@ -1775,7 +1759,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 1779 "DirectPhoto.c"
+#line 1763 "DirectPhoto.c"
 }
 
 
@@ -1788,7 +1772,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 1792 "DirectPhoto.c"
+#line 1776 "DirectPhoto.c"
 }
 
 
@@ -1796,7 +1780,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 1800 "DirectPhoto.c"
+#line 1784 "DirectPhoto.c"
 }
 
 
@@ -1804,7 +1788,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 1808 "DirectPhoto.c"
+#line 1792 "DirectPhoto.c"
 }
 
 
@@ -1812,7 +1796,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 1816 "DirectPhoto.c"
+#line 1800 "DirectPhoto.c"
 }
 
 
@@ -1820,7 +1804,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 1824 "DirectPhoto.c"
+#line 1808 "DirectPhoto.c"
 }
 
 
@@ -1861,7 +1845,7 @@ static void direct_photo_class_init (DirectPhotoClass * klass) {
 	G_OBJECT_CLASS (klass)->finalize = direct_photo_finalize;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	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"
+#line 1849 "DirectPhoto.c"
 }
 
 
@@ -1872,7 +1856,7 @@ 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 1876 "DirectPhoto.c"
+#line 1860 "DirectPhoto.c"
 }
 
 
@@ -1884,7 +1868,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 1888 "DirectPhoto.c"
+#line 1872 "DirectPhoto.c"
 }
 
 
@@ -1905,7 +1889,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 1909 "DirectPhoto.c"
+#line 1893 "DirectPhoto.c"
 }
 
 
@@ -1914,7 +1898,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 1918 "DirectPhoto.c"
+#line 1902 "DirectPhoto.c"
 }
 
 
@@ -1923,21 +1907,21 @@ 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 1927 "DirectPhoto.c"
+#line 1911 "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 1934 "DirectPhoto.c"
+#line 1918 "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 1941 "DirectPhoto.c"
+#line 1925 "DirectPhoto.c"
 }
 
 
@@ -1982,14 +1966,14 @@ 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 1986 "DirectPhoto.c"
+#line 1970 "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 1993 "DirectPhoto.c"
+#line 1977 "DirectPhoto.c"
 }
 
 
@@ -2007,14 +1991,14 @@ 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 2011 "DirectPhoto.c"
+#line 1995 "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 2018 "DirectPhoto.c"
+#line 2002 "DirectPhoto.c"
 }
 
 
@@ -2049,7 +2033,7 @@ 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 2053 "DirectPhoto.c"
+#line 2037 "DirectPhoto.c"
 }
 
 
@@ -2060,7 +2044,7 @@ static void direct_photo_source_collection_real_notify_items_added (DataCollecti
 	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 2064 "DirectPhoto.c"
+#line 2048 "DirectPhoto.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeIterable* _tmp0_;
@@ -2073,7 +2057,7 @@ 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 2077 "DirectPhoto.c"
+#line 2061 "DirectPhoto.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataObject* object = NULL;
@@ -2099,7 +2083,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 2103 "DirectPhoto.c"
+#line 2087 "DirectPhoto.c"
 			}
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_tmp4_ = _object_it;
@@ -2141,17 +2125,17 @@ 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 2145 "DirectPhoto.c"
+#line 2129 "DirectPhoto.c"
 		}
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_object_it);
-#line 2149 "DirectPhoto.c"
+#line 2133 "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 2155 "DirectPhoto.c"
+#line 2139 "DirectPhoto.c"
 }
 
 
@@ -2162,7 +2146,7 @@ static void direct_photo_source_collection_real_notify_items_removed (DataCollec
 	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 2166 "DirectPhoto.c"
+#line 2150 "DirectPhoto.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeIterable* _tmp0_;
@@ -2175,7 +2159,7 @@ 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 2179 "DirectPhoto.c"
+#line 2163 "DirectPhoto.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataObject* object = NULL;
@@ -2200,7 +2184,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 2204 "DirectPhoto.c"
+#line 2188 "DirectPhoto.c"
 			}
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_tmp4_ = _object_it;
@@ -2238,17 +2222,17 @@ 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 2242 "DirectPhoto.c"
+#line 2226 "DirectPhoto.c"
 		}
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_object_it);
-#line 2246 "DirectPhoto.c"
+#line 2230 "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 2252 "DirectPhoto.c"
+#line 2236 "DirectPhoto.c"
 }
 
 
@@ -2271,7 +2255,7 @@ 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 2275 "DirectPhoto.c"
+#line 2259 "DirectPhoto.c"
 }
 
 
@@ -2305,7 +2289,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 2309 "DirectPhoto.c"
+#line 2293 "DirectPhoto.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp2_ = file;
@@ -2315,7 +2299,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 2319 "DirectPhoto.c"
+#line 2303 "DirectPhoto.c"
 	}
 #line 243 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp4_ = file;
@@ -2331,13 +2315,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 2335 "DirectPhoto.c"
+#line 2319 "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 2341 "DirectPhoto.c"
+#line 2325 "DirectPhoto.c"
 	}
 #line 246 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp9_ = self->priv->prepared_photos;
@@ -2355,13 +2339,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 2359 "DirectPhoto.c"
+#line 2343 "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 2365 "DirectPhoto.c"
+#line 2349 "DirectPhoto.c"
 }
 
 
@@ -2370,7 +2354,7 @@ 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 2374 "DirectPhoto.c"
+#line 2358 "DirectPhoto.c"
 }
 
 
@@ -2393,7 +2377,7 @@ 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 2397 "DirectPhoto.c"
+#line 2381 "DirectPhoto.c"
 }
 
 
@@ -2416,7 +2400,7 @@ gboolean direct_photo_source_collection_has_file (DirectPhotoSourceCollection* s
 	result = _tmp2_;
 #line 261 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2420 "DirectPhoto.c"
+#line 2404 "DirectPhoto.c"
 }
 
 
@@ -2457,7 +2441,7 @@ 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 2461 "DirectPhoto.c"
+#line 2445 "DirectPhoto.c"
 }
 
 
@@ -2493,7 +2477,7 @@ 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 2497 "DirectPhoto.c"
+#line 2481 "DirectPhoto.c"
 		gchar* reason = NULL;
 		gboolean _tmp4_;
 #line 275 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2502,7 +2486,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 		_tmp4_ = reimport;
 #line 277 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (_tmp4_) {
-#line 2506 "DirectPhoto.c"
+#line 2490 "DirectPhoto.c"
 			{
 				Orientation ori_tmp = 0;
 				gboolean should_restore_ori = FALSE;
@@ -2526,7 +2510,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 				if (_tmp7_) {
 #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp5_ = TRUE;
-#line 2530 "DirectPhoto.c"
+#line 2514 "DirectPhoto.c"
 				} else {
 					DirectPhoto* _tmp8_;
 					PhotoFileFormat _tmp9_;
@@ -2536,11 +2520,11 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 					_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 2540 "DirectPhoto.c"
+#line 2524 "DirectPhoto.c"
 				}
 #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				if (_tmp5_) {
-#line 2544 "DirectPhoto.c"
+#line 2528 "DirectPhoto.c"
 					DirectPhoto* _tmp10_;
 					Orientation _tmp11_;
 #line 284 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2551,7 +2535,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 2555 "DirectPhoto.c"
+#line 2539 "DirectPhoto.c"
 				}
 #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				_tmp13_ = _vala_photo;
@@ -2567,12 +2551,12 @@ 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 2571 "DirectPhoto.c"
-					goto __catch47_g_error;
+#line 2555 "DirectPhoto.c"
+					goto __catch51_g_error;
 				}
 #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				if (_tmp12_) {
-#line 2576 "DirectPhoto.c"
+#line 2560 "DirectPhoto.c"
 					DirectPhoto* _tmp16_;
 					PhotoReimportMasterState* _tmp17_;
 					gboolean _tmp18_;
@@ -2586,14 +2570,14 @@ 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 2590 "DirectPhoto.c"
-						goto __catch47_g_error;
+#line 2574 "DirectPhoto.c"
+						goto __catch51_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 2597 "DirectPhoto.c"
+#line 2581 "DirectPhoto.c"
 						DirectPhoto* _tmp19_;
 						Orientation _tmp20_;
 #line 292 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2602,7 +2586,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 						_tmp20_ = ori_tmp;
 #line 292 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 						direct_photo_fixup_orientation_after_reimport (_tmp19_, _tmp20_);
-#line 2606 "DirectPhoto.c"
+#line 2590 "DirectPhoto.c"
 					}
 				} else {
 					gchar* _tmp21_;
@@ -2612,14 +2596,14 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 					_g_free0 (reason);
 #line 296 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					reason = _tmp21_;
-#line 2616 "DirectPhoto.c"
+#line 2600 "DirectPhoto.c"
 				}
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				_photo_reimport_master_state_unref0 (reimport_state);
-#line 2620 "DirectPhoto.c"
+#line 2604 "DirectPhoto.c"
 			}
-			goto __finally47;
-			__catch47_g_error:
+			goto __finally51;
+			__catch51_g_error:
 			{
 				GError* err = NULL;
 				GError* _tmp22_;
@@ -2641,9 +2625,9 @@ 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 2645 "DirectPhoto.c"
+#line 2629 "DirectPhoto.c"
 			}
-			__finally47:
+			__finally51:
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2654,7 +2638,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 2658 "DirectPhoto.c"
+#line 2642 "DirectPhoto.c"
 			}
 		}
 #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2663,15 +2647,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 2667 "DirectPhoto.c"
+#line 2651 "DirectPhoto.c"
 		} else {
 #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_g_object_unref0 (_vala_photo);
-#line 2671 "DirectPhoto.c"
+#line 2655 "DirectPhoto.c"
 		}
 #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return result;
-#line 2675 "DirectPhoto.c"
+#line 2659 "DirectPhoto.c"
 	}
 #line 308 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp25_ = file;
@@ -2691,7 +2675,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 		_g_free0 (_tmp28_);
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp28_ = NULL;
-#line 2695 "DirectPhoto.c"
+#line 2679 "DirectPhoto.c"
 	} else {
 		ImportResult _tmp30_;
 		gchar* _tmp31_;
@@ -2703,7 +2687,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 2707 "DirectPhoto.c"
+#line 2691 "DirectPhoto.c"
 	}
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	result = _tmp28_;
@@ -2711,15 +2695,15 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 	if (photo) {
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		*photo = _vala_photo;
-#line 2715 "DirectPhoto.c"
+#line 2699 "DirectPhoto.c"
 	} else {
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_vala_photo);
-#line 2719 "DirectPhoto.c"
+#line 2703 "DirectPhoto.c"
 	}
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2723 "DirectPhoto.c"
+#line 2707 "DirectPhoto.c"
 }
 
 
@@ -2742,7 +2726,7 @@ gboolean direct_photo_source_collection_has_file_source (DirectPhotoSourceCollec
 	result = _tmp2_;
 #line 314 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2746 "DirectPhoto.c"
+#line 2730 "DirectPhoto.c"
 }
 
 
@@ -2765,7 +2749,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 2769 "DirectPhoto.c"
+#line 2753 "DirectPhoto.c"
 }
 
 
@@ -2782,7 +2766,7 @@ static void direct_photo_source_collection_class_init (DirectPhotoSourceCollecti
 	((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 2786 "DirectPhoto.c"
+#line 2770 "DirectPhoto.c"
 }
 
 
@@ -2799,7 +2783,7 @@ 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 2803 "DirectPhoto.c"
+#line 2787 "DirectPhoto.c"
 }
 
 
@@ -2815,7 +2799,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 2819 "DirectPhoto.c"
+#line 2803 "DirectPhoto.c"
 }