Merge tag 'upstream/0.24.1'

Upstream version 0.24.1
author: Jörg Frings-Fürst <debian@jff-webhosting.net> 2016-10-19 05:09:43 +0200
committer: Jörg Frings-Fürst <debian@jff-webhosting.net> 2016-10-19 05:09:43 +0200
commit: 694c7e47ece2cd322b0d2b57b88933a22d2734db (patch)
tree: c098b2104f1b76db60dd1f50de060c4439437fd8 /src/db
parent: 6824050190585821a13ce0f52d314986a25d6c2a (diff)
parent: b076314018e4b53d745823754a26eb6fb73a2801 (diff)
10 files changed, 955 insertions, 924 deletions
diff --git a/src/db/DatabaseTable.c b/src/db/DatabaseTable.c
index 4e0ada2..7b533de 100644
--- a/src/db/DatabaseTable.c
+++ b/src/db/DatabaseTable.c
@@ -1,4 +1,4 @@
-/* DatabaseTable.c generated by valac 0.32.1, the Vala compiler
+/* DatabaseTable.c generated by valac 0.34.1, the Vala compiler
  * generated from DatabaseTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -86,6 +86,7 @@ static void database_table_prepare_db (const gchar* filename);
 void app_window_panic (const gchar* msg);
 #define DB_IN_MEMORY_NAME ":memory:"
 void database_table_on_trace (const gchar* message);
+static void _database_table_on_trace_sqlite_trace_callback (gpointer self, const gchar* message);
 void database_table_init (const gchar* filename);
 void database_table_warning (const gchar* op, gint res);
 void database_table_terminate (void);
@@ -119,6 +120,13 @@ GQuark database_error_quark (void) {
 }
 
 
+static void _database_table_on_trace_sqlite_trace_callback (gpointer self, const gchar* message) {
+#line 57 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+	database_table_on_trace (message);
+#line 127 "DatabaseTable.c"
+}
+
+
 static void database_table_prepare_db (const gchar* filename) {
 	gint res = 0;
 	const gchar* _tmp0_ = NULL;
@@ -126,6 +134,9 @@ static void database_table_prepare_db (const gchar* filename) {
 	gint _tmp2_ = 0;
 	gint _tmp3_ = 0;
 	const gchar* _tmp9_ = NULL;
+	const gchar* sql_debug = NULL;
+	const gchar* _tmp26_ = NULL;
+	const gchar* _tmp27_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 32 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (filename != NULL);
@@ -143,7 +154,7 @@ static void database_table_prepare_db (const gchar* filename) {
 	_tmp3_ = res;
 #line 36 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp3_ != SQLITE_OK) {
-#line 147 "DatabaseTable.c"
+#line 158 "DatabaseTable.c"
 		const gchar* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
@@ -163,13 +174,13 @@ static void database_table_prepare_db (const gchar* filename) {
 		app_window_panic (_tmp8_);
 #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_g_free0 (_tmp8_);
-#line 167 "DatabaseTable.c"
+#line 178 "DatabaseTable.c"
 	}
 #line 41 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp9_ = filename;
 #line 41 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (g_strcmp0 (_tmp9_, DB_IN_MEMORY_NAME) != 0) {
-#line 173 "DatabaseTable.c"
+#line 184 "DatabaseTable.c"
 		{
 			GFile* file_db = NULL;
 			const gchar* _tmp10_ = NULL;
@@ -195,7 +206,7 @@ static void database_table_prepare_db (const gchar* filename) {
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_object_unref0 (file_db);
-#line 199 "DatabaseTable.c"
+#line 210 "DatabaseTable.c"
 				goto __catch13_g_error;
 			}
 #line 45 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -204,7 +215,7 @@ static void database_table_prepare_db (const gchar* filename) {
 			_tmp15_ = g_file_info_get_attribute_boolean (_tmp14_, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE);
 #line 45 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			if (!_tmp15_) {
-#line 208 "DatabaseTable.c"
+#line 219 "DatabaseTable.c"
 				const gchar* _tmp16_ = NULL;
 				const gchar* _tmp17_ = NULL;
 				gchar* _tmp18_ = NULL;
@@ -221,13 +232,13 @@ static void database_table_prepare_db (const gchar* filename) {
 				app_window_panic (_tmp19_);
 #line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (_tmp19_);
-#line 225 "DatabaseTable.c"
+#line 236 "DatabaseTable.c"
 			}
 #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_g_object_unref0 (info);
 #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_g_object_unref0 (file_db);
-#line 231 "DatabaseTable.c"
+#line 242 "DatabaseTable.c"
 		}
 		goto __finally13;
 		__catch13_g_error:
@@ -261,7 +272,7 @@ static void database_table_prepare_db (const gchar* filename) {
 			_g_free0 (_tmp25_);
 #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_g_error_free0 (e);
-#line 265 "DatabaseTable.c"
+#line 276 "DatabaseTable.c"
 		}
 		__finally13:
 #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -272,21 +283,37 @@ static void database_table_prepare_db (const gchar* filename) {
 			g_clear_error (&_inner_error_);
 #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			return;
-#line 276 "DatabaseTable.c"
+#line 287 "DatabaseTable.c"
 		}
 	}
+#line 53 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+	_tmp26_ = g_getenv ("SHOTWELL_SQL_DEBUG");
+#line 53 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+	sql_debug = _tmp26_;
+#line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+	_tmp27_ = sql_debug;
+#line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+	if (g_strcmp0 (_tmp27_, "") != 0) {
+#line 298 "DatabaseTable.c"
+		sqlite3* _tmp28_ = NULL;
+#line 57 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+		_tmp28_ = database_table_db;
+#line 57 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+		sqlite3_trace (_tmp28_, _database_table_on_trace_sqlite_trace_callback, NULL);
+#line 304 "DatabaseTable.c"
+	}
 }
 
 
 void database_table_on_trace (const gchar* message) {
 	const gchar* _tmp0_ = NULL;
-#line 57 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 61 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (message != NULL);
-#line 58 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 62 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = message;
-#line 58 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_debug ("DatabaseTable.vala:58: SQLITE: %s", _tmp0_);
-#line 290 "DatabaseTable.c"
+#line 62 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+	g_debug ("DatabaseTable.vala:62: SQLITE: %s", _tmp0_);
+#line 317 "DatabaseTable.c"
 }
 
 
@@ -301,56 +328,56 @@ static gint _sqlite3_exec (sqlite3* self, const gchar* sql, sqlite3_callback cal
 	const gchar* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
 	const gchar* _tmp6_ = NULL;
-#line 34 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 34 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 34 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 34 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	g_return_val_if_fail (sql != NULL, 0);
-#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	_tmp0_ = sql;
-#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	_tmp1_ = callback;
-#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	_tmp1__target = callback_target;
-#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	_tmp3_ = sqlite3_exec (self, _tmp0_, _tmp1_, _tmp1__target, (char**) (&_tmp2_));
-#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	sqlite_errmsg = _tmp2_;
-#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	ec = _tmp3_;
-#line 37 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 37 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	if ((&_vala_errmsg) != NULL) {
-#line 323 "DatabaseTable.c"
+#line 350 "DatabaseTable.c"
 		const gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 		_tmp4_ = sqlite_errmsg;
-#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 		_tmp5_ = g_strdup (_tmp4_);
-#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 		_g_free0 (_vala_errmsg);
-#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 		_vala_errmsg = _tmp5_;
-#line 334 "DatabaseTable.c"
+#line 361 "DatabaseTable.c"
 	}
-#line 40 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 40 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	_tmp6_ = sqlite_errmsg;
-#line 40 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 40 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	sqlite3_free ((void*) _tmp6_);
-#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	result = ec;
-#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	if (errmsg) {
-#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 		*errmsg = _vala_errmsg;
-#line 346 "DatabaseTable.c"
+#line 373 "DatabaseTable.c"
 	} else {
-#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 		_g_free0 (_vala_errmsg);
-#line 350 "DatabaseTable.c"
+#line 377 "DatabaseTable.c"
 	}
-#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	return result;
-#line 354 "DatabaseTable.c"
+#line 381 "DatabaseTable.c"
 }
 
 
@@ -366,41 +393,41 @@ void database_table_init (const gchar* filename) {
 	gint _tmp20_ = 0;
 	gint _tmp21_ = 0;
 	GError * _inner_error_ = NULL;
-#line 61 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 65 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (filename != NULL);
-#line 63 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 67 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = filename;
-#line 63 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	database_table_prepare_db (_tmp0_);
 #line 67 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+	database_table_prepare_db (_tmp0_);
+#line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = database_table_db;
-#line 67 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp3_ = sqlite3_prepare_v2 (_tmp1_, "CREATE TABLE IF NOT EXISTS VersionTable (" "id INTEGER PRIMARY KEY, " "schema_version INTEGER, " "app_version TEXT, " "user_data TEXT NULL" ")", -1, &_tmp2_, NULL);
-#line 67 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 67 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	stmt = _tmp2_;
-#line 67 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp3_;
-#line 75 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 79 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp4_ = res;
-#line 75 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 79 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp4_ != SQLITE_OK) {
-#line 390 "DatabaseTable.c"
+#line 417 "DatabaseTable.c"
 		gchar* backup_path = NULL;
 		const gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 76 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_sqlite3_close0 (database_table_db);
-#line 76 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		database_table_db = NULL;
-#line 78 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 82 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp5_ = filename;
-#line 78 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 82 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp6_ = g_strconcat (_tmp5_, ".bak", NULL);
-#line 78 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 82 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		backup_path = _tmp6_;
-#line 404 "DatabaseTable.c"
+#line 431 "DatabaseTable.c"
 		{
 			GFile* src = NULL;
 			const gchar* _tmp7_ = NULL;
@@ -411,42 +438,42 @@ void database_table_init (const gchar* filename) {
 			GFile* _tmp11_ = NULL;
 			GFile* _tmp12_ = NULL;
 			const gchar* _tmp13_ = NULL;
-#line 81 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 85 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp7_ = backup_path;
-#line 81 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 85 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp8_ = g_file_new_for_commandline_arg (_tmp7_);
-#line 81 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 85 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			src = _tmp8_;
-#line 82 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 86 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp9_ = filename;
-#line 82 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 86 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp10_ = g_file_new_for_commandline_arg (_tmp9_);
-#line 82 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 86 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			dest = _tmp10_;
-#line 83 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp11_ = src;
-#line 83 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp12_ = dest;
-#line 83 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			g_file_copy (_tmp11_, _tmp12_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_ALL_METADATA, NULL, NULL, NULL, &_inner_error_);
-#line 83 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 83 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_object_unref0 (dest);
-#line 83 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_object_unref0 (src);
-#line 439 "DatabaseTable.c"
+#line 466 "DatabaseTable.c"
 				goto __catch14_g_error;
 			}
-#line 86 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 90 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp13_ = filename;
-#line 86 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 90 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			database_table_prepare_db (_tmp13_);
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_g_object_unref0 (dest);
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_g_object_unref0 (src);
-#line 450 "DatabaseTable.c"
+#line 477 "DatabaseTable.c"
 		}
 		goto __finally14;
 		__catch14_g_error:
@@ -457,77 +484,77 @@ void database_table_init (const gchar* filename) {
 			const gchar* _tmp16_ = NULL;
 			gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_error_ = _inner_error_;
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_inner_error_ = NULL;
-#line 88 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp14_ = _ ("Unable to restore photo database %s");
-#line 88 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp15_ = _error_;
-#line 88 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp16_ = _tmp15_->message;
-#line 88 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp17_ = g_strdup_printf (_tmp14_, _tmp16_);
-#line 88 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp18_ = _tmp17_;
-#line 88 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			app_window_panic (_tmp18_);
-#line 88 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_g_free0 (_tmp18_);
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_g_error_free0 (_error_);
-#line 481 "DatabaseTable.c"
+#line 508 "DatabaseTable.c"
 		}
 		__finally14:
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_g_free0 (backup_path);
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_sqlite3_finalize0 (stmt);
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			g_clear_error (&_inner_error_);
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			return;
-#line 496 "DatabaseTable.c"
+#line 523 "DatabaseTable.c"
 		}
-#line 75 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 79 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_g_free0 (backup_path);
-#line 500 "DatabaseTable.c"
+#line 527 "DatabaseTable.c"
 	}
-#line 94 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 98 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp19_ = database_table_db;
-#line 94 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 98 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp20_ = _sqlite3_exec (_tmp19_, "PRAGMA synchronous=OFF", NULL, NULL, NULL);
-#line 94 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 98 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp20_;
-#line 95 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 99 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp21_ = res;
-#line 95 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 99 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp21_ != SQLITE_OK) {
-#line 512 "DatabaseTable.c"
+#line 539 "DatabaseTable.c"
 		gint _tmp22_ = 0;
-#line 96 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 100 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp22_ = res;
-#line 96 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 100 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		database_table_warning ("Unable to disable synchronous mode", _tmp22_);
-#line 518 "DatabaseTable.c"
+#line 545 "DatabaseTable.c"
 	}
-#line 61 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 65 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 522 "DatabaseTable.c"
+#line 549 "DatabaseTable.c"
 }
 
 
 void database_table_terminate (void) {
-#line 101 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 105 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_close0 (database_table_db);
-#line 101 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 105 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	database_table_db = NULL;
-#line 531 "DatabaseTable.c"
+#line 558 "DatabaseTable.c"
 }
 
 
@@ -536,19 +563,19 @@ void database_table_fatal (const gchar* op, gint res) {
 	gint _tmp1_ = 0;
 	sqlite3* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
-#line 105 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 109 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (op != NULL);
-#line 106 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = op;
-#line 106 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = res;
-#line 106 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp2_ = database_table_db;
-#line 106 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp3_ = sqlite3_errmsg (_tmp2_);
-#line 106 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_error ("DatabaseTable.vala:106: %s: [%d] %s", _tmp0_, _tmp1_, _tmp3_);
-#line 552 "DatabaseTable.c"
+#line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+	g_error ("DatabaseTable.vala:110: %s: [%d] %s", _tmp0_, _tmp1_, _tmp3_);
+#line 579 "DatabaseTable.c"
 }
 
 
@@ -557,38 +584,38 @@ void database_table_warning (const gchar* op, gint res) {
 	gint _tmp1_ = 0;
 	sqlite3* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
-#line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 114 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (op != NULL);
-#line 111 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = op;
-#line 111 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = res;
-#line 111 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp2_ = database_table_db;
-#line 111 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp3_ = sqlite3_errmsg (_tmp2_);
-#line 111 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_warning ("DatabaseTable.vala:111: %s: [%d] %s", _tmp0_, _tmp1_, _tmp3_);
-#line 573 "DatabaseTable.c"
+#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+	g_warning ("DatabaseTable.vala:115: %s: [%d] %s", _tmp0_, _tmp1_, _tmp3_);
+#line 600 "DatabaseTable.c"
 }
 
 
 void database_table_set_table_name (DatabaseTable* self, const gchar* table_name) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 114 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 118 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (IS_DATABASE_TABLE (self));
-#line 114 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 118 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (table_name != NULL);
-#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 119 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = table_name;
-#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 119 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 119 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_g_free0 (self->table_name);
-#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 119 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	self->table_name = _tmp1_;
-#line 592 "DatabaseTable.c"
+#line 619 "DatabaseTable.c"
 }
 
 
@@ -601,277 +628,277 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 	gchar* _tmp4_ = NULL;
 	gint _tmp5_ = 0;
 	GError * _inner_error_ = NULL;
-#line 120 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 124 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (method != NULL);
-#line 121 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = method;
-#line 121 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = res;
-#line 121 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp2_ = database_table_db;
-#line 121 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp3_ = sqlite3_errmsg (_tmp2_);
-#line 121 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp4_ = g_strdup_printf ("(%s) [%d] - %s", _tmp0_, _tmp1_, _tmp3_);
-#line 121 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	msg = _tmp4_;
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp5_ = res;
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	switch (_tmp5_) {
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_OK:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_DONE:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_ROW:
-#line 629 "DatabaseTable.c"
+#line 656 "DatabaseTable.c"
 		{
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 131 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_g_free0 (msg);
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 131 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			return;
-#line 635 "DatabaseTable.c"
+#line 662 "DatabaseTable.c"
 		}
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_PERM:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_BUSY:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_READONLY:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_IOERR:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_CORRUPT:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_CANTOPEN:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_NOLFS:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_AUTH:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_FORMAT:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_NOTADB:
-#line 657 "DatabaseTable.c"
+#line 684 "DatabaseTable.c"
 		{
 			const gchar* _tmp6_ = NULL;
 			GError* _tmp7_ = NULL;
-#line 139 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp6_ = msg;
-#line 139 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp7_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_BACKING, _tmp6_);
-#line 139 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_inner_error_ = _tmp7_;
-#line 139 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 139 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_propagate_error (error, _inner_error_);
-#line 139 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
-#line 139 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 675 "DatabaseTable.c"
+#line 702 "DatabaseTable.c"
 			} else {
-#line 139 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
-#line 139 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 139 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_clear_error (&_inner_error_);
-#line 139 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 685 "DatabaseTable.c"
+#line 712 "DatabaseTable.c"
 			}
 		}
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_NOMEM:
-#line 690 "DatabaseTable.c"
+#line 717 "DatabaseTable.c"
 		{
 			const gchar* _tmp8_ = NULL;
 			GError* _tmp9_ = NULL;
-#line 142 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp8_ = msg;
-#line 142 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp9_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_MEMORY, _tmp8_);
-#line 142 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_inner_error_ = _tmp9_;
-#line 142 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 142 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_propagate_error (error, _inner_error_);
-#line 142 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
-#line 142 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 708 "DatabaseTable.c"
+#line 735 "DatabaseTable.c"
 			} else {
-#line 142 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
-#line 142 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 142 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_clear_error (&_inner_error_);
-#line 142 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 718 "DatabaseTable.c"
+#line 745 "DatabaseTable.c"
 			}
 		}
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_ABORT:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_LOCKED:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_INTERRUPT:
-#line 727 "DatabaseTable.c"
+#line 754 "DatabaseTable.c"
 		{
 			const gchar* _tmp10_ = NULL;
 			GError* _tmp11_ = NULL;
-#line 147 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp10_ = msg;
-#line 147 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp11_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_ABORT, _tmp10_);
-#line 147 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_inner_error_ = _tmp11_;
-#line 147 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 147 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_propagate_error (error, _inner_error_);
-#line 147 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
-#line 147 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 745 "DatabaseTable.c"
+#line 772 "DatabaseTable.c"
 			} else {
-#line 147 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
-#line 147 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 147 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_clear_error (&_inner_error_);
-#line 147 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 755 "DatabaseTable.c"
+#line 782 "DatabaseTable.c"
 			}
 		}
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_FULL:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_EMPTY:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_TOOBIG:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_CONSTRAINT:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_RANGE:
-#line 768 "DatabaseTable.c"
+#line 795 "DatabaseTable.c"
 		{
 			const gchar* _tmp12_ = NULL;
 			GError* _tmp13_ = NULL;
-#line 154 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp12_ = msg;
-#line 154 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp13_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_LIMITS, _tmp12_);
-#line 154 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_inner_error_ = _tmp13_;
-#line 154 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 154 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_propagate_error (error, _inner_error_);
-#line 154 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
-#line 154 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 786 "DatabaseTable.c"
+#line 813 "DatabaseTable.c"
 			} else {
-#line 154 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
-#line 154 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 154 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_clear_error (&_inner_error_);
-#line 154 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 796 "DatabaseTable.c"
+#line 823 "DatabaseTable.c"
 			}
 		}
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_SCHEMA:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_MISMATCH:
-#line 803 "DatabaseTable.c"
+#line 830 "DatabaseTable.c"
 		{
 			const gchar* _tmp14_ = NULL;
 			GError* _tmp15_ = NULL;
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp14_ = msg;
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp15_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_TYPESPEC, _tmp14_);
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_inner_error_ = _tmp15_;
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_propagate_error (error, _inner_error_);
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 821 "DatabaseTable.c"
+#line 848 "DatabaseTable.c"
 			} else {
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_clear_error (&_inner_error_);
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 831 "DatabaseTable.c"
+#line 858 "DatabaseTable.c"
 			}
 		}
 		default:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_ERROR:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_INTERNAL:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_MISUSE:
-#line 841 "DatabaseTable.c"
+#line 868 "DatabaseTable.c"
 		{
 			const gchar* _tmp16_ = NULL;
 			GError* _tmp17_ = NULL;
-#line 164 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp16_ = msg;
-#line 164 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp17_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_ERROR, _tmp16_);
-#line 164 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_inner_error_ = _tmp17_;
-#line 164 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 164 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_propagate_error (error, _inner_error_);
-#line 164 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
-#line 164 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 859 "DatabaseTable.c"
+#line 886 "DatabaseTable.c"
 			} else {
-#line 164 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
-#line 164 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 164 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_clear_error (&_inner_error_);
-#line 164 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 869 "DatabaseTable.c"
+#line 896 "DatabaseTable.c"
 			}
 		}
 	}
-#line 120 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 124 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_g_free0 (msg);
-#line 875 "DatabaseTable.c"
+#line 902 "DatabaseTable.c"
 }
 
 
@@ -896,69 +923,69 @@ gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id) {
 	gboolean _tmp14_ = FALSE;
 	gint _tmp15_ = 0;
 	gint _tmp24_ = 0;
-#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 172 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
-#line 170 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = database_table_db;
-#line 170 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = self->table_name;
-#line 170 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp2_ = g_strdup_printf ("SELECT id FROM %s WHERE id=?", _tmp1_);
-#line 170 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp3_ = _tmp2_;
-#line 170 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp5_ = sqlite3_prepare_v2 (_tmp0_, _tmp3_, -1, &_tmp4_, NULL);
-#line 170 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 170 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	stmt = _tmp4_;
-#line 170 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp6_ = _tmp5_;
-#line 170 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_g_free0 (_tmp3_);
-#line 170 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp6_;
-#line 171 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 175 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp7_ = res;
-#line 171 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 175 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 173 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp8_ = stmt;
-#line 173 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp9_ = id;
-#line 173 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp10_ = sqlite3_bind_int64 (_tmp8_, 1, _tmp9_);
-#line 173 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp10_;
-#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp11_ = res;
-#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
-#line 176 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 180 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp12_ = stmt;
-#line 176 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 180 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp13_ = sqlite3_step (_tmp12_);
-#line 176 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 180 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp13_;
-#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp15_ = res;
-#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp15_ != SQLITE_ROW) {
-#line 948 "DatabaseTable.c"
+#line 975 "DatabaseTable.c"
 		gint _tmp16_ = 0;
-#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp16_ = res;
-#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp14_ = _tmp16_ != SQLITE_DONE;
-#line 954 "DatabaseTable.c"
+#line 981 "DatabaseTable.c"
 	} else {
-#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp14_ = FALSE;
-#line 958 "DatabaseTable.c"
+#line 985 "DatabaseTable.c"
 	}
-#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp14_) {
-#line 962 "DatabaseTable.c"
+#line 989 "DatabaseTable.c"
 		gint64 _tmp17_ = 0LL;
 		gchar* _tmp18_ = NULL;
 		gchar* _tmp19_ = NULL;
@@ -966,37 +993,37 @@ gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id) {
 		gchar* _tmp21_ = NULL;
 		gchar* _tmp22_ = NULL;
 		gint _tmp23_ = 0;
-#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp17_ = id;
-#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp18_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp17_);
-#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp19_ = _tmp18_;
-#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp20_ = self->table_name;
-#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp21_ = g_strdup_printf ("exists_by_id [%s] %s", _tmp19_, _tmp20_);
-#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp22_ = _tmp21_;
-#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp23_ = res;
-#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		database_table_fatal (_tmp22_, _tmp23_);
-#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_g_free0 (_tmp22_);
-#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_g_free0 (_tmp19_);
-#line 990 "DatabaseTable.c"
+#line 1017 "DatabaseTable.c"
 	}
-#line 180 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp24_ = res;
-#line 180 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	result = _tmp24_ == SQLITE_ROW;
-#line 180 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 180 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 1000 "DatabaseTable.c"
+#line 1027 "DatabaseTable.c"
 }
 
 
@@ -1022,71 +1049,71 @@ gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gcha
 	gboolean _tmp14_ = FALSE;
 	gint _tmp15_ = 0;
 	gint _tmp25_ = 0;
-#line 183 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 187 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
-#line 183 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 187 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (columns != NULL, FALSE);
-#line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 188 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = columns;
-#line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 188 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = self->table_name;
-#line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 188 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp2_ = g_strdup_printf ("SELECT %s FROM %s WHERE id=?", _tmp0_, _tmp1_);
-#line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 188 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	sql = _tmp2_;
-#line 186 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp3_ = database_table_db;
-#line 186 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp4_ = sql;
-#line 186 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp6_ = sqlite3_prepare_v2 (_tmp3_, _tmp4_, -1, &_tmp5_, NULL);
-#line 186 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (_vala_stmt);
-#line 186 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_stmt = _tmp5_;
-#line 186 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp6_;
-#line 187 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 191 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp7_ = res;
-#line 187 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 191 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 189 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp8_ = _vala_stmt;
-#line 189 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp9_ = id;
-#line 189 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp10_ = sqlite3_bind_int64 (_tmp8_, 1, _tmp9_);
-#line 189 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp10_;
-#line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp11_ = res;
-#line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
-#line 192 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp12_ = _vala_stmt;
-#line 192 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp13_ = sqlite3_step (_tmp12_);
-#line 192 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp13_;
-#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp15_ = res;
-#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp15_ != SQLITE_ROW) {
-#line 1076 "DatabaseTable.c"
+#line 1103 "DatabaseTable.c"
 		gint _tmp16_ = 0;
-#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp16_ = res;
-#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp14_ = _tmp16_ != SQLITE_DONE;
-#line 1082 "DatabaseTable.c"
+#line 1109 "DatabaseTable.c"
 	} else {
-#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp14_ = FALSE;
-#line 1086 "DatabaseTable.c"
+#line 1113 "DatabaseTable.c"
 	}
-#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp14_) {
-#line 1090 "DatabaseTable.c"
+#line 1117 "DatabaseTable.c"
 		gint64 _tmp17_ = 0LL;
 		gchar* _tmp18_ = NULL;
 		gchar* _tmp19_ = NULL;
@@ -1095,49 +1122,49 @@ gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gcha
 		gchar* _tmp22_ = NULL;
 		gchar* _tmp23_ = NULL;
 		gint _tmp24_ = 0;
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp17_ = id;
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp18_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp17_);
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp19_ = _tmp18_;
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp20_ = self->table_name;
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp21_ = columns;
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp22_ = g_strdup_printf ("select_by_id [%s] %s %s", _tmp19_, _tmp20_, _tmp21_);
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp23_ = _tmp22_;
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp24_ = res;
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		database_table_fatal (_tmp23_, _tmp24_);
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_g_free0 (_tmp23_);
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_g_free0 (_tmp19_);
-#line 1121 "DatabaseTable.c"
+#line 1148 "DatabaseTable.c"
 	}
-#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp25_ = res;
-#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	result = _tmp25_ == SQLITE_ROW;
-#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_g_free0 (sql);
-#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (stmt) {
-#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		*stmt = _vala_stmt;
-#line 1133 "DatabaseTable.c"
+#line 1160 "DatabaseTable.c"
 	} else {
-#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_sqlite3_finalize0 (_vala_stmt);
-#line 1137 "DatabaseTable.c"
+#line 1164 "DatabaseTable.c"
 	}
-#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 1141 "DatabaseTable.c"
+#line 1168 "DatabaseTable.c"
 }
 
 
@@ -1155,53 +1182,53 @@ static void database_table_prepare_update_by_id (DatabaseTable* self, gint64 id,
 	gint64 _tmp7_ = 0LL;
 	gint _tmp8_ = 0;
 	gint _tmp9_ = 0;
-#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (IS_DATABASE_TABLE (self));
-#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (column != NULL);
-#line 201 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 205 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = self->table_name;
-#line 201 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 205 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = column;
-#line 201 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 205 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp2_ = g_strdup_printf ("UPDATE %s SET %s=? WHERE id=?", _tmp0_, _tmp1_);
-#line 201 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 205 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	sql = _tmp2_;
-#line 203 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp3_ = database_table_db;
-#line 203 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp5_ = sqlite3_prepare_v2 (_tmp3_, sql, -1, &_tmp4_, NULL);
-#line 203 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (_vala_stmt);
-#line 203 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_stmt = _tmp4_;
-#line 203 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp5_;
-#line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 208 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp6_ = res;
-#line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 208 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK");
-#line 206 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 210 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp7_ = id;
-#line 206 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 210 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp8_ = sqlite3_bind_int64 (_vala_stmt, 2, _tmp7_);
-#line 206 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 210 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp8_;
-#line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 211 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp9_ = res;
-#line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 211 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK");
-#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_g_free0 (sql);
-#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (stmt) {
-#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		*stmt = _vala_stmt;
-#line 1201 "DatabaseTable.c"
+#line 1228 "DatabaseTable.c"
 	} else {
-#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_sqlite3_finalize0 (_vala_stmt);
-#line 1205 "DatabaseTable.c"
+#line 1232 "DatabaseTable.c"
 	}
 }
 
@@ -1212,37 +1239,37 @@ static gboolean database_table_execute_update_by_id (DatabaseTable* self, sqlite
 	sqlite3_stmt* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 210 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 214 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
-#line 210 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 214 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (stmt != NULL, FALSE);
-#line 211 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 215 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = stmt;
-#line 211 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 215 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = sqlite3_step (_tmp0_);
-#line 211 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 215 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp1_;
-#line 212 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 216 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp2_ = res;
-#line 212 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 216 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp2_ != SQLITE_DONE) {
-#line 1230 "DatabaseTable.c"
+#line 1257 "DatabaseTable.c"
 		gint _tmp3_ = 0;
-#line 213 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 217 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp3_ = res;
-#line 213 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 217 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		database_table_fatal ("execute_update_by_id", _tmp3_);
-#line 215 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 219 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		result = FALSE;
-#line 215 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 219 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		return result;
-#line 1240 "DatabaseTable.c"
+#line 1267 "DatabaseTable.c"
 	}
-#line 218 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 222 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	result = TRUE;
-#line 218 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 222 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 1246 "DatabaseTable.c"
+#line 1273 "DatabaseTable.c"
 }
 
 
@@ -1258,43 +1285,43 @@ gboolean database_table_update_text_by_id (DatabaseTable* self, gint64 id, const
 	GDestroyNotify _tmp5_ = NULL;
 	gint _tmp6_ = 0;
 	gboolean _tmp7_ = FALSE;
-#line 221 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
-#line 221 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (column != NULL, FALSE);
-#line 221 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 223 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 227 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = id;
-#line 223 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 227 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = column;
-#line 223 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 227 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 223 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 227 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 223 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 227 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	stmt = _tmp2_;
-#line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 229 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp3_ = text;
-#line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 229 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp4_ = g_strdup (_tmp3_);
-#line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 229 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp5_ = g_free;
-#line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 229 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp6_ = sqlite3_bind_text (stmt, 1, _tmp4_, -1, _tmp5_);
-#line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 229 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp6_;
-#line 226 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 230 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (res == SQLITE_OK, "res == Sqlite.OK");
-#line 228 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 232 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp7_ = database_table_execute_update_by_id (self, stmt);
-#line 228 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 232 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	result = _tmp7_;
-#line 228 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 232 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 228 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 232 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 1298 "DatabaseTable.c"
+#line 1325 "DatabaseTable.c"
 }
 
 
@@ -1314,95 +1341,95 @@ void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const g
 	gint _tmp10_ = 0;
 	gint _tmp11_ = 0;
 	GError * _inner_error_ = NULL;
-#line 231 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (IS_DATABASE_TABLE (self));
-#line 231 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (column != NULL);
-#line 231 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (text != NULL);
-#line 233 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 237 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = id;
-#line 233 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 237 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = column;
-#line 233 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 237 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 233 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 237 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 233 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 237 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	stmt = _tmp2_;
-#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp3_ = stmt;
-#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp4_ = text;
-#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp6_ = g_free;
-#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp7_ = sqlite3_bind_text (_tmp3_, 1, _tmp5_, -1, _tmp6_);
-#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp7_;
-#line 236 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp8_ = res;
-#line 236 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
-#line 238 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp9_ = stmt;
-#line 238 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp10_ = sqlite3_step (_tmp9_);
-#line 238 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp10_;
-#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 243 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp11_ = res;
-#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 243 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp11_ != SQLITE_DONE) {
-#line 1360 "DatabaseTable.c"
+#line 1387 "DatabaseTable.c"
 		const gchar* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
 		gint _tmp16_ = 0;
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp12_ = self->table_name;
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp13_ = column;
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp14_ = g_strdup_printf ("DatabaseTable.update_text_by_id_2 %s.%s", _tmp12_, _tmp13_);
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp15_ = _tmp14_;
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp16_ = res;
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		database_table_throw_error (_tmp15_, _tmp16_, &_inner_error_);
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_g_free0 (_tmp15_);
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_propagate_error (error, _inner_error_);
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_sqlite3_finalize0 (stmt);
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1390 "DatabaseTable.c"
+#line 1417 "DatabaseTable.c"
 			} else {
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_sqlite3_finalize0 (stmt);
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_clear_error (&_inner_error_);
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1400 "DatabaseTable.c"
+#line 1427 "DatabaseTable.c"
 			}
 		}
 	}
-#line 231 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1406 "DatabaseTable.c"
+#line 1433 "DatabaseTable.c"
 }
 
 
@@ -1416,37 +1443,37 @@ gboolean database_table_update_int_by_id (DatabaseTable* self, gint64 id, const
 	gint _tmp3_ = 0;
 	gint _tmp4_ = 0;
 	gboolean _tmp5_ = FALSE;
-#line 243 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 247 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
-#line 243 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 247 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (column != NULL, FALSE);
-#line 245 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 249 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = id;
-#line 245 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 249 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = column;
-#line 245 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 249 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 245 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 249 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 245 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 249 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	stmt = _tmp2_;
-#line 247 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 251 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp3_ = value;
-#line 247 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 251 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp4_ = sqlite3_bind_int (stmt, 1, _tmp3_);
-#line 247 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 251 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp4_;
-#line 248 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 252 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (res == SQLITE_OK, "res == Sqlite.OK");
-#line 250 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 254 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp5_ = database_table_execute_update_by_id (self, stmt);
-#line 250 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 254 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	result = _tmp5_;
-#line 250 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 254 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 250 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 254 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 1450 "DatabaseTable.c"
+#line 1477 "DatabaseTable.c"
 }
 
 
@@ -1464,89 +1491,89 @@ void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gc
 	gint _tmp8_ = 0;
 	gint _tmp9_ = 0;
 	GError * _inner_error_ = NULL;
-#line 253 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (IS_DATABASE_TABLE (self));
-#line 253 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (column != NULL);
-#line 255 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 259 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = id;
-#line 255 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 259 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = column;
-#line 255 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 259 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 255 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 259 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 255 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 259 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	stmt = _tmp2_;
-#line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 261 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp3_ = stmt;
-#line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 261 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp4_ = value;
-#line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 261 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp5_ = sqlite3_bind_int (_tmp3_, 1, _tmp4_);
-#line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 261 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp5_;
-#line 258 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp6_ = res;
-#line 258 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK");
-#line 260 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 264 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp7_ = stmt;
-#line 260 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 264 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp8_ = sqlite3_step (_tmp7_);
-#line 260 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 264 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp8_;
-#line 261 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 265 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp9_ = res;
-#line 261 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 265 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp9_ != SQLITE_DONE) {
-#line 1504 "DatabaseTable.c"
+#line 1531 "DatabaseTable.c"
 		const gchar* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 		gint _tmp14_ = 0;
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp10_ = self->table_name;
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp11_ = column;
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp12_ = g_strdup_printf ("DatabaseTable.update_int_by_id_2 %s.%s", _tmp10_, _tmp11_);
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp13_ = _tmp12_;
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp14_ = res;
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		database_table_throw_error (_tmp13_, _tmp14_, &_inner_error_);
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_g_free0 (_tmp13_);
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_propagate_error (error, _inner_error_);
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_sqlite3_finalize0 (stmt);
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1534 "DatabaseTable.c"
+#line 1561 "DatabaseTable.c"
 			} else {
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_sqlite3_finalize0 (stmt);
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_clear_error (&_inner_error_);
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1544 "DatabaseTable.c"
+#line 1571 "DatabaseTable.c"
 			}
 		}
 	}
-#line 253 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1550 "DatabaseTable.c"
+#line 1577 "DatabaseTable.c"
 }
 
 
@@ -1560,37 +1587,37 @@ gboolean database_table_update_int64_by_id (DatabaseTable* self, gint64 id, cons
 	gint64 _tmp3_ = 0LL;
 	gint _tmp4_ = 0;
 	gboolean _tmp5_ = FALSE;
-#line 265 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 269 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
-#line 265 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 269 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (column != NULL, FALSE);
-#line 267 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 271 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = id;
-#line 267 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 271 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = column;
-#line 267 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 271 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 267 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 271 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 267 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 271 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	stmt = _tmp2_;
-#line 269 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp3_ = value;
-#line 269 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp4_ = sqlite3_bind_int64 (stmt, 1, _tmp3_);
-#line 269 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp4_;
-#line 270 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 274 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (res == SQLITE_OK, "res == Sqlite.OK");
-#line 272 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 276 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp5_ = database_table_execute_update_by_id (self, stmt);
-#line 272 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 276 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	result = _tmp5_;
-#line 272 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 276 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 272 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 276 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 1594 "DatabaseTable.c"
+#line 1621 "DatabaseTable.c"
 }
 
 
@@ -1608,89 +1635,89 @@ void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const
 	gint _tmp8_ = 0;
 	gint _tmp9_ = 0;
 	GError * _inner_error_ = NULL;
-#line 275 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (IS_DATABASE_TABLE (self));
-#line 275 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (column != NULL);
-#line 277 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 281 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = id;
-#line 277 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 281 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = column;
-#line 277 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 281 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 277 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 281 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 277 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 281 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	stmt = _tmp2_;
-#line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 283 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp3_ = stmt;
-#line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 283 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp4_ = value;
-#line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 283 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp5_ = sqlite3_bind_int64 (_tmp3_, 1, _tmp4_);
-#line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 283 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp5_;
-#line 280 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp6_ = res;
-#line 280 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK");
-#line 282 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 286 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp7_ = stmt;
-#line 282 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 286 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp8_ = sqlite3_step (_tmp7_);
-#line 282 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 286 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp8_;
-#line 283 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 287 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp9_ = res;
-#line 283 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 287 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp9_ != SQLITE_DONE) {
-#line 1648 "DatabaseTable.c"
+#line 1675 "DatabaseTable.c"
 		const gchar* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 		gint _tmp14_ = 0;
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp10_ = self->table_name;
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp11_ = column;
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp12_ = g_strdup_printf ("DatabaseTable.update_int64_by_id_2 %s.%s", _tmp10_, _tmp11_);
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp13_ = _tmp12_;
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp14_ = res;
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		database_table_throw_error (_tmp13_, _tmp14_, &_inner_error_);
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_g_free0 (_tmp13_);
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_propagate_error (error, _inner_error_);
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_sqlite3_finalize0 (stmt);
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1678 "DatabaseTable.c"
+#line 1705 "DatabaseTable.c"
 			} else {
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_sqlite3_finalize0 (stmt);
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_clear_error (&_inner_error_);
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1688 "DatabaseTable.c"
+#line 1715 "DatabaseTable.c"
 			}
 		}
 	}
-#line 275 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1694 "DatabaseTable.c"
+#line 1721 "DatabaseTable.c"
 }
 
 
@@ -1713,98 +1740,98 @@ void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error
 	gint _tmp13_ = 0;
 	gint _tmp14_ = 0;
 	GError * _inner_error_ = NULL;
-#line 287 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 291 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (IS_DATABASE_TABLE (self));
-#line 289 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = database_table_db;
-#line 289 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = self->table_name;
-#line 289 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp2_ = g_strdup_printf ("DELETE FROM %s WHERE id=?", _tmp1_);
-#line 289 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp3_ = _tmp2_;
-#line 289 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp5_ = sqlite3_prepare_v2 (_tmp0_, _tmp3_, -1, &_tmp4_, NULL);
-#line 289 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 289 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	stmt = _tmp4_;
-#line 289 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp6_ = _tmp5_;
-#line 289 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_g_free0 (_tmp3_);
-#line 289 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp6_;
-#line 290 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 294 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp7_ = res;
-#line 290 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 294 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 292 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 296 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp8_ = stmt;
-#line 292 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 296 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp9_ = id;
-#line 292 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 296 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp10_ = sqlite3_bind_int64 (_tmp8_, 1, _tmp9_);
-#line 292 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 296 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp10_;
-#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp11_ = res;
-#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
-#line 295 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 299 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp12_ = stmt;
-#line 295 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 299 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp13_ = sqlite3_step (_tmp12_);
-#line 295 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 299 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp13_;
-#line 296 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 300 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp14_ = res;
-#line 296 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 300 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp14_ != SQLITE_DONE) {
-#line 1765 "DatabaseTable.c"
+#line 1792 "DatabaseTable.c"
 		const gchar* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
 		gint _tmp18_ = 0;
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp15_ = self->table_name;
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp16_ = g_strdup_printf ("%s.remove", _tmp15_);
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp17_ = _tmp16_;
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp18_ = res;
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		database_table_throw_error (_tmp17_, _tmp18_, &_inner_error_);
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_g_free0 (_tmp17_);
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_propagate_error (error, _inner_error_);
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_sqlite3_finalize0 (stmt);
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1792 "DatabaseTable.c"
+#line 1819 "DatabaseTable.c"
 			} else {
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_sqlite3_finalize0 (stmt);
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_clear_error (&_inner_error_);
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1802 "DatabaseTable.c"
+#line 1829 "DatabaseTable.c"
 			}
 		}
 	}
-#line 287 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 291 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1808 "DatabaseTable.c"
+#line 1835 "DatabaseTable.c"
 }
 
 
@@ -1820,90 +1847,90 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column
 	gint _tmp5_ = 0;
 	gint _tmp6_ = 0;
 	gint _tmp7_ = 0;
-#line 300 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 304 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (table_name != NULL, FALSE);
-#line 300 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 304 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (column_name != NULL, FALSE);
-#line 302 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = database_table_db;
-#line 302 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = table_name;
-#line 302 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp2_ = g_strdup_printf ("PRAGMA table_info(%s)", _tmp1_);
-#line 302 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp3_ = _tmp2_;
-#line 302 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp5_ = sqlite3_prepare_v2 (_tmp0_, _tmp3_, -1, &_tmp4_, NULL);
-#line 302 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 302 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	stmt = _tmp4_;
-#line 302 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp6_ = _tmp5_;
-#line 302 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_g_free0 (_tmp3_);
-#line 302 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp6_;
-#line 303 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 307 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp7_ = res;
-#line 303 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 307 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1852 "DatabaseTable.c"
+#line 1879 "DatabaseTable.c"
 	{
 		gboolean _tmp8_ = FALSE;
-#line 305 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp8_ = TRUE;
-#line 305 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		while (TRUE) {
-#line 1859 "DatabaseTable.c"
+#line 1886 "DatabaseTable.c"
 			sqlite3_stmt* _tmp9_ = NULL;
 			gint _tmp10_ = 0;
 			gint _tmp11_ = 0;
-#line 305 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			if (!_tmp8_) {
-#line 1865 "DatabaseTable.c"
+#line 1892 "DatabaseTable.c"
 			}
-#line 305 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp8_ = FALSE;
-#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp9_ = stmt;
-#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp10_ = sqlite3_step (_tmp9_);
-#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			res = _tmp10_;
-#line 307 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 311 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp11_ = res;
-#line 307 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 311 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			if (_tmp11_ == SQLITE_DONE) {
-#line 308 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 312 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				break;
-#line 1881 "DatabaseTable.c"
+#line 1908 "DatabaseTable.c"
 			} else {
 				gint _tmp12_ = 0;
-#line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_tmp12_ = res;
-#line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				if (_tmp12_ != SQLITE_ROW) {
-#line 1888 "DatabaseTable.c"
+#line 1915 "DatabaseTable.c"
 					const gchar* _tmp13_ = NULL;
 					gchar* _tmp14_ = NULL;
 					gchar* _tmp15_ = NULL;
 					gint _tmp16_ = 0;
-#line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					_tmp13_ = table_name;
-#line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					_tmp14_ = g_strdup_printf ("has_column %s", _tmp13_);
-#line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					_tmp15_ = _tmp14_;
-#line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					_tmp16_ = res;
-#line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					database_table_fatal (_tmp15_, _tmp16_);
-#line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					_g_free0 (_tmp15_);
-#line 312 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 316 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					break;
-#line 1907 "DatabaseTable.c"
+#line 1934 "DatabaseTable.c"
 				} else {
 					gchar* column = NULL;
 					sqlite3_stmt* _tmp17_ = NULL;
@@ -1911,59 +1938,59 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column
 					gchar* _tmp19_ = NULL;
 					gboolean _tmp20_ = FALSE;
 					const gchar* _tmp21_ = NULL;
-#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					_tmp17_ = stmt;
-#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					_tmp18_ = sqlite3_column_text (_tmp17_, 1);
-#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					_tmp19_ = g_strdup (_tmp18_);
-#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					column = _tmp19_;
-#line 315 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					_tmp21_ = column;
-#line 315 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					if (_tmp21_ != NULL) {
-#line 1927 "DatabaseTable.c"
+#line 1954 "DatabaseTable.c"
 						const gchar* _tmp22_ = NULL;
 						const gchar* _tmp23_ = NULL;
-#line 315 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 						_tmp22_ = column;
-#line 315 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 						_tmp23_ = column_name;
-#line 315 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 						_tmp20_ = g_strcmp0 (_tmp22_, _tmp23_) == 0;
-#line 1936 "DatabaseTable.c"
+#line 1963 "DatabaseTable.c"
 					} else {
-#line 315 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 						_tmp20_ = FALSE;
-#line 1940 "DatabaseTable.c"
+#line 1967 "DatabaseTable.c"
 					}
-#line 315 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					if (_tmp20_) {
-#line 316 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 						result = TRUE;
-#line 316 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 						_g_free0 (column);
-#line 316 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 						_sqlite3_finalize0 (stmt);
-#line 316 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 						return result;
-#line 1952 "DatabaseTable.c"
+#line 1979 "DatabaseTable.c"
 					}
-#line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					_g_free0 (column);
-#line 1956 "DatabaseTable.c"
+#line 1983 "DatabaseTable.c"
 				}
 			}
 		}
 	}
-#line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 324 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	result = FALSE;
-#line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 324 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 324 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 1967 "DatabaseTable.c"
+#line 1994 "DatabaseTable.c"
 }
 
 
@@ -1981,45 +2008,45 @@ gboolean database_table_has_table (const gchar* table_name) {
 	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
 	gint _tmp9_ = 0;
-#line 323 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 327 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (table_name != NULL, FALSE);
-#line 325 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = database_table_db;
-#line 325 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = table_name;
-#line 325 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp2_ = g_strdup_printf ("PRAGMA table_info(%s)", _tmp1_);
-#line 325 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp3_ = _tmp2_;
-#line 325 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp5_ = sqlite3_prepare_v2 (_tmp0_, _tmp3_, -1, &_tmp4_, NULL);
-#line 325 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 325 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	stmt = _tmp4_;
-#line 325 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp6_ = _tmp5_;
-#line 325 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_g_free0 (_tmp3_);
-#line 325 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp6_;
-#line 326 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 330 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp7_ = res;
-#line 326 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 330 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 328 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 332 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp8_ = sqlite3_step (stmt);
-#line 328 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 332 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp8_;
-#line 330 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 334 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp9_ = res;
-#line 330 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 334 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	result = _tmp9_ != SQLITE_DONE;
-#line 330 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 334 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 330 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 334 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 2023 "DatabaseTable.c"
+#line 2050 "DatabaseTable.c"
 }
 
 
@@ -2040,86 +2067,86 @@ gboolean database_table_add_column (const gchar* table_name, const gchar* column
 	sqlite3_stmt* _tmp10_ = NULL;
 	gint _tmp11_ = 0;
 	gint _tmp12_ = 0;
-#line 333 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 337 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (table_name != NULL, FALSE);
-#line 333 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 337 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (column_name != NULL, FALSE);
-#line 333 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 337 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (column_constraints != NULL, FALSE);
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = database_table_db;
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = table_name;
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp2_ = column_name;
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp3_ = column_constraints;
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp4_ = g_strdup_printf ("ALTER TABLE %s ADD COLUMN %s %s", _tmp1_, _tmp2_, _tmp3_);
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp5_ = _tmp4_;
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp7_ = sqlite3_prepare_v2 (_tmp0_, _tmp5_, -1, &_tmp6_, NULL);
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	stmt = _tmp6_;
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp8_ = _tmp7_;
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_g_free0 (_tmp5_);
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp8_;
-#line 337 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp9_ = res;
-#line 337 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK");
-#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 343 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp10_ = stmt;
-#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 343 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp11_ = sqlite3_step (_tmp10_);
-#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 343 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp11_;
-#line 340 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 344 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp12_ = res;
-#line 340 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 344 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp12_ != SQLITE_DONE) {
-#line 2088 "DatabaseTable.c"
+#line 2115 "DatabaseTable.c"
 		const gchar* _tmp13_ = NULL;
 		const gchar* _tmp14_ = NULL;
 		const gchar* _tmp15_ = NULL;
 		gint _tmp16_ = 0;
 		sqlite3* _tmp17_ = NULL;
 		const gchar* _tmp18_ = NULL;
-#line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp13_ = table_name;
-#line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp14_ = column_name;
-#line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp15_ = column_constraints;
-#line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp16_ = res;
-#line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp17_ = database_table_db;
-#line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp18_ = sqlite3_errmsg (_tmp17_);
-#line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		g_critical ("DatabaseTable.vala:341: Unable to add column %s %s %s: (%d) %s", _tmp13_, _tmp14_, _tmp15_, _tmp16_, _tmp18_);
-#line 344 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+		g_critical ("DatabaseTable.vala:345: Unable to add column %s %s %s: (%d) %s", _tmp13_, _tmp14_, _tmp15_, _tmp16_, _tmp18_);
+#line 348 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		result = FALSE;
-#line 344 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 348 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_sqlite3_finalize0 (stmt);
-#line 344 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 348 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		return result;
-#line 2115 "DatabaseTable.c"
+#line 2142 "DatabaseTable.c"
 	}
-#line 347 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 351 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	result = TRUE;
-#line 347 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 351 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 347 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 351 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 2123 "DatabaseTable.c"
+#line 2150 "DatabaseTable.c"
 }
 
 
@@ -2133,62 +2160,62 @@ gboolean database_table_ensure_column (const gchar* table_name, const gchar* col
 	const gchar* _tmp8_ = NULL;
 	const gchar* _tmp9_ = NULL;
 	gboolean _tmp10_ = FALSE;
-#line 353 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 357 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (table_name != NULL, FALSE);
-#line 353 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 357 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (column_name != NULL, FALSE);
-#line 353 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 357 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (column_constraints != NULL, FALSE);
-#line 353 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 357 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (upgrade_msg != NULL, FALSE);
-#line 355 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = table_name;
-#line 355 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp2_ = database_table_has_table (_tmp1_);
-#line 355 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (!_tmp2_) {
-#line 355 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp0_ = TRUE;
-#line 2153 "DatabaseTable.c"
+#line 2180 "DatabaseTable.c"
 	} else {
 		const gchar* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 355 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp3_ = table_name;
-#line 355 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp4_ = column_name;
-#line 355 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp5_ = database_table_has_column (_tmp3_, _tmp4_);
-#line 355 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp0_ = _tmp5_;
-#line 2166 "DatabaseTable.c"
+#line 2193 "DatabaseTable.c"
 	}
-#line 355 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp0_) {
-#line 356 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 360 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		result = TRUE;
-#line 356 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 360 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		return result;
-#line 2174 "DatabaseTable.c"
+#line 2201 "DatabaseTable.c"
 	}
-#line 358 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 362 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp6_ = upgrade_msg;
-#line 358 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_message ("DatabaseTable.vala:358: %s", _tmp6_);
-#line 360 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 362 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+	g_message ("DatabaseTable.vala:362: %s", _tmp6_);
+#line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp7_ = table_name;
-#line 360 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp8_ = column_name;
-#line 360 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp9_ = column_constraints;
-#line 360 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp10_ = database_table_add_column (_tmp7_, _tmp8_, _tmp9_);
-#line 360 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	result = _tmp10_;
-#line 360 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 2192 "DatabaseTable.c"
+#line 2219 "DatabaseTable.c"
 }
 
 
@@ -2209,76 +2236,76 @@ gint database_table_get_row_count (DatabaseTable* self) {
 	gint _tmp10_ = 0;
 	sqlite3_stmt* _tmp15_ = NULL;
 	gint _tmp16_ = 0;
-#line 363 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_val_if_fail (IS_DATABASE_TABLE (self), 0);
-#line 365 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = database_table_db;
-#line 365 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = self->table_name;
-#line 365 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp2_ = g_strdup_printf ("SELECT COUNT(id) AS RowCount FROM %s", _tmp1_);
-#line 365 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp3_ = _tmp2_;
-#line 365 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp5_ = sqlite3_prepare_v2 (_tmp0_, _tmp3_, -1, &_tmp4_, NULL);
-#line 365 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 365 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	stmt = _tmp4_;
-#line 365 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp6_ = _tmp5_;
-#line 365 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_g_free0 (_tmp3_);
-#line 365 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp6_;
-#line 366 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 370 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp7_ = res;
-#line 366 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 370 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 368 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 372 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp8_ = stmt;
-#line 368 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 372 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp9_ = sqlite3_step (_tmp8_);
-#line 368 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 372 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp9_;
-#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 373 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp10_ = res;
-#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 373 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp10_ != SQLITE_ROW) {
-#line 2249 "DatabaseTable.c"
+#line 2276 "DatabaseTable.c"
 		const gchar* _tmp11_ = NULL;
 		gint _tmp12_ = 0;
 		sqlite3* _tmp13_ = NULL;
 		const gchar* _tmp14_ = NULL;
-#line 370 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp11_ = self->table_name;
-#line 370 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp12_ = res;
-#line 370 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp13_ = database_table_db;
-#line 370 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp14_ = sqlite3_errmsg (_tmp13_);
-#line 370 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		g_critical ("DatabaseTable.vala:370: Unable to retrieve row count on %s: (%d) %s", _tmp11_, _tmp12_, _tmp14_);
-#line 372 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+		g_critical ("DatabaseTable.vala:374: Unable to retrieve row count on %s: (%d) %s", _tmp11_, _tmp12_, _tmp14_);
+#line 376 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		result = 0;
-#line 372 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 376 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_sqlite3_finalize0 (stmt);
-#line 372 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 376 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		return result;
-#line 2270 "DatabaseTable.c"
+#line 2297 "DatabaseTable.c"
 	}
-#line 375 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp15_ = stmt;
-#line 375 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp16_ = sqlite3_column_int (_tmp15_, 0);
-#line 375 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	result = _tmp16_;
-#line 375 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 375 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 2282 "DatabaseTable.c"
+#line 2309 "DatabaseTable.c"
 }
 
 
@@ -2288,27 +2315,27 @@ void database_table_begin_transaction (void) {
 	sqlite3* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gint _tmp3_ = 0;
-#line 380 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = database_table_in_transaction;
-#line 380 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	database_table_in_transaction = _tmp0_ + 1;
-#line 380 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp0_ != 0) {
-#line 381 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 385 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		return;
-#line 2300 "DatabaseTable.c"
+#line 2327 "DatabaseTable.c"
 	}
-#line 383 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 387 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = database_table_db;
-#line 383 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 387 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp2_ = _sqlite3_exec (_tmp1_, "BEGIN TRANSACTION", NULL, NULL, NULL);
-#line 383 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 387 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp2_;
-#line 384 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 388 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp3_ = res;
-#line 384 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 388 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 2312 "DatabaseTable.c"
+#line 2339 "DatabaseTable.c"
 }
 
 
@@ -2321,55 +2348,55 @@ void database_table_commit_transaction (GError** error) {
 	gint _tmp4_ = 0;
 	gint _tmp5_ = 0;
 	GError * _inner_error_ = NULL;
-#line 389 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 393 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp0_ = database_table_in_transaction;
-#line 389 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 393 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (_tmp0_ > 0, "in_transaction > 0");
-#line 390 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 394 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = database_table_in_transaction;
-#line 390 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 394 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	database_table_in_transaction = _tmp1_ - 1;
-#line 390 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 394 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp2_ = database_table_in_transaction;
-#line 390 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 394 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp2_ != 0) {
-#line 391 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		return;
-#line 2339 "DatabaseTable.c"
+#line 2366 "DatabaseTable.c"
 	}
-#line 393 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 397 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp3_ = database_table_db;
-#line 393 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 397 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp4_ = _sqlite3_exec (_tmp3_, "COMMIT TRANSACTION", NULL, NULL, NULL);
-#line 393 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 397 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	res = _tmp4_;
-#line 394 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 398 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp5_ = res;
-#line 394 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 398 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp5_ != SQLITE_DONE) {
-#line 2351 "DatabaseTable.c"
+#line 2378 "DatabaseTable.c"
 		gint _tmp6_ = 0;
-#line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp6_ = res;
-#line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		database_table_throw_error ("commit_transaction", _tmp6_, &_inner_error_);
-#line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_propagate_error (error, _inner_error_);
-#line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 2365 "DatabaseTable.c"
+#line 2392 "DatabaseTable.c"
 			} else {
-#line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_clear_error (&_inner_error_);
-#line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 2373 "DatabaseTable.c"
+#line 2400 "DatabaseTable.c"
 			}
 		}
 	}
@@ -2382,14 +2409,14 @@ DatabaseTable* database_table_construct (GType object_type) {
 	self = (DatabaseTable*) g_type_create_instance (object_type);
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return self;
-#line 2386 "DatabaseTable.c"
+#line 2413 "DatabaseTable.c"
 }
 
 
 static void value_database_table_init (GValue* value) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	value->data[0].v_pointer = NULL;
-#line 2393 "DatabaseTable.c"
+#line 2420 "DatabaseTable.c"
 }
 
 
@@ -2398,7 +2425,7 @@ static void value_database_table_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		database_table_unref (value->data[0].v_pointer);
-#line 2402 "DatabaseTable.c"
+#line 2429 "DatabaseTable.c"
 	}
 }
 
@@ -2408,11 +2435,11 @@ static void value_database_table_copy_value (const GValue* src_value, GValue* de
 	if (src_value->data[0].v_pointer) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		dest_value->data[0].v_pointer = database_table_ref (src_value->data[0].v_pointer);
-#line 2412 "DatabaseTable.c"
+#line 2439 "DatabaseTable.c"
 	} else {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2416 "DatabaseTable.c"
+#line 2443 "DatabaseTable.c"
 	}
 }
 
@@ -2420,37 +2447,37 @@ static void value_database_table_copy_value (const GValue* src_value, GValue* de
 static gpointer value_database_table_peek_pointer (const GValue* value) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return value->data[0].v_pointer;
-#line 2424 "DatabaseTable.c"
+#line 2451 "DatabaseTable.c"
 }
 
 
 static gchar* value_database_table_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (collect_values[0].v_pointer) {
-#line 2431 "DatabaseTable.c"
+#line 2458 "DatabaseTable.c"
 		DatabaseTable* object;
 		object = collect_values[0].v_pointer;
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2438 "DatabaseTable.c"
+#line 2465 "DatabaseTable.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2442 "DatabaseTable.c"
+#line 2469 "DatabaseTable.c"
 		}
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		value->data[0].v_pointer = database_table_ref (object);
-#line 2446 "DatabaseTable.c"
+#line 2473 "DatabaseTable.c"
 	} else {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 2450 "DatabaseTable.c"
+#line 2477 "DatabaseTable.c"
 	}
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return NULL;
-#line 2454 "DatabaseTable.c"
+#line 2481 "DatabaseTable.c"
 }
 
 
@@ -2461,25 +2488,25 @@ static gchar* value_database_table_lcopy_value (const GValue* value, guint n_col
 	if (!object_p) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2465 "DatabaseTable.c"
+#line 2492 "DatabaseTable.c"
 	}
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (!value->data[0].v_pointer) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		*object_p = NULL;
-#line 2471 "DatabaseTable.c"
+#line 2498 "DatabaseTable.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2475 "DatabaseTable.c"
+#line 2502 "DatabaseTable.c"
 	} else {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		*object_p = database_table_ref (value->data[0].v_pointer);
-#line 2479 "DatabaseTable.c"
+#line 2506 "DatabaseTable.c"
 	}
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return NULL;
-#line 2483 "DatabaseTable.c"
+#line 2510 "DatabaseTable.c"
 }
 
 
@@ -2493,7 +2520,7 @@ GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return G_PARAM_SPEC (spec);
-#line 2497 "DatabaseTable.c"
+#line 2524 "DatabaseTable.c"
 }
 
 
@@ -2502,7 +2529,7 @@ gpointer value_get_database_table (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATABASE_TABLE), NULL);
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return value->data[0].v_pointer;
-#line 2506 "DatabaseTable.c"
+#line 2533 "DatabaseTable.c"
 }
 
 
@@ -2522,17 +2549,17 @@ void value_set_database_table (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		database_table_ref (value->data[0].v_pointer);
-#line 2526 "DatabaseTable.c"
+#line 2553 "DatabaseTable.c"
 	} else {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 2530 "DatabaseTable.c"
+#line 2557 "DatabaseTable.c"
 	}
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (old) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		database_table_unref (old);
-#line 2536 "DatabaseTable.c"
+#line 2563 "DatabaseTable.c"
 	}
 }
 
@@ -2551,17 +2578,17 @@ void value_take_database_table (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		value->data[0].v_pointer = v_object;
-#line 2555 "DatabaseTable.c"
+#line 2582 "DatabaseTable.c"
 	} else {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 2559 "DatabaseTable.c"
+#line 2586 "DatabaseTable.c"
 	}
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (old) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		database_table_unref (old);
-#line 2565 "DatabaseTable.c"
+#line 2592 "DatabaseTable.c"
 	}
 }
 
@@ -2571,7 +2598,7 @@ static void database_table_class_init (DatabaseTableClass * klass) {
 	database_table_parent_class = g_type_class_peek_parent (klass);
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	((DatabaseTableClass *) klass)->finalize = database_table_finalize;
-#line 2575 "DatabaseTable.c"
+#line 2602 "DatabaseTable.c"
 }
 
 
@@ -2580,7 +2607,7 @@ static void database_table_instance_init (DatabaseTable * self) {
 	self->table_name = NULL;
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	self->ref_count = 1;
-#line 2584 "DatabaseTable.c"
+#line 2611 "DatabaseTable.c"
 }
 
 
@@ -2592,7 +2619,7 @@ static void database_table_finalize (DatabaseTable* obj) {
 	g_signal_handlers_destroy (self);
 #line 30 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_g_free0 (self->table_name);
-#line 2596 "DatabaseTable.c"
+#line 2623 "DatabaseTable.c"
 }
 
 
@@ -2617,7 +2644,7 @@ gpointer database_table_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return instance;
-#line 2621 "DatabaseTable.c"
+#line 2648 "DatabaseTable.c"
 }
 
 
@@ -2630,7 +2657,7 @@ void database_table_unref (gpointer instance) {
 		DATABASE_TABLE_GET_CLASS (self)->finalize (self);
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2634 "DatabaseTable.c"
+#line 2661 "DatabaseTable.c"
 	}
 }
 
diff --git a/src/db/DatabaseTable.vala b/src/db/DatabaseTable.vala
index 09c026f..4fc8853 100644
--- a/src/db/DatabaseTable.vala
+++ b/src/db/DatabaseTable.vala
@@ -49,9 +49,13 @@ public abstract class DatabaseTable {
                     e.message));
             }
         }
-#if SQLITE_DEBUG
-        db.trace (on_trace);
-#endif
+
+        unowned string? sql_debug = Environment.get_variable
+                                                         ("SHOTWELL_SQL_DEBUG");
+
+        if (sql_debug != "") {
+            db.trace (on_trace);
+        }
     }
 
     public static void on_trace (string message) {
diff --git a/src/db/Db.c b/src/db/Db.c
index 9c7e328..72c8f32 100644
--- a/src/db/Db.c
+++ b/src/db/Db.c
@@ -1,4 +1,4 @@
-/* Db.c generated by valac 0.32.1, the Vala compiler
+/* Db.c generated by valac 0.34.1, the Vala compiler
  * generated from Db.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/EventTable.c b/src/db/EventTable.c
index 0e763e9..08f6ba3 100644
--- a/src/db/EventTable.c
+++ b/src/db/EventTable.c
@@ -1,4 +1,4 @@
-/* EventTable.c generated by valac 0.32.1, the Vala compiler
+/* EventTable.c generated by valac 0.34.1, the Vala compiler
  * generated from EventTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/PhotoTable.c b/src/db/PhotoTable.c
index 42ed64a..e88ee47 100644
--- a/src/db/PhotoTable.c
+++ b/src/db/PhotoTable.c
@@ -1,4 +1,4 @@
-/* PhotoTable.c generated by valac 0.32.1, the Vala compiler
+/* PhotoTable.c generated by valac 0.34.1, the Vala compiler
  * generated from PhotoTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/SavedSearchDBTable.c b/src/db/SavedSearchDBTable.c
index 1747d47..1bce91d 100644
--- a/src/db/SavedSearchDBTable.c
+++ b/src/db/SavedSearchDBTable.c
@@ -1,4 +1,4 @@
-/* SavedSearchDBTable.c generated by valac 0.32.1, the Vala compiler
+/* SavedSearchDBTable.c generated by valac 0.34.1, the Vala compiler
  * generated from SavedSearchDBTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/TagTable.c b/src/db/TagTable.c
index 1c58788..ef78a70 100644
--- a/src/db/TagTable.c
+++ b/src/db/TagTable.c
@@ -1,4 +1,4 @@
-/* TagTable.c generated by valac 0.32.1, the Vala compiler
+/* TagTable.c generated by valac 0.34.1, the Vala compiler
  * generated from TagTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -645,11 +645,11 @@ static gpointer _g_object_ref0 (gpointer self) {
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 655 "TagTable.c"
 	{
@@ -664,73 +664,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 686 "TagTable.c"
 				goto __catch19_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 695 "TagTable.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 711 "TagTable.c"
 				goto __catch19_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 722 "TagTable.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 736 "TagTable.c"
 	}
@@ -738,24 +738,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	__catch19_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 750 "TagTable.c"
 	}
 	__finally19:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
 #line 761 "TagTable.c"
 	}
@@ -2013,15 +2013,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 2025 "TagTable.c"
 }
diff --git a/src/db/TombstoneTable.c b/src/db/TombstoneTable.c
index 542e568..e92f9a5 100644
--- a/src/db/TombstoneTable.c
+++ b/src/db/TombstoneTable.c
@@ -1,4 +1,4 @@
-/* TombstoneTable.c generated by valac 0.32.1, the Vala compiler
+/* TombstoneTable.c generated by valac 0.34.1, the Vala compiler
  * generated from TombstoneTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/VersionTable.c b/src/db/VersionTable.c
index fa79d52..c65621b 100644
--- a/src/db/VersionTable.c
+++ b/src/db/VersionTable.c
@@ -1,4 +1,4 @@
-/* VersionTable.c generated by valac 0.32.1, the Vala compiler
+/* VersionTable.c generated by valac 0.34.1, the Vala compiler
  * generated from VersionTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/VideoTable.c b/src/db/VideoTable.c
index 8b8d78a..7d5c06e 100644
--- a/src/db/VideoTable.c
+++ b/src/db/VideoTable.c
@@ -1,4 +1,4 @@
-/* VideoTable.c generated by valac 0.32.1, the Vala compiler
+/* VideoTable.c generated by valac 0.34.1, the Vala compiler
  * generated from VideoTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
author	Jörg Frings-Fürst <debian@jff-webhosting.net>	2016-10-19 05:09:43 +0200
committer	Jörg Frings-Fürst <debian@jff-webhosting.net>	2016-10-19 05:09:43 +0200
commit	694c7e47ece2cd322b0d2b57b88933a22d2734db (patch)
tree	c098b2104f1b76db60dd1f50de060c4439437fd8 /src/db
parent	6824050190585821a13ce0f52d314986a25d6c2a (diff)
parent	b076314018e4b53d745823754a26eb6fb73a2801 (diff)