Update upstream source from tag 'upstream/0.30.1'

Update to upstream version '0.30.1' with Debian dir dc242531effff8d9c6fab093414edee28b403c6a
author: Jörg Frings-Fürst <debian@jff.email> 2018-09-30 14:09:32 +0200
committer: Jörg Frings-Fürst <debian@jff.email> 2018-09-30 14:09:32 +0200
commit: 0537caaf4af94a9ead8b292679f6b34c90b55e06 (patch)
tree: 6761cfdf959926be7af3147cf770e7f253390fe8 /src/db
parent: eca5837e235a356c8db9416bbbc13577db3e6f76 (diff)
parent: 5e9f4eea451a77ba3b93db3747841ed2bd969e9f (diff)
11 files changed, 371 insertions, 26237 deletions
diff --git a/src/db/DatabaseTable.c b/src/db/DatabaseTable.c
deleted file mode 100644
index 4c1b44e..0000000
--- a/src/db/DatabaseTable.c
+++ /dev/null
@@ -1,2570 +0,0 @@
-/* DatabaseTable.c generated by valac 0.40.4, the Vala compiler
- * generated from DatabaseTable.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sqlite3.h>
-#include <glib/gi18n-lib.h>
-#include <gio/gio.h>
-#include <gobject/gvaluecollector.h>
-
-
-#define TYPE_DATABASE_TABLE (database_table_get_type ())
-#define DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATABASE_TABLE, DatabaseTable))
-#define DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATABASE_TABLE, DatabaseTableClass))
-#define IS_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATABASE_TABLE))
-#define IS_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DATABASE_TABLE))
-#define DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DATABASE_TABLE, DatabaseTableClass))
-
-typedef struct _DatabaseTable DatabaseTable;
-typedef struct _DatabaseTableClass DatabaseTableClass;
-typedef struct _DatabaseTablePrivate DatabaseTablePrivate;
-#define _g_free0(var) (var = (g_free (var), NULL))
-#define _sqlite3_close0(var) ((var == NULL) ? NULL : (var = (sqlite3_close (var), NULL)))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-#define _sqlite3_finalize0(var) ((var == NULL) ? NULL : (var = (sqlite3_finalize (var), NULL)))
-typedef struct _ParamSpecDatabaseTable ParamSpecDatabaseTable;
-#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
-#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
-#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-
-typedef enum  {
-	DATABASE_ERROR_ERROR,
-	DATABASE_ERROR_BACKING,
-	DATABASE_ERROR_MEMORY,
-	DATABASE_ERROR_ABORT,
-	DATABASE_ERROR_LIMITS,
-	DATABASE_ERROR_TYPESPEC
-} DatabaseError;
-#define DATABASE_ERROR database_error_quark ()
-struct _DatabaseTable {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	DatabaseTablePrivate * priv;
-	gchar* table_name;
-};
-
-struct _DatabaseTableClass {
-	GTypeClass parent_class;
-	void (*finalize) (DatabaseTable *self);
-};
-
-struct _ParamSpecDatabaseTable {
-	GParamSpec parent_instance;
-};
-
-
-static gpointer database_table_parent_class = NULL;
-extern sqlite3* database_table_db;
-sqlite3* database_table_db = NULL;
-static gint database_table_in_transaction;
-static gint database_table_in_transaction = 0;
-
-GQuark database_error_quark (void);
-gpointer database_table_ref (gpointer instance);
-void database_table_unref (gpointer instance);
-GParamSpec* param_spec_database_table (const gchar* name,
-                                       const gchar* nick,
-                                       const gchar* blurb,
-                                       GType object_type,
-                                       GParamFlags flags);
-void value_set_database_table (GValue* value,
-                               gpointer v_object);
-void value_take_database_table (GValue* value,
-                                gpointer v_object);
-gpointer value_get_database_table (const GValue* value);
-GType database_table_get_type (void) G_GNUC_CONST;
-#define DATABASE_TABLE_SCHEMA_VERSION 20
-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);
-void database_table_fatal (const gchar* op,
-                           gint res);
-void database_table_set_table_name (DatabaseTable* self,
-                                    const gchar* table_name);
-void database_table_throw_error (const gchar* method,
-                                 gint res,
-                                 GError** error);
-gboolean database_table_exists_by_id (DatabaseTable* self,
-                                      gint64 id);
-gboolean database_table_select_by_id (DatabaseTable* self,
-                                      gint64 id,
-                                      const gchar* columns,
-                                      sqlite3_stmt* * stmt);
-static void database_table_prepare_update_by_id (DatabaseTable* self,
-                                          gint64 id,
-                                          const gchar* column,
-                                          sqlite3_stmt* * stmt);
-static gboolean database_table_execute_update_by_id (DatabaseTable* self,
-                                              sqlite3_stmt* stmt);
-gboolean database_table_update_text_by_id (DatabaseTable* self,
-                                           gint64 id,
-                                           const gchar* column,
-                                           const gchar* text);
-void database_table_update_text_by_id_2 (DatabaseTable* self,
-                                         gint64 id,
-                                         const gchar* column,
-                                         const gchar* text,
-                                         GError** error);
-gboolean database_table_update_int_by_id (DatabaseTable* self,
-                                          gint64 id,
-                                          const gchar* column,
-                                          gint value);
-void database_table_update_int_by_id_2 (DatabaseTable* self,
-                                        gint64 id,
-                                        const gchar* column,
-                                        gint value,
-                                        GError** error);
-gboolean database_table_update_int64_by_id (DatabaseTable* self,
-                                            gint64 id,
-                                            const gchar* column,
-                                            gint64 value);
-void database_table_update_int64_by_id_2 (DatabaseTable* self,
-                                          gint64 id,
-                                          const gchar* column,
-                                          gint64 value,
-                                          GError** error);
-void database_table_delete_by_id (DatabaseTable* self,
-                                  gint64 id,
-                                  GError** error);
-gboolean database_table_has_column (const gchar* table_name,
-                                    const gchar* column_name);
-gboolean database_table_has_table (const gchar* table_name);
-gboolean database_table_add_column (const gchar* table_name,
-                                    const gchar* column_name,
-                                    const gchar* column_constraints);
-gboolean database_table_ensure_column (const gchar* table_name,
-                                       const gchar* column_name,
-                                       const gchar* column_constraints,
-                                       const gchar* upgrade_msg);
-gint database_table_get_row_count (DatabaseTable* self);
-void database_table_begin_transaction (void);
-void database_table_commit_transaction (GError** error);
-DatabaseTable* database_table_construct (GType object_type);
-static void database_table_finalize (DatabaseTable * obj);
-
-
-GQuark
-database_error_quark (void)
-{
-	return g_quark_from_static_string ("database_error-quark");
-}
-
-
-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 179 "DatabaseTable.c"
-}
-
-
-static void
-database_table_prepare_db (const gchar* filename)
-{
-	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
-	gint _tmp1_;
-	gint _tmp2_;
-	const gchar* sql_debug = NULL;
-	const gchar* _tmp16_;
-	gboolean _tmp17_ = FALSE;
-	const gchar* _tmp18_;
-	GError * _inner_error_ = NULL;
-#line 32 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_if_fail (filename != NULL);
-#line 34 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp1_ = sqlite3_open_v2 (filename, &_tmp0_, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
-#line 34 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_close0 (database_table_db);
-#line 34 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	database_table_db = _tmp0_;
-#line 34 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = _tmp1_;
-#line 36 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp2_ = res;
-#line 36 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (_tmp2_ != SQLITE_OK) {
-#line 209 "DatabaseTable.c"
-		gint _tmp3_;
-		gchar* _tmp4_;
-		gchar* _tmp5_;
-#line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp3_ = res;
-#line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp4_ = g_strdup_printf (_ ("Unable to open/create photo database %s: error code %d"), filename, _tmp3_);
-#line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp5_ = _tmp4_;
-#line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		app_window_panic (_tmp5_);
-#line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_g_free0 (_tmp5_);
-#line 223 "DatabaseTable.c"
-	}
-#line 41 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (g_strcmp0 (filename, DB_IN_MEMORY_NAME) != 0) {
-#line 227 "DatabaseTable.c"
-		{
-			GFile* file_db = NULL;
-			GFile* _tmp6_;
-			GFileInfo* info = NULL;
-			GFile* _tmp7_;
-			GFileInfo* _tmp8_;
-			GFileInfo* _tmp9_;
-#line 43 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp6_ = g_file_new_for_path (filename);
-#line 43 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			file_db = _tmp6_;
-#line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp7_ = file_db;
-#line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp8_ = g_file_query_info (_tmp7_, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
-#line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			info = _tmp8_;
-#line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_g_object_unref0 (file_db);
-#line 249 "DatabaseTable.c"
-				goto __catch15_g_error;
-			}
-#line 45 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp9_ = info;
-#line 45 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			if (!g_file_info_get_attribute_boolean (_tmp9_, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE)) {
-#line 256 "DatabaseTable.c"
-				gchar* _tmp10_;
-				gchar* _tmp11_;
-#line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_tmp10_ = g_strdup_printf (_ ("Unable to write to photo database file:\n %s"), filename);
-#line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_tmp11_ = _tmp10_;
-#line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				app_window_panic (_tmp11_);
-#line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_g_free0 (_tmp11_);
-#line 267 "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 273 "DatabaseTable.c"
-		}
-		goto __finally15;
-		__catch15_g_error:
-		{
-			GError* e = NULL;
-			GError* _tmp12_;
-			const gchar* _tmp13_;
-			gchar* _tmp14_;
-			gchar* _tmp15_;
-#line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			e = _inner_error_;
-#line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_inner_error_ = NULL;
-#line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp12_ = e;
-#line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp13_ = _tmp12_->message;
-#line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp14_ = g_strdup_printf (_ ("Error accessing database file:\n %s\n\nError was: \n%s"), filename, _tmp13_);
-#line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp15_ = _tmp14_;
-#line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			app_window_panic (_tmp15_);
-#line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_g_free0 (_tmp15_);
-#line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_g_error_free0 (e);
-#line 301 "DatabaseTable.c"
-		}
-		__finally15:
-#line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 42 "/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 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			g_clear_error (&_inner_error_);
-#line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			return;
-#line 312 "DatabaseTable.c"
-		}
-	}
-#line 53 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp16_ = g_getenv ("SHOTWELL_SQL_DEBUG");
-#line 53 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	sql_debug = _tmp16_;
-#line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp18_ = sql_debug;
-#line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (_tmp18_ != NULL) {
-#line 323 "DatabaseTable.c"
-		const gchar* _tmp19_;
-#line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp19_ = sql_debug;
-#line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp17_ = g_strcmp0 (_tmp19_, "") != 0;
-#line 329 "DatabaseTable.c"
-	} else {
-#line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp17_ = FALSE;
-#line 333 "DatabaseTable.c"
-	}
-#line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (_tmp17_) {
-#line 337 "DatabaseTable.c"
-		sqlite3* _tmp20_;
-#line 57 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp20_ = database_table_db;
-#line 57 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		sqlite3_trace (_tmp20_, _database_table_on_trace_sqlite_trace_callback, NULL);
-#line 343 "DatabaseTable.c"
-	}
-}
-
-
-void
-database_table_on_trace (const gchar* message)
-{
-#line 61 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_if_fail (message != NULL);
-#line 62 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_debug ("DatabaseTable.vala:62: SQLITE: %s", message);
-#line 355 "DatabaseTable.c"
-}
-
-
-static gint
-_sqlite3_exec (sqlite3* self,
-               const gchar* sql,
-               sqlite3_callback callback,
-               void* callback_target,
-               gchar* * errmsg)
-{
-	gchar* _vala_errmsg = NULL;
-	gint result = 0;
-	const gchar* sqlite_errmsg = NULL;
-	gint ec = 0;
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_;
-	const gchar* _tmp4_;
-#line 34 "/usr/share/vala-0.40/vapi/sqlite3.vapi"
-	g_return_val_if_fail (self != NULL, 0);
-#line 34 "/usr/share/vala-0.40/vapi/sqlite3.vapi"
-	g_return_val_if_fail (sql != NULL, 0);
-#line 36 "/usr/share/vala-0.40/vapi/sqlite3.vapi"
-	_tmp1_ = sqlite3_exec (self, sql, callback, callback_target, (char**) (&_tmp0_));
-#line 36 "/usr/share/vala-0.40/vapi/sqlite3.vapi"
-	sqlite_errmsg = _tmp0_;
-#line 36 "/usr/share/vala-0.40/vapi/sqlite3.vapi"
-	ec = _tmp1_;
-#line 37 "/usr/share/vala-0.40/vapi/sqlite3.vapi"
-	if ((&_vala_errmsg) != NULL) {
-#line 385 "DatabaseTable.c"
-		const gchar* _tmp2_;
-		gchar* _tmp3_;
-#line 38 "/usr/share/vala-0.40/vapi/sqlite3.vapi"
-		_tmp2_ = sqlite_errmsg;
-#line 38 "/usr/share/vala-0.40/vapi/sqlite3.vapi"
-		_tmp3_ = g_strdup (_tmp2_);
-#line 38 "/usr/share/vala-0.40/vapi/sqlite3.vapi"
-		_g_free0 (_vala_errmsg);
-#line 38 "/usr/share/vala-0.40/vapi/sqlite3.vapi"
-		_vala_errmsg = _tmp3_;
-#line 396 "DatabaseTable.c"
-	}
-#line 40 "/usr/share/vala-0.40/vapi/sqlite3.vapi"
-	_tmp4_ = sqlite_errmsg;
-#line 40 "/usr/share/vala-0.40/vapi/sqlite3.vapi"
-	sqlite3_free ((void*) _tmp4_);
-#line 41 "/usr/share/vala-0.40/vapi/sqlite3.vapi"
-	result = ec;
-#line 41 "/usr/share/vala-0.40/vapi/sqlite3.vapi"
-	if (errmsg) {
-#line 41 "/usr/share/vala-0.40/vapi/sqlite3.vapi"
-		*errmsg = _vala_errmsg;
-#line 408 "DatabaseTable.c"
-	} else {
-#line 41 "/usr/share/vala-0.40/vapi/sqlite3.vapi"
-		_g_free0 (_vala_errmsg);
-#line 412 "DatabaseTable.c"
-	}
-#line 41 "/usr/share/vala-0.40/vapi/sqlite3.vapi"
-	return result;
-#line 416 "DatabaseTable.c"
-}
-
-
-void
-database_table_init (const gchar* filename)
-{
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3* _tmp14_;
-	gint _tmp15_;
-	gint _tmp16_;
-	GError * _inner_error_ = NULL;
-#line 65 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_if_fail (filename != NULL);
-#line 67 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	database_table_prepare_db (filename);
-#line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp0_ = database_table_db;
-#line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "CREATE TABLE IF NOT EXISTS VersionTable (" "id INTEGER PRIMARY KEY, " "schema_version INTEGER, " "app_version TEXT, " "user_data TEXT NULL" ")", -1, &_tmp1_, NULL);
-#line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	stmt = _tmp1_;
-#line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = _tmp2_;
-#line 79 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp3_ = res;
-#line 79 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (_tmp3_ != SQLITE_OK) {
-#line 451 "DatabaseTable.c"
-		gchar* backup_path = NULL;
-		gchar* _tmp4_;
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_sqlite3_close0 (database_table_db);
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		database_table_db = NULL;
-#line 82 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp4_ = g_strconcat (filename, ".bak", NULL);
-#line 82 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		backup_path = _tmp4_;
-#line 462 "DatabaseTable.c"
-		{
-			GFile* src = NULL;
-			const gchar* _tmp5_;
-			GFile* _tmp6_;
-			GFile* dest = NULL;
-			GFile* _tmp7_;
-			GFile* _tmp8_;
-			GFile* _tmp9_;
-#line 85 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp5_ = backup_path;
-#line 85 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp6_ = g_file_new_for_commandline_arg (_tmp5_);
-#line 85 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			src = _tmp6_;
-#line 86 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp7_ = g_file_new_for_commandline_arg (filename);
-#line 86 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			dest = _tmp7_;
-#line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp8_ = src;
-#line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp9_ = dest;
-#line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			g_file_copy (_tmp8_, _tmp9_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_ALL_METADATA, NULL, NULL, NULL, &_inner_error_);
-#line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_g_object_unref0 (dest);
-#line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_g_object_unref0 (src);
-#line 493 "DatabaseTable.c"
-				goto __catch16_g_error;
-			}
-#line 90 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			database_table_prepare_db (filename);
-#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_g_object_unref0 (dest);
-#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_g_object_unref0 (src);
-#line 502 "DatabaseTable.c"
-		}
-		goto __finally16;
-		__catch16_g_error:
-		{
-			GError* _error_ = NULL;
-			GError* _tmp10_;
-			const gchar* _tmp11_;
-			gchar* _tmp12_;
-			gchar* _tmp13_;
-#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_error_ = _inner_error_;
-#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_inner_error_ = NULL;
-#line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp10_ = _error_;
-#line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp11_ = _tmp10_->message;
-#line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp12_ = g_strdup_printf (_ ("Unable to restore photo database %s"), _tmp11_);
-#line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp13_ = _tmp12_;
-#line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			app_window_panic (_tmp13_);
-#line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_g_free0 (_tmp13_);
-#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_g_error_free0 (_error_);
-#line 530 "DatabaseTable.c"
-		}
-		__finally16:
-#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_g_free0 (backup_path);
-#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_sqlite3_finalize0 (stmt);
-#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 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			g_clear_error (&_inner_error_);
-#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			return;
-#line 545 "DatabaseTable.c"
-		}
-#line 79 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_g_free0 (backup_path);
-#line 549 "DatabaseTable.c"
-	}
-#line 98 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp14_ = database_table_db;
-#line 98 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp15_ = _sqlite3_exec (_tmp14_, "PRAGMA synchronous=OFF", NULL, NULL, NULL);
-#line 98 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = _tmp15_;
-#line 99 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp16_ = res;
-#line 99 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (_tmp16_ != SQLITE_OK) {
-#line 561 "DatabaseTable.c"
-		gint _tmp17_;
-#line 100 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp17_ = res;
-#line 100 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		database_table_warning ("Unable to disable synchronous mode", _tmp17_);
-#line 567 "DatabaseTable.c"
-	}
-#line 65 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 571 "DatabaseTable.c"
-}
-
-
-void
-database_table_terminate (void)
-{
-#line 105 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_close0 (database_table_db);
-#line 105 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	database_table_db = NULL;
-#line 582 "DatabaseTable.c"
-}
-
-
-void
-database_table_fatal (const gchar* op,
-                      gint res)
-{
-	sqlite3* _tmp0_;
-	const gchar* _tmp1_;
-#line 109 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_if_fail (op != NULL);
-#line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp0_ = database_table_db;
-#line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp1_ = sqlite3_errmsg (_tmp0_);
-#line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_error ("DatabaseTable.vala:110: %s: [%d] %s", op, res, _tmp1_);
-#line 600 "DatabaseTable.c"
-}
-
-
-void
-database_table_warning (const gchar* op,
-                        gint res)
-{
-	sqlite3* _tmp0_;
-	const gchar* _tmp1_;
-#line 114 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_if_fail (op != NULL);
-#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp0_ = database_table_db;
-#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp1_ = sqlite3_errmsg (_tmp0_);
-#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_warning ("DatabaseTable.vala:115: %s: [%d] %s", op, res, _tmp1_);
-#line 618 "DatabaseTable.c"
-}
-
-
-void
-database_table_set_table_name (DatabaseTable* self,
-                               const gchar* table_name)
-{
-	gchar* _tmp0_;
-#line 118 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_if_fail (IS_DATABASE_TABLE (self));
-#line 118 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_if_fail (table_name != NULL);
-#line 119 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp0_ = g_strdup (table_name);
-#line 119 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_g_free0 (self->table_name);
-#line 119 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	self->table_name = _tmp0_;
-#line 637 "DatabaseTable.c"
-}
-
-
-void
-database_table_throw_error (const gchar* method,
-                            gint res,
-                            GError** error)
-{
-	gchar* msg = NULL;
-	sqlite3* _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-	GError * _inner_error_ = NULL;
-#line 124 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_if_fail (method != NULL);
-#line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp0_ = database_table_db;
-#line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp1_ = sqlite3_errmsg (_tmp0_);
-#line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp2_ = g_strdup_printf ("(%s) [%d] - %s", method, res, _tmp1_);
-#line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	msg = _tmp2_;
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	switch (res) {
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_OK:
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_DONE:
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_ROW:
-#line 669 "DatabaseTable.c"
-		{
-#line 131 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_g_free0 (msg);
-#line 131 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			return;
-#line 675 "DatabaseTable.c"
-		}
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_PERM:
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_BUSY:
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_READONLY:
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_IOERR:
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_CORRUPT:
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_CANTOPEN:
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_NOLFS:
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_AUTH:
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_FORMAT:
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_NOTADB:
-#line 697 "DatabaseTable.c"
-		{
-			const gchar* _tmp3_;
-			GError* _tmp4_;
-#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp3_ = msg;
-#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp4_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_BACKING, _tmp3_);
-#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_inner_error_ = _tmp4_;
-#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_g_free0 (msg);
-#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				return;
-#line 715 "DatabaseTable.c"
-			} else {
-#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_g_free0 (msg);
-#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 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				g_clear_error (&_inner_error_);
-#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				return;
-#line 725 "DatabaseTable.c"
-			}
-		}
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_NOMEM:
-#line 730 "DatabaseTable.c"
-		{
-			const gchar* _tmp5_;
-			GError* _tmp6_;
-#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp5_ = msg;
-#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp6_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_MEMORY, _tmp5_);
-#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_inner_error_ = _tmp6_;
-#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_g_free0 (msg);
-#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				return;
-#line 748 "DatabaseTable.c"
-			} else {
-#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_g_free0 (msg);
-#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 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				g_clear_error (&_inner_error_);
-#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				return;
-#line 758 "DatabaseTable.c"
-			}
-		}
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_ABORT:
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_LOCKED:
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_INTERRUPT:
-#line 767 "DatabaseTable.c"
-		{
-			const gchar* _tmp7_;
-			GError* _tmp8_;
-#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp7_ = msg;
-#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp8_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_ABORT, _tmp7_);
-#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_inner_error_ = _tmp8_;
-#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_g_free0 (msg);
-#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				return;
-#line 785 "DatabaseTable.c"
-			} else {
-#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_g_free0 (msg);
-#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 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				g_clear_error (&_inner_error_);
-#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				return;
-#line 795 "DatabaseTable.c"
-			}
-		}
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_FULL:
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_EMPTY:
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_TOOBIG:
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_CONSTRAINT:
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_RANGE:
-#line 808 "DatabaseTable.c"
-		{
-			const gchar* _tmp9_;
-			GError* _tmp10_;
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp9_ = msg;
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp10_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_LIMITS, _tmp9_);
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_inner_error_ = _tmp10_;
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_g_free0 (msg);
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				return;
-#line 826 "DatabaseTable.c"
-			} else {
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_g_free0 (msg);
-#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 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				g_clear_error (&_inner_error_);
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				return;
-#line 836 "DatabaseTable.c"
-			}
-		}
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_SCHEMA:
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_MISMATCH:
-#line 843 "DatabaseTable.c"
-		{
-			const gchar* _tmp11_;
-			GError* _tmp12_;
-#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp11_ = msg;
-#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp12_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_TYPESPEC, _tmp11_);
-#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_inner_error_ = _tmp12_;
-#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_g_free0 (msg);
-#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				return;
-#line 861 "DatabaseTable.c"
-			} else {
-#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_g_free0 (msg);
-#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 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				g_clear_error (&_inner_error_);
-#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				return;
-#line 871 "DatabaseTable.c"
-			}
-		}
-		default:
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_ERROR:
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_INTERNAL:
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		case SQLITE_MISUSE:
-#line 881 "DatabaseTable.c"
-		{
-			const gchar* _tmp13_;
-			GError* _tmp14_;
-#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp13_ = msg;
-#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp14_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_ERROR, _tmp13_);
-#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_inner_error_ = _tmp14_;
-#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_g_free0 (msg);
-#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				return;
-#line 899 "DatabaseTable.c"
-			} else {
-#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_g_free0 (msg);
-#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 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				g_clear_error (&_inner_error_);
-#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				return;
-#line 909 "DatabaseTable.c"
-			}
-		}
-	}
-#line 124 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_g_free0 (msg);
-#line 915 "DatabaseTable.c"
-}
-
-
-gboolean
-database_table_exists_by_id (DatabaseTable* self,
-                             gint64 id)
-{
-	gboolean result = FALSE;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_;
-	gint _tmp6_;
-	gint _tmp7_;
-	sqlite3_stmt* _tmp8_;
-	gint _tmp9_;
-	sqlite3_stmt* _tmp10_;
-	gboolean _tmp11_ = FALSE;
-	gint _tmp12_;
-	gint _tmp20_;
-#line 172 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
-#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp0_ = database_table_db;
-#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp1_ = self->table_name;
-#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp2_ = g_strdup_printf ("SELECT id FROM %s WHERE id=?", _tmp1_);
-#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp3_ = _tmp2_;
-#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp5_ = sqlite3_prepare_v2 (_tmp0_, _tmp3_, -1, &_tmp4_, NULL);
-#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	stmt = _tmp4_;
-#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp6_ = _tmp5_;
-#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_g_free0 (_tmp3_);
-#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = _tmp6_;
-#line 175 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp7_ = res;
-#line 175 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp8_ = stmt;
-#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = sqlite3_bind_int64 (_tmp8_, 1, id);
-#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp9_ = res;
-#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK");
-#line 180 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp10_ = stmt;
-#line 180 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = sqlite3_step (_tmp10_);
-#line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp12_ = res;
-#line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (_tmp12_ != SQLITE_ROW) {
-#line 982 "DatabaseTable.c"
-		gint _tmp13_;
-#line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp13_ = res;
-#line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp11_ = _tmp13_ != SQLITE_DONE;
-#line 988 "DatabaseTable.c"
-	} else {
-#line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp11_ = FALSE;
-#line 992 "DatabaseTable.c"
-	}
-#line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (_tmp11_) {
-#line 996 "DatabaseTable.c"
-		gchar* _tmp14_;
-		gchar* _tmp15_;
-		const gchar* _tmp16_;
-		gchar* _tmp17_;
-		gchar* _tmp18_;
-		gint _tmp19_;
-#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp14_ = g_strdup_printf ("%" G_GINT64_FORMAT, id);
-#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp15_ = _tmp14_;
-#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp16_ = self->table_name;
-#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp17_ = g_strdup_printf ("exists_by_id [%s] %s", _tmp15_, _tmp16_);
-#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp18_ = _tmp17_;
-#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp19_ = res;
-#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		database_table_fatal (_tmp18_, _tmp19_);
-#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_g_free0 (_tmp18_);
-#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_g_free0 (_tmp15_);
-#line 1021 "DatabaseTable.c"
-	}
-#line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp20_ = res;
-#line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	result = _tmp20_ == SQLITE_ROW;
-#line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	return result;
-#line 1031 "DatabaseTable.c"
-}
-
-
-gboolean
-database_table_select_by_id (DatabaseTable* self,
-                             gint64 id,
-                             const gchar* columns,
-                             sqlite3_stmt* * stmt)
-{
-	sqlite3_stmt* _vala_stmt = NULL;
-	gboolean result = FALSE;
-	gchar* sql = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	gint res = 0;
-	sqlite3* _tmp2_;
-	const gchar* _tmp3_;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_;
-	gint _tmp6_;
-	sqlite3_stmt* _tmp7_;
-	gint _tmp8_;
-	sqlite3_stmt* _tmp9_;
-	gboolean _tmp10_ = FALSE;
-	gint _tmp11_;
-	gint _tmp19_;
-#line 187 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
-#line 187 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (columns != NULL, FALSE);
-#line 188 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp0_ = self->table_name;
-#line 188 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp1_ = g_strdup_printf ("SELECT %s FROM %s WHERE id=?", columns, _tmp0_);
-#line 188 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	sql = _tmp1_;
-#line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp2_ = database_table_db;
-#line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp3_ = sql;
-#line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp5_ = sqlite3_prepare_v2 (_tmp2_, _tmp3_, -1, &_tmp4_, NULL);
-#line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (_vala_stmt);
-#line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_vala_stmt = _tmp4_;
-#line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = _tmp5_;
-#line 191 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp6_ = res;
-#line 191 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK");
-#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp7_ = _vala_stmt;
-#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = sqlite3_bind_int64 (_tmp7_, 1, id);
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp8_ = res;
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
-#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp9_ = _vala_stmt;
-#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = sqlite3_step (_tmp9_);
-#line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp11_ = res;
-#line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (_tmp11_ != SQLITE_ROW) {
-#line 1100 "DatabaseTable.c"
-		gint _tmp12_;
-#line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp12_ = res;
-#line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp10_ = _tmp12_ != SQLITE_DONE;
-#line 1106 "DatabaseTable.c"
-	} else {
-#line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp10_ = FALSE;
-#line 1110 "DatabaseTable.c"
-	}
-#line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (_tmp10_) {
-#line 1114 "DatabaseTable.c"
-		gchar* _tmp13_;
-		gchar* _tmp14_;
-		const gchar* _tmp15_;
-		gchar* _tmp16_;
-		gchar* _tmp17_;
-		gint _tmp18_;
-#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp13_ = g_strdup_printf ("%" G_GINT64_FORMAT, id);
-#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp14_ = _tmp13_;
-#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp15_ = self->table_name;
-#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp16_ = g_strdup_printf ("select_by_id [%s] %s %s", _tmp14_, _tmp15_, columns);
-#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp17_ = _tmp16_;
-#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp18_ = res;
-#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		database_table_fatal (_tmp17_, _tmp18_);
-#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_g_free0 (_tmp17_);
-#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_g_free0 (_tmp14_);
-#line 1139 "DatabaseTable.c"
-	}
-#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp19_ = res;
-#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	result = _tmp19_ == SQLITE_ROW;
-#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_g_free0 (sql);
-#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (stmt) {
-#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		*stmt = _vala_stmt;
-#line 1151 "DatabaseTable.c"
-	} else {
-#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_sqlite3_finalize0 (_vala_stmt);
-#line 1155 "DatabaseTable.c"
-	}
-#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	return result;
-#line 1159 "DatabaseTable.c"
-}
-
-
-static void
-database_table_prepare_update_by_id (DatabaseTable* self,
-                                     gint64 id,
-                                     const gchar* column,
-                                     sqlite3_stmt* * stmt)
-{
-	sqlite3_stmt* _vala_stmt = NULL;
-	gchar* sql = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	gint res = 0;
-	sqlite3* _tmp2_;
-	sqlite3_stmt* _tmp3_ = NULL;
-	gint _tmp4_;
-	gint _tmp5_;
-	gint _tmp6_;
-#line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_if_fail (IS_DATABASE_TABLE (self));
-#line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_if_fail (column != NULL);
-#line 205 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp0_ = self->table_name;
-#line 205 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp1_ = g_strdup_printf ("UPDATE %s SET %s=? WHERE id=?", _tmp0_, column);
-#line 205 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	sql = _tmp1_;
-#line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp2_ = database_table_db;
-#line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp4_ = sqlite3_prepare_v2 (_tmp2_, sql, -1, &_tmp3_, NULL);
-#line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (_vala_stmt);
-#line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_vala_stmt = _tmp3_;
-#line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = _tmp4_;
-#line 208 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp5_ = res;
-#line 208 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK");
-#line 210 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = sqlite3_bind_int64 (_vala_stmt, 2, id);
-#line 211 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp6_ = res;
-#line 211 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK");
-#line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_g_free0 (sql);
-#line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (stmt) {
-#line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		*stmt = _vala_stmt;
-#line 1215 "DatabaseTable.c"
-	} else {
-#line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_sqlite3_finalize0 (_vala_stmt);
-#line 1219 "DatabaseTable.c"
-	}
-}
-
-
-static gboolean
-database_table_execute_update_by_id (DatabaseTable* self,
-                                     sqlite3_stmt* stmt)
-{
-	gboolean result = FALSE;
-	gint res = 0;
-	gint _tmp0_;
-#line 214 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
-#line 214 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (stmt != NULL, FALSE);
-#line 215 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = sqlite3_step (stmt);
-#line 216 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp0_ = res;
-#line 216 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (_tmp0_ != SQLITE_DONE) {
-#line 1241 "DatabaseTable.c"
-		gint _tmp1_;
-#line 217 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp1_ = res;
-#line 217 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		database_table_fatal ("execute_update_by_id", _tmp1_);
-#line 219 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		result = FALSE;
-#line 219 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		return result;
-#line 1251 "DatabaseTable.c"
-	}
-#line 222 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	result = TRUE;
-#line 222 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	return result;
-#line 1257 "DatabaseTable.c"
-}
-
-
-gboolean
-database_table_update_text_by_id (DatabaseTable* self,
-                                  gint64 id,
-                                  const gchar* column,
-                                  const gchar* text)
-{
-	gboolean result = FALSE;
-	sqlite3_stmt* stmt = NULL;
-	sqlite3_stmt* _tmp0_ = NULL;
-	gint res = 0;
-	gchar* _tmp1_;
-	GDestroyNotify _tmp2_;
-#line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
-#line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (column != NULL, FALSE);
-#line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (text != NULL, FALSE);
-#line 227 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	database_table_prepare_update_by_id (self, id, column, &_tmp0_);
-#line 227 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 227 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	stmt = _tmp0_;
-#line 229 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp1_ = g_strdup (text);
-#line 229 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp2_ = g_free;
-#line 229 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = sqlite3_bind_text (stmt, 1, _tmp1_, -1, _tmp2_);
-#line 230 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_vala_assert (res == SQLITE_OK, "res == Sqlite.OK");
-#line 232 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	result = database_table_execute_update_by_id (self, stmt);
-#line 232 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 232 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	return result;
-#line 1299 "DatabaseTable.c"
-}
-
-
-void
-database_table_update_text_by_id_2 (DatabaseTable* self,
-                                    gint64 id,
-                                    const gchar* column,
-                                    const gchar* text,
-                                    GError** error)
-{
-	sqlite3_stmt* stmt = NULL;
-	sqlite3_stmt* _tmp0_ = NULL;
-	gint res = 0;
-	sqlite3_stmt* _tmp1_;
-	gchar* _tmp2_;
-	GDestroyNotify _tmp3_;
-	gint _tmp4_;
-	sqlite3_stmt* _tmp5_;
-	gint _tmp6_;
-	GError * _inner_error_ = NULL;
-#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_if_fail (IS_DATABASE_TABLE (self));
-#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_if_fail (column != NULL);
-#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_if_fail (text != NULL);
-#line 237 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	database_table_prepare_update_by_id (self, id, column, &_tmp0_);
-#line 237 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 237 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	stmt = _tmp0_;
-#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp1_ = stmt;
-#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp2_ = g_strdup (text);
-#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp3_ = g_free;
-#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = sqlite3_bind_text (_tmp1_, 1, _tmp2_, -1, _tmp3_);
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp4_ = res;
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_vala_assert (_tmp4_ == SQLITE_OK, "res == Sqlite.OK");
-#line 242 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp5_ = stmt;
-#line 242 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = sqlite3_step (_tmp5_);
-#line 243 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp6_ = res;
-#line 243 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (_tmp6_ != SQLITE_DONE) {
-#line 1352 "DatabaseTable.c"
-		const gchar* _tmp7_;
-		gchar* _tmp8_;
-		gchar* _tmp9_;
-		gint _tmp10_;
-#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp7_ = self->table_name;
-#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp8_ = g_strdup_printf ("DatabaseTable.update_text_by_id_2 %s.%s", _tmp7_, column);
-#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp9_ = _tmp8_;
-#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp10_ = res;
-#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		database_table_throw_error (_tmp9_, _tmp10_, &_inner_error_);
-#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_g_free0 (_tmp9_);
-#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				return;
-#line 1379 "DatabaseTable.c"
-			} else {
-#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_sqlite3_finalize0 (stmt);
-#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 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				g_clear_error (&_inner_error_);
-#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				return;
-#line 1389 "DatabaseTable.c"
-			}
-		}
-	}
-#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 1395 "DatabaseTable.c"
-}
-
-
-gboolean
-database_table_update_int_by_id (DatabaseTable* self,
-                                 gint64 id,
-                                 const gchar* column,
-                                 gint value)
-{
-	gboolean result = FALSE;
-	sqlite3_stmt* stmt = NULL;
-	sqlite3_stmt* _tmp0_ = NULL;
-	gint res = 0;
-#line 247 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
-#line 247 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (column != NULL, FALSE);
-#line 249 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	database_table_prepare_update_by_id (self, id, column, &_tmp0_);
-#line 249 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 249 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	stmt = _tmp0_;
-#line 251 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = sqlite3_bind_int (stmt, 1, value);
-#line 252 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_vala_assert (res == SQLITE_OK, "res == Sqlite.OK");
-#line 254 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	result = database_table_execute_update_by_id (self, stmt);
-#line 254 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 254 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	return result;
-#line 1429 "DatabaseTable.c"
-}
-
-
-void
-database_table_update_int_by_id_2 (DatabaseTable* self,
-                                   gint64 id,
-                                   const gchar* column,
-                                   gint value,
-                                   GError** error)
-{
-	sqlite3_stmt* stmt = NULL;
-	sqlite3_stmt* _tmp0_ = NULL;
-	gint res = 0;
-	sqlite3_stmt* _tmp1_;
-	gint _tmp2_;
-	sqlite3_stmt* _tmp3_;
-	gint _tmp4_;
-	GError * _inner_error_ = NULL;
-#line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_if_fail (IS_DATABASE_TABLE (self));
-#line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_if_fail (column != NULL);
-#line 259 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	database_table_prepare_update_by_id (self, id, column, &_tmp0_);
-#line 259 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 259 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	stmt = _tmp0_;
-#line 261 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp1_ = stmt;
-#line 261 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = sqlite3_bind_int (_tmp1_, 1, value);
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp2_ = res;
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_vala_assert (_tmp2_ == SQLITE_OK, "res == Sqlite.OK");
-#line 264 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp3_ = stmt;
-#line 264 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = sqlite3_step (_tmp3_);
-#line 265 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp4_ = res;
-#line 265 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (_tmp4_ != SQLITE_DONE) {
-#line 1474 "DatabaseTable.c"
-		const gchar* _tmp5_;
-		gchar* _tmp6_;
-		gchar* _tmp7_;
-		gint _tmp8_;
-#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp5_ = self->table_name;
-#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp6_ = g_strdup_printf ("DatabaseTable.update_int_by_id_2 %s.%s", _tmp5_, column);
-#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp7_ = _tmp6_;
-#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp8_ = res;
-#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		database_table_throw_error (_tmp7_, _tmp8_, &_inner_error_);
-#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_g_free0 (_tmp7_);
-#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				return;
-#line 1501 "DatabaseTable.c"
-			} else {
-#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_sqlite3_finalize0 (stmt);
-#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 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				g_clear_error (&_inner_error_);
-#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				return;
-#line 1511 "DatabaseTable.c"
-			}
-		}
-	}
-#line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 1517 "DatabaseTable.c"
-}
-
-
-gboolean
-database_table_update_int64_by_id (DatabaseTable* self,
-                                   gint64 id,
-                                   const gchar* column,
-                                   gint64 value)
-{
-	gboolean result = FALSE;
-	sqlite3_stmt* stmt = NULL;
-	sqlite3_stmt* _tmp0_ = NULL;
-	gint res = 0;
-#line 269 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
-#line 269 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (column != NULL, FALSE);
-#line 271 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	database_table_prepare_update_by_id (self, id, column, &_tmp0_);
-#line 271 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 271 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	stmt = _tmp0_;
-#line 273 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = sqlite3_bind_int64 (stmt, 1, value);
-#line 274 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_vala_assert (res == SQLITE_OK, "res == Sqlite.OK");
-#line 276 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	result = database_table_execute_update_by_id (self, stmt);
-#line 276 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 276 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	return result;
-#line 1551 "DatabaseTable.c"
-}
-
-
-void
-database_table_update_int64_by_id_2 (DatabaseTable* self,
-                                     gint64 id,
-                                     const gchar* column,
-                                     gint64 value,
-                                     GError** error)
-{
-	sqlite3_stmt* stmt = NULL;
-	sqlite3_stmt* _tmp0_ = NULL;
-	gint res = 0;
-	sqlite3_stmt* _tmp1_;
-	gint _tmp2_;
-	sqlite3_stmt* _tmp3_;
-	gint _tmp4_;
-	GError * _inner_error_ = NULL;
-#line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_if_fail (IS_DATABASE_TABLE (self));
-#line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_if_fail (column != NULL);
-#line 281 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	database_table_prepare_update_by_id (self, id, column, &_tmp0_);
-#line 281 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 281 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	stmt = _tmp0_;
-#line 283 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp1_ = stmt;
-#line 283 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = sqlite3_bind_int64 (_tmp1_, 1, value);
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp2_ = res;
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_vala_assert (_tmp2_ == SQLITE_OK, "res == Sqlite.OK");
-#line 286 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp3_ = stmt;
-#line 286 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = sqlite3_step (_tmp3_);
-#line 287 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp4_ = res;
-#line 287 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (_tmp4_ != SQLITE_DONE) {
-#line 1596 "DatabaseTable.c"
-		const gchar* _tmp5_;
-		gchar* _tmp6_;
-		gchar* _tmp7_;
-		gint _tmp8_;
-#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp5_ = self->table_name;
-#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp6_ = g_strdup_printf ("DatabaseTable.update_int64_by_id_2 %s.%s", _tmp5_, column);
-#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp7_ = _tmp6_;
-#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp8_ = res;
-#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		database_table_throw_error (_tmp7_, _tmp8_, &_inner_error_);
-#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_g_free0 (_tmp7_);
-#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				return;
-#line 1623 "DatabaseTable.c"
-			} else {
-#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_sqlite3_finalize0 (stmt);
-#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 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				g_clear_error (&_inner_error_);
-#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				return;
-#line 1633 "DatabaseTable.c"
-			}
-		}
-	}
-#line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 1639 "DatabaseTable.c"
-}
-
-
-void
-database_table_delete_by_id (DatabaseTable* self,
-                             gint64 id,
-                             GError** error)
-{
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_;
-	gint _tmp6_;
-	gint _tmp7_;
-	sqlite3_stmt* _tmp8_;
-	gint _tmp9_;
-	sqlite3_stmt* _tmp10_;
-	gint _tmp11_;
-	GError * _inner_error_ = NULL;
-#line 291 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_if_fail (IS_DATABASE_TABLE (self));
-#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp0_ = database_table_db;
-#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp1_ = self->table_name;
-#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp2_ = g_strdup_printf ("DELETE FROM %s WHERE id=?", _tmp1_);
-#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp3_ = _tmp2_;
-#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp5_ = sqlite3_prepare_v2 (_tmp0_, _tmp3_, -1, &_tmp4_, NULL);
-#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	stmt = _tmp4_;
-#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp6_ = _tmp5_;
-#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_g_free0 (_tmp3_);
-#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = _tmp6_;
-#line 294 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp7_ = res;
-#line 294 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 296 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp8_ = stmt;
-#line 296 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = sqlite3_bind_int64 (_tmp8_, 1, id);
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp9_ = res;
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK");
-#line 299 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp10_ = stmt;
-#line 299 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = sqlite3_step (_tmp10_);
-#line 300 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp11_ = res;
-#line 300 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (_tmp11_ != SQLITE_DONE) {
-#line 1705 "DatabaseTable.c"
-		const gchar* _tmp12_;
-		gchar* _tmp13_;
-		gchar* _tmp14_;
-		gint _tmp15_;
-#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp12_ = self->table_name;
-#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp13_ = g_strdup_printf ("%s.remove", _tmp12_);
-#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp14_ = _tmp13_;
-#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp15_ = res;
-#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		database_table_throw_error (_tmp14_, _tmp15_, &_inner_error_);
-#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_g_free0 (_tmp14_);
-#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				return;
-#line 1732 "DatabaseTable.c"
-			} else {
-#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_sqlite3_finalize0 (stmt);
-#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 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				g_clear_error (&_inner_error_);
-#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				return;
-#line 1742 "DatabaseTable.c"
-			}
-		}
-	}
-#line 291 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 1748 "DatabaseTable.c"
-}
-
-
-gboolean
-database_table_has_column (const gchar* table_name,
-                           const gchar* column_name)
-{
-	gboolean result = FALSE;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	sqlite3_stmt* _tmp3_ = NULL;
-	gint _tmp4_;
-	gint _tmp5_;
-	gint _tmp6_;
-#line 304 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (table_name != NULL, FALSE);
-#line 304 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (column_name != NULL, FALSE);
-#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp0_ = database_table_db;
-#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp1_ = g_strdup_printf ("PRAGMA table_info(%s)", table_name);
-#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp2_ = _tmp1_;
-#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp4_ = sqlite3_prepare_v2 (_tmp0_, _tmp2_, -1, &_tmp3_, NULL);
-#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	stmt = _tmp3_;
-#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp5_ = _tmp4_;
-#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_g_free0 (_tmp2_);
-#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = _tmp5_;
-#line 307 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp6_ = res;
-#line 307 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1792 "DatabaseTable.c"
-	{
-		gboolean _tmp7_ = FALSE;
-#line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp7_ = TRUE;
-#line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		while (TRUE) {
-#line 1799 "DatabaseTable.c"
-			sqlite3_stmt* _tmp8_;
-			gint _tmp9_;
-#line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			if (!_tmp7_) {
-#line 1804 "DatabaseTable.c"
-			}
-#line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp7_ = FALSE;
-#line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp8_ = stmt;
-#line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			res = sqlite3_step (_tmp8_);
-#line 311 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			_tmp9_ = res;
-#line 311 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			if (_tmp9_ == SQLITE_DONE) {
-#line 312 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				break;
-#line 1818 "DatabaseTable.c"
-			} else {
-				gint _tmp10_;
-#line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				_tmp10_ = res;
-#line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				if (_tmp10_ != SQLITE_ROW) {
-#line 1825 "DatabaseTable.c"
-					gchar* _tmp11_;
-					gchar* _tmp12_;
-					gint _tmp13_;
-#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-					_tmp11_ = g_strdup_printf ("has_column %s", table_name);
-#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-					_tmp12_ = _tmp11_;
-#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-					_tmp13_ = res;
-#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-					database_table_fatal (_tmp12_, _tmp13_);
-#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-					_g_free0 (_tmp12_);
-#line 316 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-					break;
-#line 1841 "DatabaseTable.c"
-				} else {
-					gchar* column = NULL;
-					sqlite3_stmt* _tmp14_;
-					const gchar* _tmp15_;
-					gchar* _tmp16_;
-					gboolean _tmp17_ = FALSE;
-					const gchar* _tmp18_;
-#line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-					_tmp14_ = stmt;
-#line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-					_tmp15_ = sqlite3_column_text (_tmp14_, 1);
-#line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-					_tmp16_ = g_strdup (_tmp15_);
-#line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-					column = _tmp16_;
-#line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-					_tmp18_ = column;
-#line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-					if (_tmp18_ != NULL) {
-#line 1861 "DatabaseTable.c"
-						const gchar* _tmp19_;
-#line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-						_tmp19_ = column;
-#line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-						_tmp17_ = g_strcmp0 (_tmp19_, column_name) == 0;
-#line 1867 "DatabaseTable.c"
-					} else {
-#line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-						_tmp17_ = FALSE;
-#line 1871 "DatabaseTable.c"
-					}
-#line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-					if (_tmp17_) {
-#line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-						result = TRUE;
-#line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-						_g_free0 (column);
-#line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-						_sqlite3_finalize0 (stmt);
-#line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-						return result;
-#line 1883 "DatabaseTable.c"
-					}
-#line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-					_g_free0 (column);
-#line 1887 "DatabaseTable.c"
-				}
-			}
-		}
-	}
-#line 324 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	result = FALSE;
-#line 324 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 324 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	return result;
-#line 1898 "DatabaseTable.c"
-}
-
-
-gboolean
-database_table_has_table (const gchar* table_name)
-{
-	gboolean result = FALSE;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	sqlite3_stmt* _tmp3_ = NULL;
-	gint _tmp4_;
-	gint _tmp5_;
-	gint _tmp6_;
-	gint _tmp7_;
-#line 327 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (table_name != NULL, FALSE);
-#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp0_ = database_table_db;
-#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp1_ = g_strdup_printf ("PRAGMA table_info(%s)", table_name);
-#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp2_ = _tmp1_;
-#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp4_ = sqlite3_prepare_v2 (_tmp0_, _tmp2_, -1, &_tmp3_, NULL);
-#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	stmt = _tmp3_;
-#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp5_ = _tmp4_;
-#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_g_free0 (_tmp2_);
-#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = _tmp5_;
-#line 330 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp6_ = res;
-#line 330 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK");
-#line 332 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = sqlite3_step (stmt);
-#line 334 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp7_ = res;
-#line 334 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	result = _tmp7_ != SQLITE_DONE;
-#line 334 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 334 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	return result;
-#line 1950 "DatabaseTable.c"
-}
-
-
-gboolean
-database_table_add_column (const gchar* table_name,
-                           const gchar* column_name,
-                           const gchar* column_constraints)
-{
-	gboolean result = FALSE;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	sqlite3_stmt* _tmp3_ = NULL;
-	gint _tmp4_;
-	gint _tmp5_;
-	gint _tmp6_;
-	sqlite3_stmt* _tmp7_;
-	gint _tmp8_;
-#line 337 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (table_name != NULL, FALSE);
-#line 337 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (column_name != NULL, FALSE);
-#line 337 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (column_constraints != NULL, FALSE);
-#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp0_ = database_table_db;
-#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp1_ = g_strdup_printf ("ALTER TABLE %s ADD COLUMN %s %s", table_name, column_name, column_constraints);
-#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp2_ = _tmp1_;
-#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp4_ = sqlite3_prepare_v2 (_tmp0_, _tmp2_, -1, &_tmp3_, NULL);
-#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	stmt = _tmp3_;
-#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp5_ = _tmp4_;
-#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_g_free0 (_tmp2_);
-#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = _tmp5_;
-#line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp6_ = res;
-#line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK");
-#line 343 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp7_ = stmt;
-#line 343 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = sqlite3_step (_tmp7_);
-#line 344 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp8_ = res;
-#line 344 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (_tmp8_ != SQLITE_DONE) {
-#line 2007 "DatabaseTable.c"
-		gint _tmp9_;
-		sqlite3* _tmp10_;
-		const gchar* _tmp11_;
-#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp9_ = res;
-#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp10_ = database_table_db;
-#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp11_ = sqlite3_errmsg (_tmp10_);
-#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		g_critical ("DatabaseTable.vala:345: Unable to add column %s %s %s: (%d) %s", table_name, column_name, column_constraints, _tmp9_, _tmp11_);
-#line 348 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		result = FALSE;
-#line 348 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 348 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		return result;
-#line 2025 "DatabaseTable.c"
-	}
-#line 351 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	result = TRUE;
-#line 351 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 351 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	return result;
-#line 2033 "DatabaseTable.c"
-}
-
-
-gboolean
-database_table_ensure_column (const gchar* table_name,
-                              const gchar* column_name,
-                              const gchar* column_constraints,
-                              const gchar* upgrade_msg)
-{
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-#line 357 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (table_name != NULL, FALSE);
-#line 357 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (column_name != NULL, FALSE);
-#line 357 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (column_constraints != NULL, FALSE);
-#line 357 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (upgrade_msg != NULL, FALSE);
-#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (!database_table_has_table (table_name)) {
-#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp0_ = TRUE;
-#line 2057 "DatabaseTable.c"
-	} else {
-#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp0_ = database_table_has_column (table_name, column_name);
-#line 2061 "DatabaseTable.c"
-	}
-#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (_tmp0_) {
-#line 360 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		result = TRUE;
-#line 360 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		return result;
-#line 2069 "DatabaseTable.c"
-	}
-#line 362 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_message ("DatabaseTable.vala:362: %s", upgrade_msg);
-#line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	result = database_table_add_column (table_name, column_name, column_constraints);
-#line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	return result;
-#line 2077 "DatabaseTable.c"
-}
-
-
-gint
-database_table_get_row_count (DatabaseTable* self)
-{
-	gint result = 0;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_;
-	gint _tmp6_;
-	gint _tmp7_;
-	sqlite3_stmt* _tmp8_;
-	gint _tmp9_;
-	sqlite3_stmt* _tmp14_;
-#line 367 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (IS_DATABASE_TABLE (self), 0);
-#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp0_ = database_table_db;
-#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp1_ = self->table_name;
-#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp2_ = g_strdup_printf ("SELECT COUNT(id) AS RowCount FROM %s", _tmp1_);
-#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp3_ = _tmp2_;
-#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp5_ = sqlite3_prepare_v2 (_tmp0_, _tmp3_, -1, &_tmp4_, NULL);
-#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	stmt = _tmp4_;
-#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp6_ = _tmp5_;
-#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_g_free0 (_tmp3_);
-#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = _tmp6_;
-#line 370 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp7_ = res;
-#line 370 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 372 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp8_ = stmt;
-#line 372 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = sqlite3_step (_tmp8_);
-#line 373 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp9_ = res;
-#line 373 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (_tmp9_ != SQLITE_ROW) {
-#line 2132 "DatabaseTable.c"
-		const gchar* _tmp10_;
-		gint _tmp11_;
-		sqlite3* _tmp12_;
-		const gchar* _tmp13_;
-#line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp10_ = self->table_name;
-#line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp11_ = res;
-#line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp12_ = database_table_db;
-#line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp13_ = sqlite3_errmsg (_tmp12_);
-#line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		g_critical ("DatabaseTable.vala:374: Unable to retrieve row count on %s: (%d) %s", _tmp10_, _tmp11_, _tmp13_);
-#line 376 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		result = 0;
-#line 376 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 376 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		return result;
-#line 2153 "DatabaseTable.c"
-	}
-#line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp14_ = stmt;
-#line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	result = sqlite3_column_int (_tmp14_, 0);
-#line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	return result;
-#line 2163 "DatabaseTable.c"
-}
-
-
-void
-database_table_begin_transaction (void)
-{
-	gint _tmp0_;
-	gint res = 0;
-	sqlite3* _tmp1_;
-	gint _tmp2_;
-	gint _tmp3_;
-#line 384 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp0_ = database_table_in_transaction;
-#line 384 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	database_table_in_transaction = _tmp0_ + 1;
-#line 384 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (_tmp0_ != 0) {
-#line 385 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		return;
-#line 2183 "DatabaseTable.c"
-	}
-#line 387 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp1_ = database_table_db;
-#line 387 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp2_ = _sqlite3_exec (_tmp1_, "BEGIN TRANSACTION", NULL, NULL, NULL);
-#line 387 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = _tmp2_;
-#line 388 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp3_ = res;
-#line 388 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 2195 "DatabaseTable.c"
-}
-
-
-void
-database_table_commit_transaction (GError** error)
-{
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-	gint res = 0;
-	sqlite3* _tmp3_;
-	gint _tmp4_;
-	gint _tmp5_;
-	GError * _inner_error_ = NULL;
-#line 393 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp0_ = database_table_in_transaction;
-#line 393 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_vala_assert (_tmp0_ > 0, "in_transaction > 0");
-#line 394 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp1_ = database_table_in_transaction;
-#line 394 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	database_table_in_transaction = _tmp1_ - 1;
-#line 394 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp2_ = database_table_in_transaction;
-#line 394 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (_tmp2_ != 0) {
-#line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		return;
-#line 2224 "DatabaseTable.c"
-	}
-#line 397 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp3_ = database_table_db;
-#line 397 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp4_ = _sqlite3_exec (_tmp3_, "COMMIT TRANSACTION", NULL, NULL, NULL);
-#line 397 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	res = _tmp4_;
-#line 398 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp5_ = res;
-#line 398 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (_tmp5_ != SQLITE_DONE) {
-#line 2236 "DatabaseTable.c"
-		gint _tmp6_;
-#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp6_ = res;
-#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		database_table_throw_error ("commit_transaction", _tmp6_, &_inner_error_);
-#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				return;
-#line 2250 "DatabaseTable.c"
-			} else {
-#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 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				g_clear_error (&_inner_error_);
-#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-				return;
-#line 2258 "DatabaseTable.c"
-			}
-		}
-	}
-}
-
-
-DatabaseTable*
-database_table_construct (GType object_type)
-{
-	DatabaseTable* self = NULL;
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	self = (DatabaseTable*) g_type_create_instance (object_type);
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	return self;
-#line 2273 "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 2282 "DatabaseTable.c"
-}
-
-
-static void
-value_database_table_free_value (GValue* value)
-{
-#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"
-		database_table_unref (value->data[0].v_pointer);
-#line 2293 "DatabaseTable.c"
-	}
-}
-
-
-static void
-value_database_table_copy_value (const GValue* src_value,
-                                 GValue* dest_value)
-{
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	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 2306 "DatabaseTable.c"
-	} else {
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 2310 "DatabaseTable.c"
-	}
-}
-
-
-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 2320 "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 2332 "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 2339 "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 2343 "DatabaseTable.c"
-		}
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		value->data[0].v_pointer = database_table_ref (object);
-#line 2347 "DatabaseTable.c"
-	} else {
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 2351 "DatabaseTable.c"
-	}
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	return NULL;
-#line 2355 "DatabaseTable.c"
-}
-
-
-static gchar*
-value_database_table_lcopy_value (const GValue* value,
-                                  guint n_collect_values,
-                                  GTypeCValue* collect_values,
-                                  guint collect_flags)
-{
-	DatabaseTable ** object_p;
-	object_p = collect_values[0].v_pointer;
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	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 2371 "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 2377 "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 2381 "DatabaseTable.c"
-	} else {
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		*object_p = database_table_ref (value->data[0].v_pointer);
-#line 2385 "DatabaseTable.c"
-	}
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	return NULL;
-#line 2389 "DatabaseTable.c"
-}
-
-
-GParamSpec*
-param_spec_database_table (const gchar* name,
-                           const gchar* nick,
-                           const gchar* blurb,
-                           GType object_type,
-                           GParamFlags flags)
-{
-	ParamSpecDatabaseTable* spec;
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, TYPE_DATABASE_TABLE), NULL);
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	return G_PARAM_SPEC (spec);
-#line 2409 "DatabaseTable.c"
-}
-
-
-gpointer
-value_get_database_table (const GValue* value)
-{
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	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 2420 "DatabaseTable.c"
-}
-
-
-void
-value_set_database_table (GValue* value,
-                          gpointer v_object)
-{
-	DatabaseTable * old;
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATABASE_TABLE));
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	old = value->data[0].v_pointer;
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (v_object) {
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_DATABASE_TABLE));
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		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 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		database_table_ref (value->data[0].v_pointer);
-#line 2443 "DatabaseTable.c"
-	} else {
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 2447 "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 2453 "DatabaseTable.c"
-	}
-}
-
-
-void
-value_take_database_table (GValue* value,
-                           gpointer v_object)
-{
-	DatabaseTable * old;
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATABASE_TABLE));
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	old = value->data[0].v_pointer;
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (v_object) {
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_DATABASE_TABLE));
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		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 2475 "DatabaseTable.c"
-	} else {
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 2479 "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 2485 "DatabaseTable.c"
-	}
-}
-
-
-static void
-database_table_class_init (DatabaseTableClass * klass)
-{
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	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 2497 "DatabaseTable.c"
-}
-
-
-static void
-database_table_instance_init (DatabaseTable * self)
-{
-#line 30 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	self->table_name = NULL;
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	self->ref_count = 1;
-#line 2508 "DatabaseTable.c"
-}
-
-
-static void
-database_table_finalize (DatabaseTable * obj)
-{
-	DatabaseTable * self;
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATABASE_TABLE, DatabaseTable);
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_signal_handlers_destroy (self);
-#line 30 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_g_free0 (self->table_name);
-#line 2522 "DatabaseTable.c"
-}
-
-
-GType
-database_table_get_type (void)
-{
-	static volatile gsize database_table_type_id__volatile = 0;
-	if (g_once_init_enter (&database_table_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_database_table_init, value_database_table_free_value, value_database_table_copy_value, value_database_table_peek_pointer, "p", value_database_table_collect_value, "p", value_database_table_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (DatabaseTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) database_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DatabaseTable), 0, (GInstanceInitFunc) database_table_instance_init, &g_define_type_value_table };
-		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
-		GType database_table_type_id;
-		database_table_type_id = g_type_register_fundamental (g_type_fundamental_next (), "DatabaseTable", &g_define_type_info, &g_define_type_fundamental_info, G_TYPE_FLAG_ABSTRACT);
-		g_once_init_leave (&database_table_type_id__volatile, database_table_type_id);
-	}
-	return database_table_type_id__volatile;
-}
-
-
-gpointer
-database_table_ref (gpointer instance)
-{
-	DatabaseTable * self;
-	self = instance;
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	return instance;
-#line 2551 "DatabaseTable.c"
-}
-
-
-void
-database_table_unref (gpointer instance)
-{
-	DatabaseTable * self;
-	self = instance;
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		DATABASE_TABLE_GET_CLASS (self)->finalize (self);
-#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 2566 "DatabaseTable.c"
-	}
-}
-
-
-
diff --git a/src/db/Db.c b/src/db/Db.c
deleted file mode 100644
index cafe2e4..0000000
--- a/src/db/Db.c
+++ /dev/null
@@ -1,742 +0,0 @@
-/* Db.c generated by valac 0.40.4, the Vala compiler
- * generated from Db.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gio/gio.h>
-
-#define _g_free0(var) (var = (g_free (var), NULL))
-
-#define DB_TYPE_VERIFY_RESULT (db_verify_result_get_type ())
-
-#define TYPE_DATABASE_TABLE (database_table_get_type ())
-#define DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATABASE_TABLE, DatabaseTable))
-#define DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATABASE_TABLE, DatabaseTableClass))
-#define IS_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATABASE_TABLE))
-#define IS_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DATABASE_TABLE))
-#define DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DATABASE_TABLE, DatabaseTableClass))
-
-typedef struct _DatabaseTable DatabaseTable;
-typedef struct _DatabaseTableClass DatabaseTableClass;
-
-#define TYPE_VERSION_TABLE (version_table_get_type ())
-#define VERSION_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VERSION_TABLE, VersionTable))
-#define VERSION_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_VERSION_TABLE, VersionTableClass))
-#define IS_VERSION_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_VERSION_TABLE))
-#define IS_VERSION_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_VERSION_TABLE))
-#define VERSION_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_VERSION_TABLE, VersionTableClass))
-
-typedef struct _VersionTable VersionTable;
-typedef struct _VersionTableClass VersionTableClass;
-#define _database_table_unref0(var) ((var == NULL) ? NULL : (var = (database_table_unref (var), NULL)))
-
-#define TYPE_APPLICATION (application_get_type ())
-#define APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APPLICATION, Application))
-#define APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APPLICATION, ApplicationClass))
-#define IS_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APPLICATION))
-#define IS_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APPLICATION))
-#define APPLICATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APPLICATION, ApplicationClass))
-
-typedef struct _Application Application;
-typedef struct _ApplicationClass ApplicationClass;
-#define _application_unref0(var) ((var == NULL) ? NULL : (var = (application_unref (var), NULL)))
-#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
-#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
-#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-
-typedef enum  {
-	DB_VERIFY_RESULT_OK,
-	DB_VERIFY_RESULT_FUTURE_VERSION,
-	DB_VERIFY_RESULT_UPGRADE_ERROR,
-	DB_VERIFY_RESULT_NO_UPGRADE_AVAILABLE
-} DbVerifyResult;
-
-
-extern gchar* db_filename;
-gchar* db_filename = NULL;
-
-#define DB_IN_MEMORY_NAME ":memory:"
-void db_preconfigure (GFile* db_file);
-void db_init (GError** error);
-void database_table_init (const gchar* filename);
-void db_terminate (void);
-void database_table_terminate (void);
-GType db_verify_result_get_type (void) G_GNUC_CONST;
-DbVerifyResult db_verify_database (gchar* * app_version,
-                                   gint* schema_version);
-gpointer database_table_ref (gpointer instance);
-void database_table_unref (gpointer instance);
-GParamSpec* param_spec_database_table (const gchar* name,
-                                       const gchar* nick,
-                                       const gchar* blurb,
-                                       GType object_type,
-                                       GParamFlags flags);
-void value_set_database_table (GValue* value,
-                               gpointer v_object);
-void value_take_database_table (GValue* value,
-                                gpointer v_object);
-gpointer value_get_database_table (const GValue* value);
-GType database_table_get_type (void) G_GNUC_CONST;
-GType version_table_get_type (void) G_GNUC_CONST;
-VersionTable* version_table_get_instance (void);
-gint version_table_get_version (VersionTable* self,
-                                gchar* * app_version);
-#define DATABASE_TABLE_SCHEMA_VERSION 20
-#define RESOURCES_APP_VERSION _VERSION
-void version_table_set_version (VersionTable* self,
-                                gint version,
-                                const gchar* app_version,
-                                const gchar* user_data);
-DbVerifyResult db_upgrade_database (gint input_version);
-gboolean database_table_has_column (const gchar* table_name,
-                                    const gchar* column_name);
-gboolean database_table_add_column (const gchar* table_name,
-                                    const gchar* column_name,
-                                    const gchar* column_constraints);
-gboolean database_table_has_table (const gchar* table_name);
-gboolean database_table_ensure_column (const gchar* table_name,
-                                       const gchar* column_name,
-                                       const gchar* column_constraints,
-                                       const gchar* upgrade_msg);
-void tag_table_upgrade_for_htags (void);
-void gsettings_configuration_engine_run_gsettings_migrator (void);
-gpointer application_ref (gpointer instance);
-void application_unref (gpointer instance);
-GParamSpec* param_spec_application (const gchar* name,
-                                    const gchar* nick,
-                                    const gchar* blurb,
-                                    GType object_type,
-                                    GParamFlags flags);
-void value_set_application (GValue* value,
-                            gpointer v_object);
-void value_take_application (GValue* value,
-                             gpointer v_object);
-gpointer value_get_application (const GValue* value);
-GType application_get_type (void) G_GNUC_CONST;
-Application* application_get_instance (void);
-void application_set_raw_thumbs_fix_required (Application* self,
-                                              gboolean should_fixup);
-void version_table_update_version (VersionTable* self,
-                                   gint version,
-                                   const gchar* app_version);
-
-
-void
-db_preconfigure (GFile* db_file)
-{
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp3_;
-#line 14 "/home/jens/Source/shotwell/src/db/Db.vala"
-	g_return_if_fail ((db_file == NULL) || G_IS_FILE (db_file));
-#line 15 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (db_file != NULL) {
-#line 144 "Db.c"
-		gchar* _tmp1_;
-#line 15 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_tmp1_ = g_file_get_path (db_file);
-#line 15 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_g_free0 (_tmp0_);
-#line 15 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_tmp0_ = _tmp1_;
-#line 152 "Db.c"
-	} else {
-		gchar* _tmp2_;
-#line 15 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_tmp2_ = g_strdup (DB_IN_MEMORY_NAME);
-#line 15 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_g_free0 (_tmp0_);
-#line 15 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_tmp0_ = _tmp2_;
-#line 161 "Db.c"
-	}
-#line 15 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_tmp3_ = g_strdup (_tmp0_);
-#line 15 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_g_free0 (db_filename);
-#line 15 "/home/jens/Source/shotwell/src/db/Db.vala"
-	db_filename = _tmp3_;
-#line 14 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_g_free0 (_tmp0_);
-#line 171 "Db.c"
-}
-
-
-void
-db_init (GError** error)
-{
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-#line 19 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_tmp0_ = db_filename;
-#line 19 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_vala_assert (_tmp0_ != NULL, "filename != null");
-#line 21 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_tmp1_ = db_filename;
-#line 21 "/home/jens/Source/shotwell/src/db/Db.vala"
-	database_table_init (_tmp1_);
-#line 188 "Db.c"
-}
-
-
-void
-db_terminate (void)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/Db.vala"
-	database_table_terminate ();
-#line 197 "Db.c"
-}
-
-
-GType
-db_verify_result_get_type (void)
-{
-	static volatile gsize db_verify_result_type_id__volatile = 0;
-	if (g_once_init_enter (&db_verify_result_type_id__volatile)) {
-		static const GEnumValue values[] = {{DB_VERIFY_RESULT_OK, "DB_VERIFY_RESULT_OK", "ok"}, {DB_VERIFY_RESULT_FUTURE_VERSION, "DB_VERIFY_RESULT_FUTURE_VERSION", "future-version"}, {DB_VERIFY_RESULT_UPGRADE_ERROR, "DB_VERIFY_RESULT_UPGRADE_ERROR", "upgrade-error"}, {DB_VERIFY_RESULT_NO_UPGRADE_AVAILABLE, "DB_VERIFY_RESULT_NO_UPGRADE_AVAILABLE", "no-upgrade-available"}, {0, NULL, NULL}};
-		GType db_verify_result_type_id;
-		db_verify_result_type_id = g_enum_register_static ("DbVerifyResult", values);
-		g_once_init_leave (&db_verify_result_type_id__volatile, db_verify_result_type_id);
-	}
-	return db_verify_result_type_id__volatile;
-}
-
-
-DbVerifyResult
-db_verify_database (gchar* * app_version,
-                    gint* schema_version)
-{
-	gchar* _vala_app_version = NULL;
-	gint _vala_schema_version = 0;
-	DbVerifyResult result = 0;
-	VersionTable* version_table = NULL;
-	VersionTable* _tmp0_;
-	VersionTable* _tmp1_;
-	gchar* _tmp2_ = NULL;
-	gint _tmp3_;
-	gint _tmp4_;
-	gint _tmp7_;
-#line 36 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_tmp0_ = version_table_get_instance ();
-#line 36 "/home/jens/Source/shotwell/src/db/Db.vala"
-	version_table = _tmp0_;
-#line 37 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_tmp1_ = version_table;
-#line 37 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_tmp3_ = version_table_get_version (_tmp1_, &_tmp2_);
-#line 37 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_g_free0 (_vala_app_version);
-#line 37 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_vala_app_version = _tmp2_;
-#line 37 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_vala_schema_version = _tmp3_;
-#line 39 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_tmp4_ = _vala_schema_version;
-#line 39 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (_tmp4_ >= 0) {
-#line 247 "Db.c"
-		gint _tmp5_;
-		const gchar* _tmp6_;
-#line 40 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_tmp5_ = _vala_schema_version;
-#line 40 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_tmp6_ = _vala_app_version;
-#line 40 "/home/jens/Source/shotwell/src/db/Db.vala"
-		g_debug ("Db.vala:40: Database schema version %d created by app version %s", _tmp5_, _tmp6_);
-#line 256 "Db.c"
-	}
-#line 42 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_tmp7_ = _vala_schema_version;
-#line 42 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (_tmp7_ == -1) {
-#line 262 "Db.c"
-		VersionTable* _tmp8_;
-		gchar* _tmp9_;
-#line 44 "/home/jens/Source/shotwell/src/db/Db.vala"
-		g_debug ("Db.vala:44: Creating database schema version %d for app version %s", DATABASE_TABLE_SCHEMA_VERSION, RESOURCES_APP_VERSION);
-#line 46 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_tmp8_ = version_table;
-#line 46 "/home/jens/Source/shotwell/src/db/Db.vala"
-		version_table_set_version (_tmp8_, DATABASE_TABLE_SCHEMA_VERSION, RESOURCES_APP_VERSION, NULL);
-#line 47 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_tmp9_ = g_strdup (RESOURCES_APP_VERSION);
-#line 47 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_g_free0 (_vala_app_version);
-#line 47 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_vala_app_version = _tmp9_;
-#line 48 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_vala_schema_version = DATABASE_TABLE_SCHEMA_VERSION;
-#line 279 "Db.c"
-	} else {
-		gint _tmp10_;
-#line 49 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_tmp10_ = _vala_schema_version;
-#line 49 "/home/jens/Source/shotwell/src/db/Db.vala"
-		if (_tmp10_ > DATABASE_TABLE_SCHEMA_VERSION) {
-#line 51 "/home/jens/Source/shotwell/src/db/Db.vala"
-			result = DB_VERIFY_RESULT_FUTURE_VERSION;
-#line 51 "/home/jens/Source/shotwell/src/db/Db.vala"
-			_database_table_unref0 (version_table);
-#line 51 "/home/jens/Source/shotwell/src/db/Db.vala"
-			if (app_version) {
-#line 51 "/home/jens/Source/shotwell/src/db/Db.vala"
-				*app_version = _vala_app_version;
-#line 294 "Db.c"
-			} else {
-#line 51 "/home/jens/Source/shotwell/src/db/Db.vala"
-				_g_free0 (_vala_app_version);
-#line 298 "Db.c"
-			}
-#line 51 "/home/jens/Source/shotwell/src/db/Db.vala"
-			if (schema_version) {
-#line 51 "/home/jens/Source/shotwell/src/db/Db.vala"
-				*schema_version = _vala_schema_version;
-#line 304 "Db.c"
-			}
-#line 51 "/home/jens/Source/shotwell/src/db/Db.vala"
-			return result;
-#line 308 "Db.c"
-		} else {
-			gint _tmp11_;
-#line 52 "/home/jens/Source/shotwell/src/db/Db.vala"
-			_tmp11_ = _vala_schema_version;
-#line 52 "/home/jens/Source/shotwell/src/db/Db.vala"
-			if (_tmp11_ < DATABASE_TABLE_SCHEMA_VERSION) {
-#line 315 "Db.c"
-				DbVerifyResult _result_ = 0;
-				gint _tmp12_;
-				DbVerifyResult _tmp13_;
-#line 54 "/home/jens/Source/shotwell/src/db/Db.vala"
-				_tmp12_ = _vala_schema_version;
-#line 54 "/home/jens/Source/shotwell/src/db/Db.vala"
-				_result_ = db_upgrade_database (_tmp12_);
-#line 55 "/home/jens/Source/shotwell/src/db/Db.vala"
-				_tmp13_ = _result_;
-#line 55 "/home/jens/Source/shotwell/src/db/Db.vala"
-				if (_tmp13_ != DB_VERIFY_RESULT_OK) {
-#line 56 "/home/jens/Source/shotwell/src/db/Db.vala"
-					result = _result_;
-#line 56 "/home/jens/Source/shotwell/src/db/Db.vala"
-					_database_table_unref0 (version_table);
-#line 56 "/home/jens/Source/shotwell/src/db/Db.vala"
-					if (app_version) {
-#line 56 "/home/jens/Source/shotwell/src/db/Db.vala"
-						*app_version = _vala_app_version;
-#line 335 "Db.c"
-					} else {
-#line 56 "/home/jens/Source/shotwell/src/db/Db.vala"
-						_g_free0 (_vala_app_version);
-#line 339 "Db.c"
-					}
-#line 56 "/home/jens/Source/shotwell/src/db/Db.vala"
-					if (schema_version) {
-#line 56 "/home/jens/Source/shotwell/src/db/Db.vala"
-						*schema_version = _vala_schema_version;
-#line 345 "Db.c"
-					}
-#line 56 "/home/jens/Source/shotwell/src/db/Db.vala"
-					return result;
-#line 349 "Db.c"
-				}
-			}
-		}
-	}
-#line 59 "/home/jens/Source/shotwell/src/db/Db.vala"
-	result = DB_VERIFY_RESULT_OK;
-#line 59 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_database_table_unref0 (version_table);
-#line 59 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (app_version) {
-#line 59 "/home/jens/Source/shotwell/src/db/Db.vala"
-		*app_version = _vala_app_version;
-#line 362 "Db.c"
-	} else {
-#line 59 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_g_free0 (_vala_app_version);
-#line 366 "Db.c"
-	}
-#line 59 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (schema_version) {
-#line 59 "/home/jens/Source/shotwell/src/db/Db.vala"
-		*schema_version = _vala_schema_version;
-#line 372 "Db.c"
-	}
-#line 59 "/home/jens/Source/shotwell/src/db/Db.vala"
-	return result;
-#line 376 "Db.c"
-}
-
-
-DbVerifyResult
-db_upgrade_database (gint input_version)
-{
-	DbVerifyResult result = 0;
-	gint version = 0;
-	gint _tmp0_;
-	gint _tmp1_;
-	gboolean _tmp2_ = FALSE;
-	gint _tmp5_;
-	VersionTable* _tmp6_;
-	VersionTable* _tmp7_;
-	gint _tmp8_;
-	gint _tmp9_;
-#line 63 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_vala_assert (input_version < DATABASE_TABLE_SCHEMA_VERSION, "input_version < DatabaseTable.SCHEMA_VERSION");
-#line 65 "/home/jens/Source/shotwell/src/db/Db.vala"
-	version = input_version;
-#line 68 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_tmp0_ = version;
-#line 68 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (_tmp0_ == 1) {
-#line 69 "/home/jens/Source/shotwell/src/db/Db.vala"
-		result = DB_VERIFY_RESULT_NO_UPGRADE_AVAILABLE;
-#line 69 "/home/jens/Source/shotwell/src/db/Db.vala"
-		return result;
-#line 405 "Db.c"
-	}
-#line 71 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_tmp1_ = version;
-#line 71 "/home/jens/Source/shotwell/src/db/Db.vala"
-	g_message ("Db.vala:71: Upgrading database from schema version %d to %d", _tmp1_, DATABASE_TABLE_SCHEMA_VERSION);
-#line 83 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (!database_table_has_column ("PhotoTable", "flags")) {
-#line 84 "/home/jens/Source/shotwell/src/db/Db.vala"
-		g_message ("Db.vala:84: upgrade_database: adding flags column to PhotoTable");
-#line 85 "/home/jens/Source/shotwell/src/db/Db.vala"
-		if (!database_table_add_column ("PhotoTable", "flags", "INTEGER DEFAULT 0")) {
-#line 86 "/home/jens/Source/shotwell/src/db/Db.vala"
-			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
-#line 86 "/home/jens/Source/shotwell/src/db/Db.vala"
-			return result;
-#line 421 "Db.c"
-		}
-	}
-#line 89 "/home/jens/Source/shotwell/src/db/Db.vala"
-	version = 3;
-#line 100 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (!database_table_has_column ("PhotoTable", "file_format")) {
-#line 101 "/home/jens/Source/shotwell/src/db/Db.vala"
-		g_message ("Db.vala:101: upgrade_database: adding file_format column to PhotoTable");
-#line 102 "/home/jens/Source/shotwell/src/db/Db.vala"
-		if (!database_table_add_column ("PhotoTable", "file_format", "INTEGER DEFAULT 0")) {
-#line 103 "/home/jens/Source/shotwell/src/db/Db.vala"
-			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
-#line 103 "/home/jens/Source/shotwell/src/db/Db.vala"
-			return result;
-#line 436 "Db.c"
-		}
-	}
-#line 106 "/home/jens/Source/shotwell/src/db/Db.vala"
-	version = 4;
-#line 113 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (!database_table_has_column ("PhotoTable", "title")) {
-#line 114 "/home/jens/Source/shotwell/src/db/Db.vala"
-		g_message ("Db.vala:114: upgrade_database: adding title column to PhotoTable");
-#line 115 "/home/jens/Source/shotwell/src/db/Db.vala"
-		if (!database_table_add_column ("PhotoTable", "title", "TEXT")) {
-#line 116 "/home/jens/Source/shotwell/src/db/Db.vala"
-			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
-#line 116 "/home/jens/Source/shotwell/src/db/Db.vala"
-			return result;
-#line 451 "Db.c"
-		}
-	}
-#line 119 "/home/jens/Source/shotwell/src/db/Db.vala"
-	version = 5;
-#line 126 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (!database_table_has_column ("PhotoTable", "backlinks")) {
-#line 127 "/home/jens/Source/shotwell/src/db/Db.vala"
-		g_message ("Db.vala:127: upgrade_database: adding backlinks column to PhotoTable");
-#line 128 "/home/jens/Source/shotwell/src/db/Db.vala"
-		if (!database_table_add_column ("PhotoTable", "backlinks", "TEXT")) {
-#line 129 "/home/jens/Source/shotwell/src/db/Db.vala"
-			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
-#line 129 "/home/jens/Source/shotwell/src/db/Db.vala"
-			return result;
-#line 466 "Db.c"
-		}
-	}
-#line 132 "/home/jens/Source/shotwell/src/db/Db.vala"
-	version = 6;
-#line 146 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (!database_table_has_column ("PhotoTable", "time_reimported")) {
-#line 147 "/home/jens/Source/shotwell/src/db/Db.vala"
-		g_message ("Db.vala:147: upgrade_database: adding time_reimported column to PhotoT" \
-"able");
-#line 148 "/home/jens/Source/shotwell/src/db/Db.vala"
-		if (!database_table_add_column ("PhotoTable", "time_reimported", "INTEGER")) {
-#line 149 "/home/jens/Source/shotwell/src/db/Db.vala"
-			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
-#line 149 "/home/jens/Source/shotwell/src/db/Db.vala"
-			return result;
-#line 481 "Db.c"
-		}
-	}
-#line 152 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (!database_table_has_column ("PhotoTable", "editable_id")) {
-#line 153 "/home/jens/Source/shotwell/src/db/Db.vala"
-		g_message ("Db.vala:153: upgrade_database: adding editable_id column to PhotoTable");
-#line 154 "/home/jens/Source/shotwell/src/db/Db.vala"
-		if (!database_table_add_column ("PhotoTable", "editable_id", "INTEGER DEFAULT -1")) {
-#line 155 "/home/jens/Source/shotwell/src/db/Db.vala"
-			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
-#line 155 "/home/jens/Source/shotwell/src/db/Db.vala"
-			return result;
-#line 494 "Db.c"
-		}
-	}
-#line 158 "/home/jens/Source/shotwell/src/db/Db.vala"
-	version = 7;
-#line 170 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (!database_table_has_column ("PhotoTable", "rating")) {
-#line 171 "/home/jens/Source/shotwell/src/db/Db.vala"
-		g_message ("Db.vala:171: upgrade_database: adding rating column to PhotoTable");
-#line 172 "/home/jens/Source/shotwell/src/db/Db.vala"
-		if (!database_table_add_column ("PhotoTable", "rating", "INTEGER DEFAULT 0")) {
-#line 173 "/home/jens/Source/shotwell/src/db/Db.vala"
-			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
-#line 173 "/home/jens/Source/shotwell/src/db/Db.vala"
-			return result;
-#line 509 "Db.c"
-		}
-	}
-#line 182 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (!database_table_has_column ("PhotoTable", "metadata_dirty")) {
-#line 183 "/home/jens/Source/shotwell/src/db/Db.vala"
-		g_message ("Db.vala:183: upgrade_database: adding metadata_dirty column to PhotoTa" \
-"ble");
-#line 184 "/home/jens/Source/shotwell/src/db/Db.vala"
-		if (!database_table_add_column ("PhotoTable", "metadata_dirty", "INTEGER DEFAULT 1")) {
-#line 185 "/home/jens/Source/shotwell/src/db/Db.vala"
-			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
-#line 185 "/home/jens/Source/shotwell/src/db/Db.vala"
-			return result;
-#line 522 "Db.c"
-		}
-	}
-#line 188 "/home/jens/Source/shotwell/src/db/Db.vala"
-	version = 9;
-#line 195 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (database_table_has_table ("VideoTable")) {
-#line 195 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_tmp2_ = !database_table_has_column ("VideoTable", "flags");
-#line 531 "Db.c"
-	} else {
-#line 195 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_tmp2_ = FALSE;
-#line 535 "Db.c"
-	}
-#line 195 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (_tmp2_) {
-#line 196 "/home/jens/Source/shotwell/src/db/Db.vala"
-		g_message ("Db.vala:196: upgrade_database: adding flags column to VideoTable");
-#line 197 "/home/jens/Source/shotwell/src/db/Db.vala"
-		if (!database_table_add_column ("VideoTable", "flags", "INTEGER DEFAULT 0")) {
-#line 198 "/home/jens/Source/shotwell/src/db/Db.vala"
-			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
-#line 198 "/home/jens/Source/shotwell/src/db/Db.vala"
-			return result;
-#line 547 "Db.c"
-		}
-	}
-#line 201 "/home/jens/Source/shotwell/src/db/Db.vala"
-	version = 10;
-#line 208 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (!database_table_has_column ("EventTable", "primary_source_id")) {
-#line 209 "/home/jens/Source/shotwell/src/db/Db.vala"
-		g_message ("Db.vala:209: upgrade_database: adding primary_source_id column to Even" \
-"tTable");
-#line 210 "/home/jens/Source/shotwell/src/db/Db.vala"
-		if (!database_table_add_column ("EventTable", "primary_source_id", "TEXT")) {
-#line 211 "/home/jens/Source/shotwell/src/db/Db.vala"
-			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
-#line 211 "/home/jens/Source/shotwell/src/db/Db.vala"
-			return result;
-#line 562 "Db.c"
-		}
-	}
-#line 214 "/home/jens/Source/shotwell/src/db/Db.vala"
-	version = 11;
-#line 221 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (!database_table_ensure_column ("TombstoneTable", "reason", "INTEGER DEFAULT 0", "upgrade_database: adding reason column to TombstoneTable")) {
-#line 223 "/home/jens/Source/shotwell/src/db/Db.vala"
-		result = DB_VERIFY_RESULT_UPGRADE_ERROR;
-#line 223 "/home/jens/Source/shotwell/src/db/Db.vala"
-		return result;
-#line 573 "Db.c"
-	}
-#line 226 "/home/jens/Source/shotwell/src/db/Db.vala"
-	version = 12;
-#line 233 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (!database_table_has_column ("PhotoTable", "developer")) {
-#line 234 "/home/jens/Source/shotwell/src/db/Db.vala"
-		g_message ("Db.vala:234: upgrade_database: adding developer column to PhotoTable");
-#line 235 "/home/jens/Source/shotwell/src/db/Db.vala"
-		if (!database_table_add_column ("PhotoTable", "developer", "TEXT")) {
-#line 236 "/home/jens/Source/shotwell/src/db/Db.vala"
-			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
-#line 236 "/home/jens/Source/shotwell/src/db/Db.vala"
-			return result;
-#line 587 "Db.c"
-		}
-	}
-#line 239 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (!database_table_has_column ("PhotoTable", "develop_shotwell_id")) {
-#line 240 "/home/jens/Source/shotwell/src/db/Db.vala"
-		g_message ("Db.vala:240: upgrade_database: adding develop_shotwell_id column to Ph" \
-"otoTable");
-#line 241 "/home/jens/Source/shotwell/src/db/Db.vala"
-		if (!database_table_add_column ("PhotoTable", "develop_shotwell_id", "INTEGER DEFAULT -1")) {
-#line 242 "/home/jens/Source/shotwell/src/db/Db.vala"
-			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
-#line 242 "/home/jens/Source/shotwell/src/db/Db.vala"
-			return result;
-#line 600 "Db.c"
-		}
-	}
-#line 245 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (!database_table_has_column ("PhotoTable", "develop_camera_id")) {
-#line 246 "/home/jens/Source/shotwell/src/db/Db.vala"
-		g_message ("Db.vala:246: upgrade_database: adding develop_camera_id column to Phot" \
-"oTable");
-#line 247 "/home/jens/Source/shotwell/src/db/Db.vala"
-		if (!database_table_add_column ("PhotoTable", "develop_camera_id", "INTEGER DEFAULT -1")) {
-#line 248 "/home/jens/Source/shotwell/src/db/Db.vala"
-			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
-#line 248 "/home/jens/Source/shotwell/src/db/Db.vala"
-			return result;
-#line 613 "Db.c"
-		}
-	}
-#line 251 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (!database_table_has_column ("PhotoTable", "develop_embedded_id")) {
-#line 252 "/home/jens/Source/shotwell/src/db/Db.vala"
-		g_message ("Db.vala:252: upgrade_database: adding develop_embedded_id column to Ph" \
-"otoTable");
-#line 253 "/home/jens/Source/shotwell/src/db/Db.vala"
-		if (!database_table_add_column ("PhotoTable", "develop_embedded_id", "INTEGER DEFAULT -1")) {
-#line 254 "/home/jens/Source/shotwell/src/db/Db.vala"
-			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
-#line 254 "/home/jens/Source/shotwell/src/db/Db.vala"
-			return result;
-#line 626 "Db.c"
-		}
-	}
-#line 257 "/home/jens/Source/shotwell/src/db/Db.vala"
-	version = 13;
-#line 264 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (input_version < 14) {
-#line 265 "/home/jens/Source/shotwell/src/db/Db.vala"
-		tag_table_upgrade_for_htags ();
-#line 635 "Db.c"
-	}
-#line 267 "/home/jens/Source/shotwell/src/db/Db.vala"
-	version = 14;
-#line 279 "/home/jens/Source/shotwell/src/db/Db.vala"
-	version = 15;
-#line 289 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (input_version < 16) {
-#line 292 "/home/jens/Source/shotwell/src/db/Db.vala"
-		gsettings_configuration_engine_run_gsettings_migrator ();
-#line 645 "Db.c"
-	}
-#line 295 "/home/jens/Source/shotwell/src/db/Db.vala"
-	version = 16;
-#line 302 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (!database_table_has_column ("PhotoTable", "comment")) {
-#line 303 "/home/jens/Source/shotwell/src/db/Db.vala"
-		g_message ("Db.vala:303: upgrade_database: adding comment column to PhotoTable");
-#line 304 "/home/jens/Source/shotwell/src/db/Db.vala"
-		if (!database_table_add_column ("PhotoTable", "comment", "TEXT")) {
-#line 305 "/home/jens/Source/shotwell/src/db/Db.vala"
-			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
-#line 305 "/home/jens/Source/shotwell/src/db/Db.vala"
-			return result;
-#line 659 "Db.c"
-		}
-	}
-#line 307 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (database_table_has_table ("VideoTable") & (!database_table_has_column ("VideoTable", "comment"))) {
-#line 308 "/home/jens/Source/shotwell/src/db/Db.vala"
-		g_message ("Db.vala:308: upgrade_database: adding comment column to VideoTable");
-#line 309 "/home/jens/Source/shotwell/src/db/Db.vala"
-		if (!database_table_add_column ("VideoTable", "comment", "TEXT")) {
-#line 310 "/home/jens/Source/shotwell/src/db/Db.vala"
-			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
-#line 310 "/home/jens/Source/shotwell/src/db/Db.vala"
-			return result;
-#line 672 "Db.c"
-		}
-	}
-#line 313 "/home/jens/Source/shotwell/src/db/Db.vala"
-	version = 17;
-#line 320 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (!database_table_has_column ("EventTable", "comment")) {
-#line 321 "/home/jens/Source/shotwell/src/db/Db.vala"
-		g_message ("Db.vala:321: upgrade_database: adding comment column to EventTable");
-#line 322 "/home/jens/Source/shotwell/src/db/Db.vala"
-		if (!database_table_add_column ("EventTable", "comment", "TEXT")) {
-#line 323 "/home/jens/Source/shotwell/src/db/Db.vala"
-			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
-#line 323 "/home/jens/Source/shotwell/src/db/Db.vala"
-			return result;
-#line 687 "Db.c"
-		}
-	}
-#line 326 "/home/jens/Source/shotwell/src/db/Db.vala"
-	version = 18;
-#line 337 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (input_version < 19) {
-#line 694 "Db.c"
-		Application* _tmp3_;
-		Application* _tmp4_;
-#line 338 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_tmp3_ = application_get_instance ();
-#line 338 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_tmp4_ = _tmp3_;
-#line 338 "/home/jens/Source/shotwell/src/db/Db.vala"
-		application_set_raw_thumbs_fix_required (_tmp4_, TRUE);
-#line 338 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_application_unref0 (_tmp4_);
-#line 705 "Db.c"
-	}
-#line 341 "/home/jens/Source/shotwell/src/db/Db.vala"
-	version = 19;
-#line 351 "/home/jens/Source/shotwell/src/db/Db.vala"
-	version = 20;
-#line 357 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_tmp5_ = version;
-#line 357 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_vala_assert (_tmp5_ == DATABASE_TABLE_SCHEMA_VERSION, "version == DatabaseTable.SCHEMA_VERSION");
-#line 358 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_tmp6_ = version_table_get_instance ();
-#line 358 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_tmp7_ = _tmp6_;
-#line 358 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_tmp8_ = version;
-#line 358 "/home/jens/Source/shotwell/src/db/Db.vala"
-	version_table_update_version (_tmp7_, _tmp8_, RESOURCES_APP_VERSION);
-#line 358 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_database_table_unref0 (_tmp7_);
-#line 360 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_tmp9_ = version;
-#line 360 "/home/jens/Source/shotwell/src/db/Db.vala"
-	g_message ("Db.vala:360: Database upgrade to schema version %d successful", _tmp9_);
-#line 362 "/home/jens/Source/shotwell/src/db/Db.vala"
-	result = DB_VERIFY_RESULT_OK;
-#line 362 "/home/jens/Source/shotwell/src/db/Db.vala"
-	return result;
-#line 733 "Db.c"
-}
-
-
-
diff --git a/src/db/EventTable.c b/src/db/EventTable.c
deleted file mode 100644
index ce14303..0000000
--- a/src/db/EventTable.c
+++ /dev/null
@@ -1,1901 +0,0 @@
-/* EventTable.c generated by valac 0.40.4, the Vala compiler
- * generated from EventTable.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <sqlite3.h>
-#include <gee.h>
-#include <gobject/gvaluecollector.h>
-
-
-#define TYPE_EVENT_ID (event_id_get_type ())
-typedef struct _EventID EventID;
-
-#define TYPE_EVENT_ROW (event_row_get_type ())
-#define EVENT_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EVENT_ROW, EventRow))
-#define EVENT_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_EVENT_ROW, EventRowClass))
-#define IS_EVENT_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_EVENT_ROW))
-#define IS_EVENT_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_EVENT_ROW))
-#define EVENT_ROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_EVENT_ROW, EventRowClass))
-
-typedef struct _EventRow EventRow;
-typedef struct _EventRowClass EventRowClass;
-typedef struct _EventRowPrivate EventRowPrivate;
-#define _g_free0(var) (var = (g_free (var), NULL))
-typedef struct _ParamSpecEventRow ParamSpecEventRow;
-
-#define TYPE_DATABASE_TABLE (database_table_get_type ())
-#define DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATABASE_TABLE, DatabaseTable))
-#define DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATABASE_TABLE, DatabaseTableClass))
-#define IS_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATABASE_TABLE))
-#define IS_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DATABASE_TABLE))
-#define DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DATABASE_TABLE, DatabaseTableClass))
-
-typedef struct _DatabaseTable DatabaseTable;
-typedef struct _DatabaseTableClass DatabaseTableClass;
-typedef struct _DatabaseTablePrivate DatabaseTablePrivate;
-
-#define TYPE_EVENT_TABLE (event_table_get_type ())
-#define EVENT_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EVENT_TABLE, EventTable))
-#define EVENT_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_EVENT_TABLE, EventTableClass))
-#define IS_EVENT_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_EVENT_TABLE))
-#define IS_EVENT_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_EVENT_TABLE))
-#define EVENT_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_EVENT_TABLE, EventTableClass))
-
-typedef struct _EventTable EventTable;
-typedef struct _EventTableClass EventTableClass;
-typedef struct _EventTablePrivate EventTablePrivate;
-#define _sqlite3_finalize0(var) ((var == NULL) ? NULL : (var = (sqlite3_finalize (var), NULL)))
-#define _database_table_unref0(var) ((var == NULL) ? NULL : (var = (database_table_unref (var), NULL)))
-
-#define TYPE_MEDIA_COLLECTION_REGISTRY (media_collection_registry_get_type ())
-#define MEDIA_COLLECTION_REGISTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_COLLECTION_REGISTRY, MediaCollectionRegistry))
-#define MEDIA_COLLECTION_REGISTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEDIA_COLLECTION_REGISTRY, MediaCollectionRegistryClass))
-#define IS_MEDIA_COLLECTION_REGISTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MEDIA_COLLECTION_REGISTRY))
-#define IS_MEDIA_COLLECTION_REGISTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MEDIA_COLLECTION_REGISTRY))
-#define MEDIA_COLLECTION_REGISTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MEDIA_COLLECTION_REGISTRY, MediaCollectionRegistryClass))
-
-typedef struct _MediaCollectionRegistry MediaCollectionRegistry;
-typedef struct _MediaCollectionRegistryClass MediaCollectionRegistryClass;
-#define _media_collection_registry_unref0(var) ((var == NULL) ? NULL : (var = (media_collection_registry_unref (var), NULL)))
-
-#define TYPE_PHOTO_ID (photo_id_get_type ())
-typedef struct _PhotoID PhotoID;
-#define _event_row_unref0(var) ((var == NULL) ? NULL : (var = (event_row_unref (var), NULL)))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
-#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
-#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-
-struct _EventID {
-	gint64 id;
-};
-
-struct _EventRow {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	EventRowPrivate * priv;
-	EventID event_id;
-	gchar* name;
-	time_t time_created;
-	gchar* primary_source_id;
-	gchar* comment;
-};
-
-struct _EventRowClass {
-	GTypeClass parent_class;
-	void (*finalize) (EventRow *self);
-};
-
-struct _ParamSpecEventRow {
-	GParamSpec parent_instance;
-};
-
-struct _DatabaseTable {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	DatabaseTablePrivate * priv;
-	gchar* table_name;
-};
-
-struct _DatabaseTableClass {
-	GTypeClass parent_class;
-	void (*finalize) (DatabaseTable *self);
-};
-
-struct _EventTable {
-	DatabaseTable parent_instance;
-	EventTablePrivate * priv;
-};
-
-struct _EventTableClass {
-	DatabaseTableClass parent_class;
-};
-
-struct _PhotoID {
-	gint64 id;
-};
-
-typedef enum  {
-	DATABASE_ERROR_ERROR,
-	DATABASE_ERROR_BACKING,
-	DATABASE_ERROR_MEMORY,
-	DATABASE_ERROR_ABORT,
-	DATABASE_ERROR_LIMITS,
-	DATABASE_ERROR_TYPESPEC
-} DatabaseError;
-#define DATABASE_ERROR database_error_quark ()
-
-static gpointer event_row_parent_class = NULL;
-static gpointer event_table_parent_class = NULL;
-static EventTable* event_table_instance;
-static EventTable* event_table_instance = NULL;
-extern sqlite3* database_table_db;
-
-GType event_id_get_type (void) G_GNUC_CONST;
-EventID* event_id_dup (const EventID* self);
-void event_id_free (EventID* self);
-#define EVENT_ID_INVALID ((gint64) -1)
-void event_id_init (EventID *self,
-                    gint64 id);
-gboolean event_id_is_invalid (EventID *self);
-gboolean event_id_is_valid (EventID *self);
-gpointer event_row_ref (gpointer instance);
-void event_row_unref (gpointer instance);
-GParamSpec* param_spec_event_row (const gchar* name,
-                                  const gchar* nick,
-                                  const gchar* blurb,
-                                  GType object_type,
-                                  GParamFlags flags);
-void value_set_event_row (GValue* value,
-                          gpointer v_object);
-void value_take_event_row (GValue* value,
-                           gpointer v_object);
-gpointer value_get_event_row (const GValue* value);
-GType event_row_get_type (void) G_GNUC_CONST;
-EventRow* event_row_new (void);
-EventRow* event_row_construct (GType object_type);
-static void event_row_finalize (EventRow * obj);
-gpointer database_table_ref (gpointer instance);
-void database_table_unref (gpointer instance);
-GParamSpec* param_spec_database_table (const gchar* name,
-                                       const gchar* nick,
-                                       const gchar* blurb,
-                                       GType object_type,
-                                       GParamFlags flags);
-void value_set_database_table (GValue* value,
-                               gpointer v_object);
-void value_take_database_table (GValue* value,
-                                gpointer v_object);
-gpointer value_get_database_table (const GValue* value);
-GType database_table_get_type (void) G_GNUC_CONST;
-GType event_table_get_type (void) G_GNUC_CONST;
-static EventTable* event_table_new (void);
-static EventTable* event_table_construct (GType object_type);
-DatabaseTable* database_table_construct (GType object_type);
-void database_table_fatal (const gchar* op,
-                           gint res);
-void database_table_set_table_name (DatabaseTable* self,
-                                    const gchar* table_name);
-EventTable* event_table_get_instance (void);
-static gchar* event_table_source_id_upgrade (EventTable* self,
-                                      gint64 primary_photo_id,
-                                      const gchar* primary_source_id);
-gpointer media_collection_registry_ref (gpointer instance);
-void media_collection_registry_unref (gpointer instance);
-GParamSpec* param_spec_media_collection_registry (const gchar* name,
-                                                  const gchar* nick,
-                                                  const gchar* blurb,
-                                                  GType object_type,
-                                                  GParamFlags flags);
-void value_set_media_collection_registry (GValue* value,
-                                          gpointer v_object);
-void value_take_media_collection_registry (GValue* value,
-                                           gpointer v_object);
-gpointer value_get_media_collection_registry (const GValue* value);
-GType media_collection_registry_get_type (void) G_GNUC_CONST;
-MediaCollectionRegistry* media_collection_registry_get_instance (void);
-gboolean media_collection_registry_is_valid_source_id (MediaCollectionRegistry* self,
-                                                       const gchar* source_id);
-#define PHOTO_ID_INVALID ((gint64) -1)
-GType photo_id_get_type (void) G_GNUC_CONST;
-PhotoID* photo_id_dup (const PhotoID* self);
-void photo_id_free (PhotoID* self);
-gchar* photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id);
-void photo_id_init (PhotoID *self,
-                    gint64 id);
-GQuark database_error_quark (void);
-EventRow* event_table_create (EventTable* self,
-                              const gchar* primary_source_id,
-                              const gchar* comment,
-                              GError** error);
-gulong now_sec (void);
-void database_table_throw_error (const gchar* method,
-                                 gint res,
-                                 GError** error);
-void event_table_create_from_row (EventTable* self,
-                                  EventRow* row,
-                                  EventID* result);
-EventRow* event_table_get_row (EventTable* self,
-                               EventID* event_id);
-void event_table_remove (EventTable* self,
-                         EventID* event_id,
-                         GError** error);
-void database_table_delete_by_id (DatabaseTable* self,
-                                  gint64 id,
-                                  GError** error);
-GeeArrayList* event_table_get_events (EventTable* self);
-gboolean event_table_rename (EventTable* self,
-                             EventID* event_id,
-                             const gchar* name);
-gboolean database_table_update_text_by_id (DatabaseTable* self,
-                                           gint64 id,
-                                           const gchar* column,
-                                           const gchar* text);
-gchar* event_table_get_name (EventTable* self,
-                             EventID* event_id);
-gboolean database_table_select_by_id (DatabaseTable* self,
-                                      gint64 id,
-                                      const gchar* columns,
-                                      sqlite3_stmt* * stmt);
-gchar* event_table_get_primary_source_id (EventTable* self,
-                                          EventID* event_id);
-gboolean event_table_set_primary_source_id (EventTable* self,
-                                            EventID* event_id,
-                                            const gchar* primary_source_id);
-time_t event_table_get_time_created (EventTable* self,
-                                     EventID* event_id);
-gboolean event_table_set_comment (EventTable* self,
-                                  EventID* event_id,
-                                  const gchar* new_comment);
-static void event_table_finalize (DatabaseTable * obj);
-
-
-void
-event_id_init (EventID *self,
-               gint64 id)
-{
-#line 12 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	memset (self, 0, sizeof (EventID));
-#line 13 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	(*self).id = id;
-#line 274 "EventTable.c"
-}
-
-
-gboolean
-event_id_is_invalid (EventID *self)
-{
-	gboolean result = FALSE;
-	gint64 _tmp0_;
-#line 17 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp0_ = (*self).id;
-#line 17 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	result = _tmp0_ == EVENT_ID_INVALID;
-#line 17 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return result;
-#line 289 "EventTable.c"
-}
-
-
-gboolean
-event_id_is_valid (EventID *self)
-{
-	gboolean result = FALSE;
-	gint64 _tmp0_;
-#line 21 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp0_ = (*self).id;
-#line 21 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	result = _tmp0_ != EVENT_ID_INVALID;
-#line 21 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return result;
-#line 304 "EventTable.c"
-}
-
-
-EventID*
-event_id_dup (const EventID* self)
-{
-	EventID* dup;
-#line 7 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	dup = g_new0 (EventID, 1);
-#line 7 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	memcpy (dup, self, sizeof (EventID));
-#line 7 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return dup;
-#line 318 "EventTable.c"
-}
-
-
-void
-event_id_free (EventID* self)
-{
-#line 7 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_free (self);
-#line 327 "EventTable.c"
-}
-
-
-GType
-event_id_get_type (void)
-{
-	static volatile gsize event_id_type_id__volatile = 0;
-	if (g_once_init_enter (&event_id_type_id__volatile)) {
-		GType event_id_type_id;
-		event_id_type_id = g_boxed_type_register_static ("EventID", (GBoxedCopyFunc) event_id_dup, (GBoxedFreeFunc) event_id_free);
-		g_once_init_leave (&event_id_type_id__volatile, event_id_type_id);
-	}
-	return event_id_type_id__volatile;
-}
-
-
-EventRow*
-event_row_construct (GType object_type)
-{
-	EventRow* self = NULL;
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	self = (EventRow*) g_type_create_instance (object_type);
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return self;
-#line 352 "EventTable.c"
-}
-
-
-EventRow*
-event_row_new (void)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return event_row_construct (TYPE_EVENT_ROW);
-#line 361 "EventTable.c"
-}
-
-
-static void
-value_event_row_init (GValue* value)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	value->data[0].v_pointer = NULL;
-#line 370 "EventTable.c"
-}
-
-
-static void
-value_event_row_free_value (GValue* value)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (value->data[0].v_pointer) {
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		event_row_unref (value->data[0].v_pointer);
-#line 381 "EventTable.c"
-	}
-}
-
-
-static void
-value_event_row_copy_value (const GValue* src_value,
-                            GValue* dest_value)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (src_value->data[0].v_pointer) {
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		dest_value->data[0].v_pointer = event_row_ref (src_value->data[0].v_pointer);
-#line 394 "EventTable.c"
-	} else {
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 398 "EventTable.c"
-	}
-}
-
-
-static gpointer
-value_event_row_peek_pointer (const GValue* value)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return value->data[0].v_pointer;
-#line 408 "EventTable.c"
-}
-
-
-static gchar*
-value_event_row_collect_value (GValue* value,
-                               guint n_collect_values,
-                               GTypeCValue* collect_values,
-                               guint collect_flags)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (collect_values[0].v_pointer) {
-#line 420 "EventTable.c"
-		EventRow * object;
-		object = collect_values[0].v_pointer;
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 427 "EventTable.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.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 431 "EventTable.c"
-		}
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		value->data[0].v_pointer = event_row_ref (object);
-#line 435 "EventTable.c"
-	} else {
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 439 "EventTable.c"
-	}
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return NULL;
-#line 443 "EventTable.c"
-}
-
-
-static gchar*
-value_event_row_lcopy_value (const GValue* value,
-                             guint n_collect_values,
-                             GTypeCValue* collect_values,
-                             guint collect_flags)
-{
-	EventRow ** object_p;
-	object_p = collect_values[0].v_pointer;
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (!object_p) {
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 459 "EventTable.c"
-	}
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (!value->data[0].v_pointer) {
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		*object_p = NULL;
-#line 465 "EventTable.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		*object_p = value->data[0].v_pointer;
-#line 469 "EventTable.c"
-	} else {
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		*object_p = event_row_ref (value->data[0].v_pointer);
-#line 473 "EventTable.c"
-	}
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return NULL;
-#line 477 "EventTable.c"
-}
-
-
-GParamSpec*
-param_spec_event_row (const gchar* name,
-                      const gchar* nick,
-                      const gchar* blurb,
-                      GType object_type,
-                      GParamFlags flags)
-{
-	ParamSpecEventRow* spec;
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, TYPE_EVENT_ROW), NULL);
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return G_PARAM_SPEC (spec);
-#line 497 "EventTable.c"
-}
-
-
-gpointer
-value_get_event_row (const GValue* value)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EVENT_ROW), NULL);
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return value->data[0].v_pointer;
-#line 508 "EventTable.c"
-}
-
-
-void
-value_set_event_row (GValue* value,
-                     gpointer v_object)
-{
-	EventRow * old;
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EVENT_ROW));
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	old = value->data[0].v_pointer;
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (v_object) {
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_EVENT_ROW));
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		value->data[0].v_pointer = v_object;
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		event_row_ref (value->data[0].v_pointer);
-#line 531 "EventTable.c"
-	} else {
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 535 "EventTable.c"
-	}
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (old) {
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		event_row_unref (old);
-#line 541 "EventTable.c"
-	}
-}
-
-
-void
-value_take_event_row (GValue* value,
-                      gpointer v_object)
-{
-	EventRow * old;
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EVENT_ROW));
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	old = value->data[0].v_pointer;
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (v_object) {
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_EVENT_ROW));
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		value->data[0].v_pointer = v_object;
-#line 563 "EventTable.c"
-	} else {
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 567 "EventTable.c"
-	}
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (old) {
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		event_row_unref (old);
-#line 573 "EventTable.c"
-	}
-}
-
-
-static void
-event_row_class_init (EventRowClass * klass)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	event_row_parent_class = g_type_class_peek_parent (klass);
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	((EventRowClass *) klass)->finalize = event_row_finalize;
-#line 585 "EventTable.c"
-}
-
-
-static void
-event_row_instance_init (EventRow * self)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	self->ref_count = 1;
-#line 594 "EventTable.c"
-}
-
-
-static void
-event_row_finalize (EventRow * obj)
-{
-	EventRow * self;
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT_ROW, EventRow);
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_signal_handlers_destroy (self);
-#line 27 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_g_free0 (self->name);
-#line 29 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_g_free0 (self->primary_source_id);
-#line 30 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_g_free0 (self->comment);
-#line 612 "EventTable.c"
-}
-
-
-GType
-event_row_get_type (void)
-{
-	static volatile gsize event_row_type_id__volatile = 0;
-	if (g_once_init_enter (&event_row_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_event_row_init, value_event_row_free_value, value_event_row_copy_value, value_event_row_peek_pointer, "p", value_event_row_collect_value, "p", value_event_row_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (EventRowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_row_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventRow), 0, (GInstanceInitFunc) event_row_instance_init, &g_define_type_value_table };
-		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
-		GType event_row_type_id;
-		event_row_type_id = g_type_register_fundamental (g_type_fundamental_next (), "EventRow", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&event_row_type_id__volatile, event_row_type_id);
-	}
-	return event_row_type_id__volatile;
-}
-
-
-gpointer
-event_row_ref (gpointer instance)
-{
-	EventRow * self;
-	self = instance;
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return instance;
-#line 641 "EventTable.c"
-}
-
-
-void
-event_row_unref (gpointer instance)
-{
-	EventRow * self;
-	self = instance;
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		EVENT_ROW_GET_CLASS (self)->finalize (self);
-#line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 656 "EventTable.c"
-	}
-}
-
-
-static EventTable*
-event_table_construct (GType object_type)
-{
-	EventTable* self = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	gint _tmp5_;
-#line 36 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	self = (EventTable*) database_table_construct (object_type);
-#line 38 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp0_ = database_table_db;
-#line 38 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "CREATE TABLE IF NOT EXISTS EventTable (" "id INTEGER PRIMARY KEY, " "name TEXT, " "primary_photo_id INTEGER, " "time_created INTEGER," "primary_source_id TEXT," "comment TEXT" ")", -1, &_tmp1_, NULL);
-#line 38 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 38 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	stmt = _tmp1_;
-#line 38 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	res = _tmp2_;
-#line 46 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp3_ = res;
-#line 46 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 48 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp4_ = stmt;
-#line 48 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	res = sqlite3_step (_tmp4_);
-#line 49 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp5_ = res;
-#line 49 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (_tmp5_ != SQLITE_DONE) {
-#line 697 "EventTable.c"
-		gint _tmp6_;
-#line 50 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp6_ = res;
-#line 50 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		database_table_fatal ("create photo table", _tmp6_);
-#line 703 "EventTable.c"
-	}
-#line 52 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	database_table_set_table_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), "EventTable");
-#line 36 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 36 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return self;
-#line 711 "EventTable.c"
-}
-
-
-static EventTable*
-event_table_new (void)
-{
-#line 36 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return event_table_construct (TYPE_EVENT_TABLE);
-#line 720 "EventTable.c"
-}
-
-
-static gpointer
-_database_table_ref0 (gpointer self)
-{
-#line 59 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return self ? database_table_ref (self) : NULL;
-#line 729 "EventTable.c"
-}
-
-
-EventTable*
-event_table_get_instance (void)
-{
-	EventTable* result = NULL;
-	EventTable* _tmp0_;
-	EventTable* _tmp2_;
-	EventTable* _tmp3_;
-#line 56 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp0_ = event_table_instance;
-#line 56 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (_tmp0_ == NULL) {
-#line 744 "EventTable.c"
-		EventTable* _tmp1_;
-#line 57 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp1_ = event_table_new ();
-#line 57 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_database_table_unref0 (event_table_instance);
-#line 57 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		event_table_instance = _tmp1_;
-#line 752 "EventTable.c"
-	}
-#line 59 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp2_ = event_table_instance;
-#line 59 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp3_ = _database_table_ref0 (_tmp2_);
-#line 59 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	result = _tmp3_;
-#line 59 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return result;
-#line 762 "EventTable.c"
-}
-
-
-static gchar*
-event_table_source_id_upgrade (EventTable* self,
-                               gint64 primary_photo_id,
-                               const gchar* primary_source_id)
-{
-	gchar* result = NULL;
-	MediaCollectionRegistry* _tmp0_;
-	MediaCollectionRegistry* _tmp1_;
-	gboolean _tmp2_;
-#line 63 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_val_if_fail (IS_EVENT_TABLE (self), NULL);
-#line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp0_ = media_collection_registry_get_instance ();
-#line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp1_ = _tmp0_;
-#line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp2_ = media_collection_registry_is_valid_source_id (_tmp1_, primary_source_id);
-#line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_media_collection_registry_unref0 (_tmp1_);
-#line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (_tmp2_) {
-#line 787 "EventTable.c"
-		gchar* _tmp3_;
-#line 65 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp3_ = g_strdup (primary_source_id);
-#line 65 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		result = _tmp3_;
-#line 65 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		return result;
-#line 795 "EventTable.c"
-	}
-#line 67 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (primary_photo_id != PHOTO_ID_INVALID) {
-#line 799 "EventTable.c"
-		PhotoID _tmp4_ = {0};
-		gchar* _tmp5_;
-#line 69 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		photo_id_init (&_tmp4_, primary_photo_id);
-#line 69 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp5_ = photo_id_upgrade_photo_id_to_source_id (&_tmp4_);
-#line 69 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		result = _tmp5_;
-#line 69 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		return result;
-#line 810 "EventTable.c"
-	}
-#line 71 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	result = NULL;
-#line 71 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return result;
-#line 816 "EventTable.c"
-}
-
-
-EventRow*
-event_table_create (EventTable* self,
-                    const gchar* primary_source_id,
-                    const gchar* comment,
-                    GError** error)
-{
-	EventRow* result = NULL;
-	gboolean _tmp0_ = FALSE;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp1_;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_;
-	gint _tmp4_;
-	time_t time_created = 0;
-	sqlite3_stmt* _tmp5_;
-	gchar* _tmp6_;
-	GDestroyNotify _tmp7_;
-	gint _tmp8_;
-	sqlite3_stmt* _tmp9_;
-	time_t _tmp10_;
-	gint _tmp11_;
-	sqlite3_stmt* _tmp12_;
-	gchar* _tmp13_;
-	GDestroyNotify _tmp14_;
-	gint _tmp15_;
-	sqlite3_stmt* _tmp16_;
-	gint _tmp17_;
-	EventRow* row = NULL;
-	EventRow* _tmp19_;
-	EventRow* _tmp20_;
-	sqlite3* _tmp21_;
-	EventRow* _tmp22_;
-	EventRow* _tmp23_;
-	gchar* _tmp24_;
-	EventRow* _tmp25_;
-	time_t _tmp26_;
-	EventRow* _tmp27_;
-	gchar* _tmp28_;
-	GError * _inner_error_ = NULL;
-#line 74 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_val_if_fail (IS_EVENT_TABLE (self), NULL);
-#line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (primary_source_id != NULL) {
-#line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp0_ = g_strcmp0 (primary_source_id, "") != 0;
-#line 866 "EventTable.c"
-	} else {
-#line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp0_ = FALSE;
-#line 870 "EventTable.c"
-	}
-#line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_vala_assert (_tmp0_, "primary_source_id != null && primary_source_id != \"\"");
-#line 78 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp1_ = database_table_db;
-#line 78 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp3_ = sqlite3_prepare_v2 (_tmp1_, "INSERT INTO EventTable (primary_source_id, time_created, comment) VALU" \
-"ES (?, ?, ?)", -1, &_tmp2_, NULL);
-#line 78 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 78 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	stmt = _tmp2_;
-#line 78 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	res = _tmp3_;
-#line 81 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp4_ = res;
-#line 81 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_vala_assert (_tmp4_ == SQLITE_OK, "res == Sqlite.OK");
-#line 83 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	time_created = (time_t) now_sec ();
-#line 85 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp5_ = stmt;
-#line 85 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp6_ = g_strdup (primary_source_id);
-#line 85 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp7_ = g_free;
-#line 85 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	res = sqlite3_bind_text (_tmp5_, 1, _tmp6_, -1, _tmp7_);
-#line 86 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp8_ = res;
-#line 86 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
-#line 87 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp9_ = stmt;
-#line 87 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp10_ = time_created;
-#line 87 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	res = sqlite3_bind_int64 (_tmp9_, 2, (gint64) _tmp10_);
-#line 88 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp11_ = res;
-#line 88 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
-#line 89 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp12_ = stmt;
-#line 89 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp13_ = g_strdup (comment);
-#line 89 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp14_ = g_free;
-#line 89 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	res = sqlite3_bind_text (_tmp12_, 3, _tmp13_, -1, _tmp14_);
-#line 90 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp15_ = res;
-#line 90 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK");
-#line 92 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp16_ = stmt;
-#line 92 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	res = sqlite3_step (_tmp16_);
-#line 93 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp17_ = res;
-#line 93 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (_tmp17_ != SQLITE_DONE) {
-#line 932 "EventTable.c"
-		gint _tmp18_;
-#line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp18_ = res;
-#line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		database_table_throw_error ("EventTable.create", _tmp18_, &_inner_error_);
-#line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-				return NULL;
-#line 948 "EventTable.c"
-			} else {
-#line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 94 "/home/jens/Source/shotwell/src/db/EventTable.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 94 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-				g_clear_error (&_inner_error_);
-#line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-				return NULL;
-#line 958 "EventTable.c"
-			}
-		}
-	}
-#line 96 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp19_ = event_row_new ();
-#line 96 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	row = _tmp19_;
-#line 97 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp20_ = row;
-#line 97 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp21_ = database_table_db;
-#line 97 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	event_id_init (&_tmp20_->event_id, sqlite3_last_insert_rowid (_tmp21_));
-#line 98 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp22_ = row;
-#line 98 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_g_free0 (_tmp22_->name);
-#line 98 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp22_->name = NULL;
-#line 99 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp23_ = row;
-#line 99 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp24_ = g_strdup (primary_source_id);
-#line 99 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_g_free0 (_tmp23_->primary_source_id);
-#line 99 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp23_->primary_source_id = _tmp24_;
-#line 100 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp25_ = row;
-#line 100 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp26_ = time_created;
-#line 100 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp25_->time_created = _tmp26_;
-#line 101 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp27_ = row;
-#line 101 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp28_ = g_strdup (comment);
-#line 101 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_g_free0 (_tmp27_->comment);
-#line 101 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp27_->comment = _tmp28_;
-#line 103 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	result = row;
-#line 103 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 103 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return result;
-#line 1006 "EventTable.c"
-}
-
-
-void
-event_table_create_from_row (EventTable* self,
-                             EventRow* row,
-                             EventID* result)
-{
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	const gchar* _tmp5_;
-	gchar* _tmp6_;
-	GDestroyNotify _tmp7_;
-	gint _tmp8_;
-	sqlite3_stmt* _tmp9_;
-	gint _tmp10_;
-	sqlite3_stmt* _tmp11_;
-	const gchar* _tmp12_;
-	gchar* _tmp13_;
-	GDestroyNotify _tmp14_;
-	gint _tmp15_;
-	sqlite3_stmt* _tmp16_;
-	time_t _tmp17_;
-	gint _tmp18_;
-	sqlite3_stmt* _tmp19_;
-	const gchar* _tmp20_;
-	gchar* _tmp21_;
-	GDestroyNotify _tmp22_;
-	gint _tmp23_;
-	sqlite3_stmt* _tmp24_;
-	gint _tmp25_;
-	sqlite3* _tmp28_;
-	EventID _tmp29_ = {0};
-#line 109 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_if_fail (IS_EVENT_TABLE (self));
-#line 109 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_if_fail (IS_EVENT_ROW (row));
-#line 111 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp0_ = database_table_db;
-#line 111 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "INSERT INTO EventTable (name, primary_photo_id, primary_source_id, tim" \
-"e_created, comment) VALUES (?, ?, ?, ?, ?)", -1, &_tmp1_, NULL);
-#line 111 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 111 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	stmt = _tmp1_;
-#line 111 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	res = _tmp2_;
-#line 113 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp3_ = res;
-#line 113 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 115 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp4_ = stmt;
-#line 115 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp5_ = row->name;
-#line 115 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp6_ = g_strdup (_tmp5_);
-#line 115 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp7_ = g_free;
-#line 115 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	res = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_);
-#line 116 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp8_ = res;
-#line 116 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
-#line 117 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp9_ = stmt;
-#line 117 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	res = sqlite3_bind_int64 (_tmp9_, 2, PHOTO_ID_INVALID);
-#line 118 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp10_ = res;
-#line 118 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK");
-#line 119 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp11_ = stmt;
-#line 119 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp12_ = row->primary_source_id;
-#line 119 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp13_ = g_strdup (_tmp12_);
-#line 119 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp14_ = g_free;
-#line 119 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	res = sqlite3_bind_text (_tmp11_, 3, _tmp13_, -1, _tmp14_);
-#line 120 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp15_ = res;
-#line 120 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK");
-#line 121 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp16_ = stmt;
-#line 121 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp17_ = row->time_created;
-#line 121 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	res = sqlite3_bind_int64 (_tmp16_, 4, (gint64) _tmp17_);
-#line 122 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp18_ = res;
-#line 122 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK");
-#line 123 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp19_ = stmt;
-#line 123 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp20_ = row->comment;
-#line 123 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp21_ = g_strdup (_tmp20_);
-#line 123 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp22_ = g_free;
-#line 123 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	res = sqlite3_bind_text (_tmp19_, 5, _tmp21_, -1, _tmp22_);
-#line 124 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp23_ = res;
-#line 124 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK");
-#line 126 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp24_ = stmt;
-#line 126 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	res = sqlite3_step (_tmp24_);
-#line 127 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp25_ = res;
-#line 127 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (_tmp25_ != SQLITE_DONE) {
-#line 1131 "EventTable.c"
-		gint _tmp26_;
-		EventID _tmp27_ = {0};
-#line 128 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp26_ = res;
-#line 128 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		database_table_fatal ("Event create_from_row", _tmp26_);
-#line 130 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		event_id_init (&_tmp27_, EVENT_ID_INVALID);
-#line 130 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		*result = _tmp27_;
-#line 130 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 130 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		return;
-#line 1146 "EventTable.c"
-	}
-#line 133 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp28_ = database_table_db;
-#line 133 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	event_id_init (&_tmp29_, sqlite3_last_insert_rowid (_tmp28_));
-#line 133 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	*result = _tmp29_;
-#line 133 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 133 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return;
-#line 1158 "EventTable.c"
-}
-
-
-EventRow*
-event_table_get_row (EventTable* self,
-                     EventID* event_id)
-{
-	EventRow* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	EventID _tmp5_;
-	gint64 _tmp6_;
-	gint _tmp7_;
-	sqlite3_stmt* _tmp8_;
-	EventRow* row = NULL;
-	EventRow* _tmp9_;
-	EventRow* _tmp10_;
-	EventID _tmp11_;
-	EventRow* _tmp12_;
-	sqlite3_stmt* _tmp13_;
-	const gchar* _tmp14_;
-	gchar* _tmp15_;
-	gboolean _tmp16_ = FALSE;
-	EventRow* _tmp17_;
-	const gchar* _tmp18_;
-	EventRow* _tmp24_;
-	sqlite3_stmt* _tmp25_;
-	sqlite3_stmt* _tmp26_;
-	const gchar* _tmp27_;
-	gchar* _tmp28_;
-	EventRow* _tmp29_;
-	sqlite3_stmt* _tmp30_;
-	EventRow* _tmp31_;
-	sqlite3_stmt* _tmp32_;
-	const gchar* _tmp33_;
-	gchar* _tmp34_;
-#line 136 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_val_if_fail (IS_EVENT_TABLE (self), NULL);
-#line 136 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_val_if_fail (event_id != NULL, NULL);
-#line 138 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp0_ = database_table_db;
-#line 138 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT name, primary_photo_id, primary_source_id, time_created, commen" \
-"t FROM EventTable WHERE id=?", -1, &_tmp1_, NULL);
-#line 138 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 138 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	stmt = _tmp1_;
-#line 138 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	res = _tmp2_;
-#line 140 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp3_ = res;
-#line 140 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 142 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp4_ = stmt;
-#line 142 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp5_ = *event_id;
-#line 142 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp6_ = _tmp5_.id;
-#line 142 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_);
-#line 143 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp7_ = res;
-#line 143 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 145 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp8_ = stmt;
-#line 145 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (sqlite3_step (_tmp8_) != SQLITE_ROW) {
-#line 146 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		result = NULL;
-#line 146 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 146 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		return result;
-#line 1240 "EventTable.c"
-	}
-#line 148 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp9_ = event_row_new ();
-#line 148 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	row = _tmp9_;
-#line 149 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp10_ = row;
-#line 149 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp11_ = *event_id;
-#line 149 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp10_->event_id = _tmp11_;
-#line 150 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp12_ = row;
-#line 150 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp13_ = stmt;
-#line 150 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp14_ = sqlite3_column_text (_tmp13_, 0);
-#line 150 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp15_ = g_strdup (_tmp14_);
-#line 150 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_g_free0 (_tmp12_->name);
-#line 150 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp12_->name = _tmp15_;
-#line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp17_ = row;
-#line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp18_ = _tmp17_->name;
-#line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (_tmp18_ != NULL) {
-#line 1270 "EventTable.c"
-		EventRow* _tmp19_;
-		const gchar* _tmp20_;
-		gint _tmp21_;
-		gint _tmp22_;
-#line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp19_ = row;
-#line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp20_ = _tmp19_->name;
-#line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp21_ = strlen (_tmp20_);
-#line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp22_ = _tmp21_;
-#line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp16_ = _tmp22_ == 0;
-#line 1285 "EventTable.c"
-	} else {
-#line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp16_ = FALSE;
-#line 1289 "EventTable.c"
-	}
-#line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (_tmp16_) {
-#line 1293 "EventTable.c"
-		EventRow* _tmp23_;
-#line 152 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp23_ = row;
-#line 152 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_g_free0 (_tmp23_->name);
-#line 152 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp23_->name = NULL;
-#line 1301 "EventTable.c"
-	}
-#line 153 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp24_ = row;
-#line 153 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp25_ = stmt;
-#line 153 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp26_ = stmt;
-#line 153 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp27_ = sqlite3_column_text (_tmp26_, 2);
-#line 153 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp28_ = event_table_source_id_upgrade (self, sqlite3_column_int64 (_tmp25_, 1), _tmp27_);
-#line 153 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_g_free0 (_tmp24_->primary_source_id);
-#line 153 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp24_->primary_source_id = _tmp28_;
-#line 154 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp29_ = row;
-#line 154 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp30_ = stmt;
-#line 154 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp29_->time_created = (time_t) sqlite3_column_int64 (_tmp30_, 3);
-#line 155 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp31_ = row;
-#line 155 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp32_ = stmt;
-#line 155 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp33_ = sqlite3_column_text (_tmp32_, 4);
-#line 155 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp34_ = g_strdup (_tmp33_);
-#line 155 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_g_free0 (_tmp31_->comment);
-#line 155 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp31_->comment = _tmp34_;
-#line 157 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	result = row;
-#line 157 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 157 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return result;
-#line 1341 "EventTable.c"
-}
-
-
-void
-event_table_remove (EventTable* self,
-                    EventID* event_id,
-                    GError** error)
-{
-	EventID _tmp0_;
-	gint64 _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 160 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_if_fail (IS_EVENT_TABLE (self));
-#line 160 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_if_fail (event_id != NULL);
-#line 161 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp0_ = *event_id;
-#line 161 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 161 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	database_table_delete_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, &_inner_error_);
-#line 161 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 161 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 161 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 161 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			return;
-#line 1371 "EventTable.c"
-		} else {
-#line 161 "/home/jens/Source/shotwell/src/db/EventTable.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 161 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			g_clear_error (&_inner_error_);
-#line 161 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			return;
-#line 1379 "EventTable.c"
-		}
-	}
-}
-
-
-GeeArrayList*
-event_table_get_events (EventTable* self)
-{
-	GeeArrayList* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	GeeArrayList* event_rows = NULL;
-	GeeArrayList* _tmp4_;
-#line 164 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_val_if_fail (IS_EVENT_TABLE (self), NULL);
-#line 166 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp0_ = database_table_db;
-#line 166 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT id, name, primary_photo_id, primary_source_id, time_created, co" \
-"mment FROM EventTable", -1, &_tmp1_, NULL);
-#line 166 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 166 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	stmt = _tmp1_;
-#line 166 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	res = _tmp2_;
-#line 168 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp3_ = res;
-#line 168 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 170 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp4_ = gee_array_list_new (TYPE_EVENT_ROW, (GBoxedCopyFunc) event_row_ref, (GDestroyNotify) event_row_unref, NULL, NULL, NULL);
-#line 170 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	event_rows = _tmp4_;
-#line 1417 "EventTable.c"
-	{
-		gboolean _tmp5_ = FALSE;
-#line 171 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp5_ = TRUE;
-#line 171 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		while (TRUE) {
-#line 1424 "EventTable.c"
-			sqlite3_stmt* _tmp6_;
-			gint _tmp7_;
-			EventRow* row = NULL;
-			EventRow* _tmp10_;
-			EventRow* _tmp11_;
-			sqlite3_stmt* _tmp12_;
-			EventRow* _tmp13_;
-			sqlite3_stmt* _tmp14_;
-			const gchar* _tmp15_;
-			gchar* _tmp16_;
-			EventRow* _tmp17_;
-			sqlite3_stmt* _tmp18_;
-			sqlite3_stmt* _tmp19_;
-			const gchar* _tmp20_;
-			gchar* _tmp21_;
-			EventRow* _tmp22_;
-			sqlite3_stmt* _tmp23_;
-			EventRow* _tmp24_;
-			sqlite3_stmt* _tmp25_;
-			const gchar* _tmp26_;
-			gchar* _tmp27_;
-			GeeArrayList* _tmp28_;
-			EventRow* _tmp29_;
-#line 171 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			if (!_tmp5_) {
-#line 1450 "EventTable.c"
-			}
-#line 171 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp5_ = FALSE;
-#line 172 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp6_ = stmt;
-#line 172 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			res = sqlite3_step (_tmp6_);
-#line 173 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp7_ = res;
-#line 173 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			if (_tmp7_ == SQLITE_DONE) {
-#line 174 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-				break;
-#line 1464 "EventTable.c"
-			} else {
-				gint _tmp8_;
-#line 175 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-				_tmp8_ = res;
-#line 175 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-				if (_tmp8_ != SQLITE_ROW) {
-#line 1471 "EventTable.c"
-					gint _tmp9_;
-#line 176 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-					_tmp9_ = res;
-#line 176 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-					database_table_fatal ("get_events", _tmp9_);
-#line 178 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-					break;
-#line 1479 "EventTable.c"
-				}
-			}
-#line 181 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp10_ = event_row_new ();
-#line 181 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			row = _tmp10_;
-#line 183 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp11_ = row;
-#line 183 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp12_ = stmt;
-#line 183 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			event_id_init (&_tmp11_->event_id, sqlite3_column_int64 (_tmp12_, 0));
-#line 184 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp13_ = row;
-#line 184 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp14_ = stmt;
-#line 184 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp15_ = sqlite3_column_text (_tmp14_, 1);
-#line 184 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp16_ = g_strdup (_tmp15_);
-#line 184 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_g_free0 (_tmp13_->name);
-#line 184 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp13_->name = _tmp16_;
-#line 185 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp17_ = row;
-#line 185 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp18_ = stmt;
-#line 185 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp19_ = stmt;
-#line 185 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp20_ = sqlite3_column_text (_tmp19_, 3);
-#line 185 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp21_ = event_table_source_id_upgrade (self, sqlite3_column_int64 (_tmp18_, 2), _tmp20_);
-#line 185 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_g_free0 (_tmp17_->primary_source_id);
-#line 185 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp17_->primary_source_id = _tmp21_;
-#line 186 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp22_ = row;
-#line 186 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp23_ = stmt;
-#line 186 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp22_->time_created = (time_t) sqlite3_column_int64 (_tmp23_, 4);
-#line 187 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp24_ = row;
-#line 187 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp25_ = stmt;
-#line 187 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp26_ = sqlite3_column_text (_tmp25_, 5);
-#line 187 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp27_ = g_strdup (_tmp26_);
-#line 187 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_g_free0 (_tmp24_->comment);
-#line 187 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp24_->comment = _tmp27_;
-#line 189 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp28_ = event_rows;
-#line 189 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_tmp29_ = row;
-#line 189 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_);
-#line 171 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-			_event_row_unref0 (row);
-#line 1544 "EventTable.c"
-		}
-	}
-#line 192 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	result = event_rows;
-#line 192 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 192 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return result;
-#line 1553 "EventTable.c"
-}
-
-
-gboolean
-event_table_rename (EventTable* self,
-                    EventID* event_id,
-                    const gchar* name)
-{
-	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	EventID _tmp1_;
-	gint64 _tmp2_;
-#line 195 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_val_if_fail (IS_EVENT_TABLE (self), FALSE);
-#line 195 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (name != NULL) {
-#line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp0_ = name;
-#line 1574 "EventTable.c"
-	} else {
-#line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp0_ = "";
-#line 1578 "EventTable.c"
-	}
-#line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp1_ = *event_id;
-#line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp2_ = _tmp1_.id;
-#line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "name", _tmp0_);
-#line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return result;
-#line 1588 "EventTable.c"
-}
-
-
-gchar*
-event_table_get_name (EventTable* self,
-                      EventID* event_id)
-{
-	gchar* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	EventID _tmp0_;
-	gint64 _tmp1_;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gboolean _tmp3_;
-	gchar* name = NULL;
-	sqlite3_stmt* _tmp4_;
-	const gchar* _tmp5_;
-	gchar* _tmp6_;
-	const gchar* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
-	const gchar* _tmp9_;
-	gchar* _tmp14_;
-#line 199 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_val_if_fail (IS_EVENT_TABLE (self), NULL);
-#line 199 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_val_if_fail (event_id != NULL, NULL);
-#line 201 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp0_ = *event_id;
-#line 201 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 201 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp3_ = database_table_select_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "name", &_tmp2_);
-#line 201 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 201 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	stmt = _tmp2_;
-#line 201 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (!_tmp3_) {
-#line 202 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		result = NULL;
-#line 202 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 202 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		return result;
-#line 1632 "EventTable.c"
-	}
-#line 204 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp4_ = stmt;
-#line 204 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp5_ = sqlite3_column_text (_tmp4_, 0);
-#line 204 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp6_ = g_strdup (_tmp5_);
-#line 204 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	name = _tmp6_;
-#line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp9_ = name;
-#line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (_tmp9_ != NULL) {
-#line 1646 "EventTable.c"
-		const gchar* _tmp10_;
-		gint _tmp11_;
-		gint _tmp12_;
-#line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp10_ = name;
-#line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp11_ = strlen (_tmp10_);
-#line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp12_ = _tmp11_;
-#line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp8_ = _tmp12_ > 0;
-#line 1658 "EventTable.c"
-	} else {
-#line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp8_ = FALSE;
-#line 1662 "EventTable.c"
-	}
-#line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (_tmp8_) {
-#line 1666 "EventTable.c"
-		const gchar* _tmp13_;
-#line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp13_ = name;
-#line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp7_ = _tmp13_;
-#line 1672 "EventTable.c"
-	} else {
-#line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp7_ = NULL;
-#line 1676 "EventTable.c"
-	}
-#line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp14_ = g_strdup (_tmp7_);
-#line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	result = _tmp14_;
-#line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_g_free0 (name);
-#line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return result;
-#line 1688 "EventTable.c"
-}
-
-
-gchar*
-event_table_get_primary_source_id (EventTable* self,
-                                   EventID* event_id)
-{
-	gchar* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	EventID _tmp0_;
-	gint64 _tmp1_;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gboolean _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	const gchar* _tmp5_;
-	gchar* _tmp6_;
-#line 209 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_val_if_fail (IS_EVENT_TABLE (self), NULL);
-#line 209 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_val_if_fail (event_id != NULL, NULL);
-#line 211 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp0_ = *event_id;
-#line 211 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 211 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp3_ = database_table_select_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "primary_source_id", &_tmp2_);
-#line 211 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 211 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	stmt = _tmp2_;
-#line 211 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (!_tmp3_) {
-#line 212 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		result = NULL;
-#line 212 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 212 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		return result;
-#line 1727 "EventTable.c"
-	}
-#line 214 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp4_ = stmt;
-#line 214 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp5_ = sqlite3_column_text (_tmp4_, 0);
-#line 214 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp6_ = g_strdup (_tmp5_);
-#line 214 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	result = _tmp6_;
-#line 214 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 214 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return result;
-#line 1741 "EventTable.c"
-}
-
-
-gboolean
-event_table_set_primary_source_id (EventTable* self,
-                                   EventID* event_id,
-                                   const gchar* primary_source_id)
-{
-	gboolean result = FALSE;
-	EventID _tmp0_;
-	gint64 _tmp1_;
-#line 217 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_val_if_fail (IS_EVENT_TABLE (self), FALSE);
-#line 217 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 217 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_val_if_fail (primary_source_id != NULL, FALSE);
-#line 218 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp0_ = *event_id;
-#line 218 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 218 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "primary_source_id", primary_source_id);
-#line 218 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return result;
-#line 1767 "EventTable.c"
-}
-
-
-time_t
-event_table_get_time_created (EventTable* self,
-                              EventID* event_id)
-{
-	time_t result = 0;
-	sqlite3_stmt* stmt = NULL;
-	EventID _tmp0_;
-	gint64 _tmp1_;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gboolean _tmp3_;
-	sqlite3_stmt* _tmp4_;
-#line 221 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_val_if_fail (IS_EVENT_TABLE (self), 0);
-#line 221 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_val_if_fail (event_id != NULL, 0);
-#line 223 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp0_ = *event_id;
-#line 223 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 223 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp3_ = database_table_select_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "time_created", &_tmp2_);
-#line 223 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 223 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	stmt = _tmp2_;
-#line 223 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (!_tmp3_) {
-#line 224 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		result = (time_t) 0;
-#line 224 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 224 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		return result;
-#line 1804 "EventTable.c"
-	}
-#line 226 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp4_ = stmt;
-#line 226 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	result = (time_t) sqlite3_column_int64 (_tmp4_, 0);
-#line 226 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 226 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return result;
-#line 1814 "EventTable.c"
-}
-
-
-gboolean
-event_table_set_comment (EventTable* self,
-                         EventID* event_id,
-                         const gchar* new_comment)
-{
-	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	EventID _tmp1_;
-	gint64 _tmp2_;
-#line 229 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_val_if_fail (IS_EVENT_TABLE (self), FALSE);
-#line 229 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 229 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	g_return_val_if_fail (new_comment != NULL, FALSE);
-#line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	if (new_comment != NULL) {
-#line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp0_ = new_comment;
-#line 1837 "EventTable.c"
-	} else {
-#line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-		_tmp0_ = "";
-#line 1841 "EventTable.c"
-	}
-#line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp1_ = *event_id;
-#line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp2_ = _tmp1_.id;
-#line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "comment", _tmp0_);
-#line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	return result;
-#line 1851 "EventTable.c"
-}
-
-
-static void
-event_table_class_init (EventTableClass * klass)
-{
-#line 33 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	event_table_parent_class = g_type_class_peek_parent (klass);
-#line 33 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	((DatabaseTableClass *) klass)->finalize = event_table_finalize;
-#line 1862 "EventTable.c"
-}
-
-
-static void
-event_table_instance_init (EventTable * self)
-{
-}
-
-
-static void
-event_table_finalize (DatabaseTable * obj)
-{
-	EventTable * self;
-#line 33 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT_TABLE, EventTable);
-#line 33 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	DATABASE_TABLE_CLASS (event_table_parent_class)->finalize (obj);
-#line 1880 "EventTable.c"
-}
-
-
-GType
-event_table_get_type (void)
-{
-	static volatile gsize event_table_type_id__volatile = 0;
-	if (g_once_init_enter (&event_table_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (EventTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventTable), 0, (GInstanceInitFunc) event_table_instance_init, NULL };
-		GType event_table_type_id;
-		event_table_type_id = g_type_register_static (TYPE_DATABASE_TABLE, "EventTable", &g_define_type_info, 0);
-		g_once_init_leave (&event_table_type_id__volatile, event_table_type_id);
-	}
-	return event_table_type_id__volatile;
-}
-
-
-
diff --git a/src/db/FaceLocationTable.vala b/src/db/FaceLocationTable.vala
new file mode 100644
index 0000000..14fef4c
--- /dev/null
+++ b/src/db/FaceLocationTable.vala
@@ -0,0 +1,202 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ */
+
+#if ENABLE_FACES   
+
+public struct FaceLocationID {
+    public const int64 INVALID = -1;
+
+    public int64 id;
+    
+    public FaceLocationID(int64 id = INVALID) {
+        this.id = id;
+    }
+    
+    public bool is_invalid() {
+        return (id == INVALID);
+    }
+    
+    public bool is_valid() {
+        return (id != INVALID);
+    }
+}
+
+public class FaceLocationRow {
+    public FaceLocationID face_location_id;
+    public FaceID face_id;
+    public PhotoID photo_id;
+    public string geometry;
+}
+
+public class FaceLocationTable : DatabaseTable {
+    private static FaceLocationTable instance = null;
+    
+    private FaceLocationTable() {
+        set_table_name("FaceLocationTable");
+        
+        Sqlite.Statement stmt;
+        int res = db.prepare_v2("CREATE TABLE IF NOT EXISTS "
+            + "FaceLocationTable "
+            + "("
+            + "id INTEGER NOT NULL PRIMARY KEY, "
+            + "face_id INTEGER NOT NULL, "
+            + "photo_id INTEGER NOT NULL, "
+            + "geometry TEXT"
+            + ")", -1, out stmt);
+        assert(res == Sqlite.OK);
+        
+        res = stmt.step();
+        if (res != Sqlite.DONE)
+            fatal("create FaceLocationTable", res);
+    }
+    
+    public static FaceLocationTable get_instance() {
+        if (instance == null)
+            instance = new FaceLocationTable();
+        
+        return instance;
+    }
+ 
+    public FaceLocationRow add(FaceID face_id, PhotoID photo_id, string geometry) throws DatabaseError {
+        Sqlite.Statement stmt;
+        int res = db.prepare_v2(
+            "INSERT INTO FaceLocationTable (face_id, photo_id, geometry) VALUES (?, ?, ?)",
+             -1, out stmt);
+        assert(res == Sqlite.OK);
+        
+        res = stmt.bind_int64(1, face_id.id);
+        assert(res == Sqlite.OK);
+        res = stmt.bind_int64(2, photo_id.id);
+        assert(res == Sqlite.OK);
+        res = stmt.bind_text(3, geometry);
+        assert(res == Sqlite.OK);
+        
+        res = stmt.step();
+        if (res != Sqlite.DONE)
+            throw_error("FaceLocationTable.add", res);
+        
+        FaceLocationRow row = new FaceLocationRow();
+        row.face_location_id = FaceLocationID(db.last_insert_rowid());
+        row.face_id = face_id;
+        row.photo_id = photo_id;
+        row.geometry = geometry;
+        
+        return row;
+    }
+    
+    public Gee.List<FaceLocationRow?> get_all_rows() throws DatabaseError {
+        Sqlite.Statement stmt;
+        int res = db.prepare_v2(
+            "SELECT id, face_id, photo_id, geometry FROM FaceLocationTable",
+            -1, out stmt);
+        assert(res == Sqlite.OK);
+        
+        Gee.List<FaceLocationRow?> rows = new Gee.ArrayList<FaceLocationRow?>();
+        
+        for (;;) {
+            res = stmt.step();
+            if (res == Sqlite.DONE)
+                break;
+            else if (res != Sqlite.ROW)
+                throw_error("FaceLocationTable.get_all_rows", res);
+            
+            // res == Sqlite.ROW
+            FaceLocationRow row = new FaceLocationRow();
+            row.face_location_id = FaceLocationID(stmt.column_int64(0));
+            row.face_id = FaceID(stmt.column_int64(1));
+            row.photo_id = PhotoID(stmt.column_int64(2));
+            row.geometry = stmt.column_text(3);
+            
+            rows.add(row);
+        }
+        
+        return rows;
+    }
+    
+    public Gee.ArrayList<string> get_face_source_ids(FaceID face_id) {
+        Sqlite.Statement stmt;
+        int res = db.prepare_v2(
+            "SELECT photo_id FROM FaceLocationTable WHERE face_id = ?",
+            -1, out stmt);
+        assert(res == Sqlite.OK);
+        
+        res = stmt.bind_int64(1, face_id.id);
+        assert(res == Sqlite.OK);
+        
+        Gee.ArrayList<string> result = new Gee.ArrayList<string>();
+        for(;;) {
+            res = stmt.step();
+            if (res == Sqlite.DONE) {
+                break;
+            } else if (res != Sqlite.ROW) {
+                fatal("get_face_source_ids", res);
+
+                break;
+            }
+            
+            result.add(PhotoID.upgrade_photo_id_to_source_id(PhotoID(stmt.column_int64(0))));
+        }
+        
+        return result;
+    }
+    
+    public string? get_face_source_serialized_geometry(Face face, MediaSource source)
+        throws DatabaseError {
+        Sqlite.Statement stmt;
+        int res = db.prepare_v2(
+            "SELECT geometry FROM FaceLocationTable WHERE face_id=? AND photo_id=?",
+            -1, out stmt);
+        assert(res == Sqlite.OK);
+        
+        res = stmt.bind_int64(1, face.get_instance_id());
+        assert(res == Sqlite.OK);
+        res = stmt.bind_int64(2, ((Photo) source).get_instance_id());
+        assert(res == Sqlite.OK);
+        
+        res = stmt.step();
+        if (res == Sqlite.DONE)
+            return null;
+        else if (res != Sqlite.ROW)
+            throw_error("FaceLocationTable.get_face_source_serialized_geometry", res);
+        
+        return stmt.column_text(0);
+    }
+    
+    public void remove_face_from_source(FaceID face_id, PhotoID photo_id) throws DatabaseError {
+        Sqlite.Statement stmt;
+        int res = db.prepare_v2(
+            "DELETE FROM FaceLocationTable WHERE face_id=? AND photo_id=?",
+            -1, out stmt);
+        assert(res == Sqlite.OK);
+        
+        res = stmt.bind_int64(1, face_id.id);
+        assert(res == Sqlite.OK);
+        res = stmt.bind_int64(2, photo_id.id);
+        assert(res == Sqlite.OK);
+        
+        res = stmt.step();
+        if (res != Sqlite.DONE)
+            throw_error("FaceLocationTable.remove_face_from_source", res);
+    }
+    
+    public void update_face_location_serialized_geometry(FaceLocation face_location)
+        throws DatabaseError {
+        Sqlite.Statement stmt;
+        int res = db.prepare_v2("UPDATE FaceLocationTable SET geometry=? WHERE id=?", -1, out stmt);
+        assert(res == Sqlite.OK);
+        
+        res = stmt.bind_text(1, face_location.get_serialized_geometry());
+        assert(res == Sqlite.OK);
+        res = stmt.bind_int64(2, face_location.get_face_location_id().id);
+        assert(res == Sqlite.OK);
+        
+        res = stmt.step();
+        if (res != Sqlite.DONE)
+            throw_error("FaceLocationTable.update_face_location_serialized_geometry", res);
+    }
+}
+
+#endif
diff --git a/src/db/FaceTable.vala b/src/db/FaceTable.vala
new file mode 100644
index 0000000..a6e0bad
--- /dev/null
+++ b/src/db/FaceTable.vala
@@ -0,0 +1,169 @@
+/* Copyright 2018 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ */
+
+#if ENABLE_FACES
+public struct FaceID {
+    public const int64 INVALID = -1;
+
+    public int64 id;
+    
+    public FaceID(int64 id = INVALID) {
+        this.id = id;
+    }
+    
+    public bool is_invalid() {
+        return (id == INVALID);
+    }
+    
+    public bool is_valid() {
+        return (id != INVALID);
+    }
+}
+
+public class FaceRow {
+    public FaceID face_id;
+    public string name;
+    public time_t time_created;
+}
+
+public class FaceTable : DatabaseTable {
+    private static FaceTable instance = null;
+    
+    private FaceTable() {
+        set_table_name("FaceTable");
+        
+        Sqlite.Statement stmt;
+        int res = db.prepare_v2("CREATE TABLE IF NOT EXISTS "
+            + "FaceTable "
+            + "("
+            + "id INTEGER NOT NULL PRIMARY KEY, "
+            + "name TEXT NOT NULL, "
+            + "time_created TIMESTAMP"
+            + ")", -1, out stmt);
+        assert(res == Sqlite.OK);
+        
+        res = stmt.step();
+        if (res != Sqlite.DONE)
+            fatal("create FaceTable", res);
+    }
+    
+    public static FaceTable get_instance() {
+        if (instance == null)
+            instance = new FaceTable();
+        
+        return instance;
+    }
+    
+    public FaceRow add(string name) throws DatabaseError {
+        Sqlite.Statement stmt;
+        int res = db.prepare_v2("INSERT INTO FaceTable (name, time_created) VALUES (?, ?)", -1,
+            out stmt);
+        assert(res == Sqlite.OK);
+        
+        time_t time_created = (time_t) now_sec();
+        
+        res = stmt.bind_text(1, name);
+        assert(res == Sqlite.OK);
+        res = stmt.bind_int64(2, time_created);
+        assert(res == Sqlite.OK);
+        
+        res = stmt.step();
+        if (res != Sqlite.DONE)
+            throw_error("FaceTable.add", res);
+        
+        FaceRow row = new FaceRow();
+        row.face_id = FaceID(db.last_insert_rowid());
+        row.name = name;
+        row.time_created = time_created;
+        
+        return row;
+    }
+    
+    public FaceID create_from_row(FaceRow row) throws DatabaseError {
+        Sqlite.Statement stmt;
+        int res = db.prepare_v2("INSERT INTO FaceTable (name, time_created) VALUES (?, ?)",
+            -1, out stmt);
+        assert(res == Sqlite.OK);
+        
+        res = stmt.bind_text(1, row.name);
+        assert(res == Sqlite.OK);
+        res = stmt.bind_int64(2, row.time_created);
+        assert(res == Sqlite.OK);
+        
+        res = stmt.step();
+        if (res != Sqlite.DONE)
+            throw_error("FaceTable.create_from_row", res);
+        
+        return FaceID(db.last_insert_rowid());
+    }
+    
+    public void remove(FaceID face_id) throws DatabaseError {
+        delete_by_id(face_id.id);
+    }
+    
+    public string? get_name(FaceID face_id) throws DatabaseError {
+        Sqlite.Statement stmt;
+        if (!select_by_id(face_id.id, "name", out stmt))
+            return null;
+        
+        return stmt.column_text(0);
+    }
+    
+    public FaceRow? get_row(FaceID face_id) throws DatabaseError {
+        Sqlite.Statement stmt;
+        int res = db.prepare_v2("SELECT name, time_created FROM FaceTable WHERE id=?",
+            -1, out stmt);
+        assert(res == Sqlite.OK);
+        
+        res = stmt.bind_int64(1, face_id.id);
+        assert(res == Sqlite.OK);
+        
+        res = stmt.step();
+        if (res == Sqlite.DONE)
+            return null;
+        else if (res != Sqlite.ROW)
+            throw_error("FaceTable.get_row", res);
+        
+        FaceRow row = new FaceRow();
+        row.face_id = face_id;
+        row.name = stmt.column_text(0);
+        row.time_created = (time_t) stmt.column_int64(1);
+        
+        return row;
+    }
+    
+    public Gee.List<FaceRow?> get_all_rows() throws DatabaseError {
+        Sqlite.Statement stmt;
+        int res = db.prepare_v2("SELECT id, name, time_created FROM FaceTable", -1,
+            out stmt);
+        assert(res == Sqlite.OK);
+        
+        Gee.List<FaceRow?> rows = new Gee.ArrayList<FaceRow?>();
+        
+        for (;;) {
+            res = stmt.step();
+            if (res == Sqlite.DONE)
+                break;
+            else if (res != Sqlite.ROW)
+                throw_error("FaceTable.get_all_rows", res);
+            
+            // res == Sqlite.ROW
+            FaceRow row = new FaceRow();
+            row.face_id = FaceID(stmt.column_int64(0));
+            row.name = stmt.column_text(1);
+            row.time_created = (time_t) stmt.column_int64(2);
+            
+            rows.add(row);
+        }
+        
+        return rows;
+    }
+    
+    public void rename(FaceID face_id, string new_name) throws DatabaseError {
+        update_text_by_id_2(face_id.id, "name", new_name);
+    }
+}
+#endif
diff --git a/src/db/PhotoTable.c b/src/db/PhotoTable.c
deleted file mode 100644
index a2832f0..0000000
--- a/src/db/PhotoTable.c
+++ /dev/null
@@ -1,8816 +0,0 @@
-/* PhotoTable.c generated by valac 0.40.4, the Vala compiler
- * generated from PhotoTable.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <gee.h>
-#include "shotwell-graphics-processor.h"
-#include <sqlite3.h>
-#include <gio/gio.h>
-#include <gobject/gvaluecollector.h>
-
-
-#define TYPE_PHOTO_ID (photo_id_get_type ())
-typedef struct _PhotoID PhotoID;
-
-#define TYPE_IMPORT_ID (import_id_get_type ())
-typedef struct _ImportID ImportID;
-
-#define TYPE_PHOTO_ROW (photo_row_get_type ())
-#define PHOTO_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_ROW, PhotoRow))
-#define PHOTO_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PHOTO_ROW, PhotoRowClass))
-#define IS_PHOTO_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PHOTO_ROW))
-#define IS_PHOTO_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PHOTO_ROW))
-#define PHOTO_ROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PHOTO_ROW, PhotoRowClass))
-
-typedef struct _PhotoRow PhotoRow;
-typedef struct _PhotoRowClass PhotoRowClass;
-typedef struct _PhotoRowPrivate PhotoRowPrivate;
-
-#define TYPE_BACKING_PHOTO_ROW (backing_photo_row_get_type ())
-#define BACKING_PHOTO_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_BACKING_PHOTO_ROW, BackingPhotoRow))
-#define BACKING_PHOTO_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_BACKING_PHOTO_ROW, BackingPhotoRowClass))
-#define IS_BACKING_PHOTO_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_BACKING_PHOTO_ROW))
-#define IS_BACKING_PHOTO_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_BACKING_PHOTO_ROW))
-#define BACKING_PHOTO_ROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_BACKING_PHOTO_ROW, BackingPhotoRowClass))
-
-typedef struct _BackingPhotoRow BackingPhotoRow;
-typedef struct _BackingPhotoRowClass BackingPhotoRowClass;
-
-#define TYPE_EVENT_ID (event_id_get_type ())
-typedef struct _EventID EventID;
-
-#define TYPE_ORIENTATION (orientation_get_type ())
-
-#define TYPE_RATING (rating_get_type ())
-
-#define TYPE_BACKING_PHOTO_ID (backing_photo_id_get_type ())
-typedef struct _BackingPhotoID BackingPhotoID;
-
-#define TYPE_RAW_DEVELOPER (raw_developer_get_type ())
-#define _backing_photo_row_unref0(var) ((var == NULL) ? NULL : (var = (backing_photo_row_unref (var), NULL)))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _g_free0(var) (var = (g_free (var), NULL))
-typedef struct _ParamSpecPhotoRow ParamSpecPhotoRow;
-
-#define TYPE_DATABASE_TABLE (database_table_get_type ())
-#define DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATABASE_TABLE, DatabaseTable))
-#define DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATABASE_TABLE, DatabaseTableClass))
-#define IS_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATABASE_TABLE))
-#define IS_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DATABASE_TABLE))
-#define DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DATABASE_TABLE, DatabaseTableClass))
-
-typedef struct _DatabaseTable DatabaseTable;
-typedef struct _DatabaseTableClass DatabaseTableClass;
-typedef struct _DatabaseTablePrivate DatabaseTablePrivate;
-
-#define TYPE_PHOTO_TABLE (photo_table_get_type ())
-#define PHOTO_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_TABLE, PhotoTable))
-#define PHOTO_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PHOTO_TABLE, PhotoTableClass))
-#define IS_PHOTO_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PHOTO_TABLE))
-#define IS_PHOTO_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PHOTO_TABLE))
-#define PHOTO_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PHOTO_TABLE, PhotoTableClass))
-
-typedef struct _PhotoTable PhotoTable;
-typedef struct _PhotoTableClass PhotoTableClass;
-typedef struct _PhotoTablePrivate PhotoTablePrivate;
-#define _sqlite3_finalize0(var) ((var == NULL) ? NULL : (var = (sqlite3_finalize (var), NULL)))
-#define _database_table_unref0(var) ((var == NULL) ? NULL : (var = (database_table_unref (var), NULL)))
-typedef struct _BackingPhotoRowPrivate BackingPhotoRowPrivate;
-
-#define TYPE_PHOTO_FILE_FORMAT (photo_file_format_get_type ())
-
-#define TYPE_DIMENSIONS (dimensions_get_type ())
-typedef struct _Dimensions Dimensions;
-#define _photo_row_unref0(var) ((var == NULL) ? NULL : (var = (photo_row_unref (var), NULL)))
-#define _g_key_file_unref0(var) ((var == NULL) ? NULL : (var = (g_key_file_unref (var), NULL)))
-#define _key_value_map_unref0(var) ((var == NULL) ? NULL : (var = (key_value_map_unref (var), NULL)))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-typedef struct _ParamSpecBackingPhotoRow ParamSpecBackingPhotoRow;
-
-#define TYPE_BACKING_PHOTO_TABLE (backing_photo_table_get_type ())
-#define BACKING_PHOTO_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_BACKING_PHOTO_TABLE, BackingPhotoTable))
-#define BACKING_PHOTO_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_BACKING_PHOTO_TABLE, BackingPhotoTableClass))
-#define IS_BACKING_PHOTO_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_BACKING_PHOTO_TABLE))
-#define IS_BACKING_PHOTO_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_BACKING_PHOTO_TABLE))
-#define BACKING_PHOTO_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_BACKING_PHOTO_TABLE, BackingPhotoTableClass))
-
-typedef struct _BackingPhotoTable BackingPhotoTable;
-typedef struct _BackingPhotoTableClass BackingPhotoTableClass;
-typedef struct _BackingPhotoTablePrivate BackingPhotoTablePrivate;
-#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
-#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
-#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-
-struct _PhotoID {
-	gint64 id;
-};
-
-struct _ImportID {
-	gint64 id;
-};
-
-struct _EventID {
-	gint64 id;
-};
-
-typedef enum  {
-	ORIENTATION_MIN = 1,
-	ORIENTATION_TOP_LEFT = 1,
-	ORIENTATION_TOP_RIGHT = 2,
-	ORIENTATION_BOTTOM_RIGHT = 3,
-	ORIENTATION_BOTTOM_LEFT = 4,
-	ORIENTATION_LEFT_TOP = 5,
-	ORIENTATION_RIGHT_TOP = 6,
-	ORIENTATION_RIGHT_BOTTOM = 7,
-	ORIENTATION_LEFT_BOTTOM = 8,
-	ORIENTATION_MAX = 8
-} Orientation;
-
-typedef enum  {
-	RATING_REJECTED = -1,
-	RATING_UNRATED = 0,
-	RATING_ONE = 1,
-	RATING_TWO = 2,
-	RATING_THREE = 3,
-	RATING_FOUR = 4,
-	RATING_FIVE = 5
-} Rating;
-
-struct _BackingPhotoID {
-	gint64 id;
-};
-
-typedef enum  {
-	RAW_DEVELOPER_SHOTWELL = 0,
-	RAW_DEVELOPER_CAMERA,
-	RAW_DEVELOPER_EMBEDDED
-} RawDeveloper;
-
-struct _PhotoRow {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	PhotoRowPrivate * priv;
-	PhotoID photo_id;
-	BackingPhotoRow* master;
-	time_t exposure_time;
-	ImportID import_id;
-	EventID event_id;
-	Orientation orientation;
-	GeeHashMap* transformations;
-	gchar* md5;
-	gchar* thumbnail_md5;
-	gchar* exif_md5;
-	time_t time_created;
-	guint64 flags;
-	Rating rating;
-	gchar* title;
-	gchar* comment;
-	gchar* backlinks;
-	time_t time_reimported;
-	BackingPhotoID editable_id;
-	gboolean metadata_dirty;
-	RawDeveloper developer;
-	BackingPhotoID* development_ids;
-	gint development_ids_length1;
-};
-
-struct _PhotoRowClass {
-	GTypeClass parent_class;
-	void (*finalize) (PhotoRow *self);
-};
-
-struct _ParamSpecPhotoRow {
-	GParamSpec parent_instance;
-};
-
-struct _DatabaseTable {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	DatabaseTablePrivate * priv;
-	gchar* table_name;
-};
-
-struct _DatabaseTableClass {
-	GTypeClass parent_class;
-	void (*finalize) (DatabaseTable *self);
-};
-
-struct _PhotoTable {
-	DatabaseTable parent_instance;
-	PhotoTablePrivate * priv;
-};
-
-struct _PhotoTableClass {
-	DatabaseTableClass parent_class;
-};
-
-typedef enum  {
-	PHOTO_FILE_FORMAT_JFIF,
-	PHOTO_FILE_FORMAT_RAW,
-	PHOTO_FILE_FORMAT_PNG,
-	PHOTO_FILE_FORMAT_TIFF,
-	PHOTO_FILE_FORMAT_BMP,
-	PHOTO_FILE_FORMAT_UNKNOWN
-} PhotoFileFormat;
-
-struct _Dimensions {
-	gint width;
-	gint height;
-};
-
-struct _BackingPhotoRow {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	BackingPhotoRowPrivate * priv;
-	BackingPhotoID id;
-	time_t time_created;
-	gchar* filepath;
-	gint64 filesize;
-	time_t timestamp;
-	PhotoFileFormat file_format;
-	Dimensions dim;
-	Orientation original_orientation;
-};
-
-struct _BackingPhotoRowClass {
-	GTypeClass parent_class;
-	void (*finalize) (BackingPhotoRow *self);
-};
-
-typedef enum  {
-	DATABASE_ERROR_ERROR,
-	DATABASE_ERROR_BACKING,
-	DATABASE_ERROR_MEMORY,
-	DATABASE_ERROR_ABORT,
-	DATABASE_ERROR_LIMITS,
-	DATABASE_ERROR_TYPESPEC
-} DatabaseError;
-#define DATABASE_ERROR database_error_quark ()
-struct _ParamSpecBackingPhotoRow {
-	GParamSpec parent_instance;
-};
-
-struct _BackingPhotoTable {
-	DatabaseTable parent_instance;
-	BackingPhotoTablePrivate * priv;
-};
-
-struct _BackingPhotoTableClass {
-	DatabaseTableClass parent_class;
-};
-
-
-static gpointer photo_row_parent_class = NULL;
-static gpointer photo_table_parent_class = NULL;
-static PhotoTable* photo_table_instance;
-static PhotoTable* photo_table_instance = NULL;
-extern sqlite3* database_table_db;
-static gpointer backing_photo_row_parent_class = NULL;
-static gpointer backing_photo_table_parent_class = NULL;
-static BackingPhotoTable* backing_photo_table_instance;
-static BackingPhotoTable* backing_photo_table_instance = NULL;
-
-GType photo_id_get_type (void) G_GNUC_CONST;
-PhotoID* photo_id_dup (const PhotoID* self);
-void photo_id_free (PhotoID* self);
-#define PHOTO_ID_INVALID ((gint64) -1)
-void photo_id_init (PhotoID *self,
-                    gint64 id);
-gboolean photo_id_is_invalid (PhotoID *self);
-gboolean photo_id_is_valid (PhotoID *self);
-guint photo_id_hash (PhotoID *self);
-guint int64_hash (gint64* n);
-gboolean photo_id_equal (void* a,
-                         void* b);
-gchar* photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id);
-#define PHOTO_TYPENAME "thumb"
-GType import_id_get_type (void) G_GNUC_CONST;
-ImportID* import_id_dup (const ImportID* self);
-void import_id_free (ImportID* self);
-#define IMPORT_ID_INVALID ((gint64) 0)
-void import_id_init (ImportID *self,
-                     gint64 id);
-void import_id_generate (ImportID* result);
-gboolean import_id_is_invalid (ImportID *self);
-gboolean import_id_is_valid (ImportID *self);
-gint import_id_compare_func (ImportID* a,
-                             ImportID* b);
-gint64 import_id_comparator (void* a,
-                             void* b);
-gpointer photo_row_ref (gpointer instance);
-void photo_row_unref (gpointer instance);
-GParamSpec* param_spec_photo_row (const gchar* name,
-                                  const gchar* nick,
-                                  const gchar* blurb,
-                                  GType object_type,
-                                  GParamFlags flags);
-void value_set_photo_row (GValue* value,
-                          gpointer v_object);
-void value_take_photo_row (GValue* value,
-                           gpointer v_object);
-gpointer value_get_photo_row (const GValue* value);
-GType photo_row_get_type (void) G_GNUC_CONST;
-gpointer backing_photo_row_ref (gpointer instance);
-void backing_photo_row_unref (gpointer instance);
-GParamSpec* param_spec_backing_photo_row (const gchar* name,
-                                          const gchar* nick,
-                                          const gchar* blurb,
-                                          GType object_type,
-                                          GParamFlags flags);
-void value_set_backing_photo_row (GValue* value,
-                                  gpointer v_object);
-void value_take_backing_photo_row (GValue* value,
-                                   gpointer v_object);
-gpointer value_get_backing_photo_row (const GValue* value);
-GType backing_photo_row_get_type (void) G_GNUC_CONST;
-GType event_id_get_type (void) G_GNUC_CONST;
-EventID* event_id_dup (const EventID* self);
-void event_id_free (EventID* self);
-GType orientation_get_type (void) G_GNUC_CONST;
-GType rating_get_type (void) G_GNUC_CONST;
-GType backing_photo_id_get_type (void) G_GNUC_CONST;
-BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self);
-void backing_photo_id_free (BackingPhotoID* self);
-GType raw_developer_get_type (void) G_GNUC_CONST;
-PhotoRow* photo_row_new (void);
-PhotoRow* photo_row_construct (GType object_type);
-BackingPhotoRow* backing_photo_row_new (void);
-BackingPhotoRow* backing_photo_row_construct (GType object_type);
-#define BACKING_PHOTO_ID_INVALID ((gint64) -1)
-void backing_photo_id_init (BackingPhotoID *self,
-                            gint64 id);
-RawDeveloper* raw_developer_as_array (int* result_length1);
-static void photo_row_finalize (PhotoRow * obj);
-gpointer database_table_ref (gpointer instance);
-void database_table_unref (gpointer instance);
-GParamSpec* param_spec_database_table (const gchar* name,
-                                       const gchar* nick,
-                                       const gchar* blurb,
-                                       GType object_type,
-                                       GParamFlags flags);
-void value_set_database_table (GValue* value,
-                               gpointer v_object);
-void value_take_database_table (GValue* value,
-                                gpointer v_object);
-gpointer value_get_database_table (const GValue* value);
-GType database_table_get_type (void) G_GNUC_CONST;
-GType photo_table_get_type (void) G_GNUC_CONST;
-static PhotoTable* photo_table_new (void);
-static PhotoTable* photo_table_construct (GType object_type);
-DatabaseTable* database_table_construct (GType object_type);
-void database_table_fatal (const gchar* op,
-                           gint res);
-void database_table_warning (const gchar* op,
-                             gint res);
-void database_table_set_table_name (DatabaseTable* self,
-                                    const gchar* table_name);
-PhotoTable* photo_table_get_instance (void);
-void photo_table_add (PhotoTable* self,
-                      PhotoRow* photo_row,
-                      PhotoID* result);
-gulong now_sec (void);
-GType photo_file_format_get_type (void) G_GNUC_CONST;
-GType dimensions_get_type (void) G_GNUC_CONST;
-Dimensions* dimensions_dup (const Dimensions* self);
-void dimensions_free (Dimensions* self);
-#define EVENT_ID_INVALID ((gint64) -1)
-gint photo_file_format_serialize (PhotoFileFormat self);
-gint rating_serialize (Rating self);
-gchar* raw_developer_to_string (RawDeveloper self);
-void event_id_init (EventID *self,
-                    gint64 id);
-GQuark database_error_quark (void);
-void photo_table_reimport (PhotoTable* self,
-                           PhotoRow* row,
-                           GError** error);
-void database_table_throw_error (const gchar* method,
-                                 gint res,
-                                 GError** error);
-gboolean photo_table_master_exif_updated (PhotoTable* self,
-                                          PhotoID* photoID,
-                                          gint64 filesize,
-                                          glong timestamp,
-                                          const gchar* md5,
-                                          const gchar* exif_md5,
-                                          const gchar* thumbnail_md5,
-                                          PhotoRow* row);
-static void photo_table_validate_orientation (PhotoTable* self,
-                                       PhotoRow* row);
-gboolean photo_table_set_orientation (PhotoTable* self,
-                                      PhotoID* photo_id,
-                                      Orientation orientation);
-PhotoRow* photo_table_get_row (PhotoTable* self,
-                               PhotoID* photo_id);
-void dimensions_init (Dimensions *self,
-                      gint width,
-                      gint height);
-GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans);
-Rating rating_unserialize (gint value);
-PhotoFileFormat photo_file_format_unserialize (gint value);
-RawDeveloper raw_developer_from_string (const gchar* value);
-GeeArrayList* photo_table_get_all (PhotoTable* self);
-void photo_table_duplicate (PhotoTable* self,
-                            PhotoID* photo_id,
-                            const gchar* new_filename,
-                            BackingPhotoID* editable_id,
-                            BackingPhotoID* develop_shotwell,
-                            BackingPhotoID* develop_camera_id,
-                            BackingPhotoID* develop_embedded_id,
-                            PhotoID* result);
-gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations);
-gboolean photo_table_set_title (PhotoTable* self,
-                                PhotoID* photo_id,
-                                const gchar* new_title);
-gboolean database_table_update_text_by_id (DatabaseTable* self,
-                                           gint64 id,
-                                           const gchar* column,
-                                           const gchar* text);
-gboolean photo_table_set_comment (PhotoTable* self,
-                                  PhotoID* photo_id,
-                                  const gchar* new_comment);
-void photo_table_set_filepath (PhotoTable* self,
-                               PhotoID* photo_id,
-                               const gchar* filepath,
-                               GError** error);
-void database_table_update_text_by_id_2 (DatabaseTable* self,
-                                         gint64 id,
-                                         const gchar* column,
-                                         const gchar* text,
-                                         GError** error);
-void photo_table_update_timestamp (PhotoTable* self,
-                                   PhotoID* photo_id,
-                                   time_t timestamp,
-                                   GError** error);
-void database_table_update_int64_by_id_2 (DatabaseTable* self,
-                                          gint64 id,
-                                          const gchar* column,
-                                          gint64 value,
-                                          GError** error);
-gboolean photo_table_set_exposure_time (PhotoTable* self,
-                                        PhotoID* photo_id,
-                                        time_t time);
-gboolean database_table_update_int64_by_id (DatabaseTable* self,
-                                            gint64 id,
-                                            const gchar* column,
-                                            gint64 value);
-void photo_table_set_import_id (PhotoTable* self,
-                                PhotoID* photo_id,
-                                ImportID* import_id,
-                                GError** error);
-gboolean photo_table_remove_by_file (PhotoTable* self,
-                                     GFile* file);
-void photo_table_remove (PhotoTable* self,
-                         PhotoID* photo_id,
-                         GError** error);
-void database_table_delete_by_id (DatabaseTable* self,
-                                  gint64 id,
-                                  GError** error);
-GeeArrayList* photo_table_get_photos (PhotoTable* self);
-gboolean database_table_update_int_by_id (DatabaseTable* self,
-                                          gint64 id,
-                                          const gchar* column,
-                                          gint value);
-gboolean photo_table_replace_flags (PhotoTable* self,
-                                    PhotoID* photo_id,
-                                    guint64 flags);
-gboolean photo_table_set_rating (PhotoTable* self,
-                                 PhotoID* photo_id,
-                                 Rating rating);
-gint photo_table_get_event_photo_count (PhotoTable* self,
-                                        EventID* event_id);
-GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self,
-                                                EventID* event_id);
-gboolean photo_table_event_has_photos (PhotoTable* self,
-                                       EventID* event_id);
-gboolean photo_table_drop_event (PhotoTable* self,
-                                 EventID* event_id);
-gboolean photo_table_set_event (PhotoTable* self,
-                                PhotoID* photo_id,
-                                EventID* event_id);
-static gchar* photo_table_get_raw_transformations (PhotoTable* self,
-                                            PhotoID* photo_id);
-gboolean database_table_select_by_id (DatabaseTable* self,
-                                      gint64 id,
-                                      const gchar* columns,
-                                      sqlite3_stmt* * stmt);
-static gboolean photo_table_set_raw_transformations (PhotoTable* self,
-                                              PhotoID* photo_id,
-                                              const gchar* trans);
-gboolean photo_table_set_transformation_state (PhotoTable* self,
-                                               PhotoID* photo_id,
-                                               Orientation orientation,
-                                               GeeHashMap* transformations);
-gboolean photo_table_set_transformation (PhotoTable* self,
-                                         PhotoID* photo_id,
-                                         KeyValueMap* map);
-gboolean photo_table_remove_transformation (PhotoTable* self,
-                                            PhotoID* photo_id,
-                                            const gchar* object);
-gboolean photo_table_remove_all_transformations (PhotoTable* self,
-                                                 PhotoID* photo_id);
-static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self,
-                                              GFile* file,
-                                              const gchar* thumbnail_md5,
-                                              const gchar* md5,
-                                              PhotoFileFormat file_format);
-gboolean photo_table_has_duplicate (PhotoTable* self,
-                                    GFile* file,
-                                    const gchar* thumbnail_md5,
-                                    const gchar* md5,
-                                    PhotoFileFormat file_format);
-PhotoID* photo_table_get_duplicate_ids (PhotoTable* self,
-                                        GFile* file,
-                                        const gchar* thumbnail_md5,
-                                        const gchar* md5,
-                                        PhotoFileFormat file_format,
-                                        int* result_length1);
-static void _vala_array_add2 (PhotoID* * array,
-                       int* length,
-                       int* size,
-                       const PhotoID* value);
-void photo_table_update_backlinks (PhotoTable* self,
-                                   PhotoID* photo_id,
-                                   const gchar* backlinks,
-                                   GError** error);
-void photo_table_attach_editable (PhotoTable* self,
-                                  PhotoRow* row,
-                                  BackingPhotoID* editable_id,
-                                  GError** error);
-void photo_table_detach_editable (PhotoTable* self,
-                                  PhotoRow* row,
-                                  GError** error);
-void photo_table_set_metadata_dirty (PhotoTable* self,
-                                     PhotoID* photo_id,
-                                     gboolean dirty,
-                                     GError** error);
-void database_table_update_int_by_id_2 (DatabaseTable* self,
-                                        gint64 id,
-                                        const gchar* column,
-                                        gint value,
-                                        GError** error);
-void photo_table_update_raw_development (PhotoTable* self,
-                                         PhotoRow* row,
-                                         RawDeveloper rd,
-                                         BackingPhotoID* backing_photo_id,
-                                         GError** error);
-void photo_table_remove_development (PhotoTable* self,
-                                     PhotoRow* row,
-                                     RawDeveloper rd,
-                                     GError** error);
-static void photo_table_finalize (DatabaseTable * obj);
-gboolean backing_photo_id_is_invalid (BackingPhotoID *self);
-gboolean backing_photo_id_is_valid (BackingPhotoID *self);
-gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self,
-                                              GFileInfo* info);
-gboolean backing_photo_row_is_touched (BackingPhotoRow* self,
-                                       GFileInfo* info);
-void backing_photo_row_copy_from (BackingPhotoRow* self,
-                                  BackingPhotoRow* from);
-static void backing_photo_row_finalize (BackingPhotoRow * obj);
-GType backing_photo_table_get_type (void) G_GNUC_CONST;
-static BackingPhotoTable* backing_photo_table_new (void);
-static BackingPhotoTable* backing_photo_table_construct (GType object_type);
-BackingPhotoTable* backing_photo_table_get_instance (void);
-void backing_photo_table_add (BackingPhotoTable* self,
-                              BackingPhotoRow* state,
-                              GError** error);
-BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self,
-                                            BackingPhotoID* id,
-                                            GError** error);
-void backing_photo_table_update (BackingPhotoTable* self,
-                                 BackingPhotoRow* row,
-                                 GError** error);
-void backing_photo_table_update_attributes (BackingPhotoTable* self,
-                                            BackingPhotoID* id,
-                                            time_t timestamp,
-                                            gint64 filesize,
-                                            GError** error);
-void backing_photo_table_remove (BackingPhotoTable* self,
-                                 BackingPhotoID* backing_id,
-                                 GError** error);
-void backing_photo_table_set_filepath (BackingPhotoTable* self,
-                                       BackingPhotoID* id,
-                                       const gchar* filepath,
-                                       GError** error);
-void backing_photo_table_update_timestamp (BackingPhotoTable* self,
-                                           BackingPhotoID* id,
-                                           time_t timestamp,
-                                           GError** error);
-static void backing_photo_table_finalize (DatabaseTable * obj);
-static void _vala_array_destroy (gpointer array,
-                          gint array_length,
-                          GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array,
-                       gint array_length,
-                       GDestroyNotify destroy_func);
-
-
-void
-photo_id_init (PhotoID *self,
-               gint64 id)
-{
-#line 12 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	memset (self, 0, sizeof (PhotoID));
-#line 13 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	(*self).id = id;
-#line 629 "PhotoTable.c"
-}
-
-
-gboolean
-photo_id_is_invalid (PhotoID *self)
-{
-	gboolean result = FALSE;
-	gint64 _tmp0_;
-#line 17 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = (*self).id;
-#line 17 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = _tmp0_ == PHOTO_ID_INVALID;
-#line 17 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 644 "PhotoTable.c"
-}
-
-
-gboolean
-photo_id_is_valid (PhotoID *self)
-{
-	gboolean result = FALSE;
-	gint64 _tmp0_;
-#line 21 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = (*self).id;
-#line 21 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = _tmp0_ != PHOTO_ID_INVALID;
-#line 21 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 659 "PhotoTable.c"
-}
-
-
-guint
-photo_id_hash (PhotoID *self)
-{
-	guint result = 0U;
-	gint64 _tmp0_;
-#line 25 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = (*self).id;
-#line 25 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = int64_hash (&_tmp0_);
-#line 25 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 674 "PhotoTable.c"
-}
-
-
-gboolean
-photo_id_equal (void* a,
-                void* b)
-{
-	gboolean result = FALSE;
-	gint64 _tmp0_;
-	gint64 _tmp1_;
-#line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = (*((PhotoID*) a)).id;
-#line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = (*((PhotoID*) b)).id;
-#line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = _tmp0_ == _tmp1_;
-#line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 693 "PhotoTable.c"
-}
-
-
-gchar*
-photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id)
-{
-	gchar* result = NULL;
-	PhotoID _tmp0_;
-	gint64 _tmp1_;
-	gchar* _tmp2_;
-#line 32 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (photo_id != NULL, NULL);
-#line 33 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = *photo_id;
-#line 33 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 33 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = g_strdup_printf ("%s%016" G_GINT64_MODIFIER "x", PHOTO_TYPENAME, _tmp1_);
-#line 33 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = _tmp2_;
-#line 33 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 716 "PhotoTable.c"
-}
-
-
-PhotoID*
-photo_id_dup (const PhotoID* self)
-{
-	PhotoID* dup;
-#line 7 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	dup = g_new0 (PhotoID, 1);
-#line 7 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	memcpy (dup, self, sizeof (PhotoID));
-#line 7 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return dup;
-#line 730 "PhotoTable.c"
-}
-
-
-void
-photo_id_free (PhotoID* self)
-{
-#line 7 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_free (self);
-#line 739 "PhotoTable.c"
-}
-
-
-GType
-photo_id_get_type (void)
-{
-	static volatile gsize photo_id_type_id__volatile = 0;
-	if (g_once_init_enter (&photo_id_type_id__volatile)) {
-		GType photo_id_type_id;
-		photo_id_type_id = g_boxed_type_register_static ("PhotoID", (GBoxedCopyFunc) photo_id_dup, (GBoxedFreeFunc) photo_id_free);
-		g_once_init_leave (&photo_id_type_id__volatile, photo_id_type_id);
-	}
-	return photo_id_type_id__volatile;
-}
-
-
-void
-import_id_init (ImportID *self,
-                gint64 id)
-{
-#line 42 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	memset (self, 0, sizeof (ImportID));
-#line 43 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	(*self).id = id;
-#line 764 "PhotoTable.c"
-}
-
-
-void
-import_id_generate (ImportID* result)
-{
-	GTimeVal timestamp = {0};
-	gint64 id = 0LL;
-	GTimeVal _tmp0_;
-	glong _tmp1_;
-	ImportID _tmp2_ = {0};
-#line 47 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_get_current_time (&timestamp);
-#line 48 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_get_current_time (&timestamp);
-#line 49 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = timestamp;
-#line 49 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = _tmp0_.tv_sec;
-#line 49 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	id = (gint64) _tmp1_;
-#line 51 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	import_id_init (&_tmp2_, id);
-#line 51 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	*result = _tmp2_;
-#line 51 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return;
-#line 792 "PhotoTable.c"
-}
-
-
-gboolean
-import_id_is_invalid (ImportID *self)
-{
-	gboolean result = FALSE;
-	gint64 _tmp0_;
-#line 55 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = (*self).id;
-#line 55 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = _tmp0_ == IMPORT_ID_INVALID;
-#line 55 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 807 "PhotoTable.c"
-}
-
-
-gboolean
-import_id_is_valid (ImportID *self)
-{
-	gboolean result = FALSE;
-	gint64 _tmp0_;
-#line 59 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = (*self).id;
-#line 59 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = _tmp0_ != IMPORT_ID_INVALID;
-#line 59 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 822 "PhotoTable.c"
-}
-
-
-gint
-import_id_compare_func (ImportID* a,
-                        ImportID* b)
-{
-	gint result = 0;
-	gboolean _tmp0_ = FALSE;
-	gint64 _tmp1_;
-	gint64 _tmp2_;
-#line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (a != NULL) {
-#line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp0_ = b != NULL;
-#line 838 "PhotoTable.c"
-	} else {
-#line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp0_ = FALSE;
-#line 842 "PhotoTable.c"
-	}
-#line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp0_, "a != null && b != null");
-#line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = (*a).id;
-#line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = (*b).id;
-#line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = (gint) (_tmp1_ - _tmp2_);
-#line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 854 "PhotoTable.c"
-}
-
-
-gint64
-import_id_comparator (void* a,
-                      void* b)
-{
-	gint64 result = 0LL;
-	gint64 _tmp0_;
-	gint64 _tmp1_;
-#line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = (*((ImportID*) a)).id;
-#line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = (*((ImportID*) b)).id;
-#line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = _tmp0_ - _tmp1_;
-#line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 873 "PhotoTable.c"
-}
-
-
-ImportID*
-import_id_dup (const ImportID* self)
-{
-	ImportID* dup;
-#line 37 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	dup = g_new0 (ImportID, 1);
-#line 37 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	memcpy (dup, self, sizeof (ImportID));
-#line 37 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return dup;
-#line 887 "PhotoTable.c"
-}
-
-
-void
-import_id_free (ImportID* self)
-{
-#line 37 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_free (self);
-#line 896 "PhotoTable.c"
-}
-
-
-GType
-import_id_get_type (void)
-{
-	static volatile gsize import_id_type_id__volatile = 0;
-	if (g_once_init_enter (&import_id_type_id__volatile)) {
-		GType import_id_type_id;
-		import_id_type_id = g_boxed_type_register_static ("ImportID", (GBoxedCopyFunc) import_id_dup, (GBoxedFreeFunc) import_id_free);
-		g_once_init_leave (&import_id_type_id__volatile, import_id_type_id);
-	}
-	return import_id_type_id__volatile;
-}
-
-
-PhotoRow*
-photo_row_construct (GType object_type)
-{
-	PhotoRow* self = NULL;
-	BackingPhotoRow* _tmp0_;
-	gint _tmp1_;
-	RawDeveloper* _tmp2_;
-	RawDeveloper* _tmp3_;
-	gint _tmp3__length1;
-	BackingPhotoID* _tmp4_;
-	gint _tmp5_;
-	RawDeveloper* _tmp6_;
-#line 100 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self = (PhotoRow*) g_type_create_instance (object_type);
-#line 101 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = backing_photo_row_new ();
-#line 101 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_backing_photo_row_unref0 (self->master);
-#line 101 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self->master = _tmp0_;
-#line 102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	backing_photo_id_init (&self->editable_id, BACKING_PHOTO_ID_INVALID);
-#line 103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = raw_developer_as_array (&_tmp1_);
-#line 103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = _tmp2_;
-#line 103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3__length1 = _tmp1_;
-#line 103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = g_new0 (BackingPhotoID, _tmp1_);
-#line 103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self->development_ids = (g_free (self->development_ids), NULL);
-#line 103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self->development_ids = _tmp4_;
-#line 103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self->development_ids_length1 = _tmp1_;
-#line 103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = (g_free (_tmp3_), NULL);
-#line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp6_ = raw_developer_as_array (&_tmp5_);
-#line 953 "PhotoTable.c"
-	{
-		RawDeveloper* d_collection = NULL;
-		gint d_collection_length1 = 0;
-		gint _d_collection_size_ = 0;
-		gint d_it = 0;
-#line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		d_collection = _tmp6_;
-#line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		d_collection_length1 = _tmp5_;
-#line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		for (d_it = 0; d_it < _tmp5_; d_it = d_it + 1) {
-#line 965 "PhotoTable.c"
-			RawDeveloper d = 0;
-#line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			d = d_collection[d_it];
-#line 969 "PhotoTable.c"
-			{
-				BackingPhotoID* _tmp7_;
-				gint _tmp7__length1;
-				RawDeveloper _tmp8_;
-				BackingPhotoID _tmp9_ = {0};
-				BackingPhotoID _tmp10_;
-#line 105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp7_ = self->development_ids;
-#line 105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp7__length1 = self->development_ids_length1;
-#line 105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp8_ = d;
-#line 105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				backing_photo_id_init (&_tmp9_, BACKING_PHOTO_ID_INVALID);
-#line 105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp7_[_tmp8_] = _tmp9_;
-#line 105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp10_ = _tmp7_[_tmp8_];
-#line 988 "PhotoTable.c"
-			}
-		}
-#line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		d_collection = (g_free (d_collection), NULL);
-#line 993 "PhotoTable.c"
-	}
-#line 100 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return self;
-#line 997 "PhotoTable.c"
-}
-
-
-PhotoRow*
-photo_row_new (void)
-{
-#line 100 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return photo_row_construct (TYPE_PHOTO_ROW);
-#line 1006 "PhotoTable.c"
-}
-
-
-static void
-value_photo_row_init (GValue* value)
-{
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	value->data[0].v_pointer = NULL;
-#line 1015 "PhotoTable.c"
-}
-
-
-static void
-value_photo_row_free_value (GValue* value)
-{
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (value->data[0].v_pointer) {
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		photo_row_unref (value->data[0].v_pointer);
-#line 1026 "PhotoTable.c"
-	}
-}
-
-
-static void
-value_photo_row_copy_value (const GValue* src_value,
-                            GValue* dest_value)
-{
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (src_value->data[0].v_pointer) {
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		dest_value->data[0].v_pointer = photo_row_ref (src_value->data[0].v_pointer);
-#line 1039 "PhotoTable.c"
-	} else {
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 1043 "PhotoTable.c"
-	}
-}
-
-
-static gpointer
-value_photo_row_peek_pointer (const GValue* value)
-{
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return value->data[0].v_pointer;
-#line 1053 "PhotoTable.c"
-}
-
-
-static gchar*
-value_photo_row_collect_value (GValue* value,
-                               guint n_collect_values,
-                               GTypeCValue* collect_values,
-                               guint collect_flags)
-{
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (collect_values[0].v_pointer) {
-#line 1065 "PhotoTable.c"
-		PhotoRow * object;
-		object = collect_values[0].v_pointer;
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1072 "PhotoTable.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.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 1076 "PhotoTable.c"
-		}
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		value->data[0].v_pointer = photo_row_ref (object);
-#line 1080 "PhotoTable.c"
-	} else {
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 1084 "PhotoTable.c"
-	}
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return NULL;
-#line 1088 "PhotoTable.c"
-}
-
-
-static gchar*
-value_photo_row_lcopy_value (const GValue* value,
-                             guint n_collect_values,
-                             GTypeCValue* collect_values,
-                             guint collect_flags)
-{
-	PhotoRow ** object_p;
-	object_p = collect_values[0].v_pointer;
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (!object_p) {
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1104 "PhotoTable.c"
-	}
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (!value->data[0].v_pointer) {
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		*object_p = NULL;
-#line 1110 "PhotoTable.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		*object_p = value->data[0].v_pointer;
-#line 1114 "PhotoTable.c"
-	} else {
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		*object_p = photo_row_ref (value->data[0].v_pointer);
-#line 1118 "PhotoTable.c"
-	}
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return NULL;
-#line 1122 "PhotoTable.c"
-}
-
-
-GParamSpec*
-param_spec_photo_row (const gchar* name,
-                      const gchar* nick,
-                      const gchar* blurb,
-                      GType object_type,
-                      GParamFlags flags)
-{
-	ParamSpecPhotoRow* spec;
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PHOTO_ROW), NULL);
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return G_PARAM_SPEC (spec);
-#line 1142 "PhotoTable.c"
-}
-
-
-gpointer
-value_get_photo_row (const GValue* value)
-{
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_ROW), NULL);
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return value->data[0].v_pointer;
-#line 1153 "PhotoTable.c"
-}
-
-
-void
-value_set_photo_row (GValue* value,
-                     gpointer v_object)
-{
-	PhotoRow * old;
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_ROW));
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	old = value->data[0].v_pointer;
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (v_object) {
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PHOTO_ROW));
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		value->data[0].v_pointer = v_object;
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		photo_row_ref (value->data[0].v_pointer);
-#line 1176 "PhotoTable.c"
-	} else {
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 1180 "PhotoTable.c"
-	}
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (old) {
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		photo_row_unref (old);
-#line 1186 "PhotoTable.c"
-	}
-}
-
-
-void
-value_take_photo_row (GValue* value,
-                      gpointer v_object)
-{
-	PhotoRow * old;
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_ROW));
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	old = value->data[0].v_pointer;
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (v_object) {
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PHOTO_ROW));
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		value->data[0].v_pointer = v_object;
-#line 1208 "PhotoTable.c"
-	} else {
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 1212 "PhotoTable.c"
-	}
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (old) {
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		photo_row_unref (old);
-#line 1218 "PhotoTable.c"
-	}
-}
-
-
-static void
-photo_row_class_init (PhotoRowClass * klass)
-{
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	photo_row_parent_class = g_type_class_peek_parent (klass);
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	((PhotoRowClass *) klass)->finalize = photo_row_finalize;
-#line 1230 "PhotoTable.c"
-}
-
-
-static void
-photo_row_instance_init (PhotoRow * self)
-{
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self->ref_count = 1;
-#line 1239 "PhotoTable.c"
-}
-
-
-static void
-photo_row_finalize (PhotoRow * obj)
-{
-	PhotoRow * self;
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_ROW, PhotoRow);
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_signal_handlers_destroy (self);
-#line 74 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_backing_photo_row_unref0 (self->master);
-#line 79 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_object_unref0 (self->transformations);
-#line 80 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (self->md5);
-#line 81 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (self->thumbnail_md5);
-#line 82 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (self->exif_md5);
-#line 86 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (self->title);
-#line 87 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (self->comment);
-#line 88 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (self->backlinks);
-#line 97 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self->development_ids = (g_free (self->development_ids), NULL);
-#line 1269 "PhotoTable.c"
-}
-
-
-GType
-photo_row_get_type (void)
-{
-	static volatile gsize photo_row_type_id__volatile = 0;
-	if (g_once_init_enter (&photo_row_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_photo_row_init, value_photo_row_free_value, value_photo_row_copy_value, value_photo_row_peek_pointer, "p", value_photo_row_collect_value, "p", value_photo_row_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (PhotoRowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_row_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoRow), 0, (GInstanceInitFunc) photo_row_instance_init, &g_define_type_value_table };
-		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
-		GType photo_row_type_id;
-		photo_row_type_id = g_type_register_fundamental (g_type_fundamental_next (), "PhotoRow", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&photo_row_type_id__volatile, photo_row_type_id);
-	}
-	return photo_row_type_id__volatile;
-}
-
-
-gpointer
-photo_row_ref (gpointer instance)
-{
-	PhotoRow * self;
-	self = instance;
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return instance;
-#line 1298 "PhotoTable.c"
-}
-
-
-void
-photo_row_unref (gpointer instance)
-{
-	PhotoRow * self;
-	self = instance;
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		PHOTO_ROW_GET_CLASS (self)->finalize (self);
-#line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 1313 "PhotoTable.c"
-	}
-}
-
-
-static PhotoTable*
-photo_table_construct (GType object_type)
-{
-	PhotoTable* self = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	gint _tmp5_;
-	sqlite3_stmt* stmt2 = NULL;
-	gint res2 = 0;
-	sqlite3* _tmp7_;
-	sqlite3_stmt* _tmp8_ = NULL;
-	gint _tmp9_;
-	gint _tmp10_;
-	sqlite3_stmt* _tmp11_;
-	gint _tmp12_;
-	sqlite3* _tmp14_;
-	sqlite3_stmt* _tmp15_ = NULL;
-	gint _tmp16_;
-	gint _tmp17_;
-	sqlite3_stmt* _tmp18_;
-	gint _tmp19_;
-	sqlite3* _tmp21_;
-	sqlite3_stmt* _tmp22_ = NULL;
-	gint _tmp23_;
-	gint _tmp24_;
-	sqlite3_stmt* _tmp25_;
-	gint _tmp26_;
-	sqlite3* _tmp28_;
-	sqlite3_stmt* _tmp29_ = NULL;
-	gint _tmp30_;
-	gint _tmp31_;
-	sqlite3_stmt* _tmp32_;
-	gint _tmp33_;
-	sqlite3* _tmp35_;
-	sqlite3_stmt* _tmp36_ = NULL;
-	gint _tmp37_;
-	gint _tmp38_;
-	sqlite3_stmt* _tmp39_;
-	gint _tmp40_;
-#line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self = (PhotoTable*) database_table_construct (object_type);
-#line 114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = database_table_db;
-#line 114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "CREATE TABLE IF NOT EXISTS PhotoTable (" "id INTEGER PRIMARY KEY, " "filename TEXT UNIQUE NOT NULL, " "width INTEGER, " "height INTEGER, " "filesize INTEGER, " "timestamp INTEGER, " "exposure_time INTEGER, " "orientation INTEGER, " "original_orientation INTEGER, " "import_id INTEGER, " "event_id INTEGER, " "transformations TEXT, " "md5 TEXT, " "thumbnail_md5 TEXT, " "exif_md5 TEXT, " "time_created INTEGER, " "flags INTEGER DEFAULT 0, " "rating INTEGER DEFAULT 0, " "file_format INTEGER DEFAULT 0, " "title TEXT, " "backlinks TEXT, " "time_reimported INTEGER, " "editable_id INTEGER DEFAULT -1, " "metadata_dirty INTEGER DEFAULT 0, " "developer TEXT, " "develop_shotwell_id INTEGER DEFAULT -1, " "develop_camera_id INTEGER DEFAULT -1, " "develop_embedded_id INTEGER DEFAULT -1, " "comment TEXT" ")", -1, &_tmp1_, NULL);
-#line 114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp1_;
-#line 114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp2_;
-#line 145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = res;
-#line 145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 147 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = stmt;
-#line 147 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_step (_tmp4_);
-#line 148 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp5_ = res;
-#line 148 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp5_ != SQLITE_DONE) {
-#line 1386 "PhotoTable.c"
-		gint _tmp6_;
-#line 149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp6_ = res;
-#line 149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		database_table_fatal ("create photo table", _tmp6_);
-#line 1392 "PhotoTable.c"
-	}
-#line 153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp7_ = database_table_db;
-#line 153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp9_ = sqlite3_prepare_v2 (_tmp7_, "CREATE INDEX IF NOT EXISTS PhotoEventIDIndex ON PhotoTable (event_id)", -1, &_tmp8_, NULL);
-#line 153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt2);
-#line 153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt2 = _tmp8_;
-#line 153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res2 = _tmp9_;
-#line 155 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp10_ = res2;
-#line 155 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp10_ == SQLITE_OK, "res2 == Sqlite.OK");
-#line 157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp11_ = stmt2;
-#line 157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res2 = sqlite3_step (_tmp11_);
-#line 158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp12_ = res2;
-#line 158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp12_ != SQLITE_DONE) {
-#line 1416 "PhotoTable.c"
-		gint _tmp13_;
-#line 159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp13_ = res2;
-#line 159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		database_table_fatal ("create photo table", _tmp13_);
-#line 1422 "PhotoTable.c"
-	}
-#line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp14_ = database_table_db;
-#line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp16_ = sqlite3_prepare_v2 (_tmp14_, "DROP INDEX IF EXISTS PhotoTableMD5Format", -1, &_tmp15_, NULL);
-#line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp15_;
-#line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp16_;
-#line 166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp17_ = res;
-#line 166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK");
-#line 167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp18_ = stmt;
-#line 167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_step (_tmp18_);
-#line 168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp19_ = res;
-#line 168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp19_ != SQLITE_DONE) {
-#line 1446 "PhotoTable.c"
-		gint _tmp20_;
-#line 169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp20_ = res;
-#line 169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		database_table_warning ("Failed to drop old PhotoTable index", _tmp20_);
-#line 1452 "PhotoTable.c"
-	}
-#line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp21_ = database_table_db;
-#line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp23_ = sqlite3_prepare_v2 (_tmp21_, "CREATE INDEX IF NOT EXISTS PhotoTableMD5FormatV2 on PhotoTable(md5, fi" \
-"le_format)", -1, &_tmp22_, NULL);
-#line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp22_;
-#line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp23_;
-#line 173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp24_ = res;
-#line 173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp24_ == SQLITE_OK, "res == Sqlite.OK");
-#line 174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp25_ = stmt;
-#line 174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_step (_tmp25_);
-#line 175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp26_ = res;
-#line 175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp26_ != SQLITE_DONE) {
-#line 1476 "PhotoTable.c"
-		gint _tmp27_;
-#line 176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp27_ = res;
-#line 176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		database_table_warning ("Failed to create index on md5 and file_format", _tmp27_);
-#line 1482 "PhotoTable.c"
-	}
-#line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp28_ = database_table_db;
-#line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp30_ = sqlite3_prepare_v2 (_tmp28_, "CREATE INDEX IF NOT EXISTS PhotoTableThumbnailMD5Format on PhotoTable(" \
-"thumbnail_md5, file_format)", -1, &_tmp29_, NULL);
-#line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp29_;
-#line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp30_;
-#line 181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp31_ = res;
-#line 181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp31_ == SQLITE_OK, "res == Sqlite.OK");
-#line 182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp32_ = stmt;
-#line 182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_step (_tmp32_);
-#line 183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp33_ = res;
-#line 183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp33_ != SQLITE_DONE) {
-#line 1506 "PhotoTable.c"
-		gint _tmp34_;
-#line 184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp34_ = res;
-#line 184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		database_table_warning ("Failed to create index on md5 and file_format", _tmp34_);
-#line 1512 "PhotoTable.c"
-	}
-#line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp35_ = database_table_db;
-#line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp37_ = sqlite3_prepare_v2 (_tmp35_, "CREATE INDEX IF NOT EXISTS PhotoTableThumbnailMD5MD5 on PhotoTable(thu" \
-"mbnail_md5, md5)", -1, &_tmp36_, NULL);
-#line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp36_;
-#line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp37_;
-#line 189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp38_ = res;
-#line 189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp38_ == SQLITE_OK, "res == Sqlite.OK");
-#line 190 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp39_ = stmt;
-#line 190 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_step (_tmp39_);
-#line 191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp40_ = res;
-#line 191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp40_ != SQLITE_DONE) {
-#line 1536 "PhotoTable.c"
-		gint _tmp41_;
-#line 192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp41_ = res;
-#line 192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		database_table_warning ("Failed to create index on thumbnail_md5 and md5", _tmp41_);
-#line 1542 "PhotoTable.c"
-	}
-#line 195 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	database_table_set_table_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), "PhotoTable");
-#line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt2);
-#line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return self;
-#line 1552 "PhotoTable.c"
-}
-
-
-static PhotoTable*
-photo_table_new (void)
-{
-#line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return photo_table_construct (TYPE_PHOTO_TABLE);
-#line 1561 "PhotoTable.c"
-}
-
-
-static gpointer
-_database_table_ref0 (gpointer self)
-{
-#line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return self ? database_table_ref (self) : NULL;
-#line 1570 "PhotoTable.c"
-}
-
-
-PhotoTable*
-photo_table_get_instance (void)
-{
-	PhotoTable* result = NULL;
-	PhotoTable* _tmp0_;
-	PhotoTable* _tmp2_;
-	PhotoTable* _tmp3_;
-#line 199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = photo_table_instance;
-#line 199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp0_ == NULL) {
-#line 1585 "PhotoTable.c"
-		PhotoTable* _tmp1_;
-#line 200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp1_ = photo_table_new ();
-#line 200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_database_table_unref0 (photo_table_instance);
-#line 200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		photo_table_instance = _tmp1_;
-#line 1593 "PhotoTable.c"
-	}
-#line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = photo_table_instance;
-#line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = _database_table_ref0 (_tmp2_);
-#line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = _tmp3_;
-#line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 1603 "PhotoTable.c"
-}
-
-
-void
-photo_table_add (PhotoTable* self,
-                 PhotoRow* photo_row,
-                 PhotoID* result)
-{
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	gulong time_created = 0UL;
-	sqlite3_stmt* _tmp4_;
-	BackingPhotoRow* _tmp5_;
-	const gchar* _tmp6_;
-	gchar* _tmp7_;
-	GDestroyNotify _tmp8_;
-	gint _tmp9_;
-	sqlite3_stmt* _tmp10_;
-	BackingPhotoRow* _tmp11_;
-	Dimensions _tmp12_;
-	gint _tmp13_;
-	gint _tmp14_;
-	sqlite3_stmt* _tmp15_;
-	BackingPhotoRow* _tmp16_;
-	Dimensions _tmp17_;
-	gint _tmp18_;
-	gint _tmp19_;
-	sqlite3_stmt* _tmp20_;
-	BackingPhotoRow* _tmp21_;
-	gint64 _tmp22_;
-	gint _tmp23_;
-	sqlite3_stmt* _tmp24_;
-	BackingPhotoRow* _tmp25_;
-	time_t _tmp26_;
-	gint _tmp27_;
-	sqlite3_stmt* _tmp28_;
-	time_t _tmp29_;
-	gint _tmp30_;
-	sqlite3_stmt* _tmp31_;
-	BackingPhotoRow* _tmp32_;
-	Orientation _tmp33_;
-	gint _tmp34_;
-	sqlite3_stmt* _tmp35_;
-	BackingPhotoRow* _tmp36_;
-	Orientation _tmp37_;
-	gint _tmp38_;
-	sqlite3_stmt* _tmp39_;
-	ImportID _tmp40_;
-	gint64 _tmp41_;
-	gint _tmp42_;
-	sqlite3_stmt* _tmp43_;
-	gint _tmp44_;
-	sqlite3_stmt* _tmp45_;
-	const gchar* _tmp46_;
-	gchar* _tmp47_;
-	GDestroyNotify _tmp48_;
-	gint _tmp49_;
-	sqlite3_stmt* _tmp50_;
-	const gchar* _tmp51_;
-	gchar* _tmp52_;
-	GDestroyNotify _tmp53_;
-	gint _tmp54_;
-	sqlite3_stmt* _tmp55_;
-	const gchar* _tmp56_;
-	gchar* _tmp57_;
-	GDestroyNotify _tmp58_;
-	gint _tmp59_;
-	sqlite3_stmt* _tmp60_;
-	gulong _tmp61_;
-	gint _tmp62_;
-	sqlite3_stmt* _tmp63_;
-	BackingPhotoRow* _tmp64_;
-	PhotoFileFormat _tmp65_;
-	gint _tmp66_;
-	sqlite3_stmt* _tmp67_;
-	const gchar* _tmp68_;
-	gchar* _tmp69_;
-	GDestroyNotify _tmp70_;
-	gint _tmp71_;
-	sqlite3_stmt* _tmp72_;
-	Rating _tmp73_;
-	gint _tmp74_;
-	sqlite3_stmt* _tmp75_;
-	gint _tmp76_;
-	sqlite3_stmt* _tmp77_;
-	RawDeveloper _tmp78_;
-	gchar* _tmp79_;
-	GDestroyNotify _tmp80_;
-	gint _tmp81_;
-	sqlite3_stmt* _tmp82_;
-	const gchar* _tmp83_;
-	gchar* _tmp84_;
-	GDestroyNotify _tmp85_;
-	gint _tmp86_;
-	sqlite3_stmt* _tmp87_;
-	gint _tmp88_;
-	sqlite3* _tmp92_;
-	BackingPhotoRow* _tmp93_;
-	Orientation _tmp94_;
-	gulong _tmp95_;
-	PhotoID _tmp96_;
-#line 207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_PHOTO_ROW (photo_row));
-#line 209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = database_table_db;
-#line 209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "INSERT INTO PhotoTable (filename, width, height, filesize, timestamp, " \
-"exposure_time, " "orientation, original_orientation, import_id, event_id, md5, thumbnail" \
-"_md5, " "exif_md5, time_created, file_format, title, rating, editable_id, devel" \
-"oper, comment) " "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", -1, &_tmp1_, NULL);
-#line 209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp1_;
-#line 209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp2_;
-#line 215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = res;
-#line 215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 217 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	time_created = now_sec ();
-#line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = stmt;
-#line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp5_ = photo_row->master;
-#line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp6_ = _tmp5_->filepath;
-#line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp7_ = g_strdup (_tmp6_);
-#line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp8_ = g_free;
-#line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp4_, 1, _tmp7_, -1, _tmp8_);
-#line 220 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp9_ = res;
-#line 220 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK");
-#line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp10_ = stmt;
-#line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp11_ = photo_row->master;
-#line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp12_ = _tmp11_->dim;
-#line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp13_ = _tmp12_.width;
-#line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp10_, 2, _tmp13_);
-#line 222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp14_ = res;
-#line 222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp14_ == SQLITE_OK, "res == Sqlite.OK");
-#line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp15_ = stmt;
-#line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp16_ = photo_row->master;
-#line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp17_ = _tmp16_->dim;
-#line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp18_ = _tmp17_.height;
-#line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp15_, 3, _tmp18_);
-#line 224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp19_ = res;
-#line 224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK");
-#line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp20_ = stmt;
-#line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp21_ = photo_row->master;
-#line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp22_ = _tmp21_->filesize;
-#line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp20_, 4, _tmp22_);
-#line 226 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp23_ = res;
-#line 226 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK");
-#line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp24_ = stmt;
-#line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp25_ = photo_row->master;
-#line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp26_ = _tmp25_->timestamp;
-#line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp24_, 5, (gint64) _tmp26_);
-#line 228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp27_ = res;
-#line 228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK");
-#line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp28_ = stmt;
-#line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp29_ = photo_row->exposure_time;
-#line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp28_, 6, (gint64) _tmp29_);
-#line 230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp30_ = res;
-#line 230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK");
-#line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp31_ = stmt;
-#line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp32_ = photo_row->master;
-#line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp33_ = _tmp32_->original_orientation;
-#line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp31_, 7, (gint) _tmp33_);
-#line 232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp34_ = res;
-#line 232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp34_ == SQLITE_OK, "res == Sqlite.OK");
-#line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp35_ = stmt;
-#line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp36_ = photo_row->master;
-#line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp37_ = _tmp36_->original_orientation;
-#line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp35_, 8, (gint) _tmp37_);
-#line 234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp38_ = res;
-#line 234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp38_ == SQLITE_OK, "res == Sqlite.OK");
-#line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp39_ = stmt;
-#line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp40_ = photo_row->import_id;
-#line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp41_ = _tmp40_.id;
-#line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp39_, 9, _tmp41_);
-#line 236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp42_ = res;
-#line 236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK");
-#line 237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp43_ = stmt;
-#line 237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp43_, 10, EVENT_ID_INVALID);
-#line 238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp44_ = res;
-#line 238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp44_ == SQLITE_OK, "res == Sqlite.OK");
-#line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp45_ = stmt;
-#line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp46_ = photo_row->md5;
-#line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp47_ = g_strdup (_tmp46_);
-#line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp48_ = g_free;
-#line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp45_, 11, _tmp47_, -1, _tmp48_);
-#line 240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp49_ = res;
-#line 240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp49_ == SQLITE_OK, "res == Sqlite.OK");
-#line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp50_ = stmt;
-#line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp51_ = photo_row->thumbnail_md5;
-#line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp52_ = g_strdup (_tmp51_);
-#line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp53_ = g_free;
-#line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp50_, 12, _tmp52_, -1, _tmp53_);
-#line 242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp54_ = res;
-#line 242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp54_ == SQLITE_OK, "res == Sqlite.OK");
-#line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp55_ = stmt;
-#line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp56_ = photo_row->exif_md5;
-#line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp57_ = g_strdup (_tmp56_);
-#line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp58_ = g_free;
-#line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp55_, 13, _tmp57_, -1, _tmp58_);
-#line 244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp59_ = res;
-#line 244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp59_ == SQLITE_OK, "res == Sqlite.OK");
-#line 245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp60_ = stmt;
-#line 245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp61_ = time_created;
-#line 245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp60_, 14, (gint64) _tmp61_);
-#line 246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp62_ = res;
-#line 246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp62_ == SQLITE_OK, "res == Sqlite.OK");
-#line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp63_ = stmt;
-#line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp64_ = photo_row->master;
-#line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp65_ = _tmp64_->file_format;
-#line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp63_, 15, photo_file_format_serialize (_tmp65_));
-#line 248 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp66_ = res;
-#line 248 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp66_ == SQLITE_OK, "res == Sqlite.OK");
-#line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp67_ = stmt;
-#line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp68_ = photo_row->title;
-#line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp69_ = g_strdup (_tmp68_);
-#line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp70_ = g_free;
-#line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp67_, 16, _tmp69_, -1, _tmp70_);
-#line 250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp71_ = res;
-#line 250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp71_ == SQLITE_OK, "res == Sqlite.OK");
-#line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp72_ = stmt;
-#line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp73_ = photo_row->rating;
-#line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp72_, 17, (gint64) rating_serialize (_tmp73_));
-#line 252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp74_ = res;
-#line 252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp74_ == SQLITE_OK, "res == Sqlite.OK");
-#line 253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp75_ = stmt;
-#line 253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp75_, 18, BACKING_PHOTO_ID_INVALID);
-#line 254 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp76_ = res;
-#line 254 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp76_ == SQLITE_OK, "res == Sqlite.OK");
-#line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp77_ = stmt;
-#line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp78_ = photo_row->developer;
-#line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp79_ = raw_developer_to_string (_tmp78_);
-#line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp80_ = g_free;
-#line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp77_, 19, _tmp79_, -1, _tmp80_);
-#line 256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp81_ = res;
-#line 256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp81_ == SQLITE_OK, "res == Sqlite.OK");
-#line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp82_ = stmt;
-#line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp83_ = photo_row->comment;
-#line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp84_ = g_strdup (_tmp83_);
-#line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp85_ = g_free;
-#line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp82_, 20, _tmp84_, -1, _tmp85_);
-#line 258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp86_ = res;
-#line 258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp86_ == SQLITE_OK, "res == Sqlite.OK");
-#line 260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp87_ = stmt;
-#line 260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_step (_tmp87_);
-#line 261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp88_ = res;
-#line 261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp88_ != SQLITE_DONE) {
-#line 1983 "PhotoTable.c"
-		gint _tmp89_;
-		PhotoID _tmp91_ = {0};
-#line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp89_ = res;
-#line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (_tmp89_ != SQLITE_CONSTRAINT) {
-#line 1990 "PhotoTable.c"
-			gint _tmp90_;
-#line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp90_ = res;
-#line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			database_table_fatal ("add_photo", _tmp90_);
-#line 1996 "PhotoTable.c"
-		}
-#line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		photo_id_init (&_tmp91_, PHOTO_ID_INVALID);
-#line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		*result = _tmp91_;
-#line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return;
-#line 2006 "PhotoTable.c"
-	}
-#line 269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp92_ = database_table_db;
-#line 269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	photo_id_init (&photo_row->photo_id, sqlite3_last_insert_rowid (_tmp92_));
-#line 270 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp93_ = photo_row->master;
-#line 270 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp94_ = _tmp93_->original_orientation;
-#line 270 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	photo_row->orientation = _tmp94_;
-#line 271 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	event_id_init (&photo_row->event_id, EVENT_ID_INVALID);
-#line 272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp95_ = time_created;
-#line 272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	photo_row->time_created = (time_t) _tmp95_;
-#line 273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	photo_row->flags = (guint64) 0;
-#line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp96_ = photo_row->photo_id;
-#line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	*result = _tmp96_;
-#line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return;
-#line 2034 "PhotoTable.c"
-}
-
-
-void
-photo_table_reimport (PhotoTable* self,
-                      PhotoRow* row,
-                      GError** error)
-{
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	time_t time_reimported = 0;
-	sqlite3_stmt* _tmp4_;
-	BackingPhotoRow* _tmp5_;
-	Dimensions _tmp6_;
-	gint _tmp7_;
-	gint _tmp8_;
-	sqlite3_stmt* _tmp9_;
-	BackingPhotoRow* _tmp10_;
-	Dimensions _tmp11_;
-	gint _tmp12_;
-	gint _tmp13_;
-	sqlite3_stmt* _tmp14_;
-	BackingPhotoRow* _tmp15_;
-	gint64 _tmp16_;
-	gint _tmp17_;
-	sqlite3_stmt* _tmp18_;
-	BackingPhotoRow* _tmp19_;
-	time_t _tmp20_;
-	gint _tmp21_;
-	sqlite3_stmt* _tmp22_;
-	time_t _tmp23_;
-	gint _tmp24_;
-	sqlite3_stmt* _tmp25_;
-	BackingPhotoRow* _tmp26_;
-	Orientation _tmp27_;
-	gint _tmp28_;
-	sqlite3_stmt* _tmp29_;
-	BackingPhotoRow* _tmp30_;
-	Orientation _tmp31_;
-	gint _tmp32_;
-	sqlite3_stmt* _tmp33_;
-	const gchar* _tmp34_;
-	gchar* _tmp35_;
-	GDestroyNotify _tmp36_;
-	gint _tmp37_;
-	sqlite3_stmt* _tmp38_;
-	const gchar* _tmp39_;
-	gchar* _tmp40_;
-	GDestroyNotify _tmp41_;
-	gint _tmp42_;
-	sqlite3_stmt* _tmp43_;
-	const gchar* _tmp44_;
-	gchar* _tmp45_;
-	GDestroyNotify _tmp46_;
-	gint _tmp47_;
-	sqlite3_stmt* _tmp48_;
-	BackingPhotoRow* _tmp49_;
-	PhotoFileFormat _tmp50_;
-	gint _tmp51_;
-	sqlite3_stmt* _tmp52_;
-	const gchar* _tmp53_;
-	gchar* _tmp54_;
-	GDestroyNotify _tmp55_;
-	gint _tmp56_;
-	sqlite3_stmt* _tmp57_;
-	time_t _tmp58_;
-	gint _tmp59_;
-	sqlite3_stmt* _tmp60_;
-	PhotoID _tmp61_;
-	gint64 _tmp62_;
-	gint _tmp63_;
-	sqlite3_stmt* _tmp64_;
-	gint _tmp65_;
-	time_t _tmp67_;
-	BackingPhotoRow* _tmp68_;
-	Orientation _tmp69_;
-	GError * _inner_error_ = NULL;
-#line 283 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 283 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_PHOTO_ROW (row));
-#line 285 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = database_table_db;
-#line 285 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "UPDATE PhotoTable SET width = ?, height = ?, filesize = ?, timestamp =" \
-" ?, " "exposure_time = ?, orientation = ?, original_orientation = ?, md5 = ?," \
-" " "exif_md5 = ?, thumbnail_md5 = ?, file_format = ?, title = ?, time_reim" \
-"ported = ? " "WHERE id = ?", -1, &_tmp1_, NULL);
-#line 285 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 285 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp1_;
-#line 285 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp2_;
-#line 290 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = res;
-#line 290 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 292 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	time_reimported = (time_t) now_sec ();
-#line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = stmt;
-#line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp5_ = row->master;
-#line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp6_ = _tmp5_->dim;
-#line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp7_ = _tmp6_.width;
-#line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp4_, 1, _tmp7_);
-#line 295 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp8_ = res;
-#line 295 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
-#line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp9_ = stmt;
-#line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp10_ = row->master;
-#line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp11_ = _tmp10_->dim;
-#line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp12_ = _tmp11_.height;
-#line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp9_, 2, _tmp12_);
-#line 297 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp13_ = res;
-#line 297 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK");
-#line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp14_ = stmt;
-#line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp15_ = row->master;
-#line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp16_ = _tmp15_->filesize;
-#line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp14_, 3, _tmp16_);
-#line 299 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp17_ = res;
-#line 299 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK");
-#line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp18_ = stmt;
-#line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp19_ = row->master;
-#line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp20_ = _tmp19_->timestamp;
-#line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp18_, 4, (gint64) _tmp20_);
-#line 301 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp21_ = res;
-#line 301 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp21_ == SQLITE_OK, "res == Sqlite.OK");
-#line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp22_ = stmt;
-#line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp23_ = row->exposure_time;
-#line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp22_, 5, (gint64) _tmp23_);
-#line 303 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp24_ = res;
-#line 303 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp24_ == SQLITE_OK, "res == Sqlite.OK");
-#line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp25_ = stmt;
-#line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp26_ = row->master;
-#line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp27_ = _tmp26_->original_orientation;
-#line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp25_, 6, (gint) _tmp27_);
-#line 305 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp28_ = res;
-#line 305 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp28_ == SQLITE_OK, "res == Sqlite.OK");
-#line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp29_ = stmt;
-#line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp30_ = row->master;
-#line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp31_ = _tmp30_->original_orientation;
-#line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp29_, 7, (gint) _tmp31_);
-#line 307 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp32_ = res;
-#line 307 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp32_ == SQLITE_OK, "res == Sqlite.OK");
-#line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp33_ = stmt;
-#line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp34_ = row->md5;
-#line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp35_ = g_strdup (_tmp34_);
-#line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp36_ = g_free;
-#line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp33_, 8, _tmp35_, -1, _tmp36_);
-#line 309 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp37_ = res;
-#line 309 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK");
-#line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp38_ = stmt;
-#line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp39_ = row->exif_md5;
-#line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp40_ = g_strdup (_tmp39_);
-#line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp41_ = g_free;
-#line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp38_, 9, _tmp40_, -1, _tmp41_);
-#line 311 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp42_ = res;
-#line 311 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK");
-#line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp43_ = stmt;
-#line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp44_ = row->thumbnail_md5;
-#line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp45_ = g_strdup (_tmp44_);
-#line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp46_ = g_free;
-#line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp43_, 10, _tmp45_, -1, _tmp46_);
-#line 313 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp47_ = res;
-#line 313 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp47_ == SQLITE_OK, "res == Sqlite.OK");
-#line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp48_ = stmt;
-#line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp49_ = row->master;
-#line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp50_ = _tmp49_->file_format;
-#line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp48_, 11, photo_file_format_serialize (_tmp50_));
-#line 315 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp51_ = res;
-#line 315 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp51_ == SQLITE_OK, "res == Sqlite.OK");
-#line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp52_ = stmt;
-#line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp53_ = row->title;
-#line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp54_ = g_strdup (_tmp53_);
-#line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp55_ = g_free;
-#line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp52_, 12, _tmp54_, -1, _tmp55_);
-#line 317 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp56_ = res;
-#line 317 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp56_ == SQLITE_OK, "res == Sqlite.OK");
-#line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp57_ = stmt;
-#line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp58_ = time_reimported;
-#line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp57_, 13, (gint64) _tmp58_);
-#line 319 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp59_ = res;
-#line 319 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp59_ == SQLITE_OK, "res == Sqlite.OK");
-#line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp60_ = stmt;
-#line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp61_ = row->photo_id;
-#line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp62_ = _tmp61_.id;
-#line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp60_, 14, _tmp62_);
-#line 321 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp63_ = res;
-#line 321 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp63_ == SQLITE_OK, "res == Sqlite.OK");
-#line 323 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp64_ = stmt;
-#line 323 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_step (_tmp64_);
-#line 324 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp65_ = res;
-#line 324 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp65_ != SQLITE_DONE) {
-#line 2320 "PhotoTable.c"
-		gint _tmp66_;
-#line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp66_ = res;
-#line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		database_table_throw_error ("PhotoTable.reimport_master", _tmp66_, &_inner_error_);
-#line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				return;
-#line 2336 "PhotoTable.c"
-			} else {
-#line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.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 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				g_clear_error (&_inner_error_);
-#line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				return;
-#line 2346 "PhotoTable.c"
-			}
-		}
-	}
-#line 327 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp67_ = time_reimported;
-#line 327 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	row->time_reimported = _tmp67_;
-#line 328 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp68_ = row->master;
-#line 328 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp69_ = _tmp68_->original_orientation;
-#line 328 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	row->orientation = _tmp69_;
-#line 283 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 2362 "PhotoTable.c"
-}
-
-
-gboolean
-photo_table_master_exif_updated (PhotoTable* self,
-                                 PhotoID* photoID,
-                                 gint64 filesize,
-                                 glong timestamp,
-                                 const gchar* md5,
-                                 const gchar* exif_md5,
-                                 const gchar* thumbnail_md5,
-                                 PhotoRow* row)
-{
-	gboolean result = FALSE;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	gint _tmp5_;
-	sqlite3_stmt* _tmp6_;
-	gint _tmp7_;
-	sqlite3_stmt* _tmp8_;
-	gchar* _tmp9_;
-	GDestroyNotify _tmp10_;
-	gint _tmp11_;
-	sqlite3_stmt* _tmp12_;
-	gchar* _tmp13_;
-	GDestroyNotify _tmp14_;
-	gint _tmp15_;
-	sqlite3_stmt* _tmp16_;
-	gchar* _tmp17_;
-	GDestroyNotify _tmp18_;
-	gint _tmp19_;
-	sqlite3_stmt* _tmp20_;
-	PhotoID _tmp21_;
-	gint64 _tmp22_;
-	gint _tmp23_;
-	sqlite3_stmt* _tmp24_;
-	gint _tmp25_;
-	BackingPhotoRow* _tmp28_;
-	BackingPhotoRow* _tmp29_;
-	gchar* _tmp30_;
-	gchar* _tmp31_;
-	gchar* _tmp32_;
-#line 331 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 331 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (photoID != NULL, FALSE);
-#line 331 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (md5 != NULL, FALSE);
-#line 331 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_ROW (row), FALSE);
-#line 334 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = database_table_db;
-#line 334 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "UPDATE PhotoTable SET filesize = ?, timestamp = ?, md5 = ?, exif_md5 =" \
-" ?," "thumbnail_md5 =? WHERE id = ?", -1, &_tmp1_, NULL);
-#line 334 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 334 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp1_;
-#line 334 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp2_;
-#line 337 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = res;
-#line 337 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 339 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = stmt;
-#line 339 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp4_, 1, filesize);
-#line 340 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp5_ = res;
-#line 340 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK");
-#line 341 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp6_ = stmt;
-#line 341 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp6_, 2, (gint64) timestamp);
-#line 342 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp7_ = res;
-#line 342 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp8_ = stmt;
-#line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp9_ = g_strdup (md5);
-#line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp10_ = g_free;
-#line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp8_, 3, _tmp9_, -1, _tmp10_);
-#line 344 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp11_ = res;
-#line 344 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
-#line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp12_ = stmt;
-#line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp13_ = g_strdup (exif_md5);
-#line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp14_ = g_free;
-#line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp12_, 4, _tmp13_, -1, _tmp14_);
-#line 346 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp15_ = res;
-#line 346 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK");
-#line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp16_ = stmt;
-#line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp17_ = g_strdup (thumbnail_md5);
-#line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp18_ = g_free;
-#line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp16_, 5, _tmp17_, -1, _tmp18_);
-#line 348 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp19_ = res;
-#line 348 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK");
-#line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp20_ = stmt;
-#line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp21_ = *photoID;
-#line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp22_ = _tmp21_.id;
-#line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp20_, 6, _tmp22_);
-#line 350 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp23_ = res;
-#line 350 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK");
-#line 352 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp24_ = stmt;
-#line 352 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_step (_tmp24_);
-#line 353 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp25_ = res;
-#line 353 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp25_ != SQLITE_DONE) {
-#line 2504 "PhotoTable.c"
-		gint _tmp26_;
-#line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp26_ = res;
-#line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (_tmp26_ != SQLITE_CONSTRAINT) {
-#line 2510 "PhotoTable.c"
-			gint _tmp27_;
-#line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp27_ = res;
-#line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			database_table_fatal ("write_update_photo", _tmp27_);
-#line 2516 "PhotoTable.c"
-		}
-#line 357 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		result = FALSE;
-#line 357 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 357 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return result;
-#line 2524 "PhotoTable.c"
-	}
-#line 360 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp28_ = row->master;
-#line 360 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp28_->filesize = filesize;
-#line 361 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp29_ = row->master;
-#line 361 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp29_->timestamp = (time_t) timestamp;
-#line 362 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp30_ = g_strdup (md5);
-#line 362 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (row->md5);
-#line 362 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	row->md5 = _tmp30_;
-#line 363 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp31_ = g_strdup (exif_md5);
-#line 363 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (row->exif_md5);
-#line 363 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	row->exif_md5 = _tmp31_;
-#line 364 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp32_ = g_strdup (thumbnail_md5);
-#line 364 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (row->thumbnail_md5);
-#line 364 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	row->thumbnail_md5 = _tmp32_;
-#line 366 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = TRUE;
-#line 366 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 366 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 2558 "PhotoTable.c"
-}
-
-
-static void
-photo_table_validate_orientation (PhotoTable* self,
-                                  PhotoRow* row)
-{
-	gboolean _tmp0_ = FALSE;
-	Orientation _tmp1_;
-#line 377 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 377 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_PHOTO_ROW (row));
-#line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = row->orientation;
-#line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp1_ < ORIENTATION_MIN) {
-#line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp0_ = TRUE;
-#line 2578 "PhotoTable.c"
-	} else {
-		Orientation _tmp2_;
-#line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp2_ = row->orientation;
-#line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp0_ = _tmp2_ > ORIENTATION_MAX;
-#line 2585 "PhotoTable.c"
-	}
-#line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp0_) {
-#line 2589 "PhotoTable.c"
-		PhotoID _tmp3_;
-#line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp3_ = row->photo_id;
-#line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		photo_table_set_orientation (self, &_tmp3_, ORIENTATION_MIN);
-#line 382 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		row->orientation = ORIENTATION_MIN;
-#line 2597 "PhotoTable.c"
-	}
-}
-
-
-PhotoRow*
-photo_table_get_row (PhotoTable* self,
-                     PhotoID* photo_id)
-{
-	PhotoRow* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	PhotoID _tmp5_;
-	gint64 _tmp6_;
-	gint _tmp7_;
-	sqlite3_stmt* _tmp8_;
-	PhotoRow* row = NULL;
-	PhotoRow* _tmp9_;
-	PhotoRow* _tmp10_;
-	PhotoID _tmp11_;
-	PhotoRow* _tmp12_;
-	BackingPhotoRow* _tmp13_;
-	sqlite3_stmt* _tmp14_;
-	const gchar* _tmp15_;
-	gchar* _tmp16_;
-	PhotoRow* _tmp17_;
-	BackingPhotoRow* _tmp18_;
-	sqlite3_stmt* _tmp19_;
-	sqlite3_stmt* _tmp20_;
-	PhotoRow* _tmp21_;
-	BackingPhotoRow* _tmp22_;
-	sqlite3_stmt* _tmp23_;
-	PhotoRow* _tmp24_;
-	BackingPhotoRow* _tmp25_;
-	sqlite3_stmt* _tmp26_;
-	PhotoRow* _tmp27_;
-	sqlite3_stmt* _tmp28_;
-	PhotoRow* _tmp29_;
-	sqlite3_stmt* _tmp30_;
-	PhotoRow* _tmp31_;
-	BackingPhotoRow* _tmp32_;
-	sqlite3_stmt* _tmp33_;
-	PhotoRow* _tmp34_;
-	sqlite3_stmt* _tmp35_;
-	PhotoRow* _tmp36_;
-	sqlite3_stmt* _tmp37_;
-	PhotoRow* _tmp38_;
-	sqlite3_stmt* _tmp39_;
-	const gchar* _tmp40_;
-	GeeHashMap* _tmp41_;
-	PhotoRow* _tmp42_;
-	sqlite3_stmt* _tmp43_;
-	const gchar* _tmp44_;
-	gchar* _tmp45_;
-	PhotoRow* _tmp46_;
-	sqlite3_stmt* _tmp47_;
-	const gchar* _tmp48_;
-	gchar* _tmp49_;
-	PhotoRow* _tmp50_;
-	sqlite3_stmt* _tmp51_;
-	const gchar* _tmp52_;
-	gchar* _tmp53_;
-	PhotoRow* _tmp54_;
-	sqlite3_stmt* _tmp55_;
-	PhotoRow* _tmp56_;
-	sqlite3_stmt* _tmp57_;
-	PhotoRow* _tmp58_;
-	sqlite3_stmt* _tmp59_;
-	PhotoRow* _tmp60_;
-	BackingPhotoRow* _tmp61_;
-	sqlite3_stmt* _tmp62_;
-	PhotoRow* _tmp63_;
-	sqlite3_stmt* _tmp64_;
-	const gchar* _tmp65_;
-	gchar* _tmp66_;
-	PhotoRow* _tmp67_;
-	sqlite3_stmt* _tmp68_;
-	const gchar* _tmp69_;
-	gchar* _tmp70_;
-	PhotoRow* _tmp71_;
-	sqlite3_stmt* _tmp72_;
-	PhotoRow* _tmp73_;
-	sqlite3_stmt* _tmp74_;
-	PhotoRow* _tmp75_;
-	sqlite3_stmt* _tmp76_;
-	RawDeveloper _tmp77_ = 0;
-	sqlite3_stmt* _tmp78_;
-	const gchar* _tmp79_;
-	PhotoRow* _tmp82_;
-	PhotoRow* _tmp83_;
-	BackingPhotoID* _tmp84_;
-	gint _tmp84__length1;
-	sqlite3_stmt* _tmp85_;
-	BackingPhotoID _tmp86_ = {0};
-	BackingPhotoID _tmp87_;
-	PhotoRow* _tmp88_;
-	BackingPhotoID* _tmp89_;
-	gint _tmp89__length1;
-	sqlite3_stmt* _tmp90_;
-	BackingPhotoID _tmp91_ = {0};
-	BackingPhotoID _tmp92_;
-	PhotoRow* _tmp93_;
-	BackingPhotoID* _tmp94_;
-	gint _tmp94__length1;
-	sqlite3_stmt* _tmp95_;
-	BackingPhotoID _tmp96_ = {0};
-	BackingPhotoID _tmp97_;
-	PhotoRow* _tmp98_;
-	sqlite3_stmt* _tmp99_;
-	const gchar* _tmp100_;
-	gchar* _tmp101_;
-#line 386 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL);
-#line 386 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (photo_id != NULL, NULL);
-#line 388 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = database_table_db;
-#line 388 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT filename, width, height, filesize, timestamp, exposure_time, or" \
-"ientation, " "original_orientation, import_id, event_id, transformations, md5, thumb" \
-"nail_md5, " "exif_md5, time_created, flags, rating, file_format, title, backlinks, " "time_reimported, editable_id, metadata_dirty, developer, develop_shotw" \
-"ell_id, " "develop_camera_id, develop_embedded_id, comment " "FROM PhotoTable WHERE id=?", -1, &_tmp1_, NULL);
-#line 388 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 388 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp1_;
-#line 388 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp2_;
-#line 396 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = res;
-#line 396 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 398 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = stmt;
-#line 398 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp5_ = *photo_id;
-#line 398 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp6_ = _tmp5_.id;
-#line 398 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_);
-#line 399 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp7_ = res;
-#line 399 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 401 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp8_ = stmt;
-#line 401 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (sqlite3_step (_tmp8_) != SQLITE_ROW) {
-#line 402 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		result = NULL;
-#line 402 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 402 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return result;
-#line 2753 "PhotoTable.c"
-	}
-#line 404 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp9_ = photo_row_new ();
-#line 404 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	row = _tmp9_;
-#line 405 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp10_ = row;
-#line 405 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp11_ = *photo_id;
-#line 405 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp10_->photo_id = _tmp11_;
-#line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp12_ = row;
-#line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp13_ = _tmp12_->master;
-#line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp14_ = stmt;
-#line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp15_ = sqlite3_column_text (_tmp14_, 0);
-#line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp16_ = g_strdup (_tmp15_);
-#line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (_tmp13_->filepath);
-#line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp13_->filepath = _tmp16_;
-#line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp17_ = row;
-#line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp18_ = _tmp17_->master;
-#line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp19_ = stmt;
-#line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp20_ = stmt;
-#line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	dimensions_init (&_tmp18_->dim, sqlite3_column_int (_tmp19_, 1), sqlite3_column_int (_tmp20_, 2));
-#line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp21_ = row;
-#line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp22_ = _tmp21_->master;
-#line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp23_ = stmt;
-#line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp22_->filesize = sqlite3_column_int64 (_tmp23_, 3);
-#line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp24_ = row;
-#line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp25_ = _tmp24_->master;
-#line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp26_ = stmt;
-#line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp25_->timestamp = (time_t) sqlite3_column_int64 (_tmp26_, 4);
-#line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp27_ = row;
-#line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp28_ = stmt;
-#line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp27_->exposure_time = (time_t) sqlite3_column_int64 (_tmp28_, 5);
-#line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp29_ = row;
-#line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp30_ = stmt;
-#line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp29_->orientation = (Orientation) sqlite3_column_int (_tmp30_, 6);
-#line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp31_ = row;
-#line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp32_ = _tmp31_->master;
-#line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp33_ = stmt;
-#line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp32_->original_orientation = (Orientation) sqlite3_column_int (_tmp33_, 7);
-#line 413 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp34_ = row;
-#line 413 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp35_ = stmt;
-#line 413 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp34_->import_id.id = sqlite3_column_int64 (_tmp35_, 8);
-#line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp36_ = row;
-#line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp37_ = stmt;
-#line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp36_->event_id.id = sqlite3_column_int64 (_tmp37_, 9);
-#line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp38_ = row;
-#line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp39_ = stmt;
-#line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp40_ = sqlite3_column_text (_tmp39_, 10);
-#line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp41_ = photo_table_marshall_all_transformations (_tmp40_);
-#line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_object_unref0 (_tmp38_->transformations);
-#line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp38_->transformations = _tmp41_;
-#line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp42_ = row;
-#line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp43_ = stmt;
-#line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp44_ = sqlite3_column_text (_tmp43_, 11);
-#line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp45_ = g_strdup (_tmp44_);
-#line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (_tmp42_->md5);
-#line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp42_->md5 = _tmp45_;
-#line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp46_ = row;
-#line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp47_ = stmt;
-#line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp48_ = sqlite3_column_text (_tmp47_, 12);
-#line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp49_ = g_strdup (_tmp48_);
-#line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (_tmp46_->thumbnail_md5);
-#line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp46_->thumbnail_md5 = _tmp49_;
-#line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp50_ = row;
-#line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp51_ = stmt;
-#line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp52_ = sqlite3_column_text (_tmp51_, 13);
-#line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp53_ = g_strdup (_tmp52_);
-#line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (_tmp50_->exif_md5);
-#line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp50_->exif_md5 = _tmp53_;
-#line 419 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp54_ = row;
-#line 419 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp55_ = stmt;
-#line 419 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp54_->time_created = (time_t) sqlite3_column_int64 (_tmp55_, 14);
-#line 420 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp56_ = row;
-#line 420 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp57_ = stmt;
-#line 420 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp56_->flags = (guint64) sqlite3_column_int64 (_tmp57_, 15);
-#line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp58_ = row;
-#line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp59_ = stmt;
-#line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp58_->rating = rating_unserialize (sqlite3_column_int (_tmp59_, 16));
-#line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp60_ = row;
-#line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp61_ = _tmp60_->master;
-#line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp62_ = stmt;
-#line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp61_->file_format = photo_file_format_unserialize (sqlite3_column_int (_tmp62_, 17));
-#line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp63_ = row;
-#line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp64_ = stmt;
-#line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp65_ = sqlite3_column_text (_tmp64_, 18);
-#line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp66_ = g_strdup (_tmp65_);
-#line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (_tmp63_->title);
-#line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp63_->title = _tmp66_;
-#line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp67_ = row;
-#line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp68_ = stmt;
-#line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp69_ = sqlite3_column_text (_tmp68_, 19);
-#line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp70_ = g_strdup (_tmp69_);
-#line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (_tmp67_->backlinks);
-#line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp67_->backlinks = _tmp70_;
-#line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp71_ = row;
-#line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp72_ = stmt;
-#line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp71_->time_reimported = (time_t) sqlite3_column_int64 (_tmp72_, 20);
-#line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp73_ = row;
-#line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp74_ = stmt;
-#line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	backing_photo_id_init (&_tmp73_->editable_id, sqlite3_column_int64 (_tmp74_, 21));
-#line 427 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp75_ = row;
-#line 427 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp76_ = stmt;
-#line 427 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp75_->metadata_dirty = sqlite3_column_int (_tmp76_, 22) != 0;
-#line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp78_ = stmt;
-#line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp79_ = sqlite3_column_text (_tmp78_, 23);
-#line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp79_ != NULL) {
-#line 2959 "PhotoTable.c"
-		sqlite3_stmt* _tmp80_;
-		const gchar* _tmp81_;
-#line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp80_ = stmt;
-#line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp81_ = sqlite3_column_text (_tmp80_, 23);
-#line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp77_ = raw_developer_from_string (_tmp81_);
-#line 2968 "PhotoTable.c"
-	} else {
-#line 429 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp77_ = RAW_DEVELOPER_CAMERA;
-#line 2972 "PhotoTable.c"
-	}
-#line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp82_ = row;
-#line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp82_->developer = _tmp77_;
-#line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp83_ = row;
-#line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp84_ = _tmp83_->development_ids;
-#line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp84__length1 = _tmp83_->development_ids_length1;
-#line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp85_ = stmt;
-#line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	backing_photo_id_init (&_tmp86_, sqlite3_column_int64 (_tmp85_, 24));
-#line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp84_[RAW_DEVELOPER_SHOTWELL] = _tmp86_;
-#line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp87_ = _tmp84_[RAW_DEVELOPER_SHOTWELL];
-#line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp88_ = row;
-#line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp89_ = _tmp88_->development_ids;
-#line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp89__length1 = _tmp88_->development_ids_length1;
-#line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp90_ = stmt;
-#line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	backing_photo_id_init (&_tmp91_, sqlite3_column_int64 (_tmp90_, 25));
-#line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp89_[RAW_DEVELOPER_CAMERA] = _tmp91_;
-#line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp92_ = _tmp89_[RAW_DEVELOPER_CAMERA];
-#line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp93_ = row;
-#line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp94_ = _tmp93_->development_ids;
-#line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp94__length1 = _tmp93_->development_ids_length1;
-#line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp95_ = stmt;
-#line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	backing_photo_id_init (&_tmp96_, sqlite3_column_int64 (_tmp95_, 26));
-#line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp94_[RAW_DEVELOPER_EMBEDDED] = _tmp96_;
-#line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp97_ = _tmp94_[RAW_DEVELOPER_EMBEDDED];
-#line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp98_ = row;
-#line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp99_ = stmt;
-#line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp100_ = sqlite3_column_text (_tmp99_, 27);
-#line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp101_ = g_strdup (_tmp100_);
-#line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (_tmp98_->comment);
-#line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp98_->comment = _tmp101_;
-#line 435 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = row;
-#line 435 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 435 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 3038 "PhotoTable.c"
-}
-
-
-GeeArrayList*
-photo_table_get_all (PhotoTable* self)
-{
-	GeeArrayList* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	GeeArrayList* all = NULL;
-	GeeArrayList* _tmp4_;
-#line 438 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL);
-#line 440 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = database_table_db;
-#line 440 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT id, filename, width, height, filesize, timestamp, exposure_time" \
-", orientation, " "original_orientation, import_id, event_id, transformations, md5, thumb" \
-"nail_md5, " "exif_md5, time_created, flags, rating, file_format, title, backlinks, " \
-"time_reimported, " "editable_id, metadata_dirty, developer, develop_shotwell_id, develop_c" \
-"amera_id, " "develop_embedded_id, comment FROM PhotoTable", -1, &_tmp1_, NULL);
-#line 440 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 440 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp1_;
-#line 440 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp2_;
-#line 447 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = res;
-#line 447 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 449 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = gee_array_list_new (TYPE_PHOTO_ROW, (GBoxedCopyFunc) photo_row_ref, (GDestroyNotify) photo_row_unref, NULL, NULL, NULL);
-#line 449 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	all = _tmp4_;
-#line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	while (TRUE) {
-#line 3076 "PhotoTable.c"
-		sqlite3_stmt* _tmp5_;
-		gint _tmp6_;
-		PhotoRow* row = NULL;
-		PhotoRow* _tmp7_;
-		PhotoRow* _tmp8_;
-		sqlite3_stmt* _tmp9_;
-		PhotoRow* _tmp10_;
-		BackingPhotoRow* _tmp11_;
-		sqlite3_stmt* _tmp12_;
-		const gchar* _tmp13_;
-		gchar* _tmp14_;
-		PhotoRow* _tmp15_;
-		BackingPhotoRow* _tmp16_;
-		sqlite3_stmt* _tmp17_;
-		sqlite3_stmt* _tmp18_;
-		PhotoRow* _tmp19_;
-		BackingPhotoRow* _tmp20_;
-		sqlite3_stmt* _tmp21_;
-		PhotoRow* _tmp22_;
-		BackingPhotoRow* _tmp23_;
-		sqlite3_stmt* _tmp24_;
-		PhotoRow* _tmp25_;
-		sqlite3_stmt* _tmp26_;
-		PhotoRow* _tmp27_;
-		sqlite3_stmt* _tmp28_;
-		PhotoRow* _tmp29_;
-		BackingPhotoRow* _tmp30_;
-		sqlite3_stmt* _tmp31_;
-		PhotoRow* _tmp32_;
-		sqlite3_stmt* _tmp33_;
-		PhotoRow* _tmp34_;
-		sqlite3_stmt* _tmp35_;
-		PhotoRow* _tmp36_;
-		sqlite3_stmt* _tmp37_;
-		const gchar* _tmp38_;
-		GeeHashMap* _tmp39_;
-		PhotoRow* _tmp40_;
-		sqlite3_stmt* _tmp41_;
-		const gchar* _tmp42_;
-		gchar* _tmp43_;
-		PhotoRow* _tmp44_;
-		sqlite3_stmt* _tmp45_;
-		const gchar* _tmp46_;
-		gchar* _tmp47_;
-		PhotoRow* _tmp48_;
-		sqlite3_stmt* _tmp49_;
-		const gchar* _tmp50_;
-		gchar* _tmp51_;
-		PhotoRow* _tmp52_;
-		sqlite3_stmt* _tmp53_;
-		PhotoRow* _tmp54_;
-		sqlite3_stmt* _tmp55_;
-		PhotoRow* _tmp56_;
-		sqlite3_stmt* _tmp57_;
-		PhotoRow* _tmp58_;
-		BackingPhotoRow* _tmp59_;
-		sqlite3_stmt* _tmp60_;
-		PhotoRow* _tmp61_;
-		sqlite3_stmt* _tmp62_;
-		const gchar* _tmp63_;
-		gchar* _tmp64_;
-		PhotoRow* _tmp65_;
-		sqlite3_stmt* _tmp66_;
-		const gchar* _tmp67_;
-		gchar* _tmp68_;
-		PhotoRow* _tmp69_;
-		sqlite3_stmt* _tmp70_;
-		PhotoRow* _tmp71_;
-		sqlite3_stmt* _tmp72_;
-		PhotoRow* _tmp73_;
-		sqlite3_stmt* _tmp74_;
-		RawDeveloper _tmp75_ = 0;
-		sqlite3_stmt* _tmp76_;
-		const gchar* _tmp77_;
-		PhotoRow* _tmp80_;
-		PhotoRow* _tmp81_;
-		BackingPhotoID* _tmp82_;
-		gint _tmp82__length1;
-		sqlite3_stmt* _tmp83_;
-		BackingPhotoID _tmp84_ = {0};
-		BackingPhotoID _tmp85_;
-		PhotoRow* _tmp86_;
-		BackingPhotoID* _tmp87_;
-		gint _tmp87__length1;
-		sqlite3_stmt* _tmp88_;
-		BackingPhotoID _tmp89_ = {0};
-		BackingPhotoID _tmp90_;
-		PhotoRow* _tmp91_;
-		BackingPhotoID* _tmp92_;
-		gint _tmp92__length1;
-		sqlite3_stmt* _tmp93_;
-		BackingPhotoID _tmp94_ = {0};
-		BackingPhotoID _tmp95_;
-		PhotoRow* _tmp96_;
-		sqlite3_stmt* _tmp97_;
-		const gchar* _tmp98_;
-		gchar* _tmp99_;
-		PhotoRow* _tmp100_;
-		GeeArrayList* _tmp101_;
-		PhotoRow* _tmp102_;
-#line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp5_ = stmt;
-#line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		res = sqlite3_step (_tmp5_);
-#line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp6_ = res;
-#line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (!(_tmp6_ == SQLITE_ROW)) {
-#line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			break;
-#line 3187 "PhotoTable.c"
-		}
-#line 452 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp7_ = photo_row_new ();
-#line 452 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		row = _tmp7_;
-#line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp8_ = row;
-#line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp9_ = stmt;
-#line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp8_->photo_id.id = sqlite3_column_int64 (_tmp9_, 0);
-#line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp10_ = row;
-#line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp11_ = _tmp10_->master;
-#line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp12_ = stmt;
-#line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp13_ = sqlite3_column_text (_tmp12_, 1);
-#line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp14_ = g_strdup (_tmp13_);
-#line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_free0 (_tmp11_->filepath);
-#line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp11_->filepath = _tmp14_;
-#line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp15_ = row;
-#line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp16_ = _tmp15_->master;
-#line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp17_ = stmt;
-#line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp18_ = stmt;
-#line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		dimensions_init (&_tmp16_->dim, sqlite3_column_int (_tmp17_, 2), sqlite3_column_int (_tmp18_, 3));
-#line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp19_ = row;
-#line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp20_ = _tmp19_->master;
-#line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp21_ = stmt;
-#line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp20_->filesize = sqlite3_column_int64 (_tmp21_, 4);
-#line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp22_ = row;
-#line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp23_ = _tmp22_->master;
-#line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp24_ = stmt;
-#line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp23_->timestamp = (time_t) sqlite3_column_int64 (_tmp24_, 5);
-#line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp25_ = row;
-#line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp26_ = stmt;
-#line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp25_->exposure_time = (time_t) sqlite3_column_int64 (_tmp26_, 6);
-#line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp27_ = row;
-#line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp28_ = stmt;
-#line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp27_->orientation = (Orientation) sqlite3_column_int (_tmp28_, 7);
-#line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp29_ = row;
-#line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp30_ = _tmp29_->master;
-#line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp31_ = stmt;
-#line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp30_->original_orientation = (Orientation) sqlite3_column_int (_tmp31_, 8);
-#line 461 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp32_ = row;
-#line 461 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp33_ = stmt;
-#line 461 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp32_->import_id.id = sqlite3_column_int64 (_tmp33_, 9);
-#line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp34_ = row;
-#line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp35_ = stmt;
-#line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp34_->event_id.id = sqlite3_column_int64 (_tmp35_, 10);
-#line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp36_ = row;
-#line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp37_ = stmt;
-#line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp38_ = sqlite3_column_text (_tmp37_, 11);
-#line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp39_ = photo_table_marshall_all_transformations (_tmp38_);
-#line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_object_unref0 (_tmp36_->transformations);
-#line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp36_->transformations = _tmp39_;
-#line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp40_ = row;
-#line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp41_ = stmt;
-#line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp42_ = sqlite3_column_text (_tmp41_, 12);
-#line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp43_ = g_strdup (_tmp42_);
-#line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_free0 (_tmp40_->md5);
-#line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp40_->md5 = _tmp43_;
-#line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp44_ = row;
-#line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp45_ = stmt;
-#line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp46_ = sqlite3_column_text (_tmp45_, 13);
-#line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp47_ = g_strdup (_tmp46_);
-#line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_free0 (_tmp44_->thumbnail_md5);
-#line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp44_->thumbnail_md5 = _tmp47_;
-#line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp48_ = row;
-#line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp49_ = stmt;
-#line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp50_ = sqlite3_column_text (_tmp49_, 14);
-#line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp51_ = g_strdup (_tmp50_);
-#line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_free0 (_tmp48_->exif_md5);
-#line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp48_->exif_md5 = _tmp51_;
-#line 467 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp52_ = row;
-#line 467 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp53_ = stmt;
-#line 467 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp52_->time_created = (time_t) sqlite3_column_int64 (_tmp53_, 15);
-#line 468 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp54_ = row;
-#line 468 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp55_ = stmt;
-#line 468 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp54_->flags = (guint64) sqlite3_column_int64 (_tmp55_, 16);
-#line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp56_ = row;
-#line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp57_ = stmt;
-#line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp56_->rating = rating_unserialize (sqlite3_column_int (_tmp57_, 17));
-#line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp58_ = row;
-#line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp59_ = _tmp58_->master;
-#line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp60_ = stmt;
-#line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp59_->file_format = photo_file_format_unserialize (sqlite3_column_int (_tmp60_, 18));
-#line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp61_ = row;
-#line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp62_ = stmt;
-#line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp63_ = sqlite3_column_text (_tmp62_, 19);
-#line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp64_ = g_strdup (_tmp63_);
-#line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_free0 (_tmp61_->title);
-#line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp61_->title = _tmp64_;
-#line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp65_ = row;
-#line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp66_ = stmt;
-#line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp67_ = sqlite3_column_text (_tmp66_, 20);
-#line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp68_ = g_strdup (_tmp67_);
-#line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_free0 (_tmp65_->backlinks);
-#line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp65_->backlinks = _tmp68_;
-#line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp69_ = row;
-#line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp70_ = stmt;
-#line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp69_->time_reimported = (time_t) sqlite3_column_int64 (_tmp70_, 21);
-#line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp71_ = row;
-#line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp72_ = stmt;
-#line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		backing_photo_id_init (&_tmp71_->editable_id, sqlite3_column_int64 (_tmp72_, 22));
-#line 475 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp73_ = row;
-#line 475 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp74_ = stmt;
-#line 475 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp73_->metadata_dirty = sqlite3_column_int (_tmp74_, 23) != 0;
-#line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp76_ = stmt;
-#line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp77_ = sqlite3_column_text (_tmp76_, 24);
-#line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (_tmp77_ != NULL) {
-#line 3393 "PhotoTable.c"
-			sqlite3_stmt* _tmp78_;
-			const gchar* _tmp79_;
-#line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp78_ = stmt;
-#line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp79_ = sqlite3_column_text (_tmp78_, 24);
-#line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp75_ = raw_developer_from_string (_tmp79_);
-#line 3402 "PhotoTable.c"
-		} else {
-#line 477 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp75_ = RAW_DEVELOPER_CAMERA;
-#line 3406 "PhotoTable.c"
-		}
-#line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp80_ = row;
-#line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp80_->developer = _tmp75_;
-#line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp81_ = row;
-#line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp82_ = _tmp81_->development_ids;
-#line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp82__length1 = _tmp81_->development_ids_length1;
-#line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp83_ = stmt;
-#line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		backing_photo_id_init (&_tmp84_, sqlite3_column_int64 (_tmp83_, 25));
-#line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp82_[RAW_DEVELOPER_SHOTWELL] = _tmp84_;
-#line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp85_ = _tmp82_[RAW_DEVELOPER_SHOTWELL];
-#line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp86_ = row;
-#line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp87_ = _tmp86_->development_ids;
-#line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp87__length1 = _tmp86_->development_ids_length1;
-#line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp88_ = stmt;
-#line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		backing_photo_id_init (&_tmp89_, sqlite3_column_int64 (_tmp88_, 26));
-#line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp87_[RAW_DEVELOPER_CAMERA] = _tmp89_;
-#line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp90_ = _tmp87_[RAW_DEVELOPER_CAMERA];
-#line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp91_ = row;
-#line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp92_ = _tmp91_->development_ids;
-#line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp92__length1 = _tmp91_->development_ids_length1;
-#line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp93_ = stmt;
-#line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		backing_photo_id_init (&_tmp94_, sqlite3_column_int64 (_tmp93_, 27));
-#line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp92_[RAW_DEVELOPER_EMBEDDED] = _tmp94_;
-#line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp95_ = _tmp92_[RAW_DEVELOPER_EMBEDDED];
-#line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp96_ = row;
-#line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp97_ = stmt;
-#line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp98_ = sqlite3_column_text (_tmp97_, 28);
-#line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp99_ = g_strdup (_tmp98_);
-#line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_free0 (_tmp96_->comment);
-#line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp96_->comment = _tmp99_;
-#line 483 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp100_ = row;
-#line 483 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		photo_table_validate_orientation (self, _tmp100_);
-#line 485 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp101_ = all;
-#line 485 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp102_ = row;
-#line 485 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp102_);
-#line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_photo_row_unref0 (row);
-#line 3478 "PhotoTable.c"
-	}
-#line 488 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = all;
-#line 488 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 488 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 3486 "PhotoTable.c"
-}
-
-
-void
-photo_table_duplicate (PhotoTable* self,
-                       PhotoID* photo_id,
-                       const gchar* new_filename,
-                       BackingPhotoID* editable_id,
-                       BackingPhotoID* develop_shotwell,
-                       BackingPhotoID* develop_camera_id,
-                       BackingPhotoID* develop_embedded_id,
-                       PhotoID* result)
-{
-	PhotoRow* original = NULL;
-	PhotoID _tmp0_;
-	PhotoRow* _tmp1_;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp2_;
-	sqlite3_stmt* _tmp3_ = NULL;
-	gint _tmp4_;
-	gint _tmp5_;
-	sqlite3_stmt* _tmp6_;
-	gchar* _tmp7_;
-	GDestroyNotify _tmp8_;
-	gint _tmp9_;
-	sqlite3_stmt* _tmp10_;
-	PhotoRow* _tmp11_;
-	BackingPhotoRow* _tmp12_;
-	Dimensions _tmp13_;
-	gint _tmp14_;
-	gint _tmp15_;
-	sqlite3_stmt* _tmp16_;
-	PhotoRow* _tmp17_;
-	BackingPhotoRow* _tmp18_;
-	Dimensions _tmp19_;
-	gint _tmp20_;
-	gint _tmp21_;
-	sqlite3_stmt* _tmp22_;
-	PhotoRow* _tmp23_;
-	BackingPhotoRow* _tmp24_;
-	gint64 _tmp25_;
-	gint _tmp26_;
-	sqlite3_stmt* _tmp27_;
-	PhotoRow* _tmp28_;
-	BackingPhotoRow* _tmp29_;
-	time_t _tmp30_;
-	gint _tmp31_;
-	sqlite3_stmt* _tmp32_;
-	PhotoRow* _tmp33_;
-	time_t _tmp34_;
-	gint _tmp35_;
-	sqlite3_stmt* _tmp36_;
-	PhotoRow* _tmp37_;
-	Orientation _tmp38_;
-	gint _tmp39_;
-	sqlite3_stmt* _tmp40_;
-	PhotoRow* _tmp41_;
-	BackingPhotoRow* _tmp42_;
-	Orientation _tmp43_;
-	gint _tmp44_;
-	sqlite3_stmt* _tmp45_;
-	PhotoRow* _tmp46_;
-	ImportID _tmp47_;
-	gint64 _tmp48_;
-	gint _tmp49_;
-	sqlite3_stmt* _tmp50_;
-	PhotoRow* _tmp51_;
-	EventID _tmp52_;
-	gint64 _tmp53_;
-	gint _tmp54_;
-	sqlite3_stmt* _tmp55_;
-	PhotoRow* _tmp56_;
-	GeeHashMap* _tmp57_;
-	gchar* _tmp58_;
-	GDestroyNotify _tmp59_;
-	gint _tmp60_;
-	sqlite3_stmt* _tmp61_;
-	PhotoRow* _tmp62_;
-	const gchar* _tmp63_;
-	gchar* _tmp64_;
-	GDestroyNotify _tmp65_;
-	gint _tmp66_;
-	sqlite3_stmt* _tmp67_;
-	PhotoRow* _tmp68_;
-	const gchar* _tmp69_;
-	gchar* _tmp70_;
-	GDestroyNotify _tmp71_;
-	gint _tmp72_;
-	sqlite3_stmt* _tmp73_;
-	PhotoRow* _tmp74_;
-	const gchar* _tmp75_;
-	gchar* _tmp76_;
-	GDestroyNotify _tmp77_;
-	gint _tmp78_;
-	sqlite3_stmt* _tmp79_;
-	gint _tmp80_;
-	sqlite3_stmt* _tmp81_;
-	PhotoRow* _tmp82_;
-	guint64 _tmp83_;
-	gint _tmp84_;
-	sqlite3_stmt* _tmp85_;
-	PhotoRow* _tmp86_;
-	Rating _tmp87_;
-	gint _tmp88_;
-	sqlite3_stmt* _tmp89_;
-	PhotoRow* _tmp90_;
-	BackingPhotoRow* _tmp91_;
-	PhotoFileFormat _tmp92_;
-	gint _tmp93_;
-	sqlite3_stmt* _tmp94_;
-	PhotoRow* _tmp95_;
-	const gchar* _tmp96_;
-	gchar* _tmp97_;
-	GDestroyNotify _tmp98_;
-	gint _tmp99_;
-	sqlite3_stmt* _tmp100_;
-	BackingPhotoID _tmp101_;
-	gint64 _tmp102_;
-	gint _tmp103_;
-	sqlite3_stmt* _tmp104_;
-	PhotoRow* _tmp105_;
-	RawDeveloper _tmp106_;
-	gchar* _tmp107_;
-	GDestroyNotify _tmp108_;
-	gint _tmp109_;
-	sqlite3_stmt* _tmp110_;
-	BackingPhotoID _tmp111_;
-	gint64 _tmp112_;
-	gint _tmp113_;
-	sqlite3_stmt* _tmp114_;
-	BackingPhotoID _tmp115_;
-	gint64 _tmp116_;
-	gint _tmp117_;
-	sqlite3_stmt* _tmp118_;
-	BackingPhotoID _tmp119_;
-	gint64 _tmp120_;
-	gint _tmp121_;
-	sqlite3_stmt* _tmp122_;
-	PhotoRow* _tmp123_;
-	const gchar* _tmp124_;
-	gchar* _tmp125_;
-	GDestroyNotify _tmp126_;
-	gint _tmp127_;
-	sqlite3_stmt* _tmp128_;
-	gint _tmp129_;
-	sqlite3* _tmp133_;
-	PhotoID _tmp134_ = {0};
-#line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (photo_id != NULL);
-#line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (new_filename != NULL);
-#line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (editable_id != NULL);
-#line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (develop_shotwell != NULL);
-#line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (develop_camera_id != NULL);
-#line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (develop_embedded_id != NULL);
-#line 497 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = *photo_id;
-#line 497 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = photo_table_get_row (self, &_tmp0_);
-#line 497 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	original = _tmp1_;
-#line 500 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = database_table_db;
-#line 500 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = sqlite3_prepare_v2 (_tmp2_, "INSERT INTO PhotoTable (filename, width, height, filesize, " "timestamp, exposure_time, orientation, original_orientation, import_id" \
-", event_id, " "transformations, md5, thumbnail_md5, exif_md5, time_created, flags, ra" \
-"ting, " "file_format, title, editable_id, developer, develop_shotwell_id, devel" \
-"op_camera_id, " "develop_embedded_id, comment) " "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?," \
-" ?, ?, ?, ?)", -1, &_tmp3_, NULL);
-#line 500 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 500 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp3_;
-#line 500 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp4_;
-#line 507 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp5_ = res;
-#line 507 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK");
-#line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp6_ = stmt;
-#line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp7_ = g_strdup (new_filename);
-#line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp8_ = g_free;
-#line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp6_, 1, _tmp7_, -1, _tmp8_);
-#line 510 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp9_ = res;
-#line 510 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK");
-#line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp10_ = stmt;
-#line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp11_ = original;
-#line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp12_ = _tmp11_->master;
-#line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp13_ = _tmp12_->dim;
-#line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp14_ = _tmp13_.width;
-#line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp10_, 2, _tmp14_);
-#line 512 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp15_ = res;
-#line 512 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK");
-#line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp16_ = stmt;
-#line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp17_ = original;
-#line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp18_ = _tmp17_->master;
-#line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp19_ = _tmp18_->dim;
-#line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp20_ = _tmp19_.height;
-#line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp16_, 3, _tmp20_);
-#line 514 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp21_ = res;
-#line 514 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp21_ == SQLITE_OK, "res == Sqlite.OK");
-#line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp22_ = stmt;
-#line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp23_ = original;
-#line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp24_ = _tmp23_->master;
-#line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp25_ = _tmp24_->filesize;
-#line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp22_, 4, _tmp25_);
-#line 516 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp26_ = res;
-#line 516 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp26_ == SQLITE_OK, "res == Sqlite.OK");
-#line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp27_ = stmt;
-#line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp28_ = original;
-#line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp29_ = _tmp28_->master;
-#line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp30_ = _tmp29_->timestamp;
-#line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp27_, 5, (gint64) _tmp30_);
-#line 518 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp31_ = res;
-#line 518 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp31_ == SQLITE_OK, "res == Sqlite.OK");
-#line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp32_ = stmt;
-#line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp33_ = original;
-#line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp34_ = _tmp33_->exposure_time;
-#line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp32_, 6, (gint64) _tmp34_);
-#line 520 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp35_ = res;
-#line 520 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp35_ == SQLITE_OK, "res == Sqlite.OK");
-#line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp36_ = stmt;
-#line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp37_ = original;
-#line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp38_ = _tmp37_->orientation;
-#line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp36_, 7, (gint) _tmp38_);
-#line 522 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp39_ = res;
-#line 522 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp39_ == SQLITE_OK, "res == Sqlite.OK");
-#line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp40_ = stmt;
-#line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp41_ = original;
-#line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp42_ = _tmp41_->master;
-#line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp43_ = _tmp42_->original_orientation;
-#line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp40_, 8, (gint) _tmp43_);
-#line 524 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp44_ = res;
-#line 524 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp44_ == SQLITE_OK, "res == Sqlite.OK");
-#line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp45_ = stmt;
-#line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp46_ = original;
-#line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp47_ = _tmp46_->import_id;
-#line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp48_ = _tmp47_.id;
-#line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp45_, 9, _tmp48_);
-#line 526 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp49_ = res;
-#line 526 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp49_ == SQLITE_OK, "res == Sqlite.OK");
-#line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp50_ = stmt;
-#line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp51_ = original;
-#line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp52_ = _tmp51_->event_id;
-#line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp53_ = _tmp52_.id;
-#line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp50_, 10, _tmp53_);
-#line 528 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp54_ = res;
-#line 528 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp54_ == SQLITE_OK, "res == Sqlite.OK");
-#line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp55_ = stmt;
-#line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp56_ = original;
-#line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp57_ = _tmp56_->transformations;
-#line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp58_ = photo_table_unmarshall_all_transformations (_tmp57_);
-#line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp59_ = g_free;
-#line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp55_, 11, _tmp58_, -1, _tmp59_);
-#line 530 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp60_ = res;
-#line 530 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp60_ == SQLITE_OK, "res == Sqlite.OK");
-#line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp61_ = stmt;
-#line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp62_ = original;
-#line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp63_ = _tmp62_->md5;
-#line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp64_ = g_strdup (_tmp63_);
-#line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp65_ = g_free;
-#line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp61_, 12, _tmp64_, -1, _tmp65_);
-#line 532 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp66_ = res;
-#line 532 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp66_ == SQLITE_OK, "res == Sqlite.OK");
-#line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp67_ = stmt;
-#line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp68_ = original;
-#line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp69_ = _tmp68_->thumbnail_md5;
-#line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp70_ = g_strdup (_tmp69_);
-#line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp71_ = g_free;
-#line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp67_, 13, _tmp70_, -1, _tmp71_);
-#line 534 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp72_ = res;
-#line 534 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp72_ == SQLITE_OK, "res == Sqlite.OK");
-#line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp73_ = stmt;
-#line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp74_ = original;
-#line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp75_ = _tmp74_->exif_md5;
-#line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp76_ = g_strdup (_tmp75_);
-#line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp77_ = g_free;
-#line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp73_, 14, _tmp76_, -1, _tmp77_);
-#line 536 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp78_ = res;
-#line 536 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp78_ == SQLITE_OK, "res == Sqlite.OK");
-#line 537 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp79_ = stmt;
-#line 537 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp79_, 15, (gint64) now_sec ());
-#line 538 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp80_ = res;
-#line 538 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp80_ == SQLITE_OK, "res == Sqlite.OK");
-#line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp81_ = stmt;
-#line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp82_ = original;
-#line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp83_ = _tmp82_->flags;
-#line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp81_, 16, (gint64) _tmp83_);
-#line 540 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp84_ = res;
-#line 540 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp84_ == SQLITE_OK, "res == Sqlite.OK");
-#line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp85_ = stmt;
-#line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp86_ = original;
-#line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp87_ = _tmp86_->rating;
-#line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp85_, 17, (gint64) rating_serialize (_tmp87_));
-#line 542 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp88_ = res;
-#line 542 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp88_ == SQLITE_OK, "res == Sqlite.OK");
-#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp89_ = stmt;
-#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp90_ = original;
-#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp91_ = _tmp90_->master;
-#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp92_ = _tmp91_->file_format;
-#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp89_, 18, photo_file_format_serialize (_tmp92_));
-#line 544 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp93_ = res;
-#line 544 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp93_ == SQLITE_OK, "res == Sqlite.OK");
-#line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp94_ = stmt;
-#line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp95_ = original;
-#line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp96_ = _tmp95_->title;
-#line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp97_ = g_strdup (_tmp96_);
-#line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp98_ = g_free;
-#line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp94_, 19, _tmp97_, -1, _tmp98_);
-#line 546 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp99_ = res;
-#line 546 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp99_ == SQLITE_OK, "res == Sqlite.OK");
-#line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp100_ = stmt;
-#line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp101_ = *editable_id;
-#line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp102_ = _tmp101_.id;
-#line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp100_, 20, _tmp102_);
-#line 548 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp103_ = res;
-#line 548 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp103_ == SQLITE_OK, "res == Sqlite.OK");
-#line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp104_ = stmt;
-#line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp105_ = original;
-#line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp106_ = _tmp105_->developer;
-#line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp107_ = raw_developer_to_string (_tmp106_);
-#line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp108_ = g_free;
-#line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp104_, 21, _tmp107_, -1, _tmp108_);
-#line 551 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp109_ = res;
-#line 551 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp109_ == SQLITE_OK, "res == Sqlite.OK");
-#line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp110_ = stmt;
-#line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp111_ = *develop_shotwell;
-#line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp112_ = _tmp111_.id;
-#line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp110_, 22, _tmp112_);
-#line 553 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp113_ = res;
-#line 553 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp113_ == SQLITE_OK, "res == Sqlite.OK");
-#line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp114_ = stmt;
-#line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp115_ = *develop_camera_id;
-#line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp116_ = _tmp115_.id;
-#line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp114_, 23, _tmp116_);
-#line 555 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp117_ = res;
-#line 555 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp117_ == SQLITE_OK, "res == Sqlite.OK");
-#line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp118_ = stmt;
-#line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp119_ = *develop_embedded_id;
-#line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp120_ = _tmp119_.id;
-#line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp118_, 24, _tmp120_);
-#line 557 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp121_ = res;
-#line 557 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp121_ == SQLITE_OK, "res == Sqlite.OK");
-#line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp122_ = stmt;
-#line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp123_ = original;
-#line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp124_ = _tmp123_->comment;
-#line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp125_ = g_strdup (_tmp124_);
-#line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp126_ = g_free;
-#line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp122_, 25, _tmp125_, -1, _tmp126_);
-#line 559 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp127_ = res;
-#line 559 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp127_ == SQLITE_OK, "res == Sqlite.OK");
-#line 561 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp128_ = stmt;
-#line 561 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_step (_tmp128_);
-#line 562 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp129_ = res;
-#line 562 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp129_ != SQLITE_DONE) {
-#line 4021 "PhotoTable.c"
-		gint _tmp130_;
-		PhotoID _tmp132_ = {0};
-#line 563 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp130_ = res;
-#line 563 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (_tmp130_ != SQLITE_CONSTRAINT) {
-#line 4028 "PhotoTable.c"
-			gint _tmp131_;
-#line 564 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp131_ = res;
-#line 564 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			database_table_fatal ("duplicate", _tmp131_);
-#line 4034 "PhotoTable.c"
-		}
-#line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		photo_id_init (&_tmp132_, PHOTO_ID_INVALID);
-#line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		*result = _tmp132_;
-#line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_photo_row_unref0 (original);
-#line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return;
-#line 4046 "PhotoTable.c"
-	}
-#line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp133_ = database_table_db;
-#line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	photo_id_init (&_tmp134_, sqlite3_last_insert_rowid (_tmp133_));
-#line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	*result = _tmp134_;
-#line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_photo_row_unref0 (original);
-#line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return;
-#line 4060 "PhotoTable.c"
-}
-
-
-gboolean
-photo_table_set_title (PhotoTable* self,
-                       PhotoID* photo_id,
-                       const gchar* new_title)
-{
-	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	PhotoID _tmp1_;
-	gint64 _tmp2_;
-#line 572 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 572 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (new_title != NULL) {
-#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp0_ = new_title;
-#line 4081 "PhotoTable.c"
-	} else {
-#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp0_ = "";
-#line 4085 "PhotoTable.c"
-	}
-#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = *photo_id;
-#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = _tmp1_.id;
-#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "title", _tmp0_);
-#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 4095 "PhotoTable.c"
-}
-
-
-gboolean
-photo_table_set_comment (PhotoTable* self,
-                         PhotoID* photo_id,
-                         const gchar* new_comment)
-{
-	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	PhotoID _tmp1_;
-	gint64 _tmp2_;
-#line 576 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 576 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (new_comment != NULL) {
-#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp0_ = new_comment;
-#line 4116 "PhotoTable.c"
-	} else {
-#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp0_ = "";
-#line 4120 "PhotoTable.c"
-	}
-#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = *photo_id;
-#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = _tmp1_.id;
-#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "comment", _tmp0_);
-#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 4130 "PhotoTable.c"
-}
-
-
-void
-photo_table_set_filepath (PhotoTable* self,
-                          PhotoID* photo_id,
-                          const gchar* filepath,
-                          GError** error)
-{
-	PhotoID _tmp0_;
-	gint64 _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 580 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 580 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (photo_id != NULL);
-#line 580 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (filepath != NULL);
-#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = *photo_id;
-#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filename", filepath, &_inner_error_);
-#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 4163 "PhotoTable.c"
-		} else {
-#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.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 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_clear_error (&_inner_error_);
-#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 4171 "PhotoTable.c"
-		}
-	}
-}
-
-
-void
-photo_table_update_timestamp (PhotoTable* self,
-                              PhotoID* photo_id,
-                              time_t timestamp,
-                              GError** error)
-{
-	PhotoID _tmp0_;
-	gint64 _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 584 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 584 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (photo_id != NULL);
-#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = *photo_id;
-#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "timestamp", (gint64) timestamp, &_inner_error_);
-#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 4204 "PhotoTable.c"
-		} else {
-#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.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 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_clear_error (&_inner_error_);
-#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 4212 "PhotoTable.c"
-		}
-	}
-}
-
-
-gboolean
-photo_table_set_exposure_time (PhotoTable* self,
-                               PhotoID* photo_id,
-                               time_t time)
-{
-	gboolean result = FALSE;
-	PhotoID _tmp0_;
-	gint64 _tmp1_;
-#line 588 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 588 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = *photo_id;
-#line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "exposure_time", (gint64) time);
-#line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 4238 "PhotoTable.c"
-}
-
-
-void
-photo_table_set_import_id (PhotoTable* self,
-                           PhotoID* photo_id,
-                           ImportID* import_id,
-                           GError** error)
-{
-	PhotoID _tmp0_;
-	gint64 _tmp1_;
-	ImportID _tmp2_;
-	gint64 _tmp3_;
-	GError * _inner_error_ = NULL;
-#line 592 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 592 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (photo_id != NULL);
-#line 592 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (import_id != NULL);
-#line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = *photo_id;
-#line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = *import_id;
-#line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = _tmp2_.id;
-#line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "import_id", _tmp3_, &_inner_error_);
-#line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 4277 "PhotoTable.c"
-		} else {
-#line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.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 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_clear_error (&_inner_error_);
-#line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 4285 "PhotoTable.c"
-		}
-	}
-}
-
-
-gboolean
-photo_table_remove_by_file (PhotoTable* self,
-                            GFile* file)
-{
-	gboolean result = FALSE;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	gchar* _tmp5_;
-	GDestroyNotify _tmp6_;
-	gint _tmp7_;
-	sqlite3_stmt* _tmp8_;
-	gint _tmp9_;
-#line 596 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 596 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 598 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = database_table_db;
-#line 598 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "DELETE FROM PhotoTable WHERE filename=?", -1, &_tmp1_, NULL);
-#line 598 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 598 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp1_;
-#line 598 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp2_;
-#line 599 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = res;
-#line 599 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = stmt;
-#line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp5_ = g_file_get_path (file);
-#line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp6_ = g_free;
-#line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp4_, 1, _tmp5_, -1, _tmp6_);
-#line 602 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp7_ = res;
-#line 602 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 604 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp8_ = stmt;
-#line 604 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_step (_tmp8_);
-#line 605 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp9_ = res;
-#line 605 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp9_ != SQLITE_DONE) {
-#line 4346 "PhotoTable.c"
-		gint _tmp10_;
-#line 606 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp10_ = res;
-#line 606 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		database_table_warning ("remove", _tmp10_);
-#line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		result = FALSE;
-#line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return result;
-#line 4358 "PhotoTable.c"
-	}
-#line 611 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = TRUE;
-#line 611 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 611 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 4366 "PhotoTable.c"
-}
-
-
-void
-photo_table_remove (PhotoTable* self,
-                    PhotoID* photo_id,
-                    GError** error)
-{
-	PhotoID _tmp0_;
-	gint64 _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 614 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 614 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (photo_id != NULL);
-#line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = *photo_id;
-#line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	database_table_delete_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, &_inner_error_);
-#line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 4396 "PhotoTable.c"
-		} else {
-#line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.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 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_clear_error (&_inner_error_);
-#line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 4404 "PhotoTable.c"
-		}
-	}
-}
-
-
-GeeArrayList*
-photo_table_get_photos (PhotoTable* self)
-{
-	GeeArrayList* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	GeeArrayList* photo_ids = NULL;
-	GeeArrayList* _tmp4_;
-#line 618 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL);
-#line 620 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = database_table_db;
-#line 620 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT id FROM PhotoTable", -1, &_tmp1_, NULL);
-#line 620 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 620 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp1_;
-#line 620 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp2_;
-#line 621 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = res;
-#line 621 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 623 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = gee_array_list_new (TYPE_PHOTO_ID, (GBoxedCopyFunc) photo_id_dup, (GDestroyNotify) photo_id_free, NULL, NULL, NULL);
-#line 623 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	photo_ids = _tmp4_;
-#line 4442 "PhotoTable.c"
-	{
-		gboolean _tmp5_ = FALSE;
-#line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp5_ = TRUE;
-#line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		while (TRUE) {
-#line 4449 "PhotoTable.c"
-			sqlite3_stmt* _tmp6_;
-			gint _tmp7_;
-			GeeArrayList* _tmp10_;
-			sqlite3_stmt* _tmp11_;
-			PhotoID _tmp12_ = {0};
-#line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			if (!_tmp5_) {
-#line 4457 "PhotoTable.c"
-			}
-#line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp5_ = FALSE;
-#line 625 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp6_ = stmt;
-#line 625 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			res = sqlite3_step (_tmp6_);
-#line 626 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp7_ = res;
-#line 626 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			if (_tmp7_ == SQLITE_DONE) {
-#line 627 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				break;
-#line 4471 "PhotoTable.c"
-			} else {
-				gint _tmp8_;
-#line 628 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp8_ = res;
-#line 628 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				if (_tmp8_ != SQLITE_ROW) {
-#line 4478 "PhotoTable.c"
-					gint _tmp9_;
-#line 629 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp9_ = res;
-#line 629 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					database_table_fatal ("get_photos", _tmp9_);
-#line 631 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					break;
-#line 4486 "PhotoTable.c"
-				}
-			}
-#line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp10_ = photo_ids;
-#line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp11_ = stmt;
-#line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			photo_id_init (&_tmp12_, sqlite3_column_int64 (_tmp11_, 0));
-#line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp12_);
-#line 4497 "PhotoTable.c"
-		}
-	}
-#line 637 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = photo_ids;
-#line 637 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 637 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 4506 "PhotoTable.c"
-}
-
-
-gboolean
-photo_table_set_orientation (PhotoTable* self,
-                             PhotoID* photo_id,
-                             Orientation orientation)
-{
-	gboolean result = FALSE;
-	PhotoID _tmp0_;
-	gint64 _tmp1_;
-#line 640 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 640 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = *photo_id;
-#line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = database_table_update_int_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "orientation", (gint) orientation);
-#line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 4530 "PhotoTable.c"
-}
-
-
-gboolean
-photo_table_replace_flags (PhotoTable* self,
-                           PhotoID* photo_id,
-                           guint64 flags)
-{
-	gboolean result = FALSE;
-	PhotoID _tmp0_;
-	gint64 _tmp1_;
-#line 644 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 644 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = *photo_id;
-#line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "flags", (gint64) flags);
-#line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 4554 "PhotoTable.c"
-}
-
-
-gboolean
-photo_table_set_rating (PhotoTable* self,
-                        PhotoID* photo_id,
-                        Rating rating)
-{
-	gboolean result = FALSE;
-	PhotoID _tmp0_;
-	gint64 _tmp1_;
-#line 648 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 648 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = *photo_id;
-#line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = database_table_update_int_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "rating", rating_serialize (rating));
-#line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 4578 "PhotoTable.c"
-}
-
-
-gint
-photo_table_get_event_photo_count (PhotoTable* self,
-                                   EventID* event_id)
-{
-	gint result = 0;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	EventID _tmp5_;
-	gint64 _tmp6_;
-	gint _tmp7_;
-	gint count = 0;
-#line 652 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), 0);
-#line 652 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (event_id != NULL, 0);
-#line 654 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = database_table_db;
-#line 654 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT id FROM PhotoTable WHERE event_id = ?", -1, &_tmp1_, NULL);
-#line 654 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 654 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp1_;
-#line 654 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp2_;
-#line 655 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = res;
-#line 655 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 657 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = stmt;
-#line 657 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp5_ = *event_id;
-#line 657 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp6_ = _tmp5_.id;
-#line 657 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_);
-#line 658 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp7_ = res;
-#line 658 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 660 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	count = 0;
-#line 4630 "PhotoTable.c"
-	{
-		gboolean _tmp8_ = FALSE;
-#line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp8_ = TRUE;
-#line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		while (TRUE) {
-#line 4637 "PhotoTable.c"
-			sqlite3_stmt* _tmp9_;
-			gint _tmp10_;
-			gint _tmp13_;
-#line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			if (!_tmp8_) {
-#line 4643 "PhotoTable.c"
-			}
-#line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp8_ = FALSE;
-#line 662 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp9_ = stmt;
-#line 662 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			res = sqlite3_step (_tmp9_);
-#line 663 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp10_ = res;
-#line 663 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			if (_tmp10_ == SQLITE_DONE) {
-#line 664 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				break;
-#line 4657 "PhotoTable.c"
-			} else {
-				gint _tmp11_;
-#line 665 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp11_ = res;
-#line 665 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				if (_tmp11_ != SQLITE_ROW) {
-#line 4664 "PhotoTable.c"
-					gint _tmp12_;
-#line 666 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp12_ = res;
-#line 666 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					database_table_fatal ("get_event_photo_count", _tmp12_);
-#line 668 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					break;
-#line 4672 "PhotoTable.c"
-				}
-			}
-#line 671 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp13_ = count;
-#line 671 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			count = _tmp13_ + 1;
-#line 4679 "PhotoTable.c"
-		}
-	}
-#line 674 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = count;
-#line 674 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 674 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 4688 "PhotoTable.c"
-}
-
-
-GeeArrayList*
-photo_table_get_event_source_ids (PhotoTable* self,
-                                  EventID* event_id)
-{
-	GeeArrayList* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	EventID _tmp5_;
-	gint64 _tmp6_;
-	gint _tmp7_;
-	GeeArrayList* _result_ = NULL;
-	GeeArrayList* _tmp8_;
-#line 677 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL);
-#line 677 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (event_id != NULL, NULL);
-#line 679 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = database_table_db;
-#line 679 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT id FROM PhotoTable WHERE event_id = ?", -1, &_tmp1_, NULL);
-#line 679 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 679 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp1_;
-#line 679 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp2_;
-#line 680 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = res;
-#line 680 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 682 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = stmt;
-#line 682 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp5_ = *event_id;
-#line 682 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp6_ = _tmp5_.id;
-#line 682 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_);
-#line 683 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp7_ = res;
-#line 683 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 685 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp8_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
-#line 685 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_result_ = _tmp8_;
-#line 4743 "PhotoTable.c"
-	{
-		gboolean _tmp9_ = FALSE;
-#line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp9_ = TRUE;
-#line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		while (TRUE) {
-#line 4750 "PhotoTable.c"
-			sqlite3_stmt* _tmp10_;
-			gint _tmp11_;
-			GeeArrayList* _tmp14_;
-			sqlite3_stmt* _tmp15_;
-			PhotoID _tmp16_ = {0};
-			gchar* _tmp17_;
-			gchar* _tmp18_;
-#line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			if (!_tmp9_) {
-#line 4760 "PhotoTable.c"
-			}
-#line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp9_ = FALSE;
-#line 687 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp10_ = stmt;
-#line 687 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			res = sqlite3_step (_tmp10_);
-#line 688 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp11_ = res;
-#line 688 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			if (_tmp11_ == SQLITE_DONE) {
-#line 689 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				break;
-#line 4774 "PhotoTable.c"
-			} else {
-				gint _tmp12_;
-#line 690 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp12_ = res;
-#line 690 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				if (_tmp12_ != SQLITE_ROW) {
-#line 4781 "PhotoTable.c"
-					gint _tmp13_;
-#line 691 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp13_ = res;
-#line 691 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					database_table_fatal ("get_event_source_ids", _tmp13_);
-#line 693 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					break;
-#line 4789 "PhotoTable.c"
-				}
-			}
-#line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp14_ = _result_;
-#line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp15_ = stmt;
-#line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			photo_id_init (&_tmp16_, sqlite3_column_int64 (_tmp15_, 0));
-#line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp17_ = photo_id_upgrade_photo_id_to_source_id (&_tmp16_);
-#line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp18_ = _tmp17_;
-#line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp18_);
-#line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_g_free0 (_tmp18_);
-#line 4806 "PhotoTable.c"
-		}
-	}
-#line 699 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = _result_;
-#line 699 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 699 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 4815 "PhotoTable.c"
-}
-
-
-gboolean
-photo_table_event_has_photos (PhotoTable* self,
-                              EventID* event_id)
-{
-	gboolean result = FALSE;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	EventID _tmp5_;
-	gint64 _tmp6_;
-	gint _tmp7_;
-	sqlite3_stmt* _tmp8_;
-	gint _tmp9_;
-#line 702 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 702 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 704 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = database_table_db;
-#line 704 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT id FROM PhotoTable WHERE event_id = ? LIMIT 1", -1, &_tmp1_, NULL);
-#line 704 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 704 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp1_;
-#line 704 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp2_;
-#line 705 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = res;
-#line 705 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 707 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = stmt;
-#line 707 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp5_ = *event_id;
-#line 707 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp6_ = _tmp5_.id;
-#line 707 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_);
-#line 708 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp7_ = res;
-#line 708 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 710 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp8_ = stmt;
-#line 710 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_step (_tmp8_);
-#line 711 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp9_ = res;
-#line 711 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp9_ == SQLITE_DONE) {
-#line 712 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		result = FALSE;
-#line 712 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 712 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return result;
-#line 4880 "PhotoTable.c"
-	} else {
-		gint _tmp10_;
-#line 713 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp10_ = res;
-#line 713 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (_tmp10_ != SQLITE_ROW) {
-#line 4887 "PhotoTable.c"
-			gint _tmp11_;
-#line 714 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp11_ = res;
-#line 714 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			database_table_fatal ("event_has_photos", _tmp11_);
-#line 716 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			result = FALSE;
-#line 716 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_sqlite3_finalize0 (stmt);
-#line 716 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return result;
-#line 4899 "PhotoTable.c"
-		}
-	}
-#line 719 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = TRUE;
-#line 719 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 719 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 4908 "PhotoTable.c"
-}
-
-
-gboolean
-photo_table_drop_event (PhotoTable* self,
-                        EventID* event_id)
-{
-	gboolean result = FALSE;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	gint _tmp5_;
-	sqlite3_stmt* _tmp6_;
-	EventID _tmp7_;
-	gint64 _tmp8_;
-	gint _tmp9_;
-	sqlite3_stmt* _tmp10_;
-	gint _tmp11_;
-#line 722 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 722 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 724 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = database_table_db;
-#line 724 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "UPDATE PhotoTable SET event_id = ? WHERE event_id = ?", -1, &_tmp1_, NULL);
-#line 724 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 724 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp1_;
-#line 724 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp2_;
-#line 725 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = res;
-#line 725 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 727 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = stmt;
-#line 727 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp4_, 1, EVENT_ID_INVALID);
-#line 728 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp5_ = res;
-#line 728 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK");
-#line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp6_ = stmt;
-#line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp7_ = *event_id;
-#line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp8_ = _tmp7_.id;
-#line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp6_, 2, _tmp8_);
-#line 730 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp9_ = res;
-#line 730 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK");
-#line 732 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp10_ = stmt;
-#line 732 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_step (_tmp10_);
-#line 733 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp11_ = res;
-#line 733 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp11_ != SQLITE_DONE) {
-#line 4977 "PhotoTable.c"
-		gint _tmp12_;
-#line 734 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp12_ = res;
-#line 734 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		database_table_fatal ("drop_event", _tmp12_);
-#line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		result = FALSE;
-#line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return result;
-#line 4989 "PhotoTable.c"
-	}
-#line 739 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = TRUE;
-#line 739 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 739 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 4997 "PhotoTable.c"
-}
-
-
-gboolean
-photo_table_set_event (PhotoTable* self,
-                       PhotoID* photo_id,
-                       EventID* event_id)
-{
-	gboolean result = FALSE;
-	PhotoID _tmp0_;
-	gint64 _tmp1_;
-	EventID _tmp2_;
-	gint64 _tmp3_;
-#line 742 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 742 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 742 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = *photo_id;
-#line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = *event_id;
-#line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = _tmp2_.id;
-#line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "event_id", _tmp3_);
-#line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 5029 "PhotoTable.c"
-}
-
-
-static gchar*
-photo_table_get_raw_transformations (PhotoTable* self,
-                                     PhotoID* photo_id)
-{
-	gchar* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	PhotoID _tmp0_;
-	gint64 _tmp1_;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gboolean _tmp3_;
-	gchar* trans = NULL;
-	sqlite3_stmt* _tmp4_;
-	const gchar* _tmp5_;
-	gchar* _tmp6_;
-	gboolean _tmp7_ = FALSE;
-	const gchar* _tmp8_;
-#line 746 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL);
-#line 746 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (photo_id != NULL, NULL);
-#line 748 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = *photo_id;
-#line 748 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 748 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = database_table_select_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "transformations", &_tmp2_);
-#line 748 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 748 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp2_;
-#line 748 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (!_tmp3_) {
-#line 749 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		result = NULL;
-#line 749 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 749 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return result;
-#line 5071 "PhotoTable.c"
-	}
-#line 751 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = stmt;
-#line 751 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp5_ = sqlite3_column_text (_tmp4_, 0);
-#line 751 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp6_ = g_strdup (_tmp5_);
-#line 751 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	trans = _tmp6_;
-#line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp8_ = trans;
-#line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp8_ == NULL) {
-#line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp7_ = TRUE;
-#line 5087 "PhotoTable.c"
-	} else {
-		const gchar* _tmp9_;
-		gint _tmp10_;
-		gint _tmp11_;
-#line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp9_ = trans;
-#line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp10_ = strlen (_tmp9_);
-#line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp11_ = _tmp10_;
-#line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp7_ = _tmp11_ == 0;
-#line 5100 "PhotoTable.c"
-	}
-#line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp7_) {
-#line 753 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		result = NULL;
-#line 753 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_free0 (trans);
-#line 753 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 753 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return result;
-#line 5112 "PhotoTable.c"
-	}
-#line 755 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = trans;
-#line 755 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 755 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 5120 "PhotoTable.c"
-}
-
-
-static gboolean
-photo_table_set_raw_transformations (PhotoTable* self,
-                                     PhotoID* photo_id,
-                                     const gchar* trans)
-{
-	gboolean result = FALSE;
-	PhotoID _tmp0_;
-	gint64 _tmp1_;
-#line 758 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 758 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 758 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (trans != NULL, FALSE);
-#line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = *photo_id;
-#line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "transformations", trans);
-#line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 5146 "PhotoTable.c"
-}
-
-
-gboolean
-photo_table_set_transformation_state (PhotoTable* self,
-                                      PhotoID* photo_id,
-                                      Orientation orientation,
-                                      GeeHashMap* transformations)
-{
-	gboolean result = FALSE;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	gint _tmp5_;
-	sqlite3_stmt* _tmp6_;
-	gchar* _tmp7_;
-	GDestroyNotify _tmp8_;
-	gint _tmp9_;
-	sqlite3_stmt* _tmp10_;
-	PhotoID _tmp11_;
-	gint64 _tmp12_;
-	gint _tmp13_;
-	sqlite3_stmt* _tmp14_;
-	gint _tmp15_;
-#line 762 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 762 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 762 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail ((transformations == NULL) || GEE_IS_HASH_MAP (transformations), FALSE);
-#line 765 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = database_table_db;
-#line 765 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "UPDATE PhotoTable SET orientation = ?, transformations = ? WHERE id = " \
-"?", -1, &_tmp1_, NULL);
-#line 765 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 765 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp1_;
-#line 765 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp2_;
-#line 767 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = res;
-#line 767 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 769 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = stmt;
-#line 769 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp4_, 1, (gint) orientation);
-#line 770 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp5_ = res;
-#line 770 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK");
-#line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp6_ = stmt;
-#line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp7_ = photo_table_unmarshall_all_transformations (transformations);
-#line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp8_ = g_free;
-#line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp6_, 2, _tmp7_, -1, _tmp8_);
-#line 772 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp9_ = res;
-#line 772 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK");
-#line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp10_ = stmt;
-#line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp11_ = *photo_id;
-#line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp12_ = _tmp11_.id;
-#line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp10_, 3, _tmp12_);
-#line 774 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp13_ = res;
-#line 774 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK");
-#line 776 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp14_ = stmt;
-#line 776 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_step (_tmp14_);
-#line 777 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp15_ = res;
-#line 777 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp15_ != SQLITE_DONE) {
-#line 5235 "PhotoTable.c"
-		gint _tmp16_;
-#line 778 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp16_ = res;
-#line 778 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		database_table_fatal ("set_transformation_state", _tmp16_);
-#line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		result = FALSE;
-#line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return result;
-#line 5247 "PhotoTable.c"
-	}
-#line 783 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = TRUE;
-#line 783 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 783 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 5255 "PhotoTable.c"
-}
-
-
-GeeHashMap*
-photo_table_marshall_all_transformations (const gchar* trans)
-{
-	GeeHashMap* result = NULL;
-	gboolean _tmp0_ = FALSE;
-	GError * _inner_error_ = NULL;
-#line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (trans == NULL) {
-#line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp0_ = TRUE;
-#line 5269 "PhotoTable.c"
-	} else {
-		gint _tmp1_;
-		gint _tmp2_;
-#line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp1_ = strlen (trans);
-#line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp2_ = _tmp1_;
-#line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp0_ = _tmp2_ == 0;
-#line 5279 "PhotoTable.c"
-	}
-#line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp0_) {
-#line 788 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		result = NULL;
-#line 788 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return result;
-#line 5287 "PhotoTable.c"
-	}
-	{
-		GKeyFile* keyfile = NULL;
-		GKeyFile* _tmp3_;
-		gboolean _tmp4_ = FALSE;
-		GKeyFile* _tmp5_;
-		gint _tmp6_;
-		gint _tmp7_;
-		GeeHashMap* map = NULL;
-		GeeHashMap* _tmp8_;
-		gchar** objects = NULL;
-		GKeyFile* _tmp9_;
-		gsize _tmp10_;
-		gchar** _tmp11_;
-		gint objects_length1;
-		gint _objects_size_;
-		gchar** _tmp12_;
-		gint _tmp12__length1;
-#line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp3_ = g_key_file_new ();
-#line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		keyfile = _tmp3_;
-#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp5_ = keyfile;
-#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp6_ = strlen (trans);
-#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp7_ = _tmp6_;
-#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp4_ = g_key_file_load_from_data (_tmp5_, trans, (gsize) _tmp7_, G_KEY_FILE_NONE, &_inner_error_);
-#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_g_key_file_unref0 (keyfile);
-#line 5322 "PhotoTable.c"
-			goto __catch17_g_error;
-		}
-#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (!_tmp4_) {
-#line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			result = NULL;
-#line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_g_key_file_unref0 (keyfile);
-#line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return result;
-#line 5333 "PhotoTable.c"
-		}
-#line 795 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp8_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 795 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		map = _tmp8_;
-#line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp9_ = keyfile;
-#line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp11_ = g_key_file_get_groups (_tmp9_, &_tmp10_);
-#line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		objects = _tmp11_;
-#line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		objects_length1 = _tmp10_;
-#line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_objects_size_ = objects_length1;
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp12_ = objects;
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp12__length1 = objects_length1;
-#line 5353 "PhotoTable.c"
-		{
-			gchar** object_collection = NULL;
-			gint object_collection_length1 = 0;
-			gint _object_collection_size_ = 0;
-			gint object_it = 0;
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			object_collection = _tmp12_;
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			object_collection_length1 = _tmp12__length1;
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			for (object_it = 0; object_it < _tmp12__length1; object_it = object_it + 1) {
-#line 5365 "PhotoTable.c"
-				gchar* _tmp13_;
-				gchar* object = NULL;
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp13_ = g_strdup (object_collection[object_it]);
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				object = _tmp13_;
-#line 5372 "PhotoTable.c"
-				{
-					gchar** keys = NULL;
-					GKeyFile* _tmp14_;
-					const gchar* _tmp15_;
-					gsize _tmp16_;
-					gchar** _tmp17_;
-					gint keys_length1;
-					gint _keys_size_;
-					gboolean _tmp18_ = FALSE;
-					gchar** _tmp19_;
-					gint _tmp19__length1;
-					KeyValueMap* key_map = NULL;
-					const gchar* _tmp21_;
-					KeyValueMap* _tmp22_;
-					GeeHashMap* _tmp38_;
-					const gchar* _tmp39_;
-					KeyValueMap* _tmp40_;
-#line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp14_ = keyfile;
-#line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp15_ = object;
-#line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp17_ = g_key_file_get_keys (_tmp14_, _tmp15_, &_tmp16_, &_inner_error_);
-#line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					keys = _tmp17_;
-#line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					keys_length1 = _tmp16_;
-#line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_keys_size_ = keys_length1;
-#line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-						_g_free0 (object);
-#line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-						objects = (_vala_array_free (objects, objects_length1, (GDestroyNotify) g_free), NULL);
-#line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-						_g_object_unref0 (map);
-#line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-						_g_key_file_unref0 (keyfile);
-#line 5412 "PhotoTable.c"
-						goto __catch17_g_error;
-					}
-#line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp19_ = keys;
-#line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp19__length1 = keys_length1;
-#line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					if (_tmp19_ == NULL) {
-#line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-						_tmp18_ = TRUE;
-#line 5423 "PhotoTable.c"
-					} else {
-						gchar** _tmp20_;
-						gint _tmp20__length1;
-#line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-						_tmp20_ = keys;
-#line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-						_tmp20__length1 = keys_length1;
-#line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-						_tmp18_ = _tmp20__length1 == 0;
-#line 5433 "PhotoTable.c"
-					}
-#line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					if (_tmp18_) {
-#line 801 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-						keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 801 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-						_g_free0 (object);
-#line 801 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-						continue;
-#line 5443 "PhotoTable.c"
-					}
-#line 803 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp21_ = object;
-#line 803 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp22_ = key_value_map_new (_tmp21_);
-#line 803 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					key_map = _tmp22_;
-#line 5451 "PhotoTable.c"
-					{
-						gint ctr = 0;
-#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-						ctr = 0;
-#line 5456 "PhotoTable.c"
-						{
-							gboolean _tmp23_ = FALSE;
-#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-							_tmp23_ = TRUE;
-#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-							while (TRUE) {
-#line 5463 "PhotoTable.c"
-								gint _tmp25_;
-								gchar** _tmp26_;
-								gint _tmp26__length1;
-								gchar* _tmp27_ = NULL;
-								GKeyFile* _tmp28_;
-								const gchar* _tmp29_;
-								gchar** _tmp30_;
-								gint _tmp30__length1;
-								gint _tmp31_;
-								const gchar* _tmp32_;
-								gchar* _tmp33_;
-								KeyValueMap* _tmp34_;
-								gchar** _tmp35_;
-								gint _tmp35__length1;
-								gint _tmp36_;
-								const gchar* _tmp37_;
-#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-								if (!_tmp23_) {
-#line 5482 "PhotoTable.c"
-									gint _tmp24_;
-#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-									_tmp24_ = ctr;
-#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-									ctr = _tmp24_ + 1;
-#line 5488 "PhotoTable.c"
-								}
-#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-								_tmp23_ = FALSE;
-#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-								_tmp25_ = ctr;
-#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-								_tmp26_ = keys;
-#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-								_tmp26__length1 = keys_length1;
-#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-								if (!(_tmp25_ < _tmp26__length1)) {
-#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-									break;
-#line 5502 "PhotoTable.c"
-								}
-#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-								_tmp28_ = keyfile;
-#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-								_tmp29_ = object;
-#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-								_tmp30_ = keys;
-#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-								_tmp30__length1 = keys_length1;
-#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-								_tmp31_ = ctr;
-#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-								_tmp32_ = _tmp30_[_tmp31_];
-#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-								_tmp33_ = g_key_file_get_string (_tmp28_, _tmp29_, _tmp32_, &_inner_error_);
-#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-								_tmp27_ = _tmp33_;
-#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-								if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-									_key_value_map_unref0 (key_map);
-#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-									keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-									_g_free0 (object);
-#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-									objects = (_vala_array_free (objects, objects_length1, (GDestroyNotify) g_free), NULL);
-#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-									_g_object_unref0 (map);
-#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-									_g_key_file_unref0 (keyfile);
-#line 5534 "PhotoTable.c"
-									goto __catch17_g_error;
-								}
-#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-								_tmp34_ = key_map;
-#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-								_tmp35_ = keys;
-#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-								_tmp35__length1 = keys_length1;
-#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-								_tmp36_ = ctr;
-#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-								_tmp37_ = _tmp35_[_tmp36_];
-#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-								key_value_map_set_string (_tmp34_, _tmp37_, _tmp27_);
-#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-								_g_free0 (_tmp27_);
-#line 5551 "PhotoTable.c"
-							}
-						}
-					}
-#line 807 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp38_ = map;
-#line 807 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp39_ = object;
-#line 807 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp40_ = key_map;
-#line 807 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp39_, _tmp40_);
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_key_value_map_unref0 (key_map);
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_g_free0 (object);
-#line 5569 "PhotoTable.c"
-				}
-			}
-		}
-#line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		result = map;
-#line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		objects = (_vala_array_free (objects, objects_length1, (GDestroyNotify) g_free), NULL);
-#line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_key_file_unref0 (keyfile);
-#line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return result;
-#line 5581 "PhotoTable.c"
-	}
-	goto __finally17;
-	__catch17_g_error:
-	{
-		GError* err = NULL;
-		const gchar* _tmp41_;
-#line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		err = _inner_error_;
-#line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_inner_error_ = NULL;
-#line 812 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp41_ = err->message;
-#line 812 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		g_error ("PhotoTable.vala:812: %s", _tmp41_);
-#line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_error_free0 (err);
-#line 5598 "PhotoTable.c"
-	}
-	__finally17:
-#line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.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 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_clear_error (&_inner_error_);
-#line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return NULL;
-#line 5607 "PhotoTable.c"
-}
-
-
-gchar*
-photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
-{
-	gchar* result = NULL;
-	gboolean _tmp0_ = FALSE;
-	GKeyFile* keyfile = NULL;
-	GKeyFile* _tmp6_;
-	gsize length = 0UL;
-	gchar* unmarshalled = NULL;
-	GKeyFile* _tmp33_;
-	gsize _tmp34_ = 0UL;
-	gchar* _tmp35_;
-	const gchar* _tmp36_;
-	const gchar* _tmp37_;
-	gint _tmp38_;
-	gint _tmp39_;
-#line 816 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail ((transformations == NULL) || GEE_IS_HASH_MAP (transformations), NULL);
-#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (transformations == NULL) {
-#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp0_ = TRUE;
-#line 5633 "PhotoTable.c"
-	} else {
-		GeeSet* _tmp1_;
-		GeeSet* _tmp2_;
-		GeeSet* _tmp3_;
-		gint _tmp4_;
-		gint _tmp5_;
-#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (transformations, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp2_ = _tmp1_;
-#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp3_ = _tmp2_;
-#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp5_ = _tmp4_;
-#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp0_ = _tmp5_ == 0;
-#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_object_unref0 (_tmp3_);
-#line 5654 "PhotoTable.c"
-	}
-#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp0_) {
-#line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		result = NULL;
-#line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return result;
-#line 5662 "PhotoTable.c"
-	}
-#line 820 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp6_ = g_key_file_new ();
-#line 820 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	keyfile = _tmp6_;
-#line 5668 "PhotoTable.c"
-	{
-		GeeIterator* _object_it = NULL;
-		GeeSet* _tmp7_;
-		GeeSet* _tmp8_;
-		GeeSet* _tmp9_;
-		GeeIterator* _tmp10_;
-		GeeIterator* _tmp11_;
-#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp7_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (transformations, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp8_ = _tmp7_;
-#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp9_ = _tmp8_;
-#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp11_ = _tmp10_;
-#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_object_unref0 (_tmp9_);
-#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_object_it = _tmp11_;
-#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		while (TRUE) {
-#line 5692 "PhotoTable.c"
-			GeeIterator* _tmp12_;
-			gchar* object = NULL;
-			GeeIterator* _tmp13_;
-			gpointer _tmp14_;
-			KeyValueMap* map = NULL;
-			const gchar* _tmp15_;
-			gpointer _tmp16_;
-#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp12_ = _object_it;
-#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			if (!gee_iterator_next (_tmp12_)) {
-#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				break;
-#line 5706 "PhotoTable.c"
-			}
-#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp13_ = _object_it;
-#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp14_ = gee_iterator_get (_tmp13_);
-#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			object = (gchar*) _tmp14_;
-#line 823 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp15_ = object;
-#line 823 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp16_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (transformations, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_);
-#line 823 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			map = (KeyValueMap*) _tmp16_;
-#line 5720 "PhotoTable.c"
-			{
-				GeeIterator* _key_it = NULL;
-				KeyValueMap* _tmp17_;
-				GeeSet* _tmp18_;
-				GeeSet* _tmp19_;
-				GeeIterator* _tmp20_;
-				GeeIterator* _tmp21_;
-#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp17_ = map;
-#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp18_ = key_value_map_get_keys (_tmp17_);
-#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp19_ = _tmp18_;
-#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp21_ = _tmp20_;
-#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_g_object_unref0 (_tmp19_);
-#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_key_it = _tmp21_;
-#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				while (TRUE) {
-#line 5744 "PhotoTable.c"
-					GeeIterator* _tmp22_;
-					gchar* key = NULL;
-					GeeIterator* _tmp23_;
-					gpointer _tmp24_;
-					gchar* value = NULL;
-					KeyValueMap* _tmp25_;
-					const gchar* _tmp26_;
-					gchar* _tmp27_;
-					const gchar* _tmp28_;
-					GKeyFile* _tmp29_;
-					const gchar* _tmp30_;
-					const gchar* _tmp31_;
-					const gchar* _tmp32_;
-#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp22_ = _key_it;
-#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					if (!gee_iterator_next (_tmp22_)) {
-#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-						break;
-#line 5764 "PhotoTable.c"
-					}
-#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp23_ = _key_it;
-#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp24_ = gee_iterator_get (_tmp23_);
-#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					key = (gchar*) _tmp24_;
-#line 826 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp25_ = map;
-#line 826 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp26_ = key;
-#line 826 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp27_ = key_value_map_get_string (_tmp25_, _tmp26_, NULL);
-#line 826 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					value = _tmp27_;
-#line 827 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp28_ = value;
-#line 827 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_vala_assert (_tmp28_ != NULL, "value != null");
-#line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp29_ = keyfile;
-#line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp30_ = object;
-#line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp31_ = key;
-#line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_tmp32_ = value;
-#line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					g_key_file_set_string (_tmp29_, _tmp30_, _tmp31_, _tmp32_);
-#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_g_free0 (value);
-#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_g_free0 (key);
-#line 5798 "PhotoTable.c"
-				}
-#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_g_object_unref0 (_key_it);
-#line 5802 "PhotoTable.c"
-			}
-#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_key_value_map_unref0 (map);
-#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_g_free0 (object);
-#line 5808 "PhotoTable.c"
-		}
-#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_object_unref0 (_object_it);
-#line 5812 "PhotoTable.c"
-	}
-#line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp33_ = keyfile;
-#line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp35_ = g_key_file_to_data (_tmp33_, &_tmp34_, NULL);
-#line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	length = _tmp34_;
-#line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	unmarshalled = _tmp35_;
-#line 835 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp36_ = unmarshalled;
-#line 835 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp36_ != NULL, "unmarshalled != null");
-#line 836 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp37_ = unmarshalled;
-#line 836 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp38_ = strlen (_tmp37_);
-#line 836 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp39_ = _tmp38_;
-#line 836 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp39_ > 0, "unmarshalled.length > 0");
-#line 838 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = unmarshalled;
-#line 838 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_key_file_unref0 (keyfile);
-#line 838 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 5840 "PhotoTable.c"
-}
-
-
-gboolean
-photo_table_set_transformation (PhotoTable* self,
-                                PhotoID* photo_id,
-                                KeyValueMap* map)
-{
-	gboolean result = FALSE;
-	gchar* trans = NULL;
-	PhotoID _tmp0_;
-	gchar* _tmp1_;
-	PhotoID _tmp33_;
-	const gchar* _tmp34_;
-	GError * _inner_error_ = NULL;
-#line 841 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 841 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 841 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_KEY_VALUE_MAP (map), FALSE);
-#line 842 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = *photo_id;
-#line 842 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = photo_table_get_raw_transformations (self, &_tmp0_);
-#line 842 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	trans = _tmp1_;
-#line 5868 "PhotoTable.c"
-	{
-		GKeyFile* keyfile = NULL;
-		GKeyFile* _tmp2_;
-		const gchar* _tmp3_;
-		GeeSet* keys = NULL;
-		GeeSet* _tmp10_;
-		gsize length = 0UL;
-		GKeyFile* _tmp24_;
-		gsize _tmp25_ = 0UL;
-		gchar* _tmp26_;
-		const gchar* _tmp27_;
-		const gchar* _tmp28_;
-		gint _tmp29_;
-		gint _tmp30_;
-#line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp2_ = g_key_file_new ();
-#line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		keyfile = _tmp2_;
-#line 846 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp3_ = trans;
-#line 846 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (_tmp3_ != NULL) {
-#line 5891 "PhotoTable.c"
-			gboolean _tmp4_ = FALSE;
-			GKeyFile* _tmp5_;
-			const gchar* _tmp6_;
-			const gchar* _tmp7_;
-			gint _tmp8_;
-			gint _tmp9_;
-#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp5_ = keyfile;
-#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp6_ = trans;
-#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp7_ = trans;
-#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp8_ = strlen (_tmp7_);
-#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp9_ = _tmp8_;
-#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp4_ = g_key_file_load_from_data (_tmp5_, _tmp6_, (gsize) _tmp9_, G_KEY_FILE_NONE, &_inner_error_);
-#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_g_key_file_unref0 (keyfile);
-#line 5914 "PhotoTable.c"
-				goto __catch18_g_error;
-			}
-#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			if (!_tmp4_) {
-#line 848 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				result = FALSE;
-#line 848 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_g_key_file_unref0 (keyfile);
-#line 848 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_g_free0 (trans);
-#line 848 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				return result;
-#line 5927 "PhotoTable.c"
-			}
-		}
-#line 851 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp10_ = key_value_map_get_keys (map);
-#line 851 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		keys = _tmp10_;
-#line 5934 "PhotoTable.c"
-		{
-			GeeIterator* _key_it = NULL;
-			GeeSet* _tmp11_;
-			GeeIterator* _tmp12_;
-#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp11_ = keys;
-#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_key_it = _tmp12_;
-#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			while (TRUE) {
-#line 5947 "PhotoTable.c"
-				GeeIterator* _tmp13_;
-				gchar* key = NULL;
-				GeeIterator* _tmp14_;
-				gpointer _tmp15_;
-				gchar* value = NULL;
-				const gchar* _tmp16_;
-				gchar* _tmp17_;
-				const gchar* _tmp18_;
-				GKeyFile* _tmp19_;
-				gchar* _tmp20_;
-				gchar* _tmp21_;
-				const gchar* _tmp22_;
-				const gchar* _tmp23_;
-#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp13_ = _key_it;
-#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				if (!gee_iterator_next (_tmp13_)) {
-#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					break;
-#line 5967 "PhotoTable.c"
-				}
-#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp14_ = _key_it;
-#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp15_ = gee_iterator_get (_tmp14_);
-#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				key = (gchar*) _tmp15_;
-#line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp16_ = key;
-#line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp17_ = key_value_map_get_string (map, _tmp16_, NULL);
-#line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				value = _tmp17_;
-#line 854 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp18_ = value;
-#line 854 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_vala_assert (_tmp18_ != NULL, "value != null");
-#line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp19_ = keyfile;
-#line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp20_ = key_value_map_get_group (map);
-#line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp21_ = _tmp20_;
-#line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp22_ = key;
-#line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp23_ = value;
-#line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				g_key_file_set_string (_tmp19_, _tmp21_, _tmp22_, _tmp23_);
-#line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_g_free0 (_tmp21_);
-#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_g_free0 (value);
-#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_g_free0 (key);
-#line 6003 "PhotoTable.c"
-			}
-#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_g_object_unref0 (_key_it);
-#line 6007 "PhotoTable.c"
-		}
-#line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp24_ = keyfile;
-#line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp26_ = g_key_file_to_data (_tmp24_, &_tmp25_, NULL);
-#line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		length = _tmp25_;
-#line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_free0 (trans);
-#line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		trans = _tmp26_;
-#line 861 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp27_ = trans;
-#line 861 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_vala_assert (_tmp27_ != NULL, "trans != null");
-#line 862 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp28_ = trans;
-#line 862 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp29_ = strlen (_tmp28_);
-#line 862 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp30_ = _tmp29_;
-#line 862 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_vala_assert (_tmp30_ > 0, "trans.length > 0");
-#line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_object_unref0 (keys);
-#line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_key_file_unref0 (keyfile);
-#line 6035 "PhotoTable.c"
-	}
-	goto __finally18;
-	__catch18_g_error:
-	{
-		GError* err = NULL;
-		const gchar* _tmp31_;
-#line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		err = _inner_error_;
-#line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_inner_error_ = NULL;
-#line 864 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp31_ = err->message;
-#line 864 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		g_error ("PhotoTable.vala:864: %s", _tmp31_);
-#line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_error_free0 (err);
-#line 6052 "PhotoTable.c"
-	}
-	__finally18:
-#line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6057 "PhotoTable.c"
-		gboolean _tmp32_ = FALSE;
-#line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_free0 (trans);
-#line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.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 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		g_clear_error (&_inner_error_);
-#line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return _tmp32_;
-#line 6067 "PhotoTable.c"
-	}
-#line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp33_ = *photo_id;
-#line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp34_ = trans;
-#line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = photo_table_set_raw_transformations (self, &_tmp33_, _tmp34_);
-#line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (trans);
-#line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 6079 "PhotoTable.c"
-}
-
-
-gboolean
-photo_table_remove_transformation (PhotoTable* self,
-                                   PhotoID* photo_id,
-                                   const gchar* object)
-{
-	gboolean result = FALSE;
-	gchar* trans = NULL;
-	PhotoID _tmp0_;
-	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	PhotoID _tmp18_;
-	const gchar* _tmp19_;
-	GError * _inner_error_ = NULL;
-#line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (object != NULL, FALSE);
-#line 871 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = *photo_id;
-#line 871 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = photo_table_get_raw_transformations (self, &_tmp0_);
-#line 871 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	trans = _tmp1_;
-#line 872 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = trans;
-#line 872 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp2_ == NULL) {
-#line 873 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		result = TRUE;
-#line 873 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_free0 (trans);
-#line 873 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return result;
-#line 6118 "PhotoTable.c"
-	}
-	{
-		GKeyFile* keyfile = NULL;
-		GKeyFile* _tmp3_;
-		gboolean _tmp4_ = FALSE;
-		GKeyFile* _tmp5_;
-		const gchar* _tmp6_;
-		const gchar* _tmp7_;
-		gint _tmp8_;
-		gint _tmp9_;
-		GKeyFile* _tmp10_;
-		GKeyFile* _tmp11_;
-		gsize length = 0UL;
-		GKeyFile* _tmp12_;
-		gsize _tmp13_ = 0UL;
-		gchar* _tmp14_;
-		const gchar* _tmp15_;
-#line 876 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp3_ = g_key_file_new ();
-#line 876 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		keyfile = _tmp3_;
-#line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp5_ = keyfile;
-#line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp6_ = trans;
-#line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp7_ = trans;
-#line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp8_ = strlen (_tmp7_);
-#line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp9_ = _tmp8_;
-#line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp4_ = g_key_file_load_from_data (_tmp5_, _tmp6_, (gsize) _tmp9_, G_KEY_FILE_NONE, &_inner_error_);
-#line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_g_key_file_unref0 (keyfile);
-#line 6156 "PhotoTable.c"
-			goto __catch19_g_error;
-		}
-#line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (!_tmp4_) {
-#line 878 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			result = FALSE;
-#line 878 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_g_key_file_unref0 (keyfile);
-#line 878 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_g_free0 (trans);
-#line 878 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return result;
-#line 6169 "PhotoTable.c"
-		}
-#line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp10_ = keyfile;
-#line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (!g_key_file_has_group (_tmp10_, object)) {
-#line 881 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			result = TRUE;
-#line 881 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_g_key_file_unref0 (keyfile);
-#line 881 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_g_free0 (trans);
-#line 881 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return result;
-#line 6183 "PhotoTable.c"
-		}
-#line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp11_ = keyfile;
-#line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		g_key_file_remove_group (_tmp11_, object, &_inner_error_);
-#line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_g_key_file_unref0 (keyfile);
-#line 6193 "PhotoTable.c"
-			goto __catch19_g_error;
-		}
-#line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp12_ = keyfile;
-#line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp14_ = g_key_file_to_data (_tmp12_, &_tmp13_, NULL);
-#line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		length = _tmp13_;
-#line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_free0 (trans);
-#line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		trans = _tmp14_;
-#line 887 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp15_ = trans;
-#line 887 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_vala_assert (_tmp15_ != NULL, "trans != null");
-#line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_key_file_unref0 (keyfile);
-#line 6212 "PhotoTable.c"
-	}
-	goto __finally19;
-	__catch19_g_error:
-	{
-		GError* err = NULL;
-		const gchar* _tmp16_;
-#line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		err = _inner_error_;
-#line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_inner_error_ = NULL;
-#line 889 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp16_ = err->message;
-#line 889 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		g_error ("PhotoTable.vala:889: %s", _tmp16_);
-#line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_error_free0 (err);
-#line 6229 "PhotoTable.c"
-	}
-	__finally19:
-#line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6234 "PhotoTable.c"
-		gboolean _tmp17_ = FALSE;
-#line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_free0 (trans);
-#line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.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 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		g_clear_error (&_inner_error_);
-#line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return _tmp17_;
-#line 6244 "PhotoTable.c"
-	}
-#line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp18_ = *photo_id;
-#line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp19_ = trans;
-#line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = photo_table_set_raw_transformations (self, &_tmp18_, _tmp19_);
-#line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (trans);
-#line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 6256 "PhotoTable.c"
-}
-
-
-gboolean
-photo_table_remove_all_transformations (PhotoTable* self,
-                                        PhotoID* photo_id)
-{
-	gboolean result = FALSE;
-	PhotoID _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gboolean _tmp3_;
-	PhotoID _tmp4_;
-	gint64 _tmp5_;
-#line 895 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 895 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 896 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = *photo_id;
-#line 896 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = photo_table_get_raw_transformations (self, &_tmp0_);
-#line 896 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = _tmp1_;
-#line 896 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = _tmp2_ == NULL;
-#line 896 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (_tmp2_);
-#line 896 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp3_) {
-#line 897 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		result = FALSE;
-#line 897 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return result;
-#line 6291 "PhotoTable.c"
-	}
-#line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = *photo_id;
-#line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp5_ = _tmp4_.id;
-#line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp5_, "transformations", "");
-#line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 6301 "PhotoTable.c"
-}
-
-
-static sqlite3_stmt*
-photo_table_get_duplicate_stmt (PhotoTable* self,
-                                GFile* file,
-                                const gchar* thumbnail_md5,
-                                const gchar* md5,
-                                PhotoFileFormat file_format)
-{
-	sqlite3_stmt* result = NULL;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gchar* sql = NULL;
-	gchar* _tmp2_;
-	gboolean first = FALSE;
-	gboolean _tmp5_ = FALSE;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp23_;
-	const gchar* _tmp24_;
-	sqlite3_stmt* _tmp25_ = NULL;
-	gint _tmp26_;
-	gint _tmp27_;
-	gint col = 0;
-	gboolean _tmp43_ = FALSE;
-	gboolean _tmp44_ = FALSE;
-#line 904 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL);
-#line 904 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL);
-#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (file != NULL) {
-#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp1_ = TRUE;
-#line 6337 "PhotoTable.c"
-	} else {
-#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp1_ = thumbnail_md5 != NULL;
-#line 6341 "PhotoTable.c"
-	}
-#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp1_) {
-#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp0_ = TRUE;
-#line 6347 "PhotoTable.c"
-	} else {
-#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp0_ = md5 != NULL;
-#line 6351 "PhotoTable.c"
-	}
-#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp0_, "file != null || thumbnail_md5 != null || md5 != null");
-#line 908 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = g_strdup ("SELECT id FROM PhotoTable WHERE");
-#line 908 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	sql = _tmp2_;
-#line 909 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	first = TRUE;
-#line 911 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (file != NULL) {
-#line 6363 "PhotoTable.c"
-		const gchar* _tmp3_;
-		gchar* _tmp4_;
-#line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp3_ = sql;
-#line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp4_ = g_strconcat (_tmp3_, " filename=?", NULL);
-#line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_free0 (sql);
-#line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		sql = _tmp4_;
-#line 913 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		first = FALSE;
-#line 6376 "PhotoTable.c"
-	}
-#line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (thumbnail_md5 != NULL) {
-#line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp5_ = TRUE;
-#line 6382 "PhotoTable.c"
-	} else {
-#line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp5_ = md5 != NULL;
-#line 6386 "PhotoTable.c"
-	}
-#line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp5_) {
-#line 6390 "PhotoTable.c"
-		gboolean _tmp6_;
-		const gchar* _tmp17_;
-		gchar* _tmp18_;
-		const gchar* _tmp21_;
-		gchar* _tmp22_;
-#line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp6_ = first;
-#line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (_tmp6_) {
-#line 6400 "PhotoTable.c"
-			const gchar* _tmp7_;
-			gchar* _tmp8_;
-#line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp7_ = sql;
-#line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp8_ = g_strconcat (_tmp7_, " ((", NULL);
-#line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_g_free0 (sql);
-#line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			sql = _tmp8_;
-#line 6411 "PhotoTable.c"
-		} else {
-			const gchar* _tmp9_;
-			gchar* _tmp10_;
-#line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp9_ = sql;
-#line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp10_ = g_strconcat (_tmp9_, " OR ((", NULL);
-#line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_g_free0 (sql);
-#line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			sql = _tmp10_;
-#line 6423 "PhotoTable.c"
-		}
-#line 921 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		first = FALSE;
-#line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (md5 != NULL) {
-#line 6429 "PhotoTable.c"
-			const gchar* _tmp11_;
-			gchar* _tmp12_;
-#line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp11_ = sql;
-#line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp12_ = g_strconcat (_tmp11_, " md5=?", NULL);
-#line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_g_free0 (sql);
-#line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			sql = _tmp12_;
-#line 6440 "PhotoTable.c"
-		}
-#line 927 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (thumbnail_md5 != NULL) {
-#line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			if (md5 == NULL) {
-#line 6446 "PhotoTable.c"
-				const gchar* _tmp13_;
-				gchar* _tmp14_;
-#line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp13_ = sql;
-#line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp14_ = g_strconcat (_tmp13_, " thumbnail_md5=?", NULL);
-#line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_g_free0 (sql);
-#line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				sql = _tmp14_;
-#line 6457 "PhotoTable.c"
-			} else {
-				const gchar* _tmp15_;
-				gchar* _tmp16_;
-#line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp15_ = sql;
-#line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp16_ = g_strconcat (_tmp15_, " OR (md5 IS NULL AND thumbnail_md5=?)", NULL);
-#line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_g_free0 (sql);
-#line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				sql = _tmp16_;
-#line 6469 "PhotoTable.c"
-			}
-		}
-#line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp17_ = sql;
-#line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp18_ = g_strconcat (_tmp17_, ")", NULL);
-#line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_free0 (sql);
-#line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		sql = _tmp18_;
-#line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (file_format != PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 6482 "PhotoTable.c"
-			const gchar* _tmp19_;
-			gchar* _tmp20_;
-#line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp19_ = sql;
-#line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp20_ = g_strconcat (_tmp19_, " AND file_format=?", NULL);
-#line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_g_free0 (sql);
-#line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			sql = _tmp20_;
-#line 6493 "PhotoTable.c"
-		}
-#line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp21_ = sql;
-#line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp22_ = g_strconcat (_tmp21_, ")", NULL);
-#line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_free0 (sql);
-#line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		sql = _tmp22_;
-#line 6503 "PhotoTable.c"
-	}
-#line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp23_ = database_table_db;
-#line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp24_ = sql;
-#line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp26_ = sqlite3_prepare_v2 (_tmp23_, _tmp24_, -1, &_tmp25_, NULL);
-#line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp25_;
-#line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp26_;
-#line 944 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp27_ = res;
-#line 944 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK");
-#line 946 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	col = 1;
-#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (file != NULL) {
-#line 6525 "PhotoTable.c"
-		sqlite3_stmt* _tmp28_;
-		gint _tmp29_;
-		gchar* _tmp30_;
-		GDestroyNotify _tmp31_;
-		gint _tmp32_;
-#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp28_ = stmt;
-#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp29_ = col;
-#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		col = _tmp29_ + 1;
-#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp30_ = g_file_get_path (file);
-#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp31_ = g_free;
-#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		res = sqlite3_bind_text (_tmp28_, _tmp29_, _tmp30_, -1, _tmp31_);
-#line 950 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp32_ = res;
-#line 950 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_vala_assert (_tmp32_ == SQLITE_OK, "res == Sqlite.OK");
-#line 6547 "PhotoTable.c"
-	}
-#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (thumbnail_md5 != NULL) {
-#line 6551 "PhotoTable.c"
-		sqlite3_stmt* _tmp33_;
-		gint _tmp34_;
-		gchar* _tmp35_;
-		GDestroyNotify _tmp36_;
-		gint _tmp37_;
-#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp33_ = stmt;
-#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp34_ = col;
-#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		col = _tmp34_ + 1;
-#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp35_ = g_strdup (thumbnail_md5);
-#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp36_ = g_free;
-#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		res = sqlite3_bind_text (_tmp33_, _tmp34_, _tmp35_, -1, _tmp36_);
-#line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp37_ = res;
-#line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK");
-#line 6573 "PhotoTable.c"
-	}
-#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (md5 != NULL) {
-#line 6577 "PhotoTable.c"
-		sqlite3_stmt* _tmp38_;
-		gint _tmp39_;
-		gchar* _tmp40_;
-		GDestroyNotify _tmp41_;
-		gint _tmp42_;
-#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp38_ = stmt;
-#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp39_ = col;
-#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		col = _tmp39_ + 1;
-#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp40_ = g_strdup (md5);
-#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp41_ = g_free;
-#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		res = sqlite3_bind_text (_tmp38_, _tmp39_, _tmp40_, -1, _tmp41_);
-#line 960 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp42_ = res;
-#line 960 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK");
-#line 6599 "PhotoTable.c"
-	}
-#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (thumbnail_md5 != NULL) {
-#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp44_ = TRUE;
-#line 6605 "PhotoTable.c"
-	} else {
-#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp44_ = md5 != NULL;
-#line 6609 "PhotoTable.c"
-	}
-#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp44_) {
-#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp43_ = file_format != PHOTO_FILE_FORMAT_UNKNOWN;
-#line 6615 "PhotoTable.c"
-	} else {
-#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp43_ = FALSE;
-#line 6619 "PhotoTable.c"
-	}
-#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp43_) {
-#line 6623 "PhotoTable.c"
-		sqlite3_stmt* _tmp45_;
-		gint _tmp46_;
-		gint _tmp47_;
-#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp45_ = stmt;
-#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp46_ = col;
-#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		col = _tmp46_ + 1;
-#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		res = sqlite3_bind_int (_tmp45_, _tmp46_, photo_file_format_serialize (file_format));
-#line 965 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp47_ = res;
-#line 965 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_vala_assert (_tmp47_ == SQLITE_OK, "res == Sqlite.OK");
-#line 6639 "PhotoTable.c"
-	}
-#line 968 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = stmt;
-#line 968 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (sql);
-#line 968 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 6647 "PhotoTable.c"
-}
-
-
-gboolean
-photo_table_has_duplicate (PhotoTable* self,
-                           GFile* file,
-                           const gchar* thumbnail_md5,
-                           const gchar* md5,
-                           PhotoFileFormat file_format)
-{
-	gboolean result = FALSE;
-	sqlite3_stmt* stmt = NULL;
-	sqlite3_stmt* _tmp0_;
-	gint res = 0;
-	sqlite3_stmt* _tmp1_;
-	gint _tmp2_;
-#line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
-#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = photo_table_get_duplicate_stmt (self, file, thumbnail_md5, md5, file_format);
-#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp0_;
-#line 973 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = stmt;
-#line 973 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_step (_tmp1_);
-#line 975 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = res;
-#line 975 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp2_ == SQLITE_DONE) {
-#line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		result = FALSE;
-#line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return result;
-#line 6686 "PhotoTable.c"
-	} else {
-		gint _tmp3_;
-#line 978 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp3_ = res;
-#line 978 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (_tmp3_ == SQLITE_ROW) {
-#line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			result = TRUE;
-#line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_sqlite3_finalize0 (stmt);
-#line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return result;
-#line 6699 "PhotoTable.c"
-		} else {
-			gint _tmp4_;
-#line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp4_ = res;
-#line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			database_table_fatal ("has_duplicate", _tmp4_);
-#line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			result = FALSE;
-#line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_sqlite3_finalize0 (stmt);
-#line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return result;
-#line 6712 "PhotoTable.c"
-		}
-	}
-#line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 6717 "PhotoTable.c"
-}
-
-
-static void
-_vala_array_add2 (PhotoID* * array,
-                  int* length,
-                  int* size,
-                  const PhotoID* value)
-{
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if ((*length) == (*size)) {
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		*array = g_renew (PhotoID, *array, *size);
-#line 6733 "PhotoTable.c"
-	}
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	(*array)[(*length)++] = *value;
-#line 6737 "PhotoTable.c"
-}
-
-
-PhotoID*
-photo_table_get_duplicate_ids (PhotoTable* self,
-                               GFile* file,
-                               const gchar* thumbnail_md5,
-                               const gchar* md5,
-                               PhotoFileFormat file_format,
-                               int* result_length1)
-{
-	PhotoID* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	sqlite3_stmt* _tmp0_;
-	PhotoID* ids = NULL;
-	PhotoID* _tmp1_;
-	gint ids_length1;
-	gint _ids_size_;
-	gint res = 0;
-	sqlite3_stmt* _tmp2_;
-	PhotoID* _tmp8_;
-	gint _tmp8__length1;
-#line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL);
-#line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL);
-#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = photo_table_get_duplicate_stmt (self, file, thumbnail_md5, md5, file_format);
-#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp0_;
-#line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = g_new0 (PhotoID, 0);
-#line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	ids = _tmp1_;
-#line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	ids_length1 = 0;
-#line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_ids_size_ = ids_length1;
-#line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = stmt;
-#line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_step (_tmp2_);
-#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	while (TRUE) {
-#line 6782 "PhotoTable.c"
-		gint _tmp3_;
-		PhotoID* _tmp4_;
-		gint _tmp4__length1;
-		sqlite3_stmt* _tmp5_;
-		PhotoID _tmp6_ = {0};
-		sqlite3_stmt* _tmp7_;
-#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp3_ = res;
-#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (!(_tmp3_ == SQLITE_ROW)) {
-#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			break;
-#line 6795 "PhotoTable.c"
-		}
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp4_ = ids;
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp4__length1 = ids_length1;
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp5_ = stmt;
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		photo_id_init (&_tmp6_, sqlite3_column_int64 (_tmp5_, 0));
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_vala_array_add2 (&ids, &ids_length1, &_ids_size_, &_tmp6_);
-#line 997 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp7_ = stmt;
-#line 997 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		res = sqlite3_step (_tmp7_);
-#line 6811 "PhotoTable.c"
-	}
-#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp8_ = ids;
-#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp8__length1 = ids_length1;
-#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (result_length1) {
-#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		*result_length1 = _tmp8__length1;
-#line 6821 "PhotoTable.c"
-	}
-#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = _tmp8_;
-#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 6829 "PhotoTable.c"
-}
-
-
-void
-photo_table_update_backlinks (PhotoTable* self,
-                              PhotoID* photo_id,
-                              const gchar* backlinks,
-                              GError** error)
-{
-	const gchar* _tmp0_ = NULL;
-	PhotoID _tmp1_;
-	gint64 _tmp2_;
-	GError * _inner_error_ = NULL;
-#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (photo_id != NULL);
-#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (backlinks != NULL) {
-#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp0_ = backlinks;
-#line 6851 "PhotoTable.c"
-	} else {
-#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp0_ = "";
-#line 6855 "PhotoTable.c"
-	}
-#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = *photo_id;
-#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = _tmp1_.id;
-#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "backlinks", _tmp0_, &_inner_error_);
-#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 6871 "PhotoTable.c"
-		} else {
-#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.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 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_clear_error (&_inner_error_);
-#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 6879 "PhotoTable.c"
-		}
-	}
-}
-
-
-void
-photo_table_attach_editable (PhotoTable* self,
-                             PhotoRow* row,
-                             BackingPhotoID* editable_id,
-                             GError** error)
-{
-	PhotoID _tmp0_;
-	gint64 _tmp1_;
-	BackingPhotoID _tmp2_;
-	gint64 _tmp3_;
-	BackingPhotoID _tmp4_;
-	GError * _inner_error_ = NULL;
-#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_PHOTO_ROW (row));
-#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (editable_id != NULL);
-#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = row->photo_id;
-#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = *editable_id;
-#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = _tmp2_.id;
-#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "editable_id", _tmp3_, &_inner_error_);
-#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 6921 "PhotoTable.c"
-		} else {
-#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.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 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_clear_error (&_inner_error_);
-#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 6929 "PhotoTable.c"
-		}
-	}
-#line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = *editable_id;
-#line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	row->editable_id = _tmp4_;
-#line 6936 "PhotoTable.c"
-}
-
-
-void
-photo_table_detach_editable (PhotoTable* self,
-                             PhotoRow* row,
-                             GError** error)
-{
-	PhotoID _tmp0_;
-	gint64 _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_PHOTO_ROW (row));
-#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = row->photo_id;
-#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "editable_id", BACKING_PHOTO_ID_INVALID, &_inner_error_);
-#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 6966 "PhotoTable.c"
-		} else {
-#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.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 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_clear_error (&_inner_error_);
-#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 6974 "PhotoTable.c"
-		}
-	}
-#line 1016 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	backing_photo_id_init (&row->editable_id, BACKING_PHOTO_ID_INVALID);
-#line 6979 "PhotoTable.c"
-}
-
-
-void
-photo_table_set_metadata_dirty (PhotoTable* self,
-                                PhotoID* photo_id,
-                                gboolean dirty,
-                                GError** error)
-{
-	gint _tmp0_ = 0;
-	PhotoID _tmp1_;
-	gint64 _tmp2_;
-	GError * _inner_error_ = NULL;
-#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (photo_id != NULL);
-#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (dirty) {
-#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp0_ = 1;
-#line 7001 "PhotoTable.c"
-	} else {
-#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp0_ = 0;
-#line 7005 "PhotoTable.c"
-	}
-#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = *photo_id;
-#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = _tmp1_.id;
-#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	database_table_update_int_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "metadata_dirty", _tmp0_, &_inner_error_);
-#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 7021 "PhotoTable.c"
-		} else {
-#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.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 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_clear_error (&_inner_error_);
-#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 7029 "PhotoTable.c"
-		}
-	}
-}
-
-
-void
-photo_table_update_raw_development (PhotoTable* self,
-                                    PhotoRow* row,
-                                    RawDeveloper rd,
-                                    BackingPhotoID* backing_photo_id,
-                                    GError** error)
-{
-	gchar* col = NULL;
-	BackingPhotoID* _tmp3_;
-	gint _tmp3__length1;
-	BackingPhotoID _tmp4_;
-	BackingPhotoID _tmp5_;
-	PhotoID _tmp6_;
-	gint64 _tmp7_;
-	const gchar* _tmp8_;
-	BackingPhotoID _tmp9_;
-	gint64 _tmp10_;
-	BackingPhotoID _tmp11_;
-	gint64 _tmp12_;
-	GError * _inner_error_ = NULL;
-#line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_PHOTO_ROW (row));
-#line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (backing_photo_id != NULL);
-#line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	switch (rd) {
-#line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		case RAW_DEVELOPER_SHOTWELL:
-#line 7065 "PhotoTable.c"
-		{
-			gchar* _tmp0_;
-#line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp0_ = g_strdup ("develop_shotwell_id");
-#line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_g_free0 (col);
-#line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			col = _tmp0_;
-#line 1030 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			break;
-#line 7076 "PhotoTable.c"
-		}
-#line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		case RAW_DEVELOPER_CAMERA:
-#line 7080 "PhotoTable.c"
-		{
-			gchar* _tmp1_;
-#line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp1_ = g_strdup ("develop_camera_id");
-#line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_g_free0 (col);
-#line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			col = _tmp1_;
-#line 1034 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			break;
-#line 7091 "PhotoTable.c"
-		}
-#line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		case RAW_DEVELOPER_EMBEDDED:
-#line 7095 "PhotoTable.c"
-		{
-			gchar* _tmp2_;
-#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp2_ = g_strdup ("develop_embedded_id");
-#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_g_free0 (col);
-#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			col = _tmp2_;
-#line 1038 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			break;
-#line 7106 "PhotoTable.c"
-		}
-		default:
-		{
-#line 1041 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_assert_not_reached ();
-#line 7112 "PhotoTable.c"
-		}
-	}
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = row->development_ids;
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3__length1 = row->development_ids_length1;
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = *backing_photo_id;
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_[rd] = _tmp4_;
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp5_ = _tmp3_[rd];
-#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp6_ = row->photo_id;
-#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp7_ = _tmp6_.id;
-#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp8_ = col;
-#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp9_ = *backing_photo_id;
-#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp10_ = _tmp9_.id;
-#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp7_, _tmp8_, _tmp10_, &_inner_error_);
-#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_g_free0 (col);
-#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 7147 "PhotoTable.c"
-		} else {
-#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_g_free0 (col);
-#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.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 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_clear_error (&_inner_error_);
-#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 7157 "PhotoTable.c"
-		}
-	}
-#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp11_ = *backing_photo_id;
-#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp12_ = _tmp11_.id;
-#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp12_ != BACKING_PHOTO_ID_INVALID) {
-#line 7166 "PhotoTable.c"
-		PhotoID _tmp13_;
-		gint64 _tmp14_;
-		gchar* _tmp15_;
-		gchar* _tmp16_;
-#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp13_ = row->photo_id;
-#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp14_ = _tmp13_.id;
-#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp15_ = raw_developer_to_string (rd);
-#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp16_ = _tmp15_;
-#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp14_, "developer", _tmp16_, &_inner_error_);
-#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_g_free0 (_tmp16_);
-#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_g_free0 (col);
-#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				return;
-#line 7193 "PhotoTable.c"
-			} else {
-#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_g_free0 (col);
-#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.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 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				g_clear_error (&_inner_error_);
-#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				return;
-#line 7203 "PhotoTable.c"
-			}
-		}
-	}
-#line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (col);
-#line 7209 "PhotoTable.c"
-}
-
-
-void
-photo_table_remove_development (PhotoTable* self,
-                                PhotoRow* row,
-                                RawDeveloper rd,
-                                GError** error)
-{
-	BackingPhotoID _tmp0_ = {0};
-	GError * _inner_error_ = NULL;
-#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_PHOTO_ROW (row));
-#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	backing_photo_id_init (&_tmp0_, BACKING_PHOTO_ID_INVALID);
-#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	photo_table_update_raw_development (self, row, rd, &_tmp0_, &_inner_error_);
-#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 7237 "PhotoTable.c"
-		} else {
-#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.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 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_clear_error (&_inner_error_);
-#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 7245 "PhotoTable.c"
-		}
-	}
-}
-
-
-static void
-photo_table_class_init (PhotoTableClass * klass)
-{
-#line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	photo_table_parent_class = g_type_class_peek_parent (klass);
-#line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	((DatabaseTableClass *) klass)->finalize = photo_table_finalize;
-#line 7258 "PhotoTable.c"
-}
-
-
-static void
-photo_table_instance_init (PhotoTable * self)
-{
-}
-
-
-static void
-photo_table_finalize (DatabaseTable * obj)
-{
-	PhotoTable * self;
-#line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_TABLE, PhotoTable);
-#line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	DATABASE_TABLE_CLASS (photo_table_parent_class)->finalize (obj);
-#line 7276 "PhotoTable.c"
-}
-
-
-GType
-photo_table_get_type (void)
-{
-	static volatile gsize photo_table_type_id__volatile = 0;
-	if (g_once_init_enter (&photo_table_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PhotoTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoTable), 0, (GInstanceInitFunc) photo_table_instance_init, NULL };
-		GType photo_table_type_id;
-		photo_table_type_id = g_type_register_static (TYPE_DATABASE_TABLE, "PhotoTable", &g_define_type_info, 0);
-		g_once_init_leave (&photo_table_type_id__volatile, photo_table_type_id);
-	}
-	return photo_table_type_id__volatile;
-}
-
-
-void
-backing_photo_id_init (BackingPhotoID *self,
-                       gint64 id)
-{
-#line 1072 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	memset (self, 0, sizeof (BackingPhotoID));
-#line 1073 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	(*self).id = id;
-#line 7302 "PhotoTable.c"
-}
-
-
-gboolean
-backing_photo_id_is_invalid (BackingPhotoID *self)
-{
-	gboolean result = FALSE;
-	gint64 _tmp0_;
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = (*self).id;
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = _tmp0_ == BACKING_PHOTO_ID_INVALID;
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 7317 "PhotoTable.c"
-}
-
-
-gboolean
-backing_photo_id_is_valid (BackingPhotoID *self)
-{
-	gboolean result = FALSE;
-	gint64 _tmp0_;
-#line 1081 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = (*self).id;
-#line 1081 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = _tmp0_ != BACKING_PHOTO_ID_INVALID;
-#line 1081 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 7332 "PhotoTable.c"
-}
-
-
-BackingPhotoID*
-backing_photo_id_dup (const BackingPhotoID* self)
-{
-	BackingPhotoID* dup;
-#line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	dup = g_new0 (BackingPhotoID, 1);
-#line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	memcpy (dup, self, sizeof (BackingPhotoID));
-#line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return dup;
-#line 7346 "PhotoTable.c"
-}
-
-
-void
-backing_photo_id_free (BackingPhotoID* self)
-{
-#line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_free (self);
-#line 7355 "PhotoTable.c"
-}
-
-
-GType
-backing_photo_id_get_type (void)
-{
-	static volatile gsize backing_photo_id_type_id__volatile = 0;
-	if (g_once_init_enter (&backing_photo_id_type_id__volatile)) {
-		GType backing_photo_id_type_id;
-		backing_photo_id_type_id = g_boxed_type_register_static ("BackingPhotoID", (GBoxedCopyFunc) backing_photo_id_dup, (GBoxedFreeFunc) backing_photo_id_free);
-		g_once_init_leave (&backing_photo_id_type_id__volatile, backing_photo_id_type_id);
-	}
-	return backing_photo_id_type_id__volatile;
-}
-
-
-gboolean
-backing_photo_row_matches_file_info (BackingPhotoRow* self,
-                                     GFileInfo* info)
-{
-	gboolean result = FALSE;
-	gint64 _tmp0_;
-	time_t _tmp1_;
-	GTimeVal _tmp2_ = {0};
-	glong _tmp3_;
-#line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_BACKING_PHOTO_ROW (self), FALSE);
-#line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE);
-#line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = self->filesize;
-#line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp0_ != g_file_info_get_size (info)) {
-#line 1097 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		result = FALSE;
-#line 1097 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return result;
-#line 7393 "PhotoTable.c"
-	}
-#line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = self->timestamp;
-#line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_file_info_get_modification_time (info, &_tmp2_);
-#line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = _tmp2_.tv_sec;
-#line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = _tmp1_ == ((time_t) _tmp3_);
-#line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 7405 "PhotoTable.c"
-}
-
-
-gboolean
-backing_photo_row_is_touched (BackingPhotoRow* self,
-                              GFileInfo* info)
-{
-	gboolean result = FALSE;
-	gint64 _tmp0_;
-	time_t _tmp1_;
-	GTimeVal _tmp2_ = {0};
-	glong _tmp3_;
-#line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_BACKING_PHOTO_ROW (self), FALSE);
-#line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE);
-#line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = self->filesize;
-#line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp0_ != g_file_info_get_size (info)) {
-#line 1104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		result = FALSE;
-#line 1104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return result;
-#line 7430 "PhotoTable.c"
-	}
-#line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = self->timestamp;
-#line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_file_info_get_modification_time (info, &_tmp2_);
-#line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = _tmp2_.tv_sec;
-#line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = _tmp1_ != ((time_t) _tmp3_);
-#line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 7442 "PhotoTable.c"
-}
-
-
-void
-backing_photo_row_copy_from (BackingPhotoRow* self,
-                             BackingPhotoRow* from)
-{
-	BackingPhotoID _tmp0_;
-	time_t _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-	gint64 _tmp4_;
-	time_t _tmp5_;
-	PhotoFileFormat _tmp6_;
-	Dimensions _tmp7_;
-	Orientation _tmp8_;
-#line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_BACKING_PHOTO_ROW (self));
-#line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_BACKING_PHOTO_ROW (from));
-#line 1111 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = from->id;
-#line 1111 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self->id = _tmp0_;
-#line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = from->time_created;
-#line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self->time_created = _tmp1_;
-#line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = from->filepath;
-#line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (self->filepath);
-#line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self->filepath = _tmp3_;
-#line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = from->filesize;
-#line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self->filesize = _tmp4_;
-#line 1115 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp5_ = from->timestamp;
-#line 1115 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self->timestamp = _tmp5_;
-#line 1116 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp6_ = from->file_format;
-#line 1116 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self->file_format = _tmp6_;
-#line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp7_ = from->dim;
-#line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self->dim = _tmp7_;
-#line 1118 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp8_ = from->original_orientation;
-#line 1118 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self->original_orientation = _tmp8_;
-#line 7499 "PhotoTable.c"
-}
-
-
-BackingPhotoRow*
-backing_photo_row_construct (GType object_type)
-{
-	BackingPhotoRow* self = NULL;
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self = (BackingPhotoRow*) g_type_create_instance (object_type);
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return self;
-#line 7511 "PhotoTable.c"
-}
-
-
-BackingPhotoRow*
-backing_photo_row_new (void)
-{
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return backing_photo_row_construct (TYPE_BACKING_PHOTO_ROW);
-#line 7520 "PhotoTable.c"
-}
-
-
-static void
-value_backing_photo_row_init (GValue* value)
-{
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	value->data[0].v_pointer = NULL;
-#line 7529 "PhotoTable.c"
-}
-
-
-static void
-value_backing_photo_row_free_value (GValue* value)
-{
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (value->data[0].v_pointer) {
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		backing_photo_row_unref (value->data[0].v_pointer);
-#line 7540 "PhotoTable.c"
-	}
-}
-
-
-static void
-value_backing_photo_row_copy_value (const GValue* src_value,
-                                    GValue* dest_value)
-{
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (src_value->data[0].v_pointer) {
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		dest_value->data[0].v_pointer = backing_photo_row_ref (src_value->data[0].v_pointer);
-#line 7553 "PhotoTable.c"
-	} else {
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 7557 "PhotoTable.c"
-	}
-}
-
-
-static gpointer
-value_backing_photo_row_peek_pointer (const GValue* value)
-{
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return value->data[0].v_pointer;
-#line 7567 "PhotoTable.c"
-}
-
-
-static gchar*
-value_backing_photo_row_collect_value (GValue* value,
-                                       guint n_collect_values,
-                                       GTypeCValue* collect_values,
-                                       guint collect_flags)
-{
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (collect_values[0].v_pointer) {
-#line 7579 "PhotoTable.c"
-		BackingPhotoRow * object;
-		object = collect_values[0].v_pointer;
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 7586 "PhotoTable.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.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 7590 "PhotoTable.c"
-		}
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		value->data[0].v_pointer = backing_photo_row_ref (object);
-#line 7594 "PhotoTable.c"
-	} else {
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 7598 "PhotoTable.c"
-	}
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return NULL;
-#line 7602 "PhotoTable.c"
-}
-
-
-static gchar*
-value_backing_photo_row_lcopy_value (const GValue* value,
-                                     guint n_collect_values,
-                                     GTypeCValue* collect_values,
-                                     guint collect_flags)
-{
-	BackingPhotoRow ** object_p;
-	object_p = collect_values[0].v_pointer;
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (!object_p) {
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 7618 "PhotoTable.c"
-	}
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (!value->data[0].v_pointer) {
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		*object_p = NULL;
-#line 7624 "PhotoTable.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		*object_p = value->data[0].v_pointer;
-#line 7628 "PhotoTable.c"
-	} else {
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		*object_p = backing_photo_row_ref (value->data[0].v_pointer);
-#line 7632 "PhotoTable.c"
-	}
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return NULL;
-#line 7636 "PhotoTable.c"
-}
-
-
-GParamSpec*
-param_spec_backing_photo_row (const gchar* name,
-                              const gchar* nick,
-                              const gchar* blurb,
-                              GType object_type,
-                              GParamFlags flags)
-{
-	ParamSpecBackingPhotoRow* spec;
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, TYPE_BACKING_PHOTO_ROW), NULL);
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return G_PARAM_SPEC (spec);
-#line 7656 "PhotoTable.c"
-}
-
-
-gpointer
-value_get_backing_photo_row (const GValue* value)
-{
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW), NULL);
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return value->data[0].v_pointer;
-#line 7667 "PhotoTable.c"
-}
-
-
-void
-value_set_backing_photo_row (GValue* value,
-                             gpointer v_object)
-{
-	BackingPhotoRow * old;
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW));
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	old = value->data[0].v_pointer;
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (v_object) {
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_BACKING_PHOTO_ROW));
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		value->data[0].v_pointer = v_object;
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		backing_photo_row_ref (value->data[0].v_pointer);
-#line 7690 "PhotoTable.c"
-	} else {
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 7694 "PhotoTable.c"
-	}
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (old) {
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		backing_photo_row_unref (old);
-#line 7700 "PhotoTable.c"
-	}
-}
-
-
-void
-value_take_backing_photo_row (GValue* value,
-                              gpointer v_object)
-{
-	BackingPhotoRow * old;
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW));
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	old = value->data[0].v_pointer;
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (v_object) {
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_BACKING_PHOTO_ROW));
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		value->data[0].v_pointer = v_object;
-#line 7722 "PhotoTable.c"
-	} else {
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 7726 "PhotoTable.c"
-	}
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (old) {
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		backing_photo_row_unref (old);
-#line 7732 "PhotoTable.c"
-	}
-}
-
-
-static void
-backing_photo_row_class_init (BackingPhotoRowClass * klass)
-{
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	backing_photo_row_parent_class = g_type_class_peek_parent (klass);
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	((BackingPhotoRowClass *) klass)->finalize = backing_photo_row_finalize;
-#line 7744 "PhotoTable.c"
-}
-
-
-static void
-backing_photo_row_instance_init (BackingPhotoRow * self)
-{
-#line 1088 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self->filepath = NULL;
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self->ref_count = 1;
-#line 7755 "PhotoTable.c"
-}
-
-
-static void
-backing_photo_row_finalize (BackingPhotoRow * obj)
-{
-	BackingPhotoRow * self;
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_PHOTO_ROW, BackingPhotoRow);
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_signal_handlers_destroy (self);
-#line 1088 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (self->filepath);
-#line 7769 "PhotoTable.c"
-}
-
-
-GType
-backing_photo_row_get_type (void)
-{
-	static volatile gsize backing_photo_row_type_id__volatile = 0;
-	if (g_once_init_enter (&backing_photo_row_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_backing_photo_row_init, value_backing_photo_row_free_value, value_backing_photo_row_copy_value, value_backing_photo_row_peek_pointer, "p", value_backing_photo_row_collect_value, "p", value_backing_photo_row_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (BackingPhotoRowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) backing_photo_row_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (BackingPhotoRow), 0, (GInstanceInitFunc) backing_photo_row_instance_init, &g_define_type_value_table };
-		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
-		GType backing_photo_row_type_id;
-		backing_photo_row_type_id = g_type_register_fundamental (g_type_fundamental_next (), "BackingPhotoRow", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&backing_photo_row_type_id__volatile, backing_photo_row_type_id);
-	}
-	return backing_photo_row_type_id__volatile;
-}
-
-
-gpointer
-backing_photo_row_ref (gpointer instance)
-{
-	BackingPhotoRow * self;
-	self = instance;
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return instance;
-#line 7798 "PhotoTable.c"
-}
-
-
-void
-backing_photo_row_unref (gpointer instance)
-{
-	BackingPhotoRow * self;
-	self = instance;
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		BACKING_PHOTO_ROW_GET_CLASS (self)->finalize (self);
-#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 7813 "PhotoTable.c"
-	}
-}
-
-
-static BackingPhotoTable*
-backing_photo_table_construct (GType object_type)
-{
-	BackingPhotoTable* self = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	gint _tmp5_;
-#line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self = (BackingPhotoTable*) database_table_construct (object_type);
-#line 1126 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	database_table_set_table_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), "BackingPhotoTable");
-#line 1129 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = database_table_db;
-#line 1129 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "CREATE TABLE IF NOT EXISTS " "BackingPhotoTable " "(" "id INTEGER PRIMARY KEY, " "filepath TEXT UNIQUE NOT NULL, " "timestamp INTEGER, " "filesize INTEGER, " "width INTEGER, " "height INTEGER, " "original_orientation INTEGER, " "file_format INTEGER, " "time_created INTEGER " ")", -1, &_tmp1_, NULL);
-#line 1129 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 1129 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp1_;
-#line 1129 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp2_;
-#line 1142 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = res;
-#line 1142 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1144 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = stmt;
-#line 1144 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_step (_tmp4_);
-#line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp5_ = res;
-#line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp5_ != SQLITE_DONE) {
-#line 7856 "PhotoTable.c"
-		gint _tmp6_;
-#line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp6_ = res;
-#line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		database_table_fatal ("create PhotoBackingTable", _tmp6_);
-#line 7862 "PhotoTable.c"
-	}
-#line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return self;
-#line 7868 "PhotoTable.c"
-}
-
-
-static BackingPhotoTable*
-backing_photo_table_new (void)
-{
-#line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return backing_photo_table_construct (TYPE_BACKING_PHOTO_TABLE);
-#line 7877 "PhotoTable.c"
-}
-
-
-BackingPhotoTable*
-backing_photo_table_get_instance (void)
-{
-	BackingPhotoTable* result = NULL;
-	BackingPhotoTable* _tmp0_;
-	BackingPhotoTable* _tmp2_;
-	BackingPhotoTable* _tmp3_;
-#line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = backing_photo_table_instance;
-#line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp0_ == NULL) {
-#line 7892 "PhotoTable.c"
-		BackingPhotoTable* _tmp1_;
-#line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp1_ = backing_photo_table_new ();
-#line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_database_table_unref0 (backing_photo_table_instance);
-#line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		backing_photo_table_instance = _tmp1_;
-#line 7900 "PhotoTable.c"
-	}
-#line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = backing_photo_table_instance;
-#line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = _database_table_ref0 (_tmp2_);
-#line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = _tmp3_;
-#line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 7910 "PhotoTable.c"
-}
-
-
-void
-backing_photo_table_add (BackingPhotoTable* self,
-                         BackingPhotoRow* state,
-                         GError** error)
-{
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	time_t time_created = 0;
-	sqlite3_stmt* _tmp4_;
-	const gchar* _tmp5_;
-	gchar* _tmp6_;
-	GDestroyNotify _tmp7_;
-	gint _tmp8_;
-	sqlite3_stmt* _tmp9_;
-	time_t _tmp10_;
-	gint _tmp11_;
-	sqlite3_stmt* _tmp12_;
-	gint64 _tmp13_;
-	gint _tmp14_;
-	sqlite3_stmt* _tmp15_;
-	Dimensions _tmp16_;
-	gint _tmp17_;
-	gint _tmp18_;
-	sqlite3_stmt* _tmp19_;
-	Dimensions _tmp20_;
-	gint _tmp21_;
-	gint _tmp22_;
-	sqlite3_stmt* _tmp23_;
-	Orientation _tmp24_;
-	gint _tmp25_;
-	sqlite3_stmt* _tmp26_;
-	PhotoFileFormat _tmp27_;
-	gint _tmp28_;
-	sqlite3_stmt* _tmp29_;
-	time_t _tmp30_;
-	gint _tmp31_;
-	sqlite3_stmt* _tmp32_;
-	gint _tmp33_;
-	sqlite3* _tmp35_;
-	time_t _tmp36_;
-	GError * _inner_error_ = NULL;
-#line 1156 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
-#line 1156 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_BACKING_PHOTO_ROW (state));
-#line 1158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = database_table_db;
-#line 1158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "INSERT INTO BackingPhotoTable " "(filepath, timestamp, filesize, width, height, original_orientation, " "file_format, time_created) " "VALUES (?, ?, ?, ?, ?, ?, ?, ?)", -1, &_tmp1_, NULL);
-#line 1158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 1158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp1_;
-#line 1158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp2_;
-#line 1163 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = res;
-#line 1163 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	time_created = (time_t) now_sec ();
-#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = stmt;
-#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp5_ = state->filepath;
-#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp6_ = g_strdup (_tmp5_);
-#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp7_ = g_free;
-#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_);
-#line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp8_ = res;
-#line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp9_ = stmt;
-#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp10_ = state->timestamp;
-#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp9_, 2, (gint64) _tmp10_);
-#line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp11_ = res;
-#line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp12_ = stmt;
-#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp13_ = state->filesize;
-#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp12_, 3, _tmp13_);
-#line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp14_ = res;
-#line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp14_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp15_ = stmt;
-#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp16_ = state->dim;
-#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp17_ = _tmp16_.width;
-#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp15_, 4, _tmp17_);
-#line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp18_ = res;
-#line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp19_ = stmt;
-#line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp20_ = state->dim;
-#line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp21_ = _tmp20_.height;
-#line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp19_, 5, _tmp21_);
-#line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp22_ = res;
-#line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp22_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp23_ = stmt;
-#line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp24_ = state->original_orientation;
-#line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp23_, 6, (gint) _tmp24_);
-#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp25_ = res;
-#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp25_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp26_ = stmt;
-#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp27_ = state->file_format;
-#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp26_, 7, photo_file_format_serialize (_tmp27_));
-#line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp28_ = res;
-#line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp28_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp29_ = stmt;
-#line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp30_ = time_created;
-#line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp29_, 8, (gint64) _tmp30_);
-#line 1182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp31_ = res;
-#line 1182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp31_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp32_ = stmt;
-#line 1184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_step (_tmp32_);
-#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp33_ = res;
-#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp33_ != SQLITE_DONE) {
-#line 8075 "PhotoTable.c"
-		gint _tmp34_;
-#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp34_ = res;
-#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		database_table_throw_error ("PhotoBackingTable.add", _tmp34_, &_inner_error_);
-#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				return;
-#line 8091 "PhotoTable.c"
-			} else {
-#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.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 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				g_clear_error (&_inner_error_);
-#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				return;
-#line 8101 "PhotoTable.c"
-			}
-		}
-	}
-#line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp35_ = database_table_db;
-#line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	backing_photo_id_init (&state->id, sqlite3_last_insert_rowid (_tmp35_));
-#line 1189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp36_ = time_created;
-#line 1189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	state->time_created = _tmp36_;
-#line 1156 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 8115 "PhotoTable.c"
-}
-
-
-BackingPhotoRow*
-backing_photo_table_fetch (BackingPhotoTable* self,
-                           BackingPhotoID* id,
-                           GError** error)
-{
-	BackingPhotoRow* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	BackingPhotoID _tmp5_;
-	gint64 _tmp6_;
-	gint _tmp7_;
-	sqlite3_stmt* _tmp8_;
-	gint _tmp9_;
-	BackingPhotoRow* row = NULL;
-	BackingPhotoRow* _tmp12_;
-	BackingPhotoRow* _tmp13_;
-	BackingPhotoID _tmp14_;
-	BackingPhotoRow* _tmp15_;
-	sqlite3_stmt* _tmp16_;
-	const gchar* _tmp17_;
-	gchar* _tmp18_;
-	BackingPhotoRow* _tmp19_;
-	sqlite3_stmt* _tmp20_;
-	BackingPhotoRow* _tmp21_;
-	sqlite3_stmt* _tmp22_;
-	BackingPhotoRow* _tmp23_;
-	sqlite3_stmt* _tmp24_;
-	sqlite3_stmt* _tmp25_;
-	BackingPhotoRow* _tmp26_;
-	sqlite3_stmt* _tmp27_;
-	BackingPhotoRow* _tmp28_;
-	sqlite3_stmt* _tmp29_;
-	BackingPhotoRow* _tmp30_;
-	sqlite3_stmt* _tmp31_;
-	GError * _inner_error_ = NULL;
-#line 1192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (IS_BACKING_PHOTO_TABLE (self), NULL);
-#line 1192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (id != NULL, NULL);
-#line 1194 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = database_table_db;
-#line 1194 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT filepath, timestamp, filesize, width, height, " "original_orientation, file_format, time_created FROM BackingPhotoTable" \
-" WHERE id=?", -1, &_tmp1_, NULL);
-#line 1194 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 1194 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp1_;
-#line 1194 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp2_;
-#line 1197 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = res;
-#line 1197 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = stmt;
-#line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp5_ = *id;
-#line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp6_ = _tmp5_.id;
-#line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_);
-#line 1200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp7_ = res;
-#line 1200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp8_ = stmt;
-#line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_step (_tmp8_);
-#line 1203 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp9_ = res;
-#line 1203 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp9_ == SQLITE_DONE) {
-#line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		result = NULL;
-#line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return result;
-#line 8203 "PhotoTable.c"
-	} else {
-		gint _tmp10_;
-#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp10_ = res;
-#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (_tmp10_ != SQLITE_ROW) {
-#line 8210 "PhotoTable.c"
-			gint _tmp11_;
-#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp11_ = res;
-#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			database_table_throw_error ("BackingPhotoTable.fetch_for_photo", _tmp11_, &_inner_error_);
-#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					g_propagate_error (error, _inner_error_);
-#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_sqlite3_finalize0 (stmt);
-#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					return NULL;
-#line 8226 "PhotoTable.c"
-				} else {
-#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					_sqlite3_finalize0 (stmt);
-#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.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 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					g_clear_error (&_inner_error_);
-#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-					return NULL;
-#line 8236 "PhotoTable.c"
-				}
-			}
-		}
-	}
-#line 1208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp12_ = backing_photo_row_new ();
-#line 1208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	row = _tmp12_;
-#line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp13_ = row;
-#line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp14_ = *id;
-#line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp13_->id = _tmp14_;
-#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp15_ = row;
-#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp16_ = stmt;
-#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp17_ = sqlite3_column_text (_tmp16_, 0);
-#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp18_ = g_strdup (_tmp17_);
-#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_g_free0 (_tmp15_->filepath);
-#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp15_->filepath = _tmp18_;
-#line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp19_ = row;
-#line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp20_ = stmt;
-#line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp19_->timestamp = (time_t) sqlite3_column_int64 (_tmp20_, 1);
-#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp21_ = row;
-#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp22_ = stmt;
-#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp21_->filesize = sqlite3_column_int64 (_tmp22_, 2);
-#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp23_ = row;
-#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp24_ = stmt;
-#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp25_ = stmt;
-#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	dimensions_init (&_tmp23_->dim, sqlite3_column_int (_tmp24_, 3), sqlite3_column_int (_tmp25_, 4));
-#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp26_ = row;
-#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp27_ = stmt;
-#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp26_->original_orientation = (Orientation) sqlite3_column_int (_tmp27_, 5);
-#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp28_ = row;
-#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp29_ = stmt;
-#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp28_->file_format = photo_file_format_unserialize (sqlite3_column_int (_tmp29_, 6));
-#line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp30_ = row;
-#line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp31_ = stmt;
-#line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp30_->time_created = (time_t) sqlite3_column_int64 (_tmp31_, 7);
-#line 1218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = row;
-#line 1218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 1218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	return result;
-#line 8307 "PhotoTable.c"
-}
-
-
-void
-backing_photo_table_update (BackingPhotoTable* self,
-                            BackingPhotoRow* row,
-                            GError** error)
-{
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	time_t _tmp5_;
-	gint _tmp6_;
-	sqlite3_stmt* _tmp7_;
-	gint64 _tmp8_;
-	gint _tmp9_;
-	sqlite3_stmt* _tmp10_;
-	Dimensions _tmp11_;
-	gint _tmp12_;
-	gint _tmp13_;
-	sqlite3_stmt* _tmp14_;
-	Dimensions _tmp15_;
-	gint _tmp16_;
-	gint _tmp17_;
-	sqlite3_stmt* _tmp18_;
-	Orientation _tmp19_;
-	gint _tmp20_;
-	sqlite3_stmt* _tmp21_;
-	PhotoFileFormat _tmp22_;
-	gint _tmp23_;
-	sqlite3_stmt* _tmp24_;
-	BackingPhotoID _tmp25_;
-	gint64 _tmp26_;
-	gint _tmp27_;
-	sqlite3_stmt* _tmp28_;
-	gint _tmp29_;
-	GError * _inner_error_ = NULL;
-#line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
-#line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_BACKING_PHOTO_ROW (row));
-#line 1224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = database_table_db;
-#line 1224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "UPDATE BackingPhotoTable SET timestamp=?, filesize=?, " "width=?, height=?, original_orientation=?, file_format=? " "WHERE id=?", -1, &_tmp1_, NULL);
-#line 1224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 1224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp1_;
-#line 1224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp2_;
-#line 1228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = res;
-#line 1228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = stmt;
-#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp5_ = row->timestamp;
-#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp4_, 1, (gint64) _tmp5_);
-#line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp6_ = res;
-#line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp7_ = stmt;
-#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp8_ = row->filesize;
-#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp7_, 2, _tmp8_);
-#line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp9_ = res;
-#line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp10_ = stmt;
-#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp11_ = row->dim;
-#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp12_ = _tmp11_.width;
-#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp10_, 3, _tmp12_);
-#line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp13_ = res;
-#line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp14_ = stmt;
-#line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp15_ = row->dim;
-#line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp16_ = _tmp15_.height;
-#line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp14_, 4, _tmp16_);
-#line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp17_ = res;
-#line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp18_ = stmt;
-#line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp19_ = row->original_orientation;
-#line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp18_, 5, (gint) _tmp19_);
-#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp20_ = res;
-#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp20_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp21_ = stmt;
-#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp22_ = row->file_format;
-#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int (_tmp21_, 6, photo_file_format_serialize (_tmp22_));
-#line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp23_ = res;
-#line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp24_ = stmt;
-#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp25_ = row->id;
-#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp26_ = _tmp25_.id;
-#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp24_, 7, _tmp26_);
-#line 1243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp27_ = res;
-#line 1243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp28_ = stmt;
-#line 1245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_step (_tmp28_);
-#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp29_ = res;
-#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp29_ != SQLITE_DONE) {
-#line 8451 "PhotoTable.c"
-		gint _tmp30_;
-#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp30_ = res;
-#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		database_table_throw_error ("BackingPhotoTable.update", _tmp30_, &_inner_error_);
-#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				return;
-#line 8467 "PhotoTable.c"
-			} else {
-#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.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 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				g_clear_error (&_inner_error_);
-#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				return;
-#line 8477 "PhotoTable.c"
-			}
-		}
-	}
-#line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 8483 "PhotoTable.c"
-}
-
-
-void
-backing_photo_table_update_attributes (BackingPhotoTable* self,
-                                       BackingPhotoID* id,
-                                       time_t timestamp,
-                                       gint64 filesize,
-                                       GError** error)
-{
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	gint _tmp5_;
-	sqlite3_stmt* _tmp6_;
-	gint _tmp7_;
-	sqlite3_stmt* _tmp8_;
-	BackingPhotoID _tmp9_;
-	gint64 _tmp10_;
-	gint _tmp11_;
-	sqlite3_stmt* _tmp12_;
-	gint _tmp13_;
-	GError * _inner_error_ = NULL;
-#line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
-#line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (id != NULL);
-#line 1252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = database_table_db;
-#line 1252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "UPDATE BackingPhotoTable SET timestamp=?, filesize=? WHERE id=?", -1, &_tmp1_, NULL);
-#line 1252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 1252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp1_;
-#line 1252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp2_;
-#line 1254 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp3_ = res;
-#line 1254 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = stmt;
-#line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp4_, 1, (gint64) timestamp);
-#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp5_ = res;
-#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp6_ = stmt;
-#line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp6_, 2, filesize);
-#line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp7_ = res;
-#line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp8_ = stmt;
-#line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp9_ = *id;
-#line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp10_ = _tmp9_.id;
-#line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_bind_int64 (_tmp8_, 3, _tmp10_);
-#line 1261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp11_ = res;
-#line 1261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp12_ = stmt;
-#line 1263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = sqlite3_step (_tmp12_);
-#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp13_ = res;
-#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp13_ != SQLITE_DONE) {
-#line 8565 "PhotoTable.c"
-		gint _tmp14_;
-#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp14_ = res;
-#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		database_table_throw_error ("BackingPhotoTable.update_attributes", _tmp14_, &_inner_error_);
-#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				return;
-#line 8581 "PhotoTable.c"
-			} else {
-#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.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 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				g_clear_error (&_inner_error_);
-#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				return;
-#line 8591 "PhotoTable.c"
-			}
-		}
-	}
-#line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 8597 "PhotoTable.c"
-}
-
-
-void
-backing_photo_table_remove (BackingPhotoTable* self,
-                            BackingPhotoID* backing_id,
-                            GError** error)
-{
-	BackingPhotoID _tmp0_;
-	gint64 _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
-#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (backing_id != NULL);
-#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = *backing_id;
-#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	database_table_delete_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, &_inner_error_);
-#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 8627 "PhotoTable.c"
-		} else {
-#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.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 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_clear_error (&_inner_error_);
-#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 8635 "PhotoTable.c"
-		}
-	}
-}
-
-
-void
-backing_photo_table_set_filepath (BackingPhotoTable* self,
-                                  BackingPhotoID* id,
-                                  const gchar* filepath,
-                                  GError** error)
-{
-	BackingPhotoID _tmp0_;
-	gint64 _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
-#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (id != NULL);
-#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (filepath != NULL);
-#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = *id;
-#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filepath", filepath, &_inner_error_);
-#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 8670 "PhotoTable.c"
-		} else {
-#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.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 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_clear_error (&_inner_error_);
-#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 8678 "PhotoTable.c"
-		}
-	}
-}
-
-
-void
-backing_photo_table_update_timestamp (BackingPhotoTable* self,
-                                      BackingPhotoID* id,
-                                      time_t timestamp,
-                                      GError** error)
-{
-	BackingPhotoID _tmp0_;
-	gint64 _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
-#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (id != NULL);
-#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp0_ = *id;
-#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "timestamp", (gint64) timestamp, &_inner_error_);
-#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 8711 "PhotoTable.c"
-		} else {
-#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.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 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			g_clear_error (&_inner_error_);
-#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			return;
-#line 8719 "PhotoTable.c"
-		}
-	}
-}
-
-
-static void
-backing_photo_table_class_init (BackingPhotoTableClass * klass)
-{
-#line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	backing_photo_table_parent_class = g_type_class_peek_parent (klass);
-#line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	((DatabaseTableClass *) klass)->finalize = backing_photo_table_finalize;
-#line 8732 "PhotoTable.c"
-}
-
-
-static void
-backing_photo_table_instance_init (BackingPhotoTable * self)
-{
-}
-
-
-static void
-backing_photo_table_finalize (DatabaseTable * obj)
-{
-	BackingPhotoTable * self;
-#line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_PHOTO_TABLE, BackingPhotoTable);
-#line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	DATABASE_TABLE_CLASS (backing_photo_table_parent_class)->finalize (obj);
-#line 8750 "PhotoTable.c"
-}
-
-
-GType
-backing_photo_table_get_type (void)
-{
-	static volatile gsize backing_photo_table_type_id__volatile = 0;
-	if (g_once_init_enter (&backing_photo_table_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (BackingPhotoTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) backing_photo_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (BackingPhotoTable), 0, (GInstanceInitFunc) backing_photo_table_instance_init, NULL };
-		GType backing_photo_table_type_id;
-		backing_photo_table_type_id = g_type_register_static (TYPE_DATABASE_TABLE, "BackingPhotoTable", &g_define_type_info, 0);
-		g_once_init_leave (&backing_photo_table_type_id__volatile, backing_photo_table_type_id);
-	}
-	return backing_photo_table_type_id__volatile;
-}
-
-
-static void
-_vala_array_destroy (gpointer array,
-                     gint array_length,
-                     GDestroyNotify destroy_func)
-{
-	if ((array != NULL) && (destroy_func != NULL)) {
-		int i;
-		for (i = 0; i < array_length; i = i + 1) {
-			if (((gpointer*) array)[i] != NULL) {
-				destroy_func (((gpointer*) array)[i]);
-			}
-		}
-	}
-}
-
-
-static void
-_vala_array_free (gpointer array,
-                  gint array_length,
-                  GDestroyNotify destroy_func)
-{
-	_vala_array_destroy (array, array_length, destroy_func);
-	g_free (array);
-}
-
-
-
diff --git a/src/db/SavedSearchDBTable.c b/src/db/SavedSearchDBTable.c
deleted file mode 100644
index d2d20d2..0000000
--- a/src/db/SavedSearchDBTable.c
+++ /dev/null
@@ -1,4648 +0,0 @@
-/* SavedSearchDBTable.c generated by valac 0.40.4, the Vala compiler
- * generated from SavedSearchDBTable.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-#include <string.h>
-#include <stdlib.h>
-#include <gee.h>
-#include <sqlite3.h>
-#include <gobject/gvaluecollector.h>
-
-
-#define TYPE_SAVED_SEARCH_ID (saved_search_id_get_type ())
-typedef struct _SavedSearchID SavedSearchID;
-
-#define TYPE_SAVED_SEARCH_ROW (saved_search_row_get_type ())
-#define SAVED_SEARCH_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SAVED_SEARCH_ROW, SavedSearchRow))
-#define SAVED_SEARCH_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SAVED_SEARCH_ROW, SavedSearchRowClass))
-#define IS_SAVED_SEARCH_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SAVED_SEARCH_ROW))
-#define IS_SAVED_SEARCH_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SAVED_SEARCH_ROW))
-#define SAVED_SEARCH_ROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SAVED_SEARCH_ROW, SavedSearchRowClass))
-
-typedef struct _SavedSearchRow SavedSearchRow;
-typedef struct _SavedSearchRowClass SavedSearchRowClass;
-typedef struct _SavedSearchRowPrivate SavedSearchRowPrivate;
-
-#define TYPE_SEARCH_OPERATOR (search_operator_get_type ())
-
-#define TYPE_SEARCH_CONDITION (search_condition_get_type ())
-#define SEARCH_CONDITION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SEARCH_CONDITION, SearchCondition))
-#define SEARCH_CONDITION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SEARCH_CONDITION, SearchConditionClass))
-#define IS_SEARCH_CONDITION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SEARCH_CONDITION))
-#define IS_SEARCH_CONDITION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SEARCH_CONDITION))
-#define SEARCH_CONDITION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SEARCH_CONDITION, SearchConditionClass))
-
-typedef struct _SearchCondition SearchCondition;
-typedef struct _SearchConditionClass SearchConditionClass;
-#define _g_free0(var) (var = (g_free (var), NULL))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-typedef struct _ParamSpecSavedSearchRow ParamSpecSavedSearchRow;
-
-#define TYPE_DATABASE_TABLE (database_table_get_type ())
-#define DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATABASE_TABLE, DatabaseTable))
-#define DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATABASE_TABLE, DatabaseTableClass))
-#define IS_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATABASE_TABLE))
-#define IS_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DATABASE_TABLE))
-#define DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DATABASE_TABLE, DatabaseTableClass))
-
-typedef struct _DatabaseTable DatabaseTable;
-typedef struct _DatabaseTableClass DatabaseTableClass;
-typedef struct _DatabaseTablePrivate DatabaseTablePrivate;
-
-#define TYPE_SAVED_SEARCH_DB_TABLE (saved_search_db_table_get_type ())
-#define SAVED_SEARCH_DB_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SAVED_SEARCH_DB_TABLE, SavedSearchDBTable))
-#define SAVED_SEARCH_DB_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SAVED_SEARCH_DB_TABLE, SavedSearchDBTableClass))
-#define IS_SAVED_SEARCH_DB_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SAVED_SEARCH_DB_TABLE))
-#define IS_SAVED_SEARCH_DB_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SAVED_SEARCH_DB_TABLE))
-#define SAVED_SEARCH_DB_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SAVED_SEARCH_DB_TABLE, SavedSearchDBTableClass))
-
-typedef struct _SavedSearchDBTable SavedSearchDBTable;
-typedef struct _SavedSearchDBTableClass SavedSearchDBTableClass;
-typedef struct _SavedSearchDBTablePrivate SavedSearchDBTablePrivate;
-#define _sqlite3_finalize0(var) ((var == NULL) ? NULL : (var = (sqlite3_finalize (var), NULL)))
-#define _database_table_unref0(var) ((var == NULL) ? NULL : (var = (database_table_unref (var), NULL)))
-#define _search_condition_unref0(var) ((var == NULL) ? NULL : (var = (search_condition_unref (var), NULL)))
-#define _saved_search_row_unref0(var) ((var == NULL) ? NULL : (var = (saved_search_row_unref (var), NULL)))
-
-#define TYPE_SEARCH_CONDITION_TEXT (search_condition_text_get_type ())
-#define SEARCH_CONDITION_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SEARCH_CONDITION_TEXT, SearchConditionText))
-#define SEARCH_CONDITION_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SEARCH_CONDITION_TEXT, SearchConditionTextClass))
-#define IS_SEARCH_CONDITION_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SEARCH_CONDITION_TEXT))
-#define IS_SEARCH_CONDITION_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SEARCH_CONDITION_TEXT))
-#define SEARCH_CONDITION_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SEARCH_CONDITION_TEXT, SearchConditionTextClass))
-
-typedef struct _SearchConditionText SearchConditionText;
-typedef struct _SearchConditionTextClass SearchConditionTextClass;
-
-#define SEARCH_CONDITION_TYPE_SEARCH_TYPE (search_condition_search_type_get_type ())
-
-#define SEARCH_CONDITION_TEXT_TYPE_CONTEXT (search_condition_text_context_get_type ())
-
-#define TYPE_SEARCH_CONDITION_MEDIA_TYPE (search_condition_media_type_get_type ())
-#define SEARCH_CONDITION_MEDIA_TYPE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SEARCH_CONDITION_MEDIA_TYPE, SearchConditionMediaType))
-#define SEARCH_CONDITION_MEDIA_TYPE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SEARCH_CONDITION_MEDIA_TYPE, SearchConditionMediaTypeClass))
-#define IS_SEARCH_CONDITION_MEDIA_TYPE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SEARCH_CONDITION_MEDIA_TYPE))
-#define IS_SEARCH_CONDITION_MEDIA_TYPE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SEARCH_CONDITION_MEDIA_TYPE))
-#define SEARCH_CONDITION_MEDIA_TYPE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SEARCH_CONDITION_MEDIA_TYPE, SearchConditionMediaTypeClass))
-
-typedef struct _SearchConditionMediaType SearchConditionMediaType;
-typedef struct _SearchConditionMediaTypeClass SearchConditionMediaTypeClass;
-
-#define SEARCH_CONDITION_MEDIA_TYPE_TYPE_CONTEXT (search_condition_media_type_context_get_type ())
-
-#define SEARCH_CONDITION_MEDIA_TYPE_TYPE_MEDIA_TYPE (search_condition_media_type_media_type_get_type ())
-
-#define TYPE_SEARCH_CONDITION_FLAGGED (search_condition_flagged_get_type ())
-#define SEARCH_CONDITION_FLAGGED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SEARCH_CONDITION_FLAGGED, SearchConditionFlagged))
-#define SEARCH_CONDITION_FLAGGED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SEARCH_CONDITION_FLAGGED, SearchConditionFlaggedClass))
-#define IS_SEARCH_CONDITION_FLAGGED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SEARCH_CONDITION_FLAGGED))
-#define IS_SEARCH_CONDITION_FLAGGED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SEARCH_CONDITION_FLAGGED))
-#define SEARCH_CONDITION_FLAGGED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SEARCH_CONDITION_FLAGGED, SearchConditionFlaggedClass))
-
-typedef struct _SearchConditionFlagged SearchConditionFlagged;
-typedef struct _SearchConditionFlaggedClass SearchConditionFlaggedClass;
-
-#define SEARCH_CONDITION_FLAGGED_TYPE_STATE (search_condition_flagged_state_get_type ())
-
-#define TYPE_SEARCH_CONDITION_MODIFIED (search_condition_modified_get_type ())
-#define SEARCH_CONDITION_MODIFIED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SEARCH_CONDITION_MODIFIED, SearchConditionModified))
-#define SEARCH_CONDITION_MODIFIED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SEARCH_CONDITION_MODIFIED, SearchConditionModifiedClass))
-#define IS_SEARCH_CONDITION_MODIFIED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SEARCH_CONDITION_MODIFIED))
-#define IS_SEARCH_CONDITION_MODIFIED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SEARCH_CONDITION_MODIFIED))
-#define SEARCH_CONDITION_MODIFIED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SEARCH_CONDITION_MODIFIED, SearchConditionModifiedClass))
-
-typedef struct _SearchConditionModified SearchConditionModified;
-typedef struct _SearchConditionModifiedClass SearchConditionModifiedClass;
-
-#define SEARCH_CONDITION_MODIFIED_TYPE_CONTEXT (search_condition_modified_context_get_type ())
-
-#define SEARCH_CONDITION_MODIFIED_TYPE_STATE (search_condition_modified_state_get_type ())
-
-#define TYPE_SEARCH_CONDITION_RATING (search_condition_rating_get_type ())
-#define SEARCH_CONDITION_RATING(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SEARCH_CONDITION_RATING, SearchConditionRating))
-#define SEARCH_CONDITION_RATING_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SEARCH_CONDITION_RATING, SearchConditionRatingClass))
-#define IS_SEARCH_CONDITION_RATING(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SEARCH_CONDITION_RATING))
-#define IS_SEARCH_CONDITION_RATING_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SEARCH_CONDITION_RATING))
-#define SEARCH_CONDITION_RATING_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SEARCH_CONDITION_RATING, SearchConditionRatingClass))
-
-typedef struct _SearchConditionRating SearchConditionRating;
-typedef struct _SearchConditionRatingClass SearchConditionRatingClass;
-
-#define TYPE_RATING (rating_get_type ())
-
-#define SEARCH_CONDITION_RATING_TYPE_CONTEXT (search_condition_rating_context_get_type ())
-
-#define TYPE_SEARCH_CONDITION_DATE (search_condition_date_get_type ())
-#define SEARCH_CONDITION_DATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SEARCH_CONDITION_DATE, SearchConditionDate))
-#define SEARCH_CONDITION_DATE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SEARCH_CONDITION_DATE, SearchConditionDateClass))
-#define IS_SEARCH_CONDITION_DATE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SEARCH_CONDITION_DATE))
-#define IS_SEARCH_CONDITION_DATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SEARCH_CONDITION_DATE))
-#define SEARCH_CONDITION_DATE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SEARCH_CONDITION_DATE, SearchConditionDateClass))
-
-typedef struct _SearchConditionDate SearchConditionDate;
-typedef struct _SearchConditionDateClass SearchConditionDateClass;
-
-#define SEARCH_CONDITION_DATE_TYPE_CONTEXT (search_condition_date_context_get_type ())
-#define _g_date_time_unref0(var) ((var == NULL) ? NULL : (var = (g_date_time_unref (var), NULL)))
-#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
-#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
-#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-
-struct _SavedSearchID {
-	gint64 id;
-};
-
-typedef enum  {
-	SEARCH_OPERATOR_ANY = 0,
-	SEARCH_OPERATOR_ALL,
-	SEARCH_OPERATOR_NONE
-} SearchOperator;
-
-struct _SavedSearchRow {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	SavedSearchRowPrivate * priv;
-	SavedSearchID search_id;
-	gchar* name;
-	SearchOperator operator;
-	GeeList* conditions;
-};
-
-struct _SavedSearchRowClass {
-	GTypeClass parent_class;
-	void (*finalize) (SavedSearchRow *self);
-};
-
-struct _ParamSpecSavedSearchRow {
-	GParamSpec parent_instance;
-};
-
-struct _DatabaseTable {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	DatabaseTablePrivate * priv;
-	gchar* table_name;
-};
-
-struct _DatabaseTableClass {
-	GTypeClass parent_class;
-	void (*finalize) (DatabaseTable *self);
-};
-
-struct _SavedSearchDBTable {
-	DatabaseTable parent_instance;
-	SavedSearchDBTablePrivate * priv;
-};
-
-struct _SavedSearchDBTableClass {
-	DatabaseTableClass parent_class;
-};
-
-typedef enum  {
-	DATABASE_ERROR_ERROR,
-	DATABASE_ERROR_BACKING,
-	DATABASE_ERROR_MEMORY,
-	DATABASE_ERROR_ABORT,
-	DATABASE_ERROR_LIMITS,
-	DATABASE_ERROR_TYPESPEC
-} DatabaseError;
-#define DATABASE_ERROR database_error_quark ()
-typedef enum  {
-	SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT = 0,
-	SEARCH_CONDITION_SEARCH_TYPE_TITLE,
-	SEARCH_CONDITION_SEARCH_TYPE_TAG,
-	SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME,
-	SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME,
-	SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE,
-	SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE,
-	SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE,
-	SEARCH_CONDITION_SEARCH_TYPE_RATING,
-	SEARCH_CONDITION_SEARCH_TYPE_COMMENT,
-	SEARCH_CONDITION_SEARCH_TYPE_DATE
-} SearchConditionSearchType;
-
-typedef enum  {
-	SEARCH_CONDITION_TEXT_CONTEXT_CONTAINS = 0,
-	SEARCH_CONDITION_TEXT_CONTEXT_IS_EXACTLY,
-	SEARCH_CONDITION_TEXT_CONTEXT_STARTS_WITH,
-	SEARCH_CONDITION_TEXT_CONTEXT_ENDS_WITH,
-	SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN,
-	SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET,
-	SEARCH_CONDITION_TEXT_CONTEXT_IS_SET
-} SearchConditionTextContext;
-
-typedef enum  {
-	SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS = 0,
-	SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT
-} SearchConditionMediaTypeContext;
-
-typedef enum  {
-	SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_ALL = 0,
-	SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_RAW,
-	SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_VIDEO
-} SearchConditionMediaTypeMediaType;
-
-typedef enum  {
-	SEARCH_CONDITION_FLAGGED_STATE_FLAGGED = 0,
-	SEARCH_CONDITION_FLAGGED_STATE_UNFLAGGED
-} SearchConditionFlaggedState;
-
-typedef enum  {
-	SEARCH_CONDITION_MODIFIED_CONTEXT_HAS = 0,
-	SEARCH_CONDITION_MODIFIED_CONTEXT_HAS_NO
-} SearchConditionModifiedContext;
-
-typedef enum  {
-	SEARCH_CONDITION_MODIFIED_STATE_MODIFIED = 0,
-	SEARCH_CONDITION_MODIFIED_STATE_INTERNAL_CHANGES,
-	SEARCH_CONDITION_MODIFIED_STATE_EXTERNAL_CHANGES
-} SearchConditionModifiedState;
-
-typedef enum  {
-	RATING_REJECTED = -1,
-	RATING_UNRATED = 0,
-	RATING_ONE = 1,
-	RATING_TWO = 2,
-	RATING_THREE = 3,
-	RATING_FOUR = 4,
-	RATING_FIVE = 5
-} Rating;
-
-typedef enum  {
-	SEARCH_CONDITION_RATING_CONTEXT_AND_HIGHER = 0,
-	SEARCH_CONDITION_RATING_CONTEXT_ONLY,
-	SEARCH_CONDITION_RATING_CONTEXT_AND_LOWER
-} SearchConditionRatingContext;
-
-typedef enum  {
-	SEARCH_CONDITION_DATE_CONTEXT_EXACT = 0,
-	SEARCH_CONDITION_DATE_CONTEXT_AFTER,
-	SEARCH_CONDITION_DATE_CONTEXT_BEFORE,
-	SEARCH_CONDITION_DATE_CONTEXT_BETWEEN,
-	SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET
-} SearchConditionDateContext;
-
-
-static gpointer saved_search_row_parent_class = NULL;
-static gpointer saved_search_db_table_parent_class = NULL;
-static SavedSearchDBTable* saved_search_db_table_instance;
-static SavedSearchDBTable* saved_search_db_table_instance = NULL;
-extern sqlite3* database_table_db;
-
-GType saved_search_id_get_type (void) G_GNUC_CONST;
-SavedSearchID* saved_search_id_dup (const SavedSearchID* self);
-void saved_search_id_free (SavedSearchID* self);
-#define SAVED_SEARCH_ID_INVALID ((gint64) -1)
-void saved_search_id_init (SavedSearchID *self,
-                           gint64 id);
-gboolean saved_search_id_is_invalid (SavedSearchID *self);
-gboolean saved_search_id_is_valid (SavedSearchID *self);
-gpointer saved_search_row_ref (gpointer instance);
-void saved_search_row_unref (gpointer instance);
-GParamSpec* param_spec_saved_search_row (const gchar* name,
-                                         const gchar* nick,
-                                         const gchar* blurb,
-                                         GType object_type,
-                                         GParamFlags flags);
-void value_set_saved_search_row (GValue* value,
-                                 gpointer v_object);
-void value_take_saved_search_row (GValue* value,
-                                  gpointer v_object);
-gpointer value_get_saved_search_row (const GValue* value);
-GType saved_search_row_get_type (void) G_GNUC_CONST;
-GType search_operator_get_type (void) G_GNUC_CONST;
-gpointer search_condition_ref (gpointer instance);
-void search_condition_unref (gpointer instance);
-GParamSpec* param_spec_search_condition (const gchar* name,
-                                         const gchar* nick,
-                                         const gchar* blurb,
-                                         GType object_type,
-                                         GParamFlags flags);
-void value_set_search_condition (GValue* value,
-                                 gpointer v_object);
-void value_take_search_condition (GValue* value,
-                                  gpointer v_object);
-gpointer value_get_search_condition (const GValue* value);
-GType search_condition_get_type (void) G_GNUC_CONST;
-SavedSearchRow* saved_search_row_new (void);
-SavedSearchRow* saved_search_row_construct (GType object_type);
-static void saved_search_row_finalize (SavedSearchRow * obj);
-gpointer database_table_ref (gpointer instance);
-void database_table_unref (gpointer instance);
-GParamSpec* param_spec_database_table (const gchar* name,
-                                       const gchar* nick,
-                                       const gchar* blurb,
-                                       GType object_type,
-                                       GParamFlags flags);
-void value_set_database_table (GValue* value,
-                               gpointer v_object);
-void value_take_database_table (GValue* value,
-                                gpointer v_object);
-gpointer value_get_database_table (const GValue* value);
-GType database_table_get_type (void) G_GNUC_CONST;
-GType saved_search_db_table_get_type (void) G_GNUC_CONST;
-static SavedSearchDBTable* saved_search_db_table_new (void);
-static SavedSearchDBTable* saved_search_db_table_construct (GType object_type);
-DatabaseTable* database_table_construct (GType object_type);
-void database_table_set_table_name (DatabaseTable* self,
-                                    const gchar* table_name);
-void database_table_fatal (const gchar* op,
-                           gint res);
-SavedSearchDBTable* saved_search_db_table_get_instance (void);
-GQuark database_error_quark (void);
-SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self,
-                                           const gchar* name,
-                                           SearchOperator operator,
-                                           GeeArrayList* conditions,
-                                           GError** error);
-gchar* search_operator_to_string (SearchOperator self);
-void database_table_throw_error (const gchar* method,
-                                 gint res,
-                                 GError** error);
-static void saved_search_db_table_add_condition (SavedSearchDBTable* self,
-                                          SavedSearchID* id,
-                                          SearchCondition* condition,
-                                          GError** error);
-GType search_condition_text_get_type (void) G_GNUC_CONST;
-GType search_condition_search_type_get_type (void) G_GNUC_CONST;
-SearchConditionSearchType search_condition_get_search_type (SearchCondition* self);
-gchar* search_condition_search_type_to_string (SearchConditionSearchType self);
-GType search_condition_text_context_get_type (void) G_GNUC_CONST;
-SearchConditionTextContext search_condition_text_get_context (SearchConditionText* self);
-gchar* search_condition_text_context_to_string (SearchConditionTextContext self);
-const gchar* search_condition_text_get_text (SearchConditionText* self);
-GType search_condition_media_type_get_type (void) G_GNUC_CONST;
-GType search_condition_media_type_context_get_type (void) G_GNUC_CONST;
-SearchConditionMediaTypeContext search_condition_media_type_get_context (SearchConditionMediaType* self);
-gchar* search_condition_media_type_context_to_string (SearchConditionMediaTypeContext self);
-GType search_condition_media_type_media_type_get_type (void) G_GNUC_CONST;
-SearchConditionMediaTypeMediaType search_condition_media_type_get_media_type (SearchConditionMediaType* self);
-gchar* search_condition_media_type_media_type_to_string (SearchConditionMediaTypeMediaType self);
-GType search_condition_flagged_get_type (void) G_GNUC_CONST;
-GType search_condition_flagged_state_get_type (void) G_GNUC_CONST;
-SearchConditionFlaggedState search_condition_flagged_get_state (SearchConditionFlagged* self);
-gchar* search_condition_flagged_state_to_string (SearchConditionFlaggedState self);
-GType search_condition_modified_get_type (void) G_GNUC_CONST;
-GType search_condition_modified_context_get_type (void) G_GNUC_CONST;
-SearchConditionModifiedContext search_condition_modified_get_context (SearchConditionModified* self);
-gchar* search_condition_modified_context_to_string (SearchConditionModifiedContext self);
-GType search_condition_modified_state_get_type (void) G_GNUC_CONST;
-SearchConditionModifiedState search_condition_modified_get_state (SearchConditionModified* self);
-gchar* search_condition_modified_state_to_string (SearchConditionModifiedState self);
-GType search_condition_rating_get_type (void) G_GNUC_CONST;
-GType rating_get_type (void) G_GNUC_CONST;
-Rating search_condition_rating_get_rating (SearchConditionRating* self);
-gint rating_serialize (Rating self);
-GType search_condition_rating_context_get_type (void) G_GNUC_CONST;
-SearchConditionRatingContext search_condition_rating_get_context (SearchConditionRating* self);
-gchar* search_condition_rating_context_to_string (SearchConditionRatingContext self);
-GType search_condition_date_get_type (void) G_GNUC_CONST;
-GType search_condition_date_context_get_type (void) G_GNUC_CONST;
-SearchConditionDateContext search_condition_date_get_context (SearchConditionDate* self);
-gchar* search_condition_date_context_to_string (SearchConditionDateContext self);
-GDateTime* search_condition_date_get_date_one (SearchConditionDate* self);
-GDateTime* search_condition_date_get_date_two (SearchConditionDate* self);
-static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDBTable* self,
-                                                            SavedSearchID* search_id,
-                                                            GError** error);
-static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTable* self,
-                                                        const gchar* table_name,
-                                                        SavedSearchID* search_id,
-                                                        GError** error);
-static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* self,
-                                                      SavedSearchID* search_id,
-                                                      GError** error);
-SearchConditionSearchType search_condition_search_type_from_string (const gchar* str);
-SearchConditionTextContext search_condition_text_context_from_string (const gchar* str);
-SearchConditionText* search_condition_text_new (SearchConditionSearchType search_type,
-                                                const gchar* text,
-                                                SearchConditionTextContext context);
-SearchConditionText* search_condition_text_construct (GType object_type,
-                                                      SearchConditionSearchType search_type,
-                                                      const gchar* text,
-                                                      SearchConditionTextContext context);
-SearchConditionMediaTypeContext search_condition_media_type_context_from_string (const gchar* str);
-SearchConditionMediaTypeMediaType search_condition_media_type_media_type_from_string (const gchar* str);
-SearchConditionMediaType* search_condition_media_type_new (SearchConditionSearchType search_type,
-                                                           SearchConditionMediaTypeContext context,
-                                                           SearchConditionMediaTypeMediaType media_type);
-SearchConditionMediaType* search_condition_media_type_construct (GType object_type,
-                                                                 SearchConditionSearchType search_type,
-                                                                 SearchConditionMediaTypeContext context,
-                                                                 SearchConditionMediaTypeMediaType media_type);
-SearchConditionFlaggedState search_condition_flagged_state_from_string (const gchar* str);
-SearchConditionFlagged* search_condition_flagged_new (SearchConditionSearchType search_type,
-                                                      SearchConditionFlaggedState state);
-SearchConditionFlagged* search_condition_flagged_construct (GType object_type,
-                                                            SearchConditionSearchType search_type,
-                                                            SearchConditionFlaggedState state);
-SearchConditionModifiedContext search_condition_modified_context_from_string (const gchar* str);
-SearchConditionModifiedState search_condition_modified_state_from_string (const gchar* str);
-SearchConditionModified* search_condition_modified_new (SearchConditionSearchType search_type,
-                                                        SearchConditionModifiedContext context,
-                                                        SearchConditionModifiedState state);
-SearchConditionModified* search_condition_modified_construct (GType object_type,
-                                                              SearchConditionSearchType search_type,
-                                                              SearchConditionModifiedContext context,
-                                                              SearchConditionModifiedState state);
-Rating rating_unserialize (gint value);
-SearchConditionRatingContext search_condition_rating_context_from_string (const gchar* str);
-SearchConditionRating* search_condition_rating_new (SearchConditionSearchType search_type,
-                                                    Rating rating,
-                                                    SearchConditionRatingContext context);
-SearchConditionRating* search_condition_rating_construct (GType object_type,
-                                                          SearchConditionSearchType search_type,
-                                                          Rating rating,
-                                                          SearchConditionRatingContext context);
-SearchConditionDateContext search_condition_date_context_from_string (const gchar* str);
-SearchConditionDate* search_condition_date_new (SearchConditionSearchType search_type,
-                                                SearchConditionDateContext context,
-                                                GDateTime* date_one,
-                                                GDateTime* date_two);
-SearchConditionDate* search_condition_date_construct (GType object_type,
-                                                      SearchConditionSearchType search_type,
-                                                      SearchConditionDateContext context,
-                                                      GDateTime* date_one,
-                                                      GDateTime* date_two);
-void saved_search_db_table_create_from_row (SavedSearchDBTable* self,
-                                            SavedSearchRow* row,
-                                            SavedSearchID* result,
-                                            GError** error);
-void saved_search_db_table_remove (SavedSearchDBTable* self,
-                                   SavedSearchID* search_id,
-                                   GError** error);
-void database_table_delete_by_id (DatabaseTable* self,
-                                  gint64 id,
-                                  GError** error);
-SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self,
-                                               SavedSearchID* search_id,
-                                               GError** error);
-SearchOperator search_operator_from_string (const gchar* str);
-GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self,
-                                             GError** error);
-void saved_search_db_table_rename (SavedSearchDBTable* self,
-                                   SavedSearchID* search_id,
-                                   const gchar* new_name,
-                                   GError** error);
-void database_table_update_text_by_id_2 (DatabaseTable* self,
-                                         gint64 id,
-                                         const gchar* column,
-                                         const gchar* text,
-                                         GError** error);
-static void saved_search_db_table_finalize (DatabaseTable * obj);
-
-
-void
-saved_search_id_init (SavedSearchID *self,
-                      gint64 id)
-{
-#line 12 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	memset (self, 0, sizeof (SavedSearchID));
-#line 13 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	(*self).id = id;
-#line 513 "SavedSearchDBTable.c"
-}
-
-
-gboolean
-saved_search_id_is_invalid (SavedSearchID *self)
-{
-	gboolean result = FALSE;
-	gint64 _tmp0_;
-#line 17 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp0_ = (*self).id;
-#line 17 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	result = _tmp0_ == SAVED_SEARCH_ID_INVALID;
-#line 17 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	return result;
-#line 528 "SavedSearchDBTable.c"
-}
-
-
-gboolean
-saved_search_id_is_valid (SavedSearchID *self)
-{
-	gboolean result = FALSE;
-	gint64 _tmp0_;
-#line 21 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp0_ = (*self).id;
-#line 21 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	result = _tmp0_ != SAVED_SEARCH_ID_INVALID;
-#line 21 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	return result;
-#line 543 "SavedSearchDBTable.c"
-}
-
-
-SavedSearchID*
-saved_search_id_dup (const SavedSearchID* self)
-{
-	SavedSearchID* dup;
-#line 7 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	dup = g_new0 (SavedSearchID, 1);
-#line 7 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	memcpy (dup, self, sizeof (SavedSearchID));
-#line 7 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	return dup;
-#line 557 "SavedSearchDBTable.c"
-}
-
-
-void
-saved_search_id_free (SavedSearchID* self)
-{
-#line 7 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_free (self);
-#line 566 "SavedSearchDBTable.c"
-}
-
-
-GType
-saved_search_id_get_type (void)
-{
-	static volatile gsize saved_search_id_type_id__volatile = 0;
-	if (g_once_init_enter (&saved_search_id_type_id__volatile)) {
-		GType saved_search_id_type_id;
-		saved_search_id_type_id = g_boxed_type_register_static ("SavedSearchID", (GBoxedCopyFunc) saved_search_id_dup, (GBoxedFreeFunc) saved_search_id_free);
-		g_once_init_leave (&saved_search_id_type_id__volatile, saved_search_id_type_id);
-	}
-	return saved_search_id_type_id__volatile;
-}
-
-
-SavedSearchRow*
-saved_search_row_construct (GType object_type)
-{
-	SavedSearchRow* self = NULL;
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	self = (SavedSearchRow*) g_type_create_instance (object_type);
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	return self;
-#line 591 "SavedSearchDBTable.c"
-}
-
-
-SavedSearchRow*
-saved_search_row_new (void)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	return saved_search_row_construct (TYPE_SAVED_SEARCH_ROW);
-#line 600 "SavedSearchDBTable.c"
-}
-
-
-static void
-value_saved_search_row_init (GValue* value)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	value->data[0].v_pointer = NULL;
-#line 609 "SavedSearchDBTable.c"
-}
-
-
-static void
-value_saved_search_row_free_value (GValue* value)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (value->data[0].v_pointer) {
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		saved_search_row_unref (value->data[0].v_pointer);
-#line 620 "SavedSearchDBTable.c"
-	}
-}
-
-
-static void
-value_saved_search_row_copy_value (const GValue* src_value,
-                                   GValue* dest_value)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (src_value->data[0].v_pointer) {
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		dest_value->data[0].v_pointer = saved_search_row_ref (src_value->data[0].v_pointer);
-#line 633 "SavedSearchDBTable.c"
-	} else {
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 637 "SavedSearchDBTable.c"
-	}
-}
-
-
-static gpointer
-value_saved_search_row_peek_pointer (const GValue* value)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	return value->data[0].v_pointer;
-#line 647 "SavedSearchDBTable.c"
-}
-
-
-static gchar*
-value_saved_search_row_collect_value (GValue* value,
-                                      guint n_collect_values,
-                                      GTypeCValue* collect_values,
-                                      guint collect_flags)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (collect_values[0].v_pointer) {
-#line 659 "SavedSearchDBTable.c"
-		SavedSearchRow * object;
-		object = collect_values[0].v_pointer;
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 666 "SavedSearchDBTable.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 670 "SavedSearchDBTable.c"
-		}
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		value->data[0].v_pointer = saved_search_row_ref (object);
-#line 674 "SavedSearchDBTable.c"
-	} else {
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 678 "SavedSearchDBTable.c"
-	}
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	return NULL;
-#line 682 "SavedSearchDBTable.c"
-}
-
-
-static gchar*
-value_saved_search_row_lcopy_value (const GValue* value,
-                                    guint n_collect_values,
-                                    GTypeCValue* collect_values,
-                                    guint collect_flags)
-{
-	SavedSearchRow ** object_p;
-	object_p = collect_values[0].v_pointer;
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (!object_p) {
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 698 "SavedSearchDBTable.c"
-	}
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (!value->data[0].v_pointer) {
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		*object_p = NULL;
-#line 704 "SavedSearchDBTable.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		*object_p = value->data[0].v_pointer;
-#line 708 "SavedSearchDBTable.c"
-	} else {
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		*object_p = saved_search_row_ref (value->data[0].v_pointer);
-#line 712 "SavedSearchDBTable.c"
-	}
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	return NULL;
-#line 716 "SavedSearchDBTable.c"
-}
-
-
-GParamSpec*
-param_spec_saved_search_row (const gchar* name,
-                             const gchar* nick,
-                             const gchar* blurb,
-                             GType object_type,
-                             GParamFlags flags)
-{
-	ParamSpecSavedSearchRow* spec;
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SAVED_SEARCH_ROW), NULL);
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	return G_PARAM_SPEC (spec);
-#line 736 "SavedSearchDBTable.c"
-}
-
-
-gpointer
-value_get_saved_search_row (const GValue* value)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_ROW), NULL);
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	return value->data[0].v_pointer;
-#line 747 "SavedSearchDBTable.c"
-}
-
-
-void
-value_set_saved_search_row (GValue* value,
-                            gpointer v_object)
-{
-	SavedSearchRow * old;
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_ROW));
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	old = value->data[0].v_pointer;
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (v_object) {
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SAVED_SEARCH_ROW));
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		value->data[0].v_pointer = v_object;
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		saved_search_row_ref (value->data[0].v_pointer);
-#line 770 "SavedSearchDBTable.c"
-	} else {
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 774 "SavedSearchDBTable.c"
-	}
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (old) {
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		saved_search_row_unref (old);
-#line 780 "SavedSearchDBTable.c"
-	}
-}
-
-
-void
-value_take_saved_search_row (GValue* value,
-                             gpointer v_object)
-{
-	SavedSearchRow * old;
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_ROW));
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	old = value->data[0].v_pointer;
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (v_object) {
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SAVED_SEARCH_ROW));
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		value->data[0].v_pointer = v_object;
-#line 802 "SavedSearchDBTable.c"
-	} else {
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 806 "SavedSearchDBTable.c"
-	}
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (old) {
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		saved_search_row_unref (old);
-#line 812 "SavedSearchDBTable.c"
-	}
-}
-
-
-static void
-saved_search_row_class_init (SavedSearchRowClass * klass)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	saved_search_row_parent_class = g_type_class_peek_parent (klass);
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	((SavedSearchRowClass *) klass)->finalize = saved_search_row_finalize;
-#line 824 "SavedSearchDBTable.c"
-}
-
-
-static void
-saved_search_row_instance_init (SavedSearchRow * self)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	self->ref_count = 1;
-#line 833 "SavedSearchDBTable.c"
-}
-
-
-static void
-saved_search_row_finalize (SavedSearchRow * obj)
-{
-	SavedSearchRow * self;
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_ROW, SavedSearchRow);
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_signal_handlers_destroy (self);
-#line 28 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_g_free0 (self->name);
-#line 30 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_g_object_unref0 (self->conditions);
-#line 849 "SavedSearchDBTable.c"
-}
-
-
-GType
-saved_search_row_get_type (void)
-{
-	static volatile gsize saved_search_row_type_id__volatile = 0;
-	if (g_once_init_enter (&saved_search_row_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_saved_search_row_init, value_saved_search_row_free_value, value_saved_search_row_copy_value, value_saved_search_row_peek_pointer, "p", value_saved_search_row_collect_value, "p", value_saved_search_row_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (SavedSearchRowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_row_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchRow), 0, (GInstanceInitFunc) saved_search_row_instance_init, &g_define_type_value_table };
-		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
-		GType saved_search_row_type_id;
-		saved_search_row_type_id = g_type_register_fundamental (g_type_fundamental_next (), "SavedSearchRow", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&saved_search_row_type_id__volatile, saved_search_row_type_id);
-	}
-	return saved_search_row_type_id__volatile;
-}
-
-
-gpointer
-saved_search_row_ref (gpointer instance)
-{
-	SavedSearchRow * self;
-	self = instance;
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	return instance;
-#line 878 "SavedSearchDBTable.c"
-}
-
-
-void
-saved_search_row_unref (gpointer instance)
-{
-	SavedSearchRow * self;
-	self = instance;
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		SAVED_SEARCH_ROW_GET_CLASS (self)->finalize (self);
-#line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 893 "SavedSearchDBTable.c"
-	}
-}
-
-
-static SavedSearchDBTable*
-saved_search_db_table_construct (GType object_type)
-{
-	SavedSearchDBTable* self = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	gint _tmp5_;
-	sqlite3* _tmp7_;
-	sqlite3_stmt* _tmp8_ = NULL;
-	gint _tmp9_;
-	gint _tmp10_;
-	sqlite3_stmt* _tmp11_;
-	gint _tmp12_;
-	sqlite3* _tmp14_;
-	sqlite3_stmt* _tmp15_ = NULL;
-	gint _tmp16_;
-	gint _tmp17_;
-	sqlite3_stmt* _tmp18_;
-	gint _tmp19_;
-	sqlite3* _tmp21_;
-	sqlite3_stmt* _tmp22_ = NULL;
-	gint _tmp23_;
-	gint _tmp24_;
-	sqlite3_stmt* _tmp25_;
-	gint _tmp26_;
-	sqlite3* _tmp28_;
-	sqlite3_stmt* _tmp29_ = NULL;
-	gint _tmp30_;
-	gint _tmp31_;
-	sqlite3_stmt* _tmp32_;
-	gint _tmp33_;
-	sqlite3* _tmp35_;
-	sqlite3_stmt* _tmp36_ = NULL;
-	gint _tmp37_;
-	gint _tmp38_;
-	sqlite3_stmt* _tmp39_;
-	gint _tmp40_;
-	sqlite3* _tmp42_;
-	sqlite3_stmt* _tmp43_ = NULL;
-	gint _tmp44_;
-	gint _tmp45_;
-	sqlite3_stmt* _tmp46_;
-	gint _tmp47_;
-	sqlite3* _tmp49_;
-	sqlite3_stmt* _tmp50_ = NULL;
-	gint _tmp51_;
-	gint _tmp52_;
-	sqlite3_stmt* _tmp53_;
-	gint _tmp54_;
-	sqlite3* _tmp56_;
-	sqlite3_stmt* _tmp57_ = NULL;
-	gint _tmp58_;
-	gint _tmp59_;
-	sqlite3_stmt* _tmp60_;
-	gint _tmp61_;
-	sqlite3* _tmp63_;
-	sqlite3_stmt* _tmp64_ = NULL;
-	gint _tmp65_;
-	gint _tmp66_;
-	sqlite3_stmt* _tmp67_;
-	gint _tmp68_;
-	sqlite3* _tmp70_;
-	sqlite3_stmt* _tmp71_ = NULL;
-	gint _tmp72_;
-	gint _tmp73_;
-	sqlite3_stmt* _tmp74_;
-	gint _tmp75_;
-	sqlite3* _tmp77_;
-	sqlite3_stmt* _tmp78_ = NULL;
-	gint _tmp79_;
-	gint _tmp80_;
-	sqlite3_stmt* _tmp81_;
-	gint _tmp82_;
-	sqlite3* _tmp84_;
-	sqlite3_stmt* _tmp85_ = NULL;
-	gint _tmp86_;
-	gint _tmp87_;
-	sqlite3_stmt* _tmp88_;
-	gint _tmp89_;
-#line 36 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	self = (SavedSearchDBTable*) database_table_construct (object_type);
-#line 37 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	database_table_set_table_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), "SavedSearchDBTable");
-#line 41 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp0_ = database_table_db;
-#line 41 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable " "(" "id INTEGER PRIMARY KEY, " "name TEXT UNIQUE NOT NULL, " "operator TEXT NOT NULL" ")", -1, &_tmp1_, NULL);
-#line 41 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 41 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp1_;
-#line 41 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp2_;
-#line 48 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp3_ = res;
-#line 48 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 50 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp4_ = stmt;
-#line 50 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_step (_tmp4_);
-#line 51 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp5_ = res;
-#line 51 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (_tmp5_ != SQLITE_DONE) {
-#line 1008 "SavedSearchDBTable.c"
-		gint _tmp6_;
-#line 52 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp6_ = res;
-#line 52 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		database_table_fatal ("create SavedSearchDBTable", _tmp6_);
-#line 1014 "SavedSearchDBTable.c"
-	}
-#line 55 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp7_ = database_table_db;
-#line 55 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp9_ = sqlite3_prepare_v2 (_tmp7_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Text " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "text TEXT" ")", -1, &_tmp8_, NULL);
-#line 55 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 55 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp8_;
-#line 55 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp9_;
-#line 64 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp10_ = res;
-#line 64 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK");
-#line 66 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp11_ = stmt;
-#line 66 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_step (_tmp11_);
-#line 67 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp12_ = res;
-#line 67 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (_tmp12_ != SQLITE_DONE) {
-#line 1038 "SavedSearchDBTable.c"
-		gint _tmp13_;
-#line 68 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp13_ = res;
-#line 68 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		database_table_fatal ("create SavedSearchDBTable_Text", _tmp13_);
-#line 1044 "SavedSearchDBTable.c"
-	}
-#line 71 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp14_ = database_table_db;
-#line 71 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp16_ = sqlite3_prepare_v2 (_tmp14_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_MediaType " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "type TEXT NOT_NULL" ")", -1, &_tmp15_, NULL);
-#line 71 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 71 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp15_;
-#line 71 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp16_;
-#line 80 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp17_ = res;
-#line 80 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK");
-#line 82 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp18_ = stmt;
-#line 82 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_step (_tmp18_);
-#line 83 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp19_ = res;
-#line 83 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (_tmp19_ != SQLITE_DONE) {
-#line 1068 "SavedSearchDBTable.c"
-		gint _tmp20_;
-#line 84 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp20_ = res;
-#line 84 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		database_table_fatal ("create SavedSearchDBTable_MediaType", _tmp20_);
-#line 1074 "SavedSearchDBTable.c"
-	}
-#line 87 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp21_ = database_table_db;
-#line 87 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp23_ = sqlite3_prepare_v2 (_tmp21_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Flagged " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "flag_state TEXT NOT NULL" ")", -1, &_tmp22_, NULL);
-#line 87 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 87 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp22_;
-#line 87 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp23_;
-#line 95 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp24_ = res;
-#line 95 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp24_ == SQLITE_OK, "res == Sqlite.OK");
-#line 97 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp25_ = stmt;
-#line 97 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_step (_tmp25_);
-#line 98 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp26_ = res;
-#line 98 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (_tmp26_ != SQLITE_DONE) {
-#line 1098 "SavedSearchDBTable.c"
-		gint _tmp27_;
-#line 99 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp27_ = res;
-#line 99 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		database_table_fatal ("create SavedSearchDBTable_Flagged", _tmp27_);
-#line 1104 "SavedSearchDBTable.c"
-	}
-#line 102 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp28_ = database_table_db;
-#line 102 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp30_ = sqlite3_prepare_v2 (_tmp28_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Modified " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "modified_state TEXT NOT NULL" ")", -1, &_tmp29_, NULL);
-#line 102 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 102 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp29_;
-#line 102 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp30_;
-#line 111 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp31_ = res;
-#line 111 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp31_ == SQLITE_OK, "res == Sqlite.OK");
-#line 113 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp32_ = stmt;
-#line 113 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_step (_tmp32_);
-#line 114 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp33_ = res;
-#line 114 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (_tmp33_ != SQLITE_DONE) {
-#line 1128 "SavedSearchDBTable.c"
-		gint _tmp34_;
-#line 115 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp34_ = res;
-#line 115 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		database_table_fatal ("create SavedSearchDBTable_Modified", _tmp34_);
-#line 1134 "SavedSearchDBTable.c"
-	}
-#line 118 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp35_ = database_table_db;
-#line 118 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp37_ = sqlite3_prepare_v2 (_tmp35_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Rating " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "rating INTEGER NOT_NULL, " "context TEXT NOT NULL" ")", -1, &_tmp36_, NULL);
-#line 118 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 118 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp36_;
-#line 118 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp37_;
-#line 127 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp38_ = res;
-#line 127 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp38_ == SQLITE_OK, "res == Sqlite.OK");
-#line 129 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp39_ = stmt;
-#line 129 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_step (_tmp39_);
-#line 130 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp40_ = res;
-#line 130 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (_tmp40_ != SQLITE_DONE) {
-#line 1158 "SavedSearchDBTable.c"
-		gint _tmp41_;
-#line 131 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp41_ = res;
-#line 131 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		database_table_fatal ("create SavedSearchDBTable_Rating", _tmp41_);
-#line 1164 "SavedSearchDBTable.c"
-	}
-#line 134 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp42_ = database_table_db;
-#line 134 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp44_ = sqlite3_prepare_v2 (_tmp42_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Date " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "date_one INTEGER NOT_NULL, " "date_two INTEGER NOT_NULL" ")", -1, &_tmp43_, NULL);
-#line 134 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 134 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp43_;
-#line 134 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp44_;
-#line 144 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp45_ = res;
-#line 144 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp45_ == SQLITE_OK, "res == Sqlite.OK");
-#line 146 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp46_ = stmt;
-#line 146 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_step (_tmp46_);
-#line 147 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp47_ = res;
-#line 147 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (_tmp47_ != SQLITE_DONE) {
-#line 1188 "SavedSearchDBTable.c"
-		gint _tmp48_;
-#line 148 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp48_ = res;
-#line 148 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		database_table_fatal ("create SavedSearchDBTable_Rating", _tmp48_);
-#line 1194 "SavedSearchDBTable.c"
-	}
-#line 151 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp49_ = database_table_db;
-#line 151 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp51_ = sqlite3_prepare_v2 (_tmp49_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Text_Index " "ON SavedSearchDBTable_Text(search_id)", -1, &_tmp50_, NULL);
-#line 151 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 151 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp50_;
-#line 151 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp51_;
-#line 154 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp52_ = res;
-#line 154 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp52_ == SQLITE_OK, "res == Sqlite.OK");
-#line 155 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp53_ = stmt;
-#line 155 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_step (_tmp53_);
-#line 156 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp54_ = res;
-#line 156 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (_tmp54_ != SQLITE_DONE) {
-#line 1218 "SavedSearchDBTable.c"
-		gint _tmp55_;
-#line 157 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp55_ = res;
-#line 157 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		database_table_fatal ("create SavedSearchDBTable_Text_Index", _tmp55_);
-#line 1224 "SavedSearchDBTable.c"
-	}
-#line 159 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp56_ = database_table_db;
-#line 159 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp58_ = sqlite3_prepare_v2 (_tmp56_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_MediaType_Index " "ON SavedSearchDBTable_MediaType(search_id)", -1, &_tmp57_, NULL);
-#line 159 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 159 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp57_;
-#line 159 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp58_;
-#line 162 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp59_ = res;
-#line 162 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp59_ == SQLITE_OK, "res == Sqlite.OK");
-#line 163 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp60_ = stmt;
-#line 163 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_step (_tmp60_);
-#line 164 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp61_ = res;
-#line 164 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (_tmp61_ != SQLITE_DONE) {
-#line 1248 "SavedSearchDBTable.c"
-		gint _tmp62_;
-#line 165 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp62_ = res;
-#line 165 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		database_table_fatal ("create SavedSearchDBTable_MediaType_Index", _tmp62_);
-#line 1254 "SavedSearchDBTable.c"
-	}
-#line 167 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp63_ = database_table_db;
-#line 167 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp65_ = sqlite3_prepare_v2 (_tmp63_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Flagged_Index " "ON SavedSearchDBTable_Flagged(search_id)", -1, &_tmp64_, NULL);
-#line 167 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 167 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp64_;
-#line 167 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp65_;
-#line 170 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp66_ = res;
-#line 170 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp66_ == SQLITE_OK, "res == Sqlite.OK");
-#line 171 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp67_ = stmt;
-#line 171 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_step (_tmp67_);
-#line 172 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp68_ = res;
-#line 172 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (_tmp68_ != SQLITE_DONE) {
-#line 1278 "SavedSearchDBTable.c"
-		gint _tmp69_;
-#line 173 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp69_ = res;
-#line 173 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		database_table_fatal ("create SavedSearchDBTable_Flagged_Index", _tmp69_);
-#line 1284 "SavedSearchDBTable.c"
-	}
-#line 175 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp70_ = database_table_db;
-#line 175 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp72_ = sqlite3_prepare_v2 (_tmp70_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Modified_Index " "ON SavedSearchDBTable_Modified(search_id)", -1, &_tmp71_, NULL);
-#line 175 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 175 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp71_;
-#line 175 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp72_;
-#line 178 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp73_ = res;
-#line 178 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp73_ == SQLITE_OK, "res == Sqlite.OK");
-#line 179 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp74_ = stmt;
-#line 179 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_step (_tmp74_);
-#line 180 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp75_ = res;
-#line 180 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (_tmp75_ != SQLITE_DONE) {
-#line 1308 "SavedSearchDBTable.c"
-		gint _tmp76_;
-#line 181 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp76_ = res;
-#line 181 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		database_table_fatal ("create SavedSearchDBTable_Modified_Index", _tmp76_);
-#line 1314 "SavedSearchDBTable.c"
-	}
-#line 183 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp77_ = database_table_db;
-#line 183 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp79_ = sqlite3_prepare_v2 (_tmp77_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Rating_Index " "ON SavedSearchDBTable_Rating(search_id)", -1, &_tmp78_, NULL);
-#line 183 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 183 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp78_;
-#line 183 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp79_;
-#line 186 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp80_ = res;
-#line 186 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp80_ == SQLITE_OK, "res == Sqlite.OK");
-#line 187 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp81_ = stmt;
-#line 187 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_step (_tmp81_);
-#line 188 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp82_ = res;
-#line 188 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (_tmp82_ != SQLITE_DONE) {
-#line 1338 "SavedSearchDBTable.c"
-		gint _tmp83_;
-#line 189 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp83_ = res;
-#line 189 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		database_table_fatal ("create SavedSearchDBTable_Rating_Index", _tmp83_);
-#line 1344 "SavedSearchDBTable.c"
-	}
-#line 191 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp84_ = database_table_db;
-#line 191 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp86_ = sqlite3_prepare_v2 (_tmp84_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Date_Index " "ON SavedSearchDBTable_Date(search_id)", -1, &_tmp85_, NULL);
-#line 191 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 191 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp85_;
-#line 191 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp86_;
-#line 194 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp87_ = res;
-#line 194 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp87_ == SQLITE_OK, "res == Sqlite.OK");
-#line 195 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp88_ = stmt;
-#line 195 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_step (_tmp88_);
-#line 196 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp89_ = res;
-#line 196 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (_tmp89_ != SQLITE_DONE) {
-#line 1368 "SavedSearchDBTable.c"
-		gint _tmp90_;
-#line 197 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp90_ = res;
-#line 197 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		database_table_fatal ("create SavedSearchDBTable_Date_Index", _tmp90_);
-#line 1374 "SavedSearchDBTable.c"
-	}
-#line 36 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 36 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	return self;
-#line 1380 "SavedSearchDBTable.c"
-}
-
-
-static SavedSearchDBTable*
-saved_search_db_table_new (void)
-{
-#line 36 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	return saved_search_db_table_construct (TYPE_SAVED_SEARCH_DB_TABLE);
-#line 1389 "SavedSearchDBTable.c"
-}
-
-
-static gpointer
-_database_table_ref0 (gpointer self)
-{
-#line 204 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	return self ? database_table_ref (self) : NULL;
-#line 1398 "SavedSearchDBTable.c"
-}
-
-
-SavedSearchDBTable*
-saved_search_db_table_get_instance (void)
-{
-	SavedSearchDBTable* result = NULL;
-	SavedSearchDBTable* _tmp0_;
-	SavedSearchDBTable* _tmp2_;
-	SavedSearchDBTable* _tmp3_;
-#line 201 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp0_ = saved_search_db_table_instance;
-#line 201 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (_tmp0_ == NULL) {
-#line 1413 "SavedSearchDBTable.c"
-		SavedSearchDBTable* _tmp1_;
-#line 202 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp1_ = saved_search_db_table_new ();
-#line 202 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_database_table_unref0 (saved_search_db_table_instance);
-#line 202 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		saved_search_db_table_instance = _tmp1_;
-#line 1421 "SavedSearchDBTable.c"
-	}
-#line 204 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp2_ = saved_search_db_table_instance;
-#line 204 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp3_ = _database_table_ref0 (_tmp2_);
-#line 204 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	result = _tmp3_;
-#line 204 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	return result;
-#line 1431 "SavedSearchDBTable.c"
-}
-
-
-static gpointer
-_g_object_ref0 (gpointer self)
-{
-#line 227 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 1440 "SavedSearchDBTable.c"
-}
-
-
-SavedSearchRow*
-saved_search_db_table_add (SavedSearchDBTable* self,
-                           const gchar* name,
-                           SearchOperator operator,
-                           GeeArrayList* conditions,
-                           GError** error)
-{
-	SavedSearchRow* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	gchar* _tmp5_;
-	GDestroyNotify _tmp6_;
-	gint _tmp7_;
-	sqlite3_stmt* _tmp8_;
-	gchar* _tmp9_;
-	GDestroyNotify _tmp10_;
-	gint _tmp11_;
-	sqlite3_stmt* _tmp12_;
-	gint _tmp13_;
-	SavedSearchRow* row = NULL;
-	SavedSearchRow* _tmp15_;
-	SavedSearchRow* _tmp16_;
-	sqlite3* _tmp17_;
-	SavedSearchRow* _tmp18_;
-	gchar* _tmp19_;
-	SavedSearchRow* _tmp20_;
-	SavedSearchRow* _tmp21_;
-	GeeList* _tmp22_;
-	GError * _inner_error_ = NULL;
-#line 207 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL);
-#line 207 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_val_if_fail (name != NULL, NULL);
-#line 207 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_val_if_fail (GEE_IS_ARRAY_LIST (conditions), NULL);
-#line 210 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp0_ = database_table_db;
-#line 210 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "INSERT INTO SavedSearchDBTable (name, operator) VALUES (?, ?)", -1, &_tmp1_, NULL);
-#line 210 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 210 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp1_;
-#line 210 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp2_;
-#line 212 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp3_ = res;
-#line 212 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 214 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp4_ = stmt;
-#line 214 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp5_ = g_strdup (name);
-#line 214 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp6_ = g_free;
-#line 214 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_bind_text (_tmp4_, 1, _tmp5_, -1, _tmp6_);
-#line 215 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp7_ = res;
-#line 215 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 216 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp8_ = stmt;
-#line 216 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp9_ = search_operator_to_string (operator);
-#line 216 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp10_ = g_free;
-#line 216 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_bind_text (_tmp8_, 2, _tmp9_, -1, _tmp10_);
-#line 217 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp11_ = res;
-#line 217 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
-#line 219 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp12_ = stmt;
-#line 219 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_step (_tmp12_);
-#line 220 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp13_ = res;
-#line 220 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (_tmp13_ != SQLITE_DONE) {
-#line 1530 "SavedSearchDBTable.c"
-		gint _tmp14_;
-#line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp14_ = res;
-#line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		database_table_throw_error ("SavedSearchDBTable.add", _tmp14_, &_inner_error_);
-#line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				return NULL;
-#line 1546 "SavedSearchDBTable.c"
-			} else {
-#line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				g_clear_error (&_inner_error_);
-#line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				return NULL;
-#line 1556 "SavedSearchDBTable.c"
-			}
-		}
-	}
-#line 223 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp15_ = saved_search_row_new ();
-#line 223 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	row = _tmp15_;
-#line 224 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp16_ = row;
-#line 224 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp17_ = database_table_db;
-#line 224 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	saved_search_id_init (&_tmp16_->search_id, sqlite3_last_insert_rowid (_tmp17_));
-#line 225 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp18_ = row;
-#line 225 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp19_ = g_strdup (name);
-#line 225 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_g_free0 (_tmp18_->name);
-#line 225 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp18_->name = _tmp19_;
-#line 226 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp20_ = row;
-#line 226 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp20_->operator = operator;
-#line 227 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp21_ = row;
-#line 227 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (conditions, GEE_TYPE_LIST, GeeList));
-#line 227 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_g_object_unref0 (_tmp21_->conditions);
-#line 227 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp21_->conditions = _tmp22_;
-#line 1590 "SavedSearchDBTable.c"
-	{
-		GeeArrayList* _sc_list = NULL;
-		GeeArrayList* _tmp23_;
-		gint _sc_size = 0;
-		GeeArrayList* _tmp24_;
-		gint _tmp25_;
-		gint _tmp26_;
-		gint _sc_index = 0;
-#line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp23_ = _g_object_ref0 (conditions);
-#line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_sc_list = _tmp23_;
-#line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp24_ = _sc_list;
-#line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp25_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp26_ = _tmp25_;
-#line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_sc_size = _tmp26_;
-#line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_sc_index = -1;
-#line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		while (TRUE) {
-#line 1615 "SavedSearchDBTable.c"
-			gint _tmp27_;
-			gint _tmp28_;
-			gint _tmp29_;
-			SearchCondition* sc = NULL;
-			GeeArrayList* _tmp30_;
-			gint _tmp31_;
-			gpointer _tmp32_;
-			SavedSearchRow* _tmp33_;
-			SavedSearchID _tmp34_;
-			SearchCondition* _tmp35_;
-#line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp27_ = _sc_index;
-#line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_sc_index = _tmp27_ + 1;
-#line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp28_ = _sc_index;
-#line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp29_ = _sc_size;
-#line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (!(_tmp28_ < _tmp29_)) {
-#line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				break;
-#line 1638 "SavedSearchDBTable.c"
-			}
-#line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp30_ = _sc_list;
-#line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp31_ = _sc_index;
-#line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp32_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp31_);
-#line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			sc = (SearchCondition*) _tmp32_;
-#line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp33_ = row;
-#line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp34_ = _tmp33_->search_id;
-#line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp35_ = sc;
-#line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			saved_search_db_table_add_condition (self, &_tmp34_, _tmp35_, &_inner_error_);
-#line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					g_propagate_error (error, _inner_error_);
-#line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_search_condition_unref0 (sc);
-#line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_g_object_unref0 (_sc_list);
-#line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_saved_search_row_unref0 (row);
-#line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_sqlite3_finalize0 (stmt);
-#line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					return NULL;
-#line 1672 "SavedSearchDBTable.c"
-				} else {
-#line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_search_condition_unref0 (sc);
-#line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_g_object_unref0 (_sc_list);
-#line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_saved_search_row_unref0 (row);
-#line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_sqlite3_finalize0 (stmt);
-#line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					g_clear_error (&_inner_error_);
-#line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					return NULL;
-#line 1688 "SavedSearchDBTable.c"
-				}
-			}
-#line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_search_condition_unref0 (sc);
-#line 1693 "SavedSearchDBTable.c"
-		}
-#line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_g_object_unref0 (_sc_list);
-#line 1697 "SavedSearchDBTable.c"
-	}
-#line 233 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	result = row;
-#line 233 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 233 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	return result;
-#line 1705 "SavedSearchDBTable.c"
-}
-
-
-static gpointer
-_search_condition_ref0 (gpointer self)
-{
-#line 238 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	return self ? search_condition_ref (self) : NULL;
-#line 1714 "SavedSearchDBTable.c"
-}
-
-
-static void
-saved_search_db_table_add_condition (SavedSearchDBTable* self,
-                                     SavedSearchID* id,
-                                     SearchCondition* condition,
-                                     GError** error)
-{
-	GError * _inner_error_ = NULL;
-#line 236 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self));
-#line 236 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_if_fail (id != NULL);
-#line 236 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_if_fail (IS_SEARCH_CONDITION (condition));
-#line 237 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_TEXT)) {
-#line 1733 "SavedSearchDBTable.c"
-		SearchConditionText* text = NULL;
-		SearchConditionText* _tmp0_;
-		sqlite3_stmt* stmt = NULL;
-		gint res = 0;
-		sqlite3* _tmp1_;
-		sqlite3_stmt* _tmp2_ = NULL;
-		gint _tmp3_;
-		gint _tmp4_;
-		sqlite3_stmt* _tmp5_;
-		SavedSearchID _tmp6_;
-		gint64 _tmp7_;
-		gint _tmp8_;
-		sqlite3_stmt* _tmp9_;
-		SearchConditionText* _tmp10_;
-		SearchConditionSearchType _tmp11_;
-		SearchConditionSearchType _tmp12_;
-		gchar* _tmp13_;
-		GDestroyNotify _tmp14_;
-		gint _tmp15_;
-		sqlite3_stmt* _tmp16_;
-		SearchConditionText* _tmp17_;
-		SearchConditionTextContext _tmp18_;
-		SearchConditionTextContext _tmp19_;
-		gchar* _tmp20_;
-		GDestroyNotify _tmp21_;
-		gint _tmp22_;
-		sqlite3_stmt* _tmp23_;
-		SearchConditionText* _tmp24_;
-		const gchar* _tmp25_;
-		const gchar* _tmp26_;
-		gchar* _tmp27_;
-		GDestroyNotify _tmp28_;
-		gint _tmp29_;
-		sqlite3_stmt* _tmp30_;
-		gint _tmp31_;
-#line 238 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp0_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_TEXT) ? ((SearchConditionText*) condition) : NULL);
-#line 238 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		text = _tmp0_;
-#line 240 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp1_ = database_table_db;
-#line 240 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp3_ = sqlite3_prepare_v2 (_tmp1_, "INSERT INTO SavedSearchDBTable_Text (search_id, search_type, context, " "text) VALUES (?, ?, ?, ?)", -1, &_tmp2_, NULL);
-#line 240 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 240 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		stmt = _tmp2_;
-#line 240 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		res = _tmp3_;
-#line 243 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp4_ = res;
-#line 243 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_vala_assert (_tmp4_ == SQLITE_OK, "res == Sqlite.OK");
-#line 245 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp5_ = stmt;
-#line 245 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp6_ = *id;
-#line 245 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp7_ = _tmp6_.id;
-#line 245 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		res = sqlite3_bind_int64 (_tmp5_, 1, _tmp7_);
-#line 246 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp8_ = res;
-#line 246 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
-#line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp9_ = stmt;
-#line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp10_ = text;
-#line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp11_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_SEARCH_CONDITION, SearchCondition));
-#line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp12_ = _tmp11_;
-#line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp13_ = search_condition_search_type_to_string (_tmp12_);
-#line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp14_ = g_free;
-#line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		res = sqlite3_bind_text (_tmp9_, 2, _tmp13_, -1, _tmp14_);
-#line 249 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp15_ = res;
-#line 249 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK");
-#line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp16_ = stmt;
-#line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp17_ = text;
-#line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp18_ = search_condition_text_get_context (_tmp17_);
-#line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp19_ = _tmp18_;
-#line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp20_ = search_condition_text_context_to_string (_tmp19_);
-#line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp21_ = g_free;
-#line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		res = sqlite3_bind_text (_tmp16_, 3, _tmp20_, -1, _tmp21_);
-#line 252 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp22_ = res;
-#line 252 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_vala_assert (_tmp22_ == SQLITE_OK, "res == Sqlite.OK");
-#line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp23_ = stmt;
-#line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp24_ = text;
-#line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp25_ = search_condition_text_get_text (_tmp24_);
-#line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp26_ = _tmp25_;
-#line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp27_ = g_strdup (_tmp26_);
-#line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp28_ = g_free;
-#line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		res = sqlite3_bind_text (_tmp23_, 4, _tmp27_, -1, _tmp28_);
-#line 255 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp29_ = res;
-#line 255 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_vala_assert (_tmp29_ == SQLITE_OK, "res == Sqlite.OK");
-#line 257 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp30_ = stmt;
-#line 257 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		res = sqlite3_step (_tmp30_);
-#line 258 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp31_ = res;
-#line 258 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		if (_tmp31_ != SQLITE_DONE) {
-#line 1861 "SavedSearchDBTable.c"
-			gint _tmp32_;
-#line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp32_ = res;
-#line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			database_table_throw_error ("SavedSearchDBTable_Text.add", _tmp32_, &_inner_error_);
-#line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					g_propagate_error (error, _inner_error_);
-#line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_sqlite3_finalize0 (stmt);
-#line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_search_condition_unref0 (text);
-#line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					return;
-#line 1879 "SavedSearchDBTable.c"
-				} else {
-#line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_sqlite3_finalize0 (stmt);
-#line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_search_condition_unref0 (text);
-#line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					g_clear_error (&_inner_error_);
-#line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					return;
-#line 1891 "SavedSearchDBTable.c"
-				}
-			}
-		}
-#line 237 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 237 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_search_condition_unref0 (text);
-#line 1899 "SavedSearchDBTable.c"
-	} else {
-#line 260 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_MEDIA_TYPE)) {
-#line 1903 "SavedSearchDBTable.c"
-			SearchConditionMediaType* media_type = NULL;
-			SearchConditionMediaType* _tmp33_;
-			sqlite3_stmt* stmt = NULL;
-			gint res = 0;
-			sqlite3* _tmp34_;
-			sqlite3_stmt* _tmp35_ = NULL;
-			gint _tmp36_;
-			gint _tmp37_;
-			sqlite3_stmt* _tmp38_;
-			SavedSearchID _tmp39_;
-			gint64 _tmp40_;
-			gint _tmp41_;
-			sqlite3_stmt* _tmp42_;
-			SearchConditionMediaType* _tmp43_;
-			SearchConditionSearchType _tmp44_;
-			SearchConditionSearchType _tmp45_;
-			gchar* _tmp46_;
-			GDestroyNotify _tmp47_;
-			gint _tmp48_;
-			sqlite3_stmt* _tmp49_;
-			SearchConditionMediaType* _tmp50_;
-			SearchConditionMediaTypeContext _tmp51_;
-			SearchConditionMediaTypeContext _tmp52_;
-			gchar* _tmp53_;
-			GDestroyNotify _tmp54_;
-			gint _tmp55_;
-			sqlite3_stmt* _tmp56_;
-			SearchConditionMediaType* _tmp57_;
-			SearchConditionMediaTypeMediaType _tmp58_;
-			SearchConditionMediaTypeMediaType _tmp59_;
-			gchar* _tmp60_;
-			GDestroyNotify _tmp61_;
-			gint _tmp62_;
-			sqlite3_stmt* _tmp63_;
-			gint _tmp64_;
-#line 261 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp33_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_MEDIA_TYPE) ? ((SearchConditionMediaType*) condition) : NULL);
-#line 261 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			media_type = _tmp33_;
-#line 263 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp34_ = database_table_db;
-#line 263 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp36_ = sqlite3_prepare_v2 (_tmp34_, "INSERT INTO SavedSearchDBTable_MediaType (search_id, search_type, cont" \
-"ext, " "type) VALUES (?, ?, ?, ?)", -1, &_tmp35_, NULL);
-#line 263 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_sqlite3_finalize0 (stmt);
-#line 263 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			stmt = _tmp35_;
-#line 263 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			res = _tmp36_;
-#line 266 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp37_ = res;
-#line 266 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK");
-#line 268 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp38_ = stmt;
-#line 268 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp39_ = *id;
-#line 268 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp40_ = _tmp39_.id;
-#line 268 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			res = sqlite3_bind_int64 (_tmp38_, 1, _tmp40_);
-#line 269 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp41_ = res;
-#line 269 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_vala_assert (_tmp41_ == SQLITE_OK, "res == Sqlite.OK");
-#line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp42_ = stmt;
-#line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp43_ = media_type;
-#line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp44_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_SEARCH_CONDITION, SearchCondition));
-#line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp45_ = _tmp44_;
-#line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp46_ = search_condition_search_type_to_string (_tmp45_);
-#line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp47_ = g_free;
-#line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			res = sqlite3_bind_text (_tmp42_, 2, _tmp46_, -1, _tmp47_);
-#line 272 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp48_ = res;
-#line 272 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_vala_assert (_tmp48_ == SQLITE_OK, "res == Sqlite.OK");
-#line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp49_ = stmt;
-#line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp50_ = media_type;
-#line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp51_ = search_condition_media_type_get_context (_tmp50_);
-#line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp52_ = _tmp51_;
-#line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp53_ = search_condition_media_type_context_to_string (_tmp52_);
-#line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp54_ = g_free;
-#line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			res = sqlite3_bind_text (_tmp49_, 3, _tmp53_, -1, _tmp54_);
-#line 275 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp55_ = res;
-#line 275 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_vala_assert (_tmp55_ == SQLITE_OK, "res == Sqlite.OK");
-#line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp56_ = stmt;
-#line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp57_ = media_type;
-#line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp58_ = search_condition_media_type_get_media_type (_tmp57_);
-#line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp59_ = _tmp58_;
-#line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp60_ = search_condition_media_type_media_type_to_string (_tmp59_);
-#line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp61_ = g_free;
-#line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			res = sqlite3_bind_text (_tmp56_, 4, _tmp60_, -1, _tmp61_);
-#line 278 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp62_ = res;
-#line 278 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_vala_assert (_tmp62_ == SQLITE_OK, "res == Sqlite.OK");
-#line 280 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp63_ = stmt;
-#line 280 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			res = sqlite3_step (_tmp63_);
-#line 281 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp64_ = res;
-#line 281 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (_tmp64_ != SQLITE_DONE) {
-#line 2031 "SavedSearchDBTable.c"
-				gint _tmp65_;
-#line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp65_ = res;
-#line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				database_table_throw_error ("SavedSearchDBTable_MediaType.add", _tmp65_, &_inner_error_);
-#line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						g_propagate_error (error, _inner_error_);
-#line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_sqlite3_finalize0 (stmt);
-#line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_search_condition_unref0 (media_type);
-#line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						return;
-#line 2049 "SavedSearchDBTable.c"
-					} else {
-#line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_sqlite3_finalize0 (stmt);
-#line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_search_condition_unref0 (media_type);
-#line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						g_clear_error (&_inner_error_);
-#line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						return;
-#line 2061 "SavedSearchDBTable.c"
-					}
-				}
-			}
-#line 260 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_sqlite3_finalize0 (stmt);
-#line 260 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_search_condition_unref0 (media_type);
-#line 2069 "SavedSearchDBTable.c"
-		} else {
-#line 283 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_FLAGGED)) {
-#line 2073 "SavedSearchDBTable.c"
-				SearchConditionFlagged* flag_state = NULL;
-				SearchConditionFlagged* _tmp66_;
-				sqlite3_stmt* stmt = NULL;
-				gint res = 0;
-				sqlite3* _tmp67_;
-				sqlite3_stmt* _tmp68_ = NULL;
-				gint _tmp69_;
-				gint _tmp70_;
-				sqlite3_stmt* _tmp71_;
-				SavedSearchID _tmp72_;
-				gint64 _tmp73_;
-				gint _tmp74_;
-				sqlite3_stmt* _tmp75_;
-				SearchConditionFlagged* _tmp76_;
-				SearchConditionSearchType _tmp77_;
-				SearchConditionSearchType _tmp78_;
-				gchar* _tmp79_;
-				GDestroyNotify _tmp80_;
-				gint _tmp81_;
-				sqlite3_stmt* _tmp82_;
-				SearchConditionFlagged* _tmp83_;
-				SearchConditionFlaggedState _tmp84_;
-				SearchConditionFlaggedState _tmp85_;
-				gchar* _tmp86_;
-				GDestroyNotify _tmp87_;
-				gint _tmp88_;
-				sqlite3_stmt* _tmp89_;
-				gint _tmp90_;
-#line 284 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp66_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_FLAGGED) ? ((SearchConditionFlagged*) condition) : NULL);
-#line 284 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				flag_state = _tmp66_;
-#line 286 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp67_ = database_table_db;
-#line 286 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp69_ = sqlite3_prepare_v2 (_tmp67_, "INSERT INTO SavedSearchDBTable_Flagged (search_id, search_type, " "flag_state) VALUES (?, ?, ?)", -1, &_tmp68_, NULL);
-#line 286 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 286 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				stmt = _tmp68_;
-#line 286 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				res = _tmp69_;
-#line 289 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp70_ = res;
-#line 289 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_vala_assert (_tmp70_ == SQLITE_OK, "res == Sqlite.OK");
-#line 291 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp71_ = stmt;
-#line 291 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp72_ = *id;
-#line 291 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp73_ = _tmp72_.id;
-#line 291 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				res = sqlite3_bind_int64 (_tmp71_, 1, _tmp73_);
-#line 292 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp74_ = res;
-#line 292 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_vala_assert (_tmp74_ == SQLITE_OK, "res == Sqlite.OK");
-#line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp75_ = stmt;
-#line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp76_ = flag_state;
-#line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp77_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, TYPE_SEARCH_CONDITION, SearchCondition));
-#line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp78_ = _tmp77_;
-#line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp79_ = search_condition_search_type_to_string (_tmp78_);
-#line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp80_ = g_free;
-#line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				res = sqlite3_bind_text (_tmp75_, 2, _tmp79_, -1, _tmp80_);
-#line 295 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp81_ = res;
-#line 295 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_vala_assert (_tmp81_ == SQLITE_OK, "res == Sqlite.OK");
-#line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp82_ = stmt;
-#line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp83_ = flag_state;
-#line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp84_ = search_condition_flagged_get_state (_tmp83_);
-#line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp85_ = _tmp84_;
-#line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp86_ = search_condition_flagged_state_to_string (_tmp85_);
-#line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp87_ = g_free;
-#line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				res = sqlite3_bind_text (_tmp82_, 3, _tmp86_, -1, _tmp87_);
-#line 298 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp88_ = res;
-#line 298 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_vala_assert (_tmp88_ == SQLITE_OK, "res == Sqlite.OK");
-#line 300 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp89_ = stmt;
-#line 300 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				res = sqlite3_step (_tmp89_);
-#line 301 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp90_ = res;
-#line 301 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				if (_tmp90_ != SQLITE_DONE) {
-#line 2176 "SavedSearchDBTable.c"
-					gint _tmp91_;
-#line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp91_ = res;
-#line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					database_table_throw_error ("SavedSearchDBTable_Flagged.add", _tmp91_, &_inner_error_);
-#line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						if (_inner_error_->domain == DATABASE_ERROR) {
-#line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							g_propagate_error (error, _inner_error_);
-#line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_search_condition_unref0 (flag_state);
-#line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							return;
-#line 2194 "SavedSearchDBTable.c"
-						} else {
-#line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_search_condition_unref0 (flag_state);
-#line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							g_clear_error (&_inner_error_);
-#line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							return;
-#line 2206 "SavedSearchDBTable.c"
-						}
-					}
-				}
-#line 283 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 283 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_search_condition_unref0 (flag_state);
-#line 2214 "SavedSearchDBTable.c"
-			} else {
-#line 303 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_MODIFIED)) {
-#line 2218 "SavedSearchDBTable.c"
-					SearchConditionModified* modified_state = NULL;
-					SearchConditionModified* _tmp92_;
-					sqlite3_stmt* stmt = NULL;
-					gint res = 0;
-					sqlite3* _tmp93_;
-					sqlite3_stmt* _tmp94_ = NULL;
-					gint _tmp95_;
-					gint _tmp96_;
-					sqlite3_stmt* _tmp97_;
-					SavedSearchID _tmp98_;
-					gint64 _tmp99_;
-					gint _tmp100_;
-					sqlite3_stmt* _tmp101_;
-					SearchConditionModified* _tmp102_;
-					SearchConditionSearchType _tmp103_;
-					SearchConditionSearchType _tmp104_;
-					gchar* _tmp105_;
-					GDestroyNotify _tmp106_;
-					gint _tmp107_;
-					sqlite3_stmt* _tmp108_;
-					SearchConditionModified* _tmp109_;
-					SearchConditionModifiedContext _tmp110_;
-					SearchConditionModifiedContext _tmp111_;
-					gchar* _tmp112_;
-					GDestroyNotify _tmp113_;
-					gint _tmp114_;
-					sqlite3_stmt* _tmp115_;
-					SearchConditionModified* _tmp116_;
-					SearchConditionModifiedState _tmp117_;
-					SearchConditionModifiedState _tmp118_;
-					gchar* _tmp119_;
-					GDestroyNotify _tmp120_;
-					gint _tmp121_;
-					sqlite3_stmt* _tmp122_;
-					gint _tmp123_;
-#line 304 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp92_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_MODIFIED) ? ((SearchConditionModified*) condition) : NULL);
-#line 304 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					modified_state = _tmp92_;
-#line 306 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp93_ = database_table_db;
-#line 306 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp95_ = sqlite3_prepare_v2 (_tmp93_, "INSERT INTO SavedSearchDBTable_Modified (search_id, search_type, conte" \
-"xt, " "modified_state) VALUES (?, ?, ?, ?)", -1, &_tmp94_, NULL);
-#line 306 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_sqlite3_finalize0 (stmt);
-#line 306 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					stmt = _tmp94_;
-#line 306 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					res = _tmp95_;
-#line 309 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp96_ = res;
-#line 309 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_vala_assert (_tmp96_ == SQLITE_OK, "res == Sqlite.OK");
-#line 311 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp97_ = stmt;
-#line 311 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp98_ = *id;
-#line 311 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp99_ = _tmp98_.id;
-#line 311 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					res = sqlite3_bind_int64 (_tmp97_, 1, _tmp99_);
-#line 312 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp100_ = res;
-#line 312 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_vala_assert (_tmp100_ == SQLITE_OK, "res == Sqlite.OK");
-#line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp101_ = stmt;
-#line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp102_ = modified_state;
-#line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp103_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, TYPE_SEARCH_CONDITION, SearchCondition));
-#line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp104_ = _tmp103_;
-#line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp105_ = search_condition_search_type_to_string (_tmp104_);
-#line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp106_ = g_free;
-#line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					res = sqlite3_bind_text (_tmp101_, 2, _tmp105_, -1, _tmp106_);
-#line 315 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp107_ = res;
-#line 315 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_vala_assert (_tmp107_ == SQLITE_OK, "res == Sqlite.OK");
-#line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp108_ = stmt;
-#line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp109_ = modified_state;
-#line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp110_ = search_condition_modified_get_context (_tmp109_);
-#line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp111_ = _tmp110_;
-#line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp112_ = search_condition_modified_context_to_string (_tmp111_);
-#line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp113_ = g_free;
-#line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					res = sqlite3_bind_text (_tmp108_, 3, _tmp112_, -1, _tmp113_);
-#line 318 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp114_ = res;
-#line 318 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_vala_assert (_tmp114_ == SQLITE_OK, "res == Sqlite.OK");
-#line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp115_ = stmt;
-#line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp116_ = modified_state;
-#line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp117_ = search_condition_modified_get_state (_tmp116_);
-#line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp118_ = _tmp117_;
-#line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp119_ = search_condition_modified_state_to_string (_tmp118_);
-#line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp120_ = g_free;
-#line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					res = sqlite3_bind_text (_tmp115_, 4, _tmp119_, -1, _tmp120_);
-#line 321 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp121_ = res;
-#line 321 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_vala_assert (_tmp121_ == SQLITE_OK, "res == Sqlite.OK");
-#line 323 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp122_ = stmt;
-#line 323 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					res = sqlite3_step (_tmp122_);
-#line 324 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp123_ = res;
-#line 324 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					if (_tmp123_ != SQLITE_DONE) {
-#line 2346 "SavedSearchDBTable.c"
-						gint _tmp124_;
-#line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp124_ = res;
-#line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						database_table_throw_error ("SavedSearchDBTable_Modified.add", _tmp124_, &_inner_error_);
-#line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							if (_inner_error_->domain == DATABASE_ERROR) {
-#line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-								g_propagate_error (error, _inner_error_);
-#line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-								_sqlite3_finalize0 (stmt);
-#line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-								_search_condition_unref0 (modified_state);
-#line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-								return;
-#line 2364 "SavedSearchDBTable.c"
-							} else {
-#line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-								_sqlite3_finalize0 (stmt);
-#line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-								_search_condition_unref0 (modified_state);
-#line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-								g_clear_error (&_inner_error_);
-#line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-								return;
-#line 2376 "SavedSearchDBTable.c"
-							}
-						}
-					}
-#line 303 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_sqlite3_finalize0 (stmt);
-#line 303 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_search_condition_unref0 (modified_state);
-#line 2384 "SavedSearchDBTable.c"
-				} else {
-#line 326 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_RATING)) {
-#line 2388 "SavedSearchDBTable.c"
-						SearchConditionRating* rating = NULL;
-						SearchConditionRating* _tmp125_;
-						sqlite3_stmt* stmt = NULL;
-						gint res = 0;
-						sqlite3* _tmp126_;
-						sqlite3_stmt* _tmp127_ = NULL;
-						gint _tmp128_;
-						gint _tmp129_;
-						sqlite3_stmt* _tmp130_;
-						SavedSearchID _tmp131_;
-						gint64 _tmp132_;
-						gint _tmp133_;
-						sqlite3_stmt* _tmp134_;
-						SearchConditionRating* _tmp135_;
-						SearchConditionSearchType _tmp136_;
-						SearchConditionSearchType _tmp137_;
-						gchar* _tmp138_;
-						GDestroyNotify _tmp139_;
-						gint _tmp140_;
-						sqlite3_stmt* _tmp141_;
-						SearchConditionRating* _tmp142_;
-						Rating _tmp143_;
-						Rating _tmp144_;
-						gint _tmp145_;
-						sqlite3_stmt* _tmp146_;
-						SearchConditionRating* _tmp147_;
-						SearchConditionRatingContext _tmp148_;
-						SearchConditionRatingContext _tmp149_;
-						gchar* _tmp150_;
-						GDestroyNotify _tmp151_;
-						gint _tmp152_;
-						sqlite3_stmt* _tmp153_;
-						gint _tmp154_;
-#line 327 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp125_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_RATING) ? ((SearchConditionRating*) condition) : NULL);
-#line 327 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						rating = _tmp125_;
-#line 329 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp126_ = database_table_db;
-#line 329 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp128_ = sqlite3_prepare_v2 (_tmp126_, "INSERT INTO SavedSearchDBTable_Rating (search_id, search_type, rating," \
-" " "context) VALUES (?, ?, ?, ?)", -1, &_tmp127_, NULL);
-#line 329 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_sqlite3_finalize0 (stmt);
-#line 329 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						stmt = _tmp127_;
-#line 329 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						res = _tmp128_;
-#line 332 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp129_ = res;
-#line 332 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_vala_assert (_tmp129_ == SQLITE_OK, "res == Sqlite.OK");
-#line 334 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp130_ = stmt;
-#line 334 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp131_ = *id;
-#line 334 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp132_ = _tmp131_.id;
-#line 334 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						res = sqlite3_bind_int64 (_tmp130_, 1, _tmp132_);
-#line 335 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp133_ = res;
-#line 335 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_vala_assert (_tmp133_ == SQLITE_OK, "res == Sqlite.OK");
-#line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp134_ = stmt;
-#line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp135_ = rating;
-#line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp136_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, TYPE_SEARCH_CONDITION, SearchCondition));
-#line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp137_ = _tmp136_;
-#line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp138_ = search_condition_search_type_to_string (_tmp137_);
-#line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp139_ = g_free;
-#line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						res = sqlite3_bind_text (_tmp134_, 2, _tmp138_, -1, _tmp139_);
-#line 338 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp140_ = res;
-#line 338 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_vala_assert (_tmp140_ == SQLITE_OK, "res == Sqlite.OK");
-#line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp141_ = stmt;
-#line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp142_ = rating;
-#line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp143_ = search_condition_rating_get_rating (_tmp142_);
-#line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp144_ = _tmp143_;
-#line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						res = sqlite3_bind_int (_tmp141_, 3, rating_serialize (_tmp144_));
-#line 341 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp145_ = res;
-#line 341 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_vala_assert (_tmp145_ == SQLITE_OK, "res == Sqlite.OK");
-#line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp146_ = stmt;
-#line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp147_ = rating;
-#line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp148_ = search_condition_rating_get_context (_tmp147_);
-#line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp149_ = _tmp148_;
-#line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp150_ = search_condition_rating_context_to_string (_tmp149_);
-#line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp151_ = g_free;
-#line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						res = sqlite3_bind_text (_tmp146_, 4, _tmp150_, -1, _tmp151_);
-#line 344 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp152_ = res;
-#line 344 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_vala_assert (_tmp152_ == SQLITE_OK, "res == Sqlite.OK");
-#line 346 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp153_ = stmt;
-#line 346 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						res = sqlite3_step (_tmp153_);
-#line 347 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_tmp154_ = res;
-#line 347 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						if (_tmp154_ != SQLITE_DONE) {
-#line 2510 "SavedSearchDBTable.c"
-							gint _tmp155_;
-#line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp155_ = res;
-#line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							database_table_throw_error ("SavedSearchDBTable_Rating.add", _tmp155_, &_inner_error_);
-#line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-								if (_inner_error_->domain == DATABASE_ERROR) {
-#line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-									g_propagate_error (error, _inner_error_);
-#line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-									_sqlite3_finalize0 (stmt);
-#line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-									_search_condition_unref0 (rating);
-#line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-									return;
-#line 2528 "SavedSearchDBTable.c"
-								} else {
-#line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-									_sqlite3_finalize0 (stmt);
-#line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-									_search_condition_unref0 (rating);
-#line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-									g_clear_error (&_inner_error_);
-#line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-									return;
-#line 2540 "SavedSearchDBTable.c"
-								}
-							}
-						}
-#line 326 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_sqlite3_finalize0 (stmt);
-#line 326 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						_search_condition_unref0 (rating);
-#line 2548 "SavedSearchDBTable.c"
-					} else {
-#line 349 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_DATE)) {
-#line 2552 "SavedSearchDBTable.c"
-							SearchConditionDate* date = NULL;
-							SearchConditionDate* _tmp156_;
-							sqlite3_stmt* stmt = NULL;
-							gint res = 0;
-							sqlite3* _tmp157_;
-							sqlite3_stmt* _tmp158_ = NULL;
-							gint _tmp159_;
-							gint _tmp160_;
-							sqlite3_stmt* _tmp161_;
-							SavedSearchID _tmp162_;
-							gint64 _tmp163_;
-							gint _tmp164_;
-							sqlite3_stmt* _tmp165_;
-							SearchConditionDate* _tmp166_;
-							SearchConditionSearchType _tmp167_;
-							SearchConditionSearchType _tmp168_;
-							gchar* _tmp169_;
-							GDestroyNotify _tmp170_;
-							gint _tmp171_;
-							sqlite3_stmt* _tmp172_;
-							SearchConditionDate* _tmp173_;
-							SearchConditionDateContext _tmp174_;
-							SearchConditionDateContext _tmp175_;
-							gchar* _tmp176_;
-							GDestroyNotify _tmp177_;
-							gint _tmp178_;
-							sqlite3_stmt* _tmp179_;
-							SearchConditionDate* _tmp180_;
-							GDateTime* _tmp181_;
-							GDateTime* _tmp182_;
-							gint _tmp183_;
-							sqlite3_stmt* _tmp184_;
-							SearchConditionDate* _tmp185_;
-							GDateTime* _tmp186_;
-							GDateTime* _tmp187_;
-							gint _tmp188_;
-							sqlite3_stmt* _tmp189_;
-							gint _tmp190_;
-#line 350 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp156_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_DATE) ? ((SearchConditionDate*) condition) : NULL);
-#line 350 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							date = _tmp156_;
-#line 352 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp157_ = database_table_db;
-#line 352 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp159_ = sqlite3_prepare_v2 (_tmp157_, "INSERT INTO SavedSearchDBTable_Date (search_id, search_type, " "context, date_one, date_two) VALUES (?, ?, ?, ?, ?)", -1, &_tmp158_, NULL);
-#line 352 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 352 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							stmt = _tmp158_;
-#line 352 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							res = _tmp159_;
-#line 355 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp160_ = res;
-#line 355 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_vala_assert (_tmp160_ == SQLITE_OK, "res == Sqlite.OK");
-#line 357 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp161_ = stmt;
-#line 357 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp162_ = *id;
-#line 357 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp163_ = _tmp162_.id;
-#line 357 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							res = sqlite3_bind_int64 (_tmp161_, 1, _tmp163_);
-#line 358 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp164_ = res;
-#line 358 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_vala_assert (_tmp164_ == SQLITE_OK, "res == Sqlite.OK");
-#line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp165_ = stmt;
-#line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp166_ = date;
-#line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp167_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp166_, TYPE_SEARCH_CONDITION, SearchCondition));
-#line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp168_ = _tmp167_;
-#line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp169_ = search_condition_search_type_to_string (_tmp168_);
-#line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp170_ = g_free;
-#line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							res = sqlite3_bind_text (_tmp165_, 2, _tmp169_, -1, _tmp170_);
-#line 361 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp171_ = res;
-#line 361 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_vala_assert (_tmp171_ == SQLITE_OK, "res == Sqlite.OK");
-#line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp172_ = stmt;
-#line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp173_ = date;
-#line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp174_ = search_condition_date_get_context (_tmp173_);
-#line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp175_ = _tmp174_;
-#line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp176_ = search_condition_date_context_to_string (_tmp175_);
-#line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp177_ = g_free;
-#line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							res = sqlite3_bind_text (_tmp172_, 3, _tmp176_, -1, _tmp177_);
-#line 364 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp178_ = res;
-#line 364 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_vala_assert (_tmp178_ == SQLITE_OK, "res == Sqlite.OK");
-#line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp179_ = stmt;
-#line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp180_ = date;
-#line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp181_ = search_condition_date_get_date_one (_tmp180_);
-#line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp182_ = _tmp181_;
-#line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							res = sqlite3_bind_int64 (_tmp179_, 4, g_date_time_to_unix (_tmp182_));
-#line 367 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp183_ = res;
-#line 367 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_vala_assert (_tmp183_ == SQLITE_OK, "res == Sqlite.OK");
-#line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp184_ = stmt;
-#line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp185_ = date;
-#line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp186_ = search_condition_date_get_date_two (_tmp185_);
-#line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp187_ = _tmp186_;
-#line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							res = sqlite3_bind_int64 (_tmp184_, 5, g_date_time_to_unix (_tmp187_));
-#line 370 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp188_ = res;
-#line 370 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_vala_assert (_tmp188_ == SQLITE_OK, "res == Sqlite.OK");
-#line 372 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp189_ = stmt;
-#line 372 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							res = sqlite3_step (_tmp189_);
-#line 373 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_tmp190_ = res;
-#line 373 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							if (_tmp190_ != SQLITE_DONE) {
-#line 2693 "SavedSearchDBTable.c"
-								gint _tmp191_;
-#line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-								_tmp191_ = res;
-#line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-								database_table_throw_error ("SavedSearchDBTable_Date.add", _tmp191_, &_inner_error_);
-#line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-								if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-									if (_inner_error_->domain == DATABASE_ERROR) {
-#line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-										g_propagate_error (error, _inner_error_);
-#line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-										_sqlite3_finalize0 (stmt);
-#line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-										_search_condition_unref0 (date);
-#line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-										return;
-#line 2711 "SavedSearchDBTable.c"
-									} else {
-#line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-										_sqlite3_finalize0 (stmt);
-#line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-										_search_condition_unref0 (date);
-#line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-										g_clear_error (&_inner_error_);
-#line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-										return;
-#line 2723 "SavedSearchDBTable.c"
-									}
-								}
-							}
-#line 349 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 349 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_search_condition_unref0 (date);
-#line 2731 "SavedSearchDBTable.c"
-						} else {
-#line 376 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							g_assert_not_reached ();
-#line 2735 "SavedSearchDBTable.c"
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-
-static void
-saved_search_db_table_remove_conditions_for_search_id (SavedSearchDBTable* self,
-                                                       SavedSearchID* search_id,
-                                                       GError** error)
-{
-	SavedSearchID _tmp0_;
-	SavedSearchID _tmp1_;
-	SavedSearchID _tmp2_;
-	SavedSearchID _tmp3_;
-	SavedSearchID _tmp4_;
-	SavedSearchID _tmp5_;
-	GError * _inner_error_ = NULL;
-#line 381 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self));
-#line 381 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_if_fail (search_id != NULL);
-#line 382 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp0_ = *search_id;
-#line 382 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	saved_search_db_table_remove_conditions_for_table (self, "SavedSearchDBTable_Text", &_tmp0_, &_inner_error_);
-#line 382 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 382 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 382 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 382 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			return;
-#line 2773 "SavedSearchDBTable.c"
-		} else {
-#line 382 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 382 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			g_clear_error (&_inner_error_);
-#line 382 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			return;
-#line 2781 "SavedSearchDBTable.c"
-		}
-	}
-#line 383 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp1_ = *search_id;
-#line 383 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	saved_search_db_table_remove_conditions_for_table (self, "SavedSearchDBTable_MediaType", &_tmp1_, &_inner_error_);
-#line 383 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 383 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 383 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 383 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			return;
-#line 2796 "SavedSearchDBTable.c"
-		} else {
-#line 383 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 383 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			g_clear_error (&_inner_error_);
-#line 383 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			return;
-#line 2804 "SavedSearchDBTable.c"
-		}
-	}
-#line 384 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp2_ = *search_id;
-#line 384 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	saved_search_db_table_remove_conditions_for_table (self, "SavedSearchDBTable_Flagged", &_tmp2_, &_inner_error_);
-#line 384 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 384 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 384 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 384 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			return;
-#line 2819 "SavedSearchDBTable.c"
-		} else {
-#line 384 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 384 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			g_clear_error (&_inner_error_);
-#line 384 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			return;
-#line 2827 "SavedSearchDBTable.c"
-		}
-	}
-#line 385 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp3_ = *search_id;
-#line 385 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	saved_search_db_table_remove_conditions_for_table (self, "SavedSearchDBTable_Modified", &_tmp3_, &_inner_error_);
-#line 385 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 385 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 385 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 385 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			return;
-#line 2842 "SavedSearchDBTable.c"
-		} else {
-#line 385 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 385 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			g_clear_error (&_inner_error_);
-#line 385 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			return;
-#line 2850 "SavedSearchDBTable.c"
-		}
-	}
-#line 386 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp4_ = *search_id;
-#line 386 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	saved_search_db_table_remove_conditions_for_table (self, "SavedSearchDBTable_Rating", &_tmp4_, &_inner_error_);
-#line 386 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 386 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 386 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 386 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			return;
-#line 2865 "SavedSearchDBTable.c"
-		} else {
-#line 386 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 386 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			g_clear_error (&_inner_error_);
-#line 386 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			return;
-#line 2873 "SavedSearchDBTable.c"
-		}
-	}
-#line 387 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp5_ = *search_id;
-#line 387 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	saved_search_db_table_remove_conditions_for_table (self, "SavedSearchDBTable_Date", &_tmp5_, &_inner_error_);
-#line 387 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 387 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 387 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 387 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			return;
-#line 2888 "SavedSearchDBTable.c"
-		} else {
-#line 387 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 387 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			g_clear_error (&_inner_error_);
-#line 387 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			return;
-#line 2896 "SavedSearchDBTable.c"
-		}
-	}
-}
-
-
-static void
-saved_search_db_table_remove_conditions_for_table (SavedSearchDBTable* self,
-                                                   const gchar* table_name,
-                                                   SavedSearchID* search_id,
-                                                   GError** error)
-{
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	sqlite3_stmt* _tmp3_ = NULL;
-	gint _tmp4_;
-	gint _tmp5_;
-	gint _tmp6_;
-	sqlite3_stmt* _tmp7_;
-	SavedSearchID _tmp8_;
-	gint64 _tmp9_;
-	gint _tmp10_;
-	sqlite3_stmt* _tmp11_;
-	gint _tmp12_;
-	GError * _inner_error_ = NULL;
-#line 390 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self));
-#line 390 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_if_fail (table_name != NULL);
-#line 390 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_if_fail (search_id != NULL);
-#line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp0_ = database_table_db;
-#line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp1_ = g_strdup_printf ("DELETE FROM %s WHERE search_id=?", table_name);
-#line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp2_ = _tmp1_;
-#line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp4_ = sqlite3_prepare_v2 (_tmp0_, _tmp2_, -1, &_tmp3_, NULL);
-#line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp3_;
-#line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp5_ = _tmp4_;
-#line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_g_free0 (_tmp2_);
-#line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp5_;
-#line 394 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp6_ = res;
-#line 394 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK");
-#line 396 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp7_ = stmt;
-#line 396 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp8_ = *search_id;
-#line 396 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp9_ = _tmp8_.id;
-#line 396 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_bind_int64 (_tmp7_, 1, _tmp9_);
-#line 397 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp10_ = res;
-#line 397 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK");
-#line 399 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp11_ = stmt;
-#line 399 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_step (_tmp11_);
-#line 400 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp12_ = res;
-#line 400 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (_tmp12_ != SQLITE_DONE) {
-#line 2972 "SavedSearchDBTable.c"
-		gchar* _tmp13_;
-		gchar* _tmp14_;
-		gint _tmp15_;
-#line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp13_ = g_strdup_printf ("%s.remove", table_name);
-#line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp14_ = _tmp13_;
-#line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp15_ = res;
-#line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		database_table_throw_error (_tmp14_, _tmp15_, &_inner_error_);
-#line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_g_free0 (_tmp14_);
-#line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				return;
-#line 2996 "SavedSearchDBTable.c"
-			} else {
-#line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				g_clear_error (&_inner_error_);
-#line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				return;
-#line 3006 "SavedSearchDBTable.c"
-			}
-		}
-	}
-#line 390 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 3012 "SavedSearchDBTable.c"
-}
-
-
-static GeeList*
-saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* self,
-                                             SavedSearchID* search_id,
-                                             GError** error)
-{
-	GeeList* result = NULL;
-	GeeList* list = NULL;
-	GeeArrayList* _tmp0_;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp1_;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_;
-	gint _tmp4_;
-	sqlite3_stmt* _tmp5_;
-	SavedSearchID _tmp6_;
-	gint64 _tmp7_;
-	gint _tmp8_;
-	sqlite3* _tmp23_;
-	sqlite3_stmt* _tmp24_ = NULL;
-	gint _tmp25_;
-	gint _tmp26_;
-	sqlite3_stmt* _tmp27_;
-	SavedSearchID _tmp28_;
-	gint64 _tmp29_;
-	gint _tmp30_;
-	sqlite3* _tmp45_;
-	sqlite3_stmt* _tmp46_ = NULL;
-	gint _tmp47_;
-	gint _tmp48_;
-	sqlite3_stmt* _tmp49_;
-	SavedSearchID _tmp50_;
-	gint64 _tmp51_;
-	gint _tmp52_;
-	sqlite3* _tmp65_;
-	sqlite3_stmt* _tmp66_ = NULL;
-	gint _tmp67_;
-	gint _tmp68_;
-	sqlite3_stmt* _tmp69_;
-	SavedSearchID _tmp70_;
-	gint64 _tmp71_;
-	gint _tmp72_;
-	sqlite3* _tmp87_;
-	sqlite3_stmt* _tmp88_ = NULL;
-	gint _tmp89_;
-	gint _tmp90_;
-	sqlite3_stmt* _tmp91_;
-	SavedSearchID _tmp92_;
-	gint64 _tmp93_;
-	gint _tmp94_;
-	sqlite3* _tmp108_;
-	sqlite3_stmt* _tmp109_ = NULL;
-	gint _tmp110_;
-	gint _tmp111_;
-	sqlite3_stmt* _tmp112_;
-	SavedSearchID _tmp113_;
-	gint64 _tmp114_;
-	gint _tmp115_;
-	GError * _inner_error_ = NULL;
-#line 405 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL);
-#line 405 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_val_if_fail (search_id != NULL, NULL);
-#line 407 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp0_ = gee_array_list_new (TYPE_SEARCH_CONDITION, (GBoxedCopyFunc) search_condition_ref, (GDestroyNotify) search_condition_unref, NULL, NULL, NULL);
-#line 407 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	list = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
-#line 412 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp1_ = database_table_db;
-#line 412 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp3_ = sqlite3_prepare_v2 (_tmp1_, "SELECT search_type, context, text FROM SavedSearchDBTable_Text " "WHERE search_id=?", -1, &_tmp2_, NULL);
-#line 412 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 412 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp2_;
-#line 412 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp3_;
-#line 415 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp4_ = res;
-#line 415 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp4_ == SQLITE_OK, "res == Sqlite.OK");
-#line 417 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp5_ = stmt;
-#line 417 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp6_ = *search_id;
-#line 417 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp7_ = _tmp6_.id;
-#line 417 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_bind_int64 (_tmp5_, 1, _tmp7_);
-#line 418 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp8_ = res;
-#line 418 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
-#line 3109 "SavedSearchDBTable.c"
-	{
-		gboolean _tmp9_ = FALSE;
-#line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp9_ = TRUE;
-#line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		while (TRUE) {
-#line 3116 "SavedSearchDBTable.c"
-			sqlite3_stmt* _tmp10_;
-			gint _tmp11_;
-			SearchConditionText* condition = NULL;
-			sqlite3_stmt* _tmp14_;
-			const gchar* _tmp15_;
-			sqlite3_stmt* _tmp16_;
-			const gchar* _tmp17_;
-			sqlite3_stmt* _tmp18_;
-			const gchar* _tmp19_;
-			SearchConditionText* _tmp20_;
-			GeeList* _tmp21_;
-			SearchConditionText* _tmp22_;
-#line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (!_tmp9_) {
-#line 3131 "SavedSearchDBTable.c"
-			}
-#line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp9_ = FALSE;
-#line 421 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp10_ = stmt;
-#line 421 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			res = sqlite3_step (_tmp10_);
-#line 422 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp11_ = res;
-#line 422 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (_tmp11_ == SQLITE_DONE) {
-#line 423 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				break;
-#line 3145 "SavedSearchDBTable.c"
-			} else {
-				gint _tmp12_;
-#line 424 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp12_ = res;
-#line 424 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				if (_tmp12_ != SQLITE_ROW) {
-#line 3152 "SavedSearchDBTable.c"
-					gint _tmp13_;
-#line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp13_ = res;
-#line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					database_table_throw_error ("SavedSearchDBTable_Text.get_all_rows", _tmp13_, &_inner_error_);
-#line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						if (_inner_error_->domain == DATABASE_ERROR) {
-#line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							g_propagate_error (error, _inner_error_);
-#line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_g_object_unref0 (list);
-#line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							return NULL;
-#line 3170 "SavedSearchDBTable.c"
-						} else {
-#line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_g_object_unref0 (list);
-#line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							g_clear_error (&_inner_error_);
-#line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							return NULL;
-#line 3182 "SavedSearchDBTable.c"
-						}
-					}
-				}
-			}
-#line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp14_ = stmt;
-#line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp15_ = sqlite3_column_text (_tmp14_, 0);
-#line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp16_ = stmt;
-#line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp17_ = sqlite3_column_text (_tmp16_, 2);
-#line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp18_ = stmt;
-#line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp19_ = sqlite3_column_text (_tmp18_, 1);
-#line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp20_ = search_condition_text_new (search_condition_search_type_from_string (_tmp15_), _tmp17_, search_condition_text_context_from_string (_tmp19_));
-#line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			condition = _tmp20_;
-#line 432 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp21_ = list;
-#line 432 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp22_ = condition;
-#line 432 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_SEARCH_CONDITION, SearchCondition));
-#line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_search_condition_unref0 (condition);
-#line 3211 "SavedSearchDBTable.c"
-		}
-	}
-#line 436 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp23_ = database_table_db;
-#line 436 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp25_ = sqlite3_prepare_v2 (_tmp23_, "SELECT search_type, context, type FROM SavedSearchDBTable_MediaType " "WHERE search_id=?", -1, &_tmp24_, NULL);
-#line 436 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 436 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp24_;
-#line 436 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp25_;
-#line 439 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp26_ = res;
-#line 439 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp26_ == SQLITE_OK, "res == Sqlite.OK");
-#line 441 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp27_ = stmt;
-#line 441 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp28_ = *search_id;
-#line 441 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp29_ = _tmp28_.id;
-#line 441 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_bind_int64 (_tmp27_, 1, _tmp29_);
-#line 442 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp30_ = res;
-#line 442 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK");
-#line 3240 "SavedSearchDBTable.c"
-	{
-		gboolean _tmp31_ = FALSE;
-#line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp31_ = TRUE;
-#line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		while (TRUE) {
-#line 3247 "SavedSearchDBTable.c"
-			sqlite3_stmt* _tmp32_;
-			gint _tmp33_;
-			SearchConditionMediaType* condition = NULL;
-			sqlite3_stmt* _tmp36_;
-			const gchar* _tmp37_;
-			sqlite3_stmt* _tmp38_;
-			const gchar* _tmp39_;
-			sqlite3_stmt* _tmp40_;
-			const gchar* _tmp41_;
-			SearchConditionMediaType* _tmp42_;
-			GeeList* _tmp43_;
-			SearchConditionMediaType* _tmp44_;
-#line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (!_tmp31_) {
-#line 3262 "SavedSearchDBTable.c"
-			}
-#line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp31_ = FALSE;
-#line 445 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp32_ = stmt;
-#line 445 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			res = sqlite3_step (_tmp32_);
-#line 446 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp33_ = res;
-#line 446 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (_tmp33_ == SQLITE_DONE) {
-#line 447 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				break;
-#line 3276 "SavedSearchDBTable.c"
-			} else {
-				gint _tmp34_;
-#line 448 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp34_ = res;
-#line 448 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				if (_tmp34_ != SQLITE_ROW) {
-#line 3283 "SavedSearchDBTable.c"
-					gint _tmp35_;
-#line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp35_ = res;
-#line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					database_table_throw_error ("SavedSearchDBTable_MediaType.get_all_rows", _tmp35_, &_inner_error_);
-#line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						if (_inner_error_->domain == DATABASE_ERROR) {
-#line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							g_propagate_error (error, _inner_error_);
-#line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_g_object_unref0 (list);
-#line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							return NULL;
-#line 3301 "SavedSearchDBTable.c"
-						} else {
-#line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_g_object_unref0 (list);
-#line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							g_clear_error (&_inner_error_);
-#line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							return NULL;
-#line 3313 "SavedSearchDBTable.c"
-						}
-					}
-				}
-			}
-#line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp36_ = stmt;
-#line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp37_ = sqlite3_column_text (_tmp36_, 0);
-#line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp38_ = stmt;
-#line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp39_ = sqlite3_column_text (_tmp38_, 1);
-#line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp40_ = stmt;
-#line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp41_ = sqlite3_column_text (_tmp40_, 2);
-#line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp42_ = search_condition_media_type_new (search_condition_search_type_from_string (_tmp37_), search_condition_media_type_context_from_string (_tmp39_), search_condition_media_type_media_type_from_string (_tmp41_));
-#line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			condition = _tmp42_;
-#line 456 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp43_ = list;
-#line 456 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp44_ = condition;
-#line 456 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_SEARCH_CONDITION, SearchCondition));
-#line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_search_condition_unref0 (condition);
-#line 3342 "SavedSearchDBTable.c"
-		}
-	}
-#line 460 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp45_ = database_table_db;
-#line 460 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp47_ = sqlite3_prepare_v2 (_tmp45_, "SELECT search_type, flag_state FROM SavedSearchDBTable_Flagged " "WHERE search_id=?", -1, &_tmp46_, NULL);
-#line 460 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 460 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp46_;
-#line 460 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp47_;
-#line 463 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp48_ = res;
-#line 463 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp48_ == SQLITE_OK, "res == Sqlite.OK");
-#line 465 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp49_ = stmt;
-#line 465 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp50_ = *search_id;
-#line 465 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp51_ = _tmp50_.id;
-#line 465 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_bind_int64 (_tmp49_, 1, _tmp51_);
-#line 466 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp52_ = res;
-#line 466 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp52_ == SQLITE_OK, "res == Sqlite.OK");
-#line 3371 "SavedSearchDBTable.c"
-	{
-		gboolean _tmp53_ = FALSE;
-#line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp53_ = TRUE;
-#line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		while (TRUE) {
-#line 3378 "SavedSearchDBTable.c"
-			sqlite3_stmt* _tmp54_;
-			gint _tmp55_;
-			SearchConditionFlagged* condition = NULL;
-			sqlite3_stmt* _tmp58_;
-			const gchar* _tmp59_;
-			sqlite3_stmt* _tmp60_;
-			const gchar* _tmp61_;
-			SearchConditionFlagged* _tmp62_;
-			GeeList* _tmp63_;
-			SearchConditionFlagged* _tmp64_;
-#line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (!_tmp53_) {
-#line 3391 "SavedSearchDBTable.c"
-			}
-#line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp53_ = FALSE;
-#line 469 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp54_ = stmt;
-#line 469 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			res = sqlite3_step (_tmp54_);
-#line 470 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp55_ = res;
-#line 470 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (_tmp55_ == SQLITE_DONE) {
-#line 471 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				break;
-#line 3405 "SavedSearchDBTable.c"
-			} else {
-				gint _tmp56_;
-#line 472 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp56_ = res;
-#line 472 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				if (_tmp56_ != SQLITE_ROW) {
-#line 3412 "SavedSearchDBTable.c"
-					gint _tmp57_;
-#line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp57_ = res;
-#line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					database_table_throw_error ("SavedSearchDBTable_Flagged.get_all_rows", _tmp57_, &_inner_error_);
-#line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						if (_inner_error_->domain == DATABASE_ERROR) {
-#line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							g_propagate_error (error, _inner_error_);
-#line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_g_object_unref0 (list);
-#line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							return NULL;
-#line 3430 "SavedSearchDBTable.c"
-						} else {
-#line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_g_object_unref0 (list);
-#line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							g_clear_error (&_inner_error_);
-#line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							return NULL;
-#line 3442 "SavedSearchDBTable.c"
-						}
-					}
-				}
-			}
-#line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp58_ = stmt;
-#line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp59_ = sqlite3_column_text (_tmp58_, 0);
-#line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp60_ = stmt;
-#line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp61_ = sqlite3_column_text (_tmp60_, 1);
-#line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp62_ = search_condition_flagged_new (search_condition_search_type_from_string (_tmp59_), search_condition_flagged_state_from_string (_tmp61_));
-#line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			condition = _tmp62_;
-#line 479 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp63_ = list;
-#line 479 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp64_ = condition;
-#line 479 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_SEARCH_CONDITION, SearchCondition));
-#line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_search_condition_unref0 (condition);
-#line 3467 "SavedSearchDBTable.c"
-		}
-	}
-#line 483 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp65_ = database_table_db;
-#line 483 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp67_ = sqlite3_prepare_v2 (_tmp65_, "SELECT search_type, context, modified_state FROM SavedSearchDBTable_Mo" \
-"dified " "WHERE search_id=?", -1, &_tmp66_, NULL);
-#line 483 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 483 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp66_;
-#line 483 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp67_;
-#line 486 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp68_ = res;
-#line 486 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp68_ == SQLITE_OK, "res == Sqlite.OK");
-#line 488 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp69_ = stmt;
-#line 488 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp70_ = *search_id;
-#line 488 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp71_ = _tmp70_.id;
-#line 488 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_bind_int64 (_tmp69_, 1, _tmp71_);
-#line 489 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp72_ = res;
-#line 489 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp72_ == SQLITE_OK, "res == Sqlite.OK");
-#line 3496 "SavedSearchDBTable.c"
-	{
-		gboolean _tmp73_ = FALSE;
-#line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp73_ = TRUE;
-#line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		while (TRUE) {
-#line 3503 "SavedSearchDBTable.c"
-			sqlite3_stmt* _tmp74_;
-			gint _tmp75_;
-			SearchConditionModified* condition = NULL;
-			sqlite3_stmt* _tmp78_;
-			const gchar* _tmp79_;
-			sqlite3_stmt* _tmp80_;
-			const gchar* _tmp81_;
-			sqlite3_stmt* _tmp82_;
-			const gchar* _tmp83_;
-			SearchConditionModified* _tmp84_;
-			GeeList* _tmp85_;
-			SearchConditionModified* _tmp86_;
-#line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (!_tmp73_) {
-#line 3518 "SavedSearchDBTable.c"
-			}
-#line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp73_ = FALSE;
-#line 492 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp74_ = stmt;
-#line 492 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			res = sqlite3_step (_tmp74_);
-#line 493 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp75_ = res;
-#line 493 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (_tmp75_ == SQLITE_DONE) {
-#line 494 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				break;
-#line 3532 "SavedSearchDBTable.c"
-			} else {
-				gint _tmp76_;
-#line 495 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp76_ = res;
-#line 495 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				if (_tmp76_ != SQLITE_ROW) {
-#line 3539 "SavedSearchDBTable.c"
-					gint _tmp77_;
-#line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp77_ = res;
-#line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					database_table_throw_error ("SavedSearchDBTable_Modified.get_all_rows", _tmp77_, &_inner_error_);
-#line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						if (_inner_error_->domain == DATABASE_ERROR) {
-#line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							g_propagate_error (error, _inner_error_);
-#line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_g_object_unref0 (list);
-#line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							return NULL;
-#line 3557 "SavedSearchDBTable.c"
-						} else {
-#line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_g_object_unref0 (list);
-#line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							g_clear_error (&_inner_error_);
-#line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							return NULL;
-#line 3569 "SavedSearchDBTable.c"
-						}
-					}
-				}
-			}
-#line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp78_ = stmt;
-#line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp79_ = sqlite3_column_text (_tmp78_, 0);
-#line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp80_ = stmt;
-#line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp81_ = sqlite3_column_text (_tmp80_, 1);
-#line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp82_ = stmt;
-#line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp83_ = sqlite3_column_text (_tmp82_, 2);
-#line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp84_ = search_condition_modified_new (search_condition_search_type_from_string (_tmp79_), search_condition_modified_context_from_string (_tmp81_), search_condition_modified_state_from_string (_tmp83_));
-#line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			condition = _tmp84_;
-#line 503 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp85_ = list;
-#line 503 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp86_ = condition;
-#line 503 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, TYPE_SEARCH_CONDITION, SearchCondition));
-#line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_search_condition_unref0 (condition);
-#line 3598 "SavedSearchDBTable.c"
-		}
-	}
-#line 507 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp87_ = database_table_db;
-#line 507 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp89_ = sqlite3_prepare_v2 (_tmp87_, "SELECT search_type, rating, context FROM SavedSearchDBTable_Rating " "WHERE search_id=?", -1, &_tmp88_, NULL);
-#line 507 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 507 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp88_;
-#line 507 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp89_;
-#line 510 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp90_ = res;
-#line 510 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp90_ == SQLITE_OK, "res == Sqlite.OK");
-#line 512 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp91_ = stmt;
-#line 512 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp92_ = *search_id;
-#line 512 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp93_ = _tmp92_.id;
-#line 512 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_bind_int64 (_tmp91_, 1, _tmp93_);
-#line 513 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp94_ = res;
-#line 513 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp94_ == SQLITE_OK, "res == Sqlite.OK");
-#line 3627 "SavedSearchDBTable.c"
-	{
-		gboolean _tmp95_ = FALSE;
-#line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp95_ = TRUE;
-#line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		while (TRUE) {
-#line 3634 "SavedSearchDBTable.c"
-			sqlite3_stmt* _tmp96_;
-			gint _tmp97_;
-			SearchConditionRating* condition = NULL;
-			sqlite3_stmt* _tmp100_;
-			const gchar* _tmp101_;
-			sqlite3_stmt* _tmp102_;
-			sqlite3_stmt* _tmp103_;
-			const gchar* _tmp104_;
-			SearchConditionRating* _tmp105_;
-			GeeList* _tmp106_;
-			SearchConditionRating* _tmp107_;
-#line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (!_tmp95_) {
-#line 3648 "SavedSearchDBTable.c"
-			}
-#line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp95_ = FALSE;
-#line 516 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp96_ = stmt;
-#line 516 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			res = sqlite3_step (_tmp96_);
-#line 517 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp97_ = res;
-#line 517 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (_tmp97_ == SQLITE_DONE) {
-#line 518 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				break;
-#line 3662 "SavedSearchDBTable.c"
-			} else {
-				gint _tmp98_;
-#line 519 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp98_ = res;
-#line 519 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				if (_tmp98_ != SQLITE_ROW) {
-#line 3669 "SavedSearchDBTable.c"
-					gint _tmp99_;
-#line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp99_ = res;
-#line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					database_table_throw_error ("SavedSearchDBTable_Rating.get_all_rows", _tmp99_, &_inner_error_);
-#line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						if (_inner_error_->domain == DATABASE_ERROR) {
-#line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							g_propagate_error (error, _inner_error_);
-#line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_g_object_unref0 (list);
-#line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							return NULL;
-#line 3687 "SavedSearchDBTable.c"
-						} else {
-#line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_g_object_unref0 (list);
-#line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							g_clear_error (&_inner_error_);
-#line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							return NULL;
-#line 3699 "SavedSearchDBTable.c"
-						}
-					}
-				}
-			}
-#line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp100_ = stmt;
-#line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp101_ = sqlite3_column_text (_tmp100_, 0);
-#line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp102_ = stmt;
-#line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp103_ = stmt;
-#line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp104_ = sqlite3_column_text (_tmp103_, 2);
-#line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp105_ = search_condition_rating_new (search_condition_search_type_from_string (_tmp101_), rating_unserialize (sqlite3_column_int (_tmp102_, 1)), search_condition_rating_context_from_string (_tmp104_));
-#line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			condition = _tmp105_;
-#line 527 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp106_ = list;
-#line 527 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp107_ = condition;
-#line 527 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_SEARCH_CONDITION, SearchCondition));
-#line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_search_condition_unref0 (condition);
-#line 3726 "SavedSearchDBTable.c"
-		}
-	}
-#line 531 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp108_ = database_table_db;
-#line 531 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp110_ = sqlite3_prepare_v2 (_tmp108_, "SELECT search_type, context, date_one, date_two FROM SavedSearchDBTabl" \
-"e_Date " "WHERE search_id=?", -1, &_tmp109_, NULL);
-#line 531 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 531 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp109_;
-#line 531 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp110_;
-#line 534 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp111_ = res;
-#line 534 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp111_ == SQLITE_OK, "res == Sqlite.OK");
-#line 536 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp112_ = stmt;
-#line 536 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp113_ = *search_id;
-#line 536 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp114_ = _tmp113_.id;
-#line 536 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_bind_int64 (_tmp112_, 1, _tmp114_);
-#line 537 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp115_ = res;
-#line 537 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp115_ == SQLITE_OK, "res == Sqlite.OK");
-#line 3755 "SavedSearchDBTable.c"
-	{
-		gboolean _tmp116_ = FALSE;
-#line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp116_ = TRUE;
-#line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		while (TRUE) {
-#line 3762 "SavedSearchDBTable.c"
-			sqlite3_stmt* _tmp117_;
-			gint _tmp118_;
-			SearchConditionDate* condition = NULL;
-			sqlite3_stmt* _tmp121_;
-			const gchar* _tmp122_;
-			sqlite3_stmt* _tmp123_;
-			const gchar* _tmp124_;
-			sqlite3_stmt* _tmp125_;
-			GDateTime* _tmp126_;
-			GDateTime* _tmp127_;
-			sqlite3_stmt* _tmp128_;
-			GDateTime* _tmp129_;
-			GDateTime* _tmp130_;
-			SearchConditionDate* _tmp131_;
-			SearchConditionDate* _tmp132_;
-			GeeList* _tmp133_;
-			SearchConditionDate* _tmp134_;
-#line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (!_tmp116_) {
-#line 3782 "SavedSearchDBTable.c"
-			}
-#line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp116_ = FALSE;
-#line 540 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp117_ = stmt;
-#line 540 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			res = sqlite3_step (_tmp117_);
-#line 541 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp118_ = res;
-#line 541 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (_tmp118_ == SQLITE_DONE) {
-#line 542 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				break;
-#line 3796 "SavedSearchDBTable.c"
-			} else {
-				gint _tmp119_;
-#line 543 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp119_ = res;
-#line 543 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				if (_tmp119_ != SQLITE_ROW) {
-#line 3803 "SavedSearchDBTable.c"
-					gint _tmp120_;
-#line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp120_ = res;
-#line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					database_table_throw_error ("SavedSearchDBTable_Date.get_all_rows", _tmp120_, &_inner_error_);
-#line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						if (_inner_error_->domain == DATABASE_ERROR) {
-#line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							g_propagate_error (error, _inner_error_);
-#line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_g_object_unref0 (list);
-#line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							return NULL;
-#line 3821 "SavedSearchDBTable.c"
-						} else {
-#line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_g_object_unref0 (list);
-#line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							g_clear_error (&_inner_error_);
-#line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							return NULL;
-#line 3833 "SavedSearchDBTable.c"
-						}
-					}
-				}
-			}
-#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp121_ = stmt;
-#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp122_ = sqlite3_column_text (_tmp121_, 0);
-#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp123_ = stmt;
-#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp124_ = sqlite3_column_text (_tmp123_, 1);
-#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp125_ = stmt;
-#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp126_ = g_date_time_new_from_unix_local (sqlite3_column_int64 (_tmp125_, 2));
-#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp127_ = _tmp126_;
-#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp128_ = stmt;
-#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp129_ = g_date_time_new_from_unix_local (sqlite3_column_int64 (_tmp128_, 3));
-#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp130_ = _tmp129_;
-#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp131_ = search_condition_date_new (search_condition_search_type_from_string (_tmp122_), search_condition_date_context_from_string (_tmp124_), _tmp127_, _tmp130_);
-#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp132_ = _tmp131_;
-#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_g_date_time_unref0 (_tmp130_);
-#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_g_date_time_unref0 (_tmp127_);
-#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			condition = _tmp132_;
-#line 551 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp133_ = list;
-#line 551 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp134_ = condition;
-#line 551 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, TYPE_SEARCH_CONDITION, SearchCondition));
-#line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_search_condition_unref0 (condition);
-#line 3876 "SavedSearchDBTable.c"
-		}
-	}
-#line 554 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	result = list;
-#line 554 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 554 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	return result;
-#line 3885 "SavedSearchDBTable.c"
-}
-
-
-void
-saved_search_db_table_create_from_row (SavedSearchDBTable* self,
-                                       SavedSearchRow* row,
-                                       SavedSearchID* result,
-                                       GError** error)
-{
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	const gchar* _tmp5_;
-	gchar* _tmp6_;
-	GDestroyNotify _tmp7_;
-	gint _tmp8_;
-	sqlite3_stmt* _tmp9_;
-	SearchOperator _tmp10_;
-	gchar* _tmp11_;
-	GDestroyNotify _tmp12_;
-	gint _tmp13_;
-	sqlite3_stmt* _tmp14_;
-	gint _tmp15_;
-	SavedSearchID search_id = {0};
-	sqlite3* _tmp17_;
-	GError * _inner_error_ = NULL;
-#line 558 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self));
-#line 558 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_if_fail (IS_SAVED_SEARCH_ROW (row));
-#line 560 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp0_ = database_table_db;
-#line 560 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "INSERT INTO SavedSearchDBTable (name, operator) VALUES (?, ?)", -1, &_tmp1_, NULL);
-#line 560 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 560 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp1_;
-#line 560 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp2_;
-#line 562 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp3_ = res;
-#line 562 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp4_ = stmt;
-#line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp5_ = row->name;
-#line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp6_ = g_strdup (_tmp5_);
-#line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp7_ = g_free;
-#line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_);
-#line 565 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp8_ = res;
-#line 565 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
-#line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp9_ = stmt;
-#line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp10_ = row->operator;
-#line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp11_ = search_operator_to_string (_tmp10_);
-#line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp12_ = g_free;
-#line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_bind_text (_tmp9_, 2, _tmp11_, -1, _tmp12_);
-#line 567 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp13_ = res;
-#line 567 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK");
-#line 569 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp14_ = stmt;
-#line 569 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_step (_tmp14_);
-#line 570 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp15_ = res;
-#line 570 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (_tmp15_ != SQLITE_DONE) {
-#line 3970 "SavedSearchDBTable.c"
-		gint _tmp16_;
-#line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp16_ = res;
-#line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		database_table_throw_error ("SavedSearchDBTable.create_from_row", _tmp16_, &_inner_error_);
-#line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				return;
-#line 3986 "SavedSearchDBTable.c"
-			} else {
-#line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				g_clear_error (&_inner_error_);
-#line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				return;
-#line 3996 "SavedSearchDBTable.c"
-			}
-		}
-	}
-#line 573 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp17_ = database_table_db;
-#line 573 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	saved_search_id_init (&search_id, sqlite3_last_insert_rowid (_tmp17_));
-#line 4004 "SavedSearchDBTable.c"
-	{
-		GeeList* _sc_list = NULL;
-		GeeList* _tmp18_;
-		GeeList* _tmp19_;
-		gint _sc_size = 0;
-		GeeList* _tmp20_;
-		gint _tmp21_;
-		gint _tmp22_;
-		gint _sc_index = 0;
-#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp18_ = row->conditions;
-#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp19_ = _g_object_ref0 (_tmp18_);
-#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_sc_list = _tmp19_;
-#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp20_ = _sc_list;
-#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp22_ = _tmp21_;
-#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_sc_size = _tmp22_;
-#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_sc_index = -1;
-#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		while (TRUE) {
-#line 4032 "SavedSearchDBTable.c"
-			gint _tmp23_;
-			gint _tmp24_;
-			gint _tmp25_;
-			SearchCondition* sc = NULL;
-			GeeList* _tmp26_;
-			gint _tmp27_;
-			gpointer _tmp28_;
-			SavedSearchID _tmp29_;
-			SearchCondition* _tmp30_;
-#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp23_ = _sc_index;
-#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_sc_index = _tmp23_ + 1;
-#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp24_ = _sc_index;
-#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp25_ = _sc_size;
-#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (!(_tmp24_ < _tmp25_)) {
-#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				break;
-#line 4054 "SavedSearchDBTable.c"
-			}
-#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp26_ = _sc_list;
-#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp27_ = _sc_index;
-#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp28_ = gee_list_get (_tmp26_, _tmp27_);
-#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			sc = (SearchCondition*) _tmp28_;
-#line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp29_ = search_id;
-#line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp30_ = sc;
-#line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			saved_search_db_table_add_condition (self, &_tmp29_, _tmp30_, &_inner_error_);
-#line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					g_propagate_error (error, _inner_error_);
-#line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_search_condition_unref0 (sc);
-#line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_g_object_unref0 (_sc_list);
-#line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_sqlite3_finalize0 (stmt);
-#line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					return;
-#line 4084 "SavedSearchDBTable.c"
-				} else {
-#line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_search_condition_unref0 (sc);
-#line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_g_object_unref0 (_sc_list);
-#line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_sqlite3_finalize0 (stmt);
-#line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					g_clear_error (&_inner_error_);
-#line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					return;
-#line 4098 "SavedSearchDBTable.c"
-				}
-			}
-#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_search_condition_unref0 (sc);
-#line 4103 "SavedSearchDBTable.c"
-		}
-#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_g_object_unref0 (_sc_list);
-#line 4107 "SavedSearchDBTable.c"
-	}
-#line 579 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	*result = search_id;
-#line 579 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 579 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	return;
-#line 4115 "SavedSearchDBTable.c"
-}
-
-
-void
-saved_search_db_table_remove (SavedSearchDBTable* self,
-                              SavedSearchID* search_id,
-                              GError** error)
-{
-	SavedSearchID _tmp0_;
-	SavedSearchID _tmp1_;
-	gint64 _tmp2_;
-	GError * _inner_error_ = NULL;
-#line 582 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self));
-#line 582 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_if_fail (search_id != NULL);
-#line 583 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp0_ = *search_id;
-#line 583 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	saved_search_db_table_remove_conditions_for_search_id (self, &_tmp0_, &_inner_error_);
-#line 583 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 583 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 583 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 583 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			return;
-#line 4144 "SavedSearchDBTable.c"
-		} else {
-#line 583 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 583 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			g_clear_error (&_inner_error_);
-#line 583 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			return;
-#line 4152 "SavedSearchDBTable.c"
-		}
-	}
-#line 584 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp1_ = *search_id;
-#line 584 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp2_ = _tmp1_.id;
-#line 584 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	database_table_delete_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, &_inner_error_);
-#line 584 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 584 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 584 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 584 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			return;
-#line 4169 "SavedSearchDBTable.c"
-		} else {
-#line 584 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 584 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			g_clear_error (&_inner_error_);
-#line 584 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			return;
-#line 4177 "SavedSearchDBTable.c"
-		}
-	}
-}
-
-
-SavedSearchRow*
-saved_search_db_table_get_row (SavedSearchDBTable* self,
-                               SavedSearchID* search_id,
-                               GError** error)
-{
-	SavedSearchRow* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	SavedSearchID _tmp5_;
-	gint64 _tmp6_;
-	gint _tmp7_;
-	sqlite3_stmt* _tmp8_;
-	gint _tmp9_;
-	SavedSearchRow* row = NULL;
-	SavedSearchRow* _tmp12_;
-	SavedSearchRow* _tmp13_;
-	SavedSearchID _tmp14_;
-	SavedSearchRow* _tmp15_;
-	sqlite3_stmt* _tmp16_;
-	const gchar* _tmp17_;
-	gchar* _tmp18_;
-	SavedSearchRow* _tmp19_;
-	sqlite3_stmt* _tmp20_;
-	const gchar* _tmp21_;
-	GError * _inner_error_ = NULL;
-#line 587 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL);
-#line 587 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_val_if_fail (search_id != NULL, NULL);
-#line 589 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp0_ = database_table_db;
-#line 589 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT name, operator FROM SavedSearchDBTable WHERE id=?", -1, &_tmp1_, NULL);
-#line 589 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 589 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp1_;
-#line 589 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp2_;
-#line 591 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp3_ = res;
-#line 591 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 593 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp4_ = stmt;
-#line 593 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp5_ = *search_id;
-#line 593 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp6_ = _tmp5_.id;
-#line 593 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_);
-#line 594 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp7_ = res;
-#line 594 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 596 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp8_ = stmt;
-#line 596 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = sqlite3_step (_tmp8_);
-#line 597 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp9_ = res;
-#line 597 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (_tmp9_ == SQLITE_DONE) {
-#line 598 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		result = NULL;
-#line 598 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 598 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		return result;
-#line 4257 "SavedSearchDBTable.c"
-	} else {
-		gint _tmp10_;
-#line 599 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp10_ = res;
-#line 599 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		if (_tmp10_ != SQLITE_ROW) {
-#line 4264 "SavedSearchDBTable.c"
-			gint _tmp11_;
-#line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp11_ = res;
-#line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			database_table_throw_error ("SavedSearchDBTable.get_row", _tmp11_, &_inner_error_);
-#line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					g_propagate_error (error, _inner_error_);
-#line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_sqlite3_finalize0 (stmt);
-#line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					return NULL;
-#line 4280 "SavedSearchDBTable.c"
-				} else {
-#line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_sqlite3_finalize0 (stmt);
-#line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					g_clear_error (&_inner_error_);
-#line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					return NULL;
-#line 4290 "SavedSearchDBTable.c"
-				}
-			}
-		}
-	}
-#line 602 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp12_ = saved_search_row_new ();
-#line 602 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	row = _tmp12_;
-#line 603 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp13_ = row;
-#line 603 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp14_ = *search_id;
-#line 603 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp13_->search_id = _tmp14_;
-#line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp15_ = row;
-#line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp16_ = stmt;
-#line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp17_ = sqlite3_column_text (_tmp16_, 0);
-#line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp18_ = g_strdup (_tmp17_);
-#line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_g_free0 (_tmp15_->name);
-#line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp15_->name = _tmp18_;
-#line 605 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp19_ = row;
-#line 605 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp20_ = stmt;
-#line 605 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp21_ = sqlite3_column_text (_tmp20_, 1);
-#line 605 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp19_->operator = search_operator_from_string (_tmp21_);
-#line 607 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	result = row;
-#line 607 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 607 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	return result;
-#line 4331 "SavedSearchDBTable.c"
-}
-
-
-GeeList*
-saved_search_db_table_get_all_rows (SavedSearchDBTable* self,
-                                    GError** error)
-{
-	GeeList* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	GeeList* rows = NULL;
-	GeeArrayList* _tmp4_;
-	GError * _inner_error_ = NULL;
-#line 610 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL);
-#line 612 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp0_ = database_table_db;
-#line 612 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT id, name, operator FROM SavedSearchDBTable", -1, &_tmp1_, NULL);
-#line 612 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 612 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	stmt = _tmp1_;
-#line 612 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	res = _tmp2_;
-#line 614 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp3_ = res;
-#line 614 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 616 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp4_ = gee_array_list_new (TYPE_SAVED_SEARCH_ROW, (GBoxedCopyFunc) saved_search_row_ref, (GDestroyNotify) saved_search_row_unref, NULL, NULL, NULL);
-#line 616 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	rows = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList);
-#line 4369 "SavedSearchDBTable.c"
-	{
-		gboolean _tmp5_ = FALSE;
-#line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp5_ = TRUE;
-#line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		while (TRUE) {
-#line 4376 "SavedSearchDBTable.c"
-			sqlite3_stmt* _tmp6_;
-			gint _tmp7_;
-			SavedSearchRow* row = NULL;
-			SavedSearchRow* _tmp10_;
-			SavedSearchRow* _tmp11_;
-			sqlite3_stmt* _tmp12_;
-			SavedSearchRow* _tmp13_;
-			sqlite3_stmt* _tmp14_;
-			const gchar* _tmp15_;
-			gchar* _tmp16_;
-			SavedSearchRow* _tmp17_;
-			sqlite3_stmt* _tmp18_;
-			const gchar* _tmp19_;
-			GeeList* _tmp20_ = NULL;
-			SavedSearchRow* _tmp21_;
-			SavedSearchID _tmp22_;
-			GeeList* _tmp23_;
-			SavedSearchRow* _tmp24_;
-			GeeList* _tmp25_;
-			GeeList* _tmp26_;
-			SavedSearchRow* _tmp27_;
-#line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (!_tmp5_) {
-#line 4400 "SavedSearchDBTable.c"
-			}
-#line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp5_ = FALSE;
-#line 619 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp6_ = stmt;
-#line 619 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			res = sqlite3_step (_tmp6_);
-#line 620 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp7_ = res;
-#line 620 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (_tmp7_ == SQLITE_DONE) {
-#line 621 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				break;
-#line 4414 "SavedSearchDBTable.c"
-			} else {
-				gint _tmp8_;
-#line 622 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				_tmp8_ = res;
-#line 622 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				if (_tmp8_ != SQLITE_ROW) {
-#line 4421 "SavedSearchDBTable.c"
-					gint _tmp9_;
-#line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_tmp9_ = res;
-#line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					database_table_throw_error ("SavedSearchDBTable.get_all_rows", _tmp9_, &_inner_error_);
-#line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-						if (_inner_error_->domain == DATABASE_ERROR) {
-#line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							g_propagate_error (error, _inner_error_);
-#line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_g_object_unref0 (rows);
-#line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							return NULL;
-#line 4439 "SavedSearchDBTable.c"
-						} else {
-#line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_g_object_unref0 (rows);
-#line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							g_clear_error (&_inner_error_);
-#line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-							return NULL;
-#line 4451 "SavedSearchDBTable.c"
-						}
-					}
-				}
-			}
-#line 625 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp10_ = saved_search_row_new ();
-#line 625 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			row = _tmp10_;
-#line 626 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp11_ = row;
-#line 626 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp12_ = stmt;
-#line 626 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			saved_search_id_init (&_tmp11_->search_id, sqlite3_column_int64 (_tmp12_, 0));
-#line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp13_ = row;
-#line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp14_ = stmt;
-#line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp15_ = sqlite3_column_text (_tmp14_, 1);
-#line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp16_ = g_strdup (_tmp15_);
-#line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_g_free0 (_tmp13_->name);
-#line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp13_->name = _tmp16_;
-#line 628 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp17_ = row;
-#line 628 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp18_ = stmt;
-#line 628 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp19_ = sqlite3_column_text (_tmp18_, 2);
-#line 628 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp17_->operator = search_operator_from_string (_tmp19_);
-#line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp21_ = row;
-#line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp22_ = _tmp21_->search_id;
-#line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp23_ = saved_search_db_table_get_conditions_for_id (self, &_tmp22_, &_inner_error_);
-#line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp20_ = _tmp23_;
-#line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					g_propagate_error (error, _inner_error_);
-#line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_saved_search_row_unref0 (row);
-#line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_g_object_unref0 (rows);
-#line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_sqlite3_finalize0 (stmt);
-#line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					return NULL;
-#line 4508 "SavedSearchDBTable.c"
-				} else {
-#line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_saved_search_row_unref0 (row);
-#line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_g_object_unref0 (rows);
-#line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					_sqlite3_finalize0 (stmt);
-#line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					g_clear_error (&_inner_error_);
-#line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-					return NULL;
-#line 4522 "SavedSearchDBTable.c"
-				}
-			}
-#line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp24_ = row;
-#line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp25_ = _tmp20_;
-#line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp20_ = NULL;
-#line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_g_object_unref0 (_tmp24_->conditions);
-#line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp24_->conditions = _tmp25_;
-#line 631 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp26_ = rows;
-#line 631 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_tmp27_ = row;
-#line 631 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_);
-#line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_g_object_unref0 (_tmp20_);
-#line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			_saved_search_row_unref0 (row);
-#line 4545 "SavedSearchDBTable.c"
-		}
-	}
-#line 634 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	result = rows;
-#line 634 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 634 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	return result;
-#line 4554 "SavedSearchDBTable.c"
-}
-
-
-void
-saved_search_db_table_rename (SavedSearchDBTable* self,
-                              SavedSearchID* search_id,
-                              const gchar* new_name,
-                              GError** error)
-{
-	SavedSearchID _tmp0_;
-	gint64 _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 637 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self));
-#line 637 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_if_fail (search_id != NULL);
-#line 637 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	g_return_if_fail (new_name != NULL);
-#line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp0_ = *search_id;
-#line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "name", new_name, &_inner_error_);
-#line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			return;
-#line 4587 "SavedSearchDBTable.c"
-		} else {
-#line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			g_clear_error (&_inner_error_);
-#line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-			return;
-#line 4595 "SavedSearchDBTable.c"
-		}
-	}
-}
-
-
-static void
-saved_search_db_table_class_init (SavedSearchDBTableClass * klass)
-{
-#line 33 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	saved_search_db_table_parent_class = g_type_class_peek_parent (klass);
-#line 33 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	((DatabaseTableClass *) klass)->finalize = saved_search_db_table_finalize;
-#line 4608 "SavedSearchDBTable.c"
-}
-
-
-static void
-saved_search_db_table_instance_init (SavedSearchDBTable * self)
-{
-}
-
-
-static void
-saved_search_db_table_finalize (DatabaseTable * obj)
-{
-	SavedSearchDBTable * self;
-#line 33 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_DB_TABLE, SavedSearchDBTable);
-#line 33 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	DATABASE_TABLE_CLASS (saved_search_db_table_parent_class)->finalize (obj);
-#line 4626 "SavedSearchDBTable.c"
-}
-
-
-GType
-saved_search_db_table_get_type (void)
-{
-	static volatile gsize saved_search_db_table_type_id__volatile = 0;
-	if (g_once_init_enter (&saved_search_db_table_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDBTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_db_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDBTable), 0, (GInstanceInitFunc) saved_search_db_table_instance_init, NULL };
-		GType saved_search_db_table_type_id;
-		saved_search_db_table_type_id = g_type_register_static (TYPE_DATABASE_TABLE, "SavedSearchDBTable", &g_define_type_info, 0);
-		g_once_init_leave (&saved_search_db_table_type_id__volatile, saved_search_db_table_type_id);
-	}
-	return saved_search_db_table_type_id__volatile;
-}
-
-
-
diff --git a/src/db/TagTable.c b/src/db/TagTable.c
deleted file mode 100644
index b1c77a4..0000000
--- a/src/db/TagTable.c
+++ /dev/null
@@ -1,2341 +0,0 @@
-/* TagTable.c generated by valac 0.40.4, the Vala compiler
- * generated from TagTable.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-#include <string.h>
-#include <stdlib.h>
-#include <gee.h>
-#include <time.h>
-#include <sqlite3.h>
-#include <gobject/gvaluecollector.h>
-
-
-#define TYPE_TAG_ID (tag_id_get_type ())
-typedef struct _TagID TagID;
-
-#define TYPE_TAG_ROW (tag_row_get_type ())
-#define TAG_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TAG_ROW, TagRow))
-#define TAG_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TAG_ROW, TagRowClass))
-#define IS_TAG_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TAG_ROW))
-#define IS_TAG_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TAG_ROW))
-#define TAG_ROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TAG_ROW, TagRowClass))
-
-typedef struct _TagRow TagRow;
-typedef struct _TagRowClass TagRowClass;
-typedef struct _TagRowPrivate TagRowPrivate;
-#define _g_free0(var) (var = (g_free (var), NULL))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-typedef struct _ParamSpecTagRow ParamSpecTagRow;
-
-#define TYPE_DATABASE_TABLE (database_table_get_type ())
-#define DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATABASE_TABLE, DatabaseTable))
-#define DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATABASE_TABLE, DatabaseTableClass))
-#define IS_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATABASE_TABLE))
-#define IS_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DATABASE_TABLE))
-#define DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DATABASE_TABLE, DatabaseTableClass))
-
-typedef struct _DatabaseTable DatabaseTable;
-typedef struct _DatabaseTableClass DatabaseTableClass;
-typedef struct _DatabaseTablePrivate DatabaseTablePrivate;
-
-#define TYPE_TAG_TABLE (tag_table_get_type ())
-#define TAG_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TAG_TABLE, TagTable))
-#define TAG_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TAG_TABLE, TagTableClass))
-#define IS_TAG_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TAG_TABLE))
-#define IS_TAG_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TAG_TABLE))
-#define TAG_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TAG_TABLE, TagTableClass))
-
-typedef struct _TagTable TagTable;
-typedef struct _TagTableClass TagTableClass;
-typedef struct _TagTablePrivate TagTablePrivate;
-#define _sqlite3_finalize0(var) ((var == NULL) ? NULL : (var = (sqlite3_finalize (var), NULL)))
-#define _database_table_unref0(var) ((var == NULL) ? NULL : (var = (database_table_unref (var), NULL)))
-#define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-#define _tag_row_unref0(var) ((var == NULL) ? NULL : (var = (tag_row_unref (var), NULL)))
-#define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL)))
-
-#define TYPE_PHOTO_ID (photo_id_get_type ())
-typedef struct _PhotoID PhotoID;
-#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
-#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
-#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-
-struct _TagID {
-	gint64 id;
-};
-
-struct _TagRow {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	TagRowPrivate * priv;
-	TagID tag_id;
-	gchar* name;
-	GeeSet* source_id_list;
-	time_t time_created;
-};
-
-struct _TagRowClass {
-	GTypeClass parent_class;
-	void (*finalize) (TagRow *self);
-};
-
-struct _ParamSpecTagRow {
-	GParamSpec parent_instance;
-};
-
-struct _DatabaseTable {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	DatabaseTablePrivate * priv;
-	gchar* table_name;
-};
-
-struct _DatabaseTableClass {
-	GTypeClass parent_class;
-	void (*finalize) (DatabaseTable *self);
-};
-
-struct _TagTable {
-	DatabaseTable parent_instance;
-	TagTablePrivate * priv;
-};
-
-struct _TagTableClass {
-	DatabaseTableClass parent_class;
-};
-
-typedef enum  {
-	DATABASE_ERROR_ERROR,
-	DATABASE_ERROR_BACKING,
-	DATABASE_ERROR_MEMORY,
-	DATABASE_ERROR_ABORT,
-	DATABASE_ERROR_LIMITS,
-	DATABASE_ERROR_TYPESPEC
-} DatabaseError;
-#define DATABASE_ERROR database_error_quark ()
-struct _PhotoID {
-	gint64 id;
-};
-
-
-static gpointer tag_row_parent_class = NULL;
-static gpointer tag_table_parent_class = NULL;
-static TagTable* tag_table_instance;
-static TagTable* tag_table_instance = NULL;
-extern sqlite3* database_table_db;
-
-GType tag_id_get_type (void) G_GNUC_CONST;
-TagID* tag_id_dup (const TagID* self);
-void tag_id_free (TagID* self);
-#define TAG_ID_INVALID ((gint64) -1)
-void tag_id_init (TagID *self,
-                  gint64 id);
-gboolean tag_id_is_invalid (TagID *self);
-gboolean tag_id_is_valid (TagID *self);
-gpointer tag_row_ref (gpointer instance);
-void tag_row_unref (gpointer instance);
-GParamSpec* param_spec_tag_row (const gchar* name,
-                                const gchar* nick,
-                                const gchar* blurb,
-                                GType object_type,
-                                GParamFlags flags);
-void value_set_tag_row (GValue* value,
-                        gpointer v_object);
-void value_take_tag_row (GValue* value,
-                         gpointer v_object);
-gpointer value_get_tag_row (const GValue* value);
-GType tag_row_get_type (void) G_GNUC_CONST;
-TagRow* tag_row_new (void);
-TagRow* tag_row_construct (GType object_type);
-static void tag_row_finalize (TagRow * obj);
-gpointer database_table_ref (gpointer instance);
-void database_table_unref (gpointer instance);
-GParamSpec* param_spec_database_table (const gchar* name,
-                                       const gchar* nick,
-                                       const gchar* blurb,
-                                       GType object_type,
-                                       GParamFlags flags);
-void value_set_database_table (GValue* value,
-                               gpointer v_object);
-void value_take_database_table (GValue* value,
-                                gpointer v_object);
-gpointer value_get_database_table (const GValue* value);
-GType database_table_get_type (void) G_GNUC_CONST;
-GType tag_table_get_type (void) G_GNUC_CONST;
-static TagTable* tag_table_new (void);
-static TagTable* tag_table_construct (GType object_type);
-DatabaseTable* database_table_construct (GType object_type);
-void database_table_set_table_name (DatabaseTable* self,
-                                    const gchar* table_name);
-void database_table_fatal (const gchar* op,
-                           gint res);
-TagTable* tag_table_get_instance (void);
-void tag_table_upgrade_for_htags (void);
-GQuark database_error_quark (void);
-GeeList* tag_table_get_all_rows (TagTable* self,
-                                 GError** error);
-#define TAG_PATH_SEPARATOR_STRING "/"
-void tag_table_rename (TagTable* self,
-                       TagID* tag_id,
-                       const gchar* new_name,
-                       GError** error);
-TagRow* tag_table_add (TagTable* self,
-                       const gchar* name,
-                       GError** error);
-gulong now_sec (void);
-void database_table_throw_error (const gchar* method,
-                                 gint res,
-                                 GError** error);
-void tag_table_create_from_row (TagTable* self,
-                                TagRow* row,
-                                TagID* result,
-                                GError** error);
-static gchar* tag_table_serialize_source_ids (TagTable* self,
-                                       GeeCollection* source_ids);
-void tag_table_remove (TagTable* self,
-                       TagID* tag_id,
-                       GError** error);
-void database_table_delete_by_id (DatabaseTable* self,
-                                  gint64 id,
-                                  GError** error);
-gchar* tag_table_get_name (TagTable* self,
-                           TagID* tag_id,
-                           GError** error);
-gboolean database_table_select_by_id (DatabaseTable* self,
-                                      gint64 id,
-                                      const gchar* columns,
-                                      sqlite3_stmt* * stmt);
-TagRow* tag_table_get_row (TagTable* self,
-                           TagID* tag_id,
-                           GError** error);
-static GeeSet* tag_table_unserialize_source_ids (TagTable* self,
-                                          const gchar* text_list);
-void database_table_update_text_by_id_2 (DatabaseTable* self,
-                                         gint64 id,
-                                         const gchar* column,
-                                         const gchar* text,
-                                         GError** error);
-void tag_table_set_tagged_sources (TagTable* self,
-                                   TagID* tag_id,
-                                   GeeCollection* source_ids,
-                                   GError** error);
-gboolean is_string_empty (const gchar* s);
-GType photo_id_get_type (void) G_GNUC_CONST;
-PhotoID* photo_id_dup (const PhotoID* self);
-void photo_id_free (PhotoID* self);
-gchar* photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id);
-gint64 parse_int64 (const gchar* str,
-                    gint num_base);
-void photo_id_init (PhotoID *self,
-                    gint64 id);
-static void tag_table_finalize (DatabaseTable * obj);
-static void _vala_array_destroy (gpointer array,
-                          gint array_length,
-                          GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array,
-                       gint array_length,
-                       GDestroyNotify destroy_func);
-static gint _vala_array_length (gpointer array);
-
-
-void
-tag_id_init (TagID *self,
-             gint64 id)
-{
-#line 12 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	memset (self, 0, sizeof (TagID));
-#line 13 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	(*self).id = id;
-#line 260 "TagTable.c"
-}
-
-
-gboolean
-tag_id_is_invalid (TagID *self)
-{
-	gboolean result = FALSE;
-	gint64 _tmp0_;
-#line 17 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp0_ = (*self).id;
-#line 17 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	result = _tmp0_ == TAG_ID_INVALID;
-#line 17 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	return result;
-#line 275 "TagTable.c"
-}
-
-
-gboolean
-tag_id_is_valid (TagID *self)
-{
-	gboolean result = FALSE;
-	gint64 _tmp0_;
-#line 21 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp0_ = (*self).id;
-#line 21 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	result = _tmp0_ != TAG_ID_INVALID;
-#line 21 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	return result;
-#line 290 "TagTable.c"
-}
-
-
-TagID*
-tag_id_dup (const TagID* self)
-{
-	TagID* dup;
-#line 7 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	dup = g_new0 (TagID, 1);
-#line 7 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	memcpy (dup, self, sizeof (TagID));
-#line 7 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	return dup;
-#line 304 "TagTable.c"
-}
-
-
-void
-tag_id_free (TagID* self)
-{
-#line 7 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_free (self);
-#line 313 "TagTable.c"
-}
-
-
-GType
-tag_id_get_type (void)
-{
-	static volatile gsize tag_id_type_id__volatile = 0;
-	if (g_once_init_enter (&tag_id_type_id__volatile)) {
-		GType tag_id_type_id;
-		tag_id_type_id = g_boxed_type_register_static ("TagID", (GBoxedCopyFunc) tag_id_dup, (GBoxedFreeFunc) tag_id_free);
-		g_once_init_leave (&tag_id_type_id__volatile, tag_id_type_id);
-	}
-	return tag_id_type_id__volatile;
-}
-
-
-TagRow*
-tag_row_construct (GType object_type)
-{
-	TagRow* self = NULL;
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	self = (TagRow*) g_type_create_instance (object_type);
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	return self;
-#line 338 "TagTable.c"
-}
-
-
-TagRow*
-tag_row_new (void)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	return tag_row_construct (TYPE_TAG_ROW);
-#line 347 "TagTable.c"
-}
-
-
-static void
-value_tag_row_init (GValue* value)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	value->data[0].v_pointer = NULL;
-#line 356 "TagTable.c"
-}
-
-
-static void
-value_tag_row_free_value (GValue* value)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	if (value->data[0].v_pointer) {
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		tag_row_unref (value->data[0].v_pointer);
-#line 367 "TagTable.c"
-	}
-}
-
-
-static void
-value_tag_row_copy_value (const GValue* src_value,
-                          GValue* dest_value)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	if (src_value->data[0].v_pointer) {
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		dest_value->data[0].v_pointer = tag_row_ref (src_value->data[0].v_pointer);
-#line 380 "TagTable.c"
-	} else {
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 384 "TagTable.c"
-	}
-}
-
-
-static gpointer
-value_tag_row_peek_pointer (const GValue* value)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	return value->data[0].v_pointer;
-#line 394 "TagTable.c"
-}
-
-
-static gchar*
-value_tag_row_collect_value (GValue* value,
-                             guint n_collect_values,
-                             GTypeCValue* collect_values,
-                             guint collect_flags)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	if (collect_values[0].v_pointer) {
-#line 406 "TagTable.c"
-		TagRow * object;
-		object = collect_values[0].v_pointer;
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 413 "TagTable.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.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 417 "TagTable.c"
-		}
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		value->data[0].v_pointer = tag_row_ref (object);
-#line 421 "TagTable.c"
-	} else {
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 425 "TagTable.c"
-	}
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	return NULL;
-#line 429 "TagTable.c"
-}
-
-
-static gchar*
-value_tag_row_lcopy_value (const GValue* value,
-                           guint n_collect_values,
-                           GTypeCValue* collect_values,
-                           guint collect_flags)
-{
-	TagRow ** object_p;
-	object_p = collect_values[0].v_pointer;
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	if (!object_p) {
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 445 "TagTable.c"
-	}
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	if (!value->data[0].v_pointer) {
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		*object_p = NULL;
-#line 451 "TagTable.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		*object_p = value->data[0].v_pointer;
-#line 455 "TagTable.c"
-	} else {
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		*object_p = tag_row_ref (value->data[0].v_pointer);
-#line 459 "TagTable.c"
-	}
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	return NULL;
-#line 463 "TagTable.c"
-}
-
-
-GParamSpec*
-param_spec_tag_row (const gchar* name,
-                    const gchar* nick,
-                    const gchar* blurb,
-                    GType object_type,
-                    GParamFlags flags)
-{
-	ParamSpecTagRow* spec;
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, TYPE_TAG_ROW), NULL);
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	return G_PARAM_SPEC (spec);
-#line 483 "TagTable.c"
-}
-
-
-gpointer
-value_get_tag_row (const GValue* value)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TAG_ROW), NULL);
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	return value->data[0].v_pointer;
-#line 494 "TagTable.c"
-}
-
-
-void
-value_set_tag_row (GValue* value,
-                   gpointer v_object)
-{
-	TagRow * old;
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TAG_ROW));
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	old = value->data[0].v_pointer;
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	if (v_object) {
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_TAG_ROW));
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		value->data[0].v_pointer = v_object;
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		tag_row_ref (value->data[0].v_pointer);
-#line 517 "TagTable.c"
-	} else {
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 521 "TagTable.c"
-	}
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	if (old) {
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		tag_row_unref (old);
-#line 527 "TagTable.c"
-	}
-}
-
-
-void
-value_take_tag_row (GValue* value,
-                    gpointer v_object)
-{
-	TagRow * old;
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TAG_ROW));
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	old = value->data[0].v_pointer;
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	if (v_object) {
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_TAG_ROW));
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		value->data[0].v_pointer = v_object;
-#line 549 "TagTable.c"
-	} else {
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 553 "TagTable.c"
-	}
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	if (old) {
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		tag_row_unref (old);
-#line 559 "TagTable.c"
-	}
-}
-
-
-static void
-tag_row_class_init (TagRowClass * klass)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	tag_row_parent_class = g_type_class_peek_parent (klass);
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	((TagRowClass *) klass)->finalize = tag_row_finalize;
-#line 571 "TagTable.c"
-}
-
-
-static void
-tag_row_instance_init (TagRow * self)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	self->ref_count = 1;
-#line 580 "TagTable.c"
-}
-
-
-static void
-tag_row_finalize (TagRow * obj)
-{
-	TagRow * self;
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TAG_ROW, TagRow);
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_signal_handlers_destroy (self);
-#line 27 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_g_free0 (self->name);
-#line 28 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_g_object_unref0 (self->source_id_list);
-#line 596 "TagTable.c"
-}
-
-
-GType
-tag_row_get_type (void)
-{
-	static volatile gsize tag_row_type_id__volatile = 0;
-	if (g_once_init_enter (&tag_row_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_tag_row_init, value_tag_row_free_value, value_tag_row_copy_value, value_tag_row_peek_pointer, "p", value_tag_row_collect_value, "p", value_tag_row_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (TagRowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tag_row_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TagRow), 0, (GInstanceInitFunc) tag_row_instance_init, &g_define_type_value_table };
-		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
-		GType tag_row_type_id;
-		tag_row_type_id = g_type_register_fundamental (g_type_fundamental_next (), "TagRow", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&tag_row_type_id__volatile, tag_row_type_id);
-	}
-	return tag_row_type_id__volatile;
-}
-
-
-gpointer
-tag_row_ref (gpointer instance)
-{
-	TagRow * self;
-	self = instance;
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	return instance;
-#line 625 "TagTable.c"
-}
-
-
-void
-tag_row_unref (gpointer instance)
-{
-	TagRow * self;
-	self = instance;
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		TAG_ROW_GET_CLASS (self)->finalize (self);
-#line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 640 "TagTable.c"
-	}
-}
-
-
-static TagTable*
-tag_table_construct (GType object_type)
-{
-	TagTable* self = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	gint _tmp5_;
-#line 35 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	self = (TagTable*) database_table_construct (object_type);
-#line 36 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	database_table_set_table_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), "TagTable");
-#line 39 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp0_ = database_table_db;
-#line 39 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "CREATE TABLE IF NOT EXISTS " "TagTable " "(" "id INTEGER PRIMARY KEY, " "name TEXT UNIQUE NOT NULL, " "photo_id_list TEXT, " "time_created INTEGER" ")", -1, &_tmp1_, NULL);
-#line 39 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 39 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	stmt = _tmp1_;
-#line 39 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	res = _tmp2_;
-#line 47 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp3_ = res;
-#line 47 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 49 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp4_ = stmt;
-#line 49 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	res = sqlite3_step (_tmp4_);
-#line 50 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp5_ = res;
-#line 50 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	if (_tmp5_ != SQLITE_DONE) {
-#line 683 "TagTable.c"
-		gint _tmp6_;
-#line 51 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_tmp6_ = res;
-#line 51 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		database_table_fatal ("create TagTable", _tmp6_);
-#line 689 "TagTable.c"
-	}
-#line 35 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 35 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	return self;
-#line 695 "TagTable.c"
-}
-
-
-static TagTable*
-tag_table_new (void)
-{
-#line 35 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	return tag_table_construct (TYPE_TAG_TABLE);
-#line 704 "TagTable.c"
-}
-
-
-static gpointer
-_database_table_ref0 (gpointer self)
-{
-#line 58 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	return self ? database_table_ref (self) : NULL;
-#line 713 "TagTable.c"
-}
-
-
-TagTable*
-tag_table_get_instance (void)
-{
-	TagTable* result = NULL;
-	TagTable* _tmp0_;
-	TagTable* _tmp2_;
-	TagTable* _tmp3_;
-#line 55 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp0_ = tag_table_instance;
-#line 55 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	if (_tmp0_ == NULL) {
-#line 728 "TagTable.c"
-		TagTable* _tmp1_;
-#line 56 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_tmp1_ = tag_table_new ();
-#line 56 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_database_table_unref0 (tag_table_instance);
-#line 56 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		tag_table_instance = _tmp1_;
-#line 736 "TagTable.c"
-	}
-#line 58 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp2_ = tag_table_instance;
-#line 58 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp3_ = _database_table_ref0 (_tmp2_);
-#line 58 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	result = _tmp3_;
-#line 58 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	return result;
-#line 746 "TagTable.c"
-}
-
-
-static gpointer
-_g_object_ref0 (gpointer self)
-{
-#line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 755 "TagTable.c"
-}
-
-
-static gchar*
-string_replace (const gchar* self,
-                const gchar* old,
-                const gchar* replacement)
-{
-	gchar* result = NULL;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	GError * _inner_error_ = NULL;
-#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (old != NULL, NULL);
-#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (replacement != NULL, NULL);
-#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	if ((*((gchar*) self)) == '\0') {
-#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_tmp1_ = TRUE;
-#line 778 "TagTable.c"
-	} else {
-#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_tmp1_ = (*((gchar*) old)) == '\0';
-#line 782 "TagTable.c"
-	}
-#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	if (_tmp1_) {
-#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_tmp0_ = TRUE;
-#line 788 "TagTable.c"
-	} else {
-#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_tmp0_ = g_strcmp0 (old, replacement) == 0;
-#line 792 "TagTable.c"
-	}
-#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	if (_tmp0_) {
-#line 796 "TagTable.c"
-		gchar* _tmp2_;
-#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_tmp2_ = g_strdup (self);
-#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		result = _tmp2_;
-#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		return result;
-#line 804 "TagTable.c"
-	}
-	{
-		GRegex* regex = NULL;
-		gchar* _tmp3_;
-		gchar* _tmp4_;
-		GRegex* _tmp5_;
-		GRegex* _tmp6_;
-		gchar* _tmp7_ = NULL;
-		GRegex* _tmp8_;
-		gchar* _tmp9_;
-		gchar* _tmp10_;
-#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_tmp3_ = g_regex_escape_string (old, -1);
-#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_tmp4_ = _tmp3_;
-#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_);
-#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_tmp6_ = _tmp5_;
-#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp4_);
-#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		regex = _tmp6_;
-#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 832 "TagTable.c"
-				goto __catch21_g_regex_error;
-			}
-#line 1426 "/usr/share/vala-0.40/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 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-			g_clear_error (&_inner_error_);
-#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-			return NULL;
-#line 841 "TagTable.c"
-		}
-#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_tmp8_ = regex;
-#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_);
-#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_tmp7_ = _tmp9_;
-#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-			_g_regex_unref0 (regex);
-#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 855 "TagTable.c"
-				goto __catch21_g_regex_error;
-			}
-#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-			_g_regex_unref0 (regex);
-#line 1427 "/usr/share/vala-0.40/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 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-			g_clear_error (&_inner_error_);
-#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-			return NULL;
-#line 866 "TagTable.c"
-		}
-#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_tmp10_ = _tmp7_;
-#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_tmp7_ = NULL;
-#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		result = _tmp10_;
-#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp7_);
-#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_g_regex_unref0 (regex);
-#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		return result;
-#line 880 "TagTable.c"
-	}
-	goto __finally21;
-	__catch21_g_regex_error:
-	{
-		GError* e = NULL;
-#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		e = _inner_error_;
-#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_inner_error_ = NULL;
-#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		g_assert_not_reached ();
-#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_g_error_free0 (e);
-#line 894 "TagTable.c"
-	}
-	__finally21:
-#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1425 "/usr/share/vala-0.40/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 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		g_clear_error (&_inner_error_);
-#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		return NULL;
-#line 905 "TagTable.c"
-	}
-}
-
-
-void
-tag_table_upgrade_for_htags (void)
-{
-	TagTable* table = NULL;
-	TagTable* _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 62 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp0_ = tag_table_get_instance ();
-#line 62 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	table = _tmp0_;
-#line 920 "TagTable.c"
-	{
-		GeeList* rows = NULL;
-		TagTable* _tmp1_;
-		GeeList* _tmp2_;
-#line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_tmp1_ = table;
-#line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_tmp2_ = tag_table_get_all_rows (_tmp1_, &_inner_error_);
-#line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		rows = _tmp2_;
-#line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 935 "TagTable.c"
-				goto __catch20_database_error;
-			}
-#line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_database_table_unref0 (table);
-#line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			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 65 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			g_clear_error (&_inner_error_);
-#line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			return;
-#line 946 "TagTable.c"
-		}
-		{
-			GeeList* _row_list = NULL;
-			GeeList* _tmp3_;
-			GeeList* _tmp4_;
-			gint _row_size = 0;
-			GeeList* _tmp5_;
-			gint _tmp6_;
-			gint _tmp7_;
-			gint _row_index = 0;
-#line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp3_ = rows;
-#line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_row_list = _tmp4_;
-#line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp5_ = _row_list;
-#line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp7_ = _tmp6_;
-#line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_row_size = _tmp7_;
-#line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_row_index = -1;
-#line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			while (TRUE) {
-#line 975 "TagTable.c"
-				gint _tmp8_;
-				gint _tmp9_;
-				gint _tmp10_;
-				TagRow* row = NULL;
-				GeeList* _tmp11_;
-				gint _tmp12_;
-				gpointer _tmp13_;
-				TagRow* _tmp14_;
-				TagRow* _tmp15_;
-				const gchar* _tmp16_;
-				gchar* _tmp17_;
-				TagTable* _tmp18_;
-				TagRow* _tmp19_;
-				TagID _tmp20_;
-				TagRow* _tmp21_;
-				const gchar* _tmp22_;
-#line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_tmp8_ = _row_index;
-#line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_row_index = _tmp8_ + 1;
-#line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_tmp9_ = _row_index;
-#line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_tmp10_ = _row_size;
-#line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				if (!(_tmp9_ < _tmp10_)) {
-#line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					break;
-#line 1004 "TagTable.c"
-				}
-#line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_tmp11_ = _row_list;
-#line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_tmp12_ = _row_index;
-#line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_tmp13_ = gee_list_get (_tmp11_, _tmp12_);
-#line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				row = (TagRow*) _tmp13_;
-#line 68 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_tmp14_ = row;
-#line 68 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_tmp15_ = row;
-#line 68 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_tmp16_ = _tmp15_->name;
-#line 68 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_tmp17_ = string_replace (_tmp16_, TAG_PATH_SEPARATOR_STRING, "-");
-#line 68 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_g_free0 (_tmp14_->name);
-#line 68 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_tmp14_->name = _tmp17_;
-#line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_tmp18_ = table;
-#line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_tmp19_ = row;
-#line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_tmp20_ = _tmp19_->tag_id;
-#line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_tmp21_ = row;
-#line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_tmp22_ = _tmp21_->name;
-#line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				tag_table_rename (_tmp18_, &_tmp20_, _tmp22_, &_inner_error_);
-#line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					_tag_row_unref0 (row);
-#line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					_g_object_unref0 (_row_list);
-#line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					_g_object_unref0 (rows);
-#line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1048 "TagTable.c"
-						goto __catch20_database_error;
-					}
-#line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					_tag_row_unref0 (row);
-#line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					_g_object_unref0 (_row_list);
-#line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					_g_object_unref0 (rows);
-#line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					_database_table_unref0 (table);
-#line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					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 69 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					g_clear_error (&_inner_error_);
-#line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					return;
-#line 1065 "TagTable.c"
-				}
-#line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_tag_row_unref0 (row);
-#line 1069 "TagTable.c"
-			}
-#line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_g_object_unref0 (_row_list);
-#line 1073 "TagTable.c"
-		}
-#line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_g_object_unref0 (rows);
-#line 1077 "TagTable.c"
-	}
-	goto __finally20;
-	__catch20_database_error:
-	{
-		GError* e = NULL;
-		const gchar* _tmp23_;
-#line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		e = _inner_error_;
-#line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_inner_error_ = NULL;
-#line 72 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_tmp23_ = e->message;
-#line 72 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		g_error ("TagTable.vala:72: TagTable: can't upgrade tag names for hierarchical t" \
-"ag support: %s", _tmp23_);
-#line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_g_error_free0 (e);
-#line 1094 "TagTable.c"
-	}
-	__finally20:
-#line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_database_table_unref0 (table);
-#line 64 "/home/jens/Source/shotwell/src/db/TagTable.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 64 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		g_clear_error (&_inner_error_);
-#line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		return;
-#line 1107 "TagTable.c"
-	}
-#line 61 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_database_table_unref0 (table);
-#line 1111 "TagTable.c"
-}
-
-
-TagRow*
-tag_table_add (TagTable* self,
-               const gchar* name,
-               GError** error)
-{
-	TagRow* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	time_t time_created = 0;
-	sqlite3_stmt* _tmp4_;
-	gchar* _tmp5_;
-	GDestroyNotify _tmp6_;
-	gint _tmp7_;
-	sqlite3_stmt* _tmp8_;
-	time_t _tmp9_;
-	gint _tmp10_;
-	sqlite3_stmt* _tmp11_;
-	gint _tmp12_;
-	TagRow* row = NULL;
-	TagRow* _tmp14_;
-	TagRow* _tmp15_;
-	sqlite3* _tmp16_;
-	TagRow* _tmp17_;
-	gchar* _tmp18_;
-	TagRow* _tmp19_;
-	TagRow* _tmp20_;
-	time_t _tmp21_;
-	GError * _inner_error_ = NULL;
-#line 76 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_val_if_fail (IS_TAG_TABLE (self), NULL);
-#line 76 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_val_if_fail (name != NULL, NULL);
-#line 78 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp0_ = database_table_db;
-#line 78 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "INSERT INTO TagTable (name, time_created) VALUES (?, ?)", -1, &_tmp1_, NULL);
-#line 78 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 78 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	stmt = _tmp1_;
-#line 78 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	res = _tmp2_;
-#line 80 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp3_ = res;
-#line 80 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 82 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	time_created = (time_t) now_sec ();
-#line 84 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp4_ = stmt;
-#line 84 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp5_ = g_strdup (name);
-#line 84 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp6_ = g_free;
-#line 84 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	res = sqlite3_bind_text (_tmp4_, 1, _tmp5_, -1, _tmp6_);
-#line 85 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp7_ = res;
-#line 85 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 86 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp8_ = stmt;
-#line 86 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp9_ = time_created;
-#line 86 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	res = sqlite3_bind_int64 (_tmp8_, 2, (gint64) _tmp9_);
-#line 87 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp10_ = res;
-#line 87 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK");
-#line 89 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp11_ = stmt;
-#line 89 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	res = sqlite3_step (_tmp11_);
-#line 90 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp12_ = res;
-#line 90 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	if (_tmp12_ != SQLITE_DONE) {
-#line 1197 "TagTable.c"
-		gint _tmp13_;
-#line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_tmp13_ = res;
-#line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		database_table_throw_error ("TagTable.add", _tmp13_, &_inner_error_);
-#line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				return NULL;
-#line 1213 "TagTable.c"
-			} else {
-#line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 91 "/home/jens/Source/shotwell/src/db/TagTable.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 91 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				g_clear_error (&_inner_error_);
-#line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				return NULL;
-#line 1223 "TagTable.c"
-			}
-		}
-	}
-#line 93 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp14_ = tag_row_new ();
-#line 93 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	row = _tmp14_;
-#line 94 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp15_ = row;
-#line 94 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp16_ = database_table_db;
-#line 94 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	tag_id_init (&_tmp15_->tag_id, sqlite3_last_insert_rowid (_tmp16_));
-#line 95 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp17_ = row;
-#line 95 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp18_ = g_strdup (name);
-#line 95 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_g_free0 (_tmp17_->name);
-#line 95 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp17_->name = _tmp18_;
-#line 96 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp19_ = row;
-#line 96 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_g_object_unref0 (_tmp19_->source_id_list);
-#line 96 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp19_->source_id_list = NULL;
-#line 97 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp20_ = row;
-#line 97 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp21_ = time_created;
-#line 97 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp20_->time_created = _tmp21_;
-#line 99 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	result = row;
-#line 99 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 99 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	return result;
-#line 1263 "TagTable.c"
-}
-
-
-void
-tag_table_create_from_row (TagTable* self,
-                           TagRow* row,
-                           TagID* result,
-                           GError** error)
-{
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	const gchar* _tmp5_;
-	gchar* _tmp6_;
-	GDestroyNotify _tmp7_;
-	gint _tmp8_;
-	sqlite3_stmt* _tmp9_;
-	GeeSet* _tmp10_;
-	gchar* _tmp11_;
-	GDestroyNotify _tmp12_;
-	gint _tmp13_;
-	sqlite3_stmt* _tmp14_;
-	time_t _tmp15_;
-	gint _tmp16_;
-	sqlite3_stmt* _tmp17_;
-	gint _tmp18_;
-	sqlite3* _tmp20_;
-	TagID _tmp21_ = {0};
-	GError * _inner_error_ = NULL;
-#line 103 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_if_fail (IS_TAG_TABLE (self));
-#line 103 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_if_fail (IS_TAG_ROW (row));
-#line 105 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp0_ = database_table_db;
-#line 105 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "INSERT INTO TagTable (name, photo_id_list, time_created) VALUES (?, ?," \
-" ?)", -1, &_tmp1_, NULL);
-#line 105 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 105 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	stmt = _tmp1_;
-#line 105 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	res = _tmp2_;
-#line 107 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp3_ = res;
-#line 107 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 109 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp4_ = stmt;
-#line 109 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp5_ = row->name;
-#line 109 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp6_ = g_strdup (_tmp5_);
-#line 109 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp7_ = g_free;
-#line 109 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	res = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_);
-#line 110 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp8_ = res;
-#line 110 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
-#line 111 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp9_ = stmt;
-#line 111 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp10_ = row->source_id_list;
-#line 111 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp11_ = tag_table_serialize_source_ids (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 111 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp12_ = g_free;
-#line 111 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	res = sqlite3_bind_text (_tmp9_, 2, _tmp11_, -1, _tmp12_);
-#line 112 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp13_ = res;
-#line 112 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK");
-#line 113 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp14_ = stmt;
-#line 113 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp15_ = row->time_created;
-#line 113 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	res = sqlite3_bind_int64 (_tmp14_, 3, (gint64) _tmp15_);
-#line 114 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp16_ = res;
-#line 114 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_vala_assert (_tmp16_ == SQLITE_OK, "res == Sqlite.OK");
-#line 116 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp17_ = stmt;
-#line 116 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	res = sqlite3_step (_tmp17_);
-#line 117 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp18_ = res;
-#line 117 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	if (_tmp18_ != SQLITE_DONE) {
-#line 1361 "TagTable.c"
-		gint _tmp19_;
-#line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_tmp19_ = res;
-#line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		database_table_throw_error ("TagTable.create_from_row", _tmp19_, &_inner_error_);
-#line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				return;
-#line 1377 "TagTable.c"
-			} else {
-#line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 118 "/home/jens/Source/shotwell/src/db/TagTable.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 118 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				g_clear_error (&_inner_error_);
-#line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				return;
-#line 1387 "TagTable.c"
-			}
-		}
-	}
-#line 120 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp20_ = database_table_db;
-#line 120 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	tag_id_init (&_tmp21_, sqlite3_last_insert_rowid (_tmp20_));
-#line 120 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	*result = _tmp21_;
-#line 120 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 120 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	return;
-#line 1401 "TagTable.c"
-}
-
-
-void
-tag_table_remove (TagTable* self,
-                  TagID* tag_id,
-                  GError** error)
-{
-	TagID _tmp0_;
-	gint64 _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 123 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_if_fail (IS_TAG_TABLE (self));
-#line 123 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_if_fail (tag_id != NULL);
-#line 124 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp0_ = *tag_id;
-#line 124 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 124 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	database_table_delete_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, &_inner_error_);
-#line 124 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 124 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 124 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 124 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			return;
-#line 1431 "TagTable.c"
-		} else {
-#line 124 "/home/jens/Source/shotwell/src/db/TagTable.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 124 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			g_clear_error (&_inner_error_);
-#line 124 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			return;
-#line 1439 "TagTable.c"
-		}
-	}
-}
-
-
-gchar*
-tag_table_get_name (TagTable* self,
-                    TagID* tag_id,
-                    GError** error)
-{
-	gchar* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	TagID _tmp0_;
-	gint64 _tmp1_;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gboolean _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	const gchar* _tmp5_;
-	gchar* _tmp6_;
-#line 127 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_val_if_fail (IS_TAG_TABLE (self), NULL);
-#line 127 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_val_if_fail (tag_id != NULL, NULL);
-#line 129 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp0_ = *tag_id;
-#line 129 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 129 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp3_ = database_table_select_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "name", &_tmp2_);
-#line 129 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 129 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	stmt = _tmp2_;
-#line 129 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	if (!_tmp3_) {
-#line 130 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		result = NULL;
-#line 130 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 130 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		return result;
-#line 1481 "TagTable.c"
-	}
-#line 132 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp4_ = stmt;
-#line 132 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp5_ = sqlite3_column_text (_tmp4_, 0);
-#line 132 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp6_ = g_strdup (_tmp5_);
-#line 132 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	result = _tmp6_;
-#line 132 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 132 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	return result;
-#line 1495 "TagTable.c"
-}
-
-
-TagRow*
-tag_table_get_row (TagTable* self,
-                   TagID* tag_id,
-                   GError** error)
-{
-	TagRow* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	TagID _tmp5_;
-	gint64 _tmp6_;
-	gint _tmp7_;
-	sqlite3_stmt* _tmp8_;
-	gint _tmp9_;
-	TagRow* row = NULL;
-	TagRow* _tmp12_;
-	TagRow* _tmp13_;
-	TagID _tmp14_;
-	TagRow* _tmp15_;
-	sqlite3_stmt* _tmp16_;
-	const gchar* _tmp17_;
-	gchar* _tmp18_;
-	TagRow* _tmp19_;
-	sqlite3_stmt* _tmp20_;
-	const gchar* _tmp21_;
-	GeeSet* _tmp22_;
-	TagRow* _tmp23_;
-	sqlite3_stmt* _tmp24_;
-	GError * _inner_error_ = NULL;
-#line 135 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_val_if_fail (IS_TAG_TABLE (self), NULL);
-#line 135 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_val_if_fail (tag_id != NULL, NULL);
-#line 137 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp0_ = database_table_db;
-#line 137 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT name, photo_id_list, time_created FROM TagTable WHERE id=?", -1, &_tmp1_, NULL);
-#line 137 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 137 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	stmt = _tmp1_;
-#line 137 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	res = _tmp2_;
-#line 139 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp3_ = res;
-#line 139 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 141 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp4_ = stmt;
-#line 141 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp5_ = *tag_id;
-#line 141 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp6_ = _tmp5_.id;
-#line 141 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_);
-#line 142 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp7_ = res;
-#line 142 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 144 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp8_ = stmt;
-#line 144 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	res = sqlite3_step (_tmp8_);
-#line 145 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp9_ = res;
-#line 145 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	if (_tmp9_ == SQLITE_DONE) {
-#line 146 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		result = NULL;
-#line 146 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 146 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		return result;
-#line 1576 "TagTable.c"
-	} else {
-		gint _tmp10_;
-#line 147 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_tmp10_ = res;
-#line 147 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		if (_tmp10_ != SQLITE_ROW) {
-#line 1583 "TagTable.c"
-			gint _tmp11_;
-#line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp11_ = res;
-#line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			database_table_throw_error ("TagTable.get_row", _tmp11_, &_inner_error_);
-#line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					g_propagate_error (error, _inner_error_);
-#line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					_sqlite3_finalize0 (stmt);
-#line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					return NULL;
-#line 1599 "TagTable.c"
-				} else {
-#line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					_sqlite3_finalize0 (stmt);
-#line 148 "/home/jens/Source/shotwell/src/db/TagTable.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 148 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					g_clear_error (&_inner_error_);
-#line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					return NULL;
-#line 1609 "TagTable.c"
-				}
-			}
-		}
-	}
-#line 150 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp12_ = tag_row_new ();
-#line 150 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	row = _tmp12_;
-#line 151 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp13_ = row;
-#line 151 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp14_ = *tag_id;
-#line 151 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp13_->tag_id = _tmp14_;
-#line 152 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp15_ = row;
-#line 152 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp16_ = stmt;
-#line 152 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp17_ = sqlite3_column_text (_tmp16_, 0);
-#line 152 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp18_ = g_strdup (_tmp17_);
-#line 152 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_g_free0 (_tmp15_->name);
-#line 152 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp15_->name = _tmp18_;
-#line 153 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp19_ = row;
-#line 153 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp20_ = stmt;
-#line 153 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp21_ = sqlite3_column_text (_tmp20_, 1);
-#line 153 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp22_ = tag_table_unserialize_source_ids (self, _tmp21_);
-#line 153 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_g_object_unref0 (_tmp19_->source_id_list);
-#line 153 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp19_->source_id_list = _tmp22_;
-#line 154 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp23_ = row;
-#line 154 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp24_ = stmt;
-#line 154 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp23_->time_created = (time_t) sqlite3_column_int64 (_tmp24_, 2);
-#line 156 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	result = row;
-#line 156 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 156 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	return result;
-#line 1660 "TagTable.c"
-}
-
-
-GeeList*
-tag_table_get_all_rows (TagTable* self,
-                        GError** error)
-{
-	GeeList* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	GeeList* rows = NULL;
-	GeeArrayList* _tmp4_;
-	GError * _inner_error_ = NULL;
-#line 159 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_val_if_fail (IS_TAG_TABLE (self), NULL);
-#line 161 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp0_ = database_table_db;
-#line 161 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT id, name, photo_id_list, time_created FROM TagTable", -1, &_tmp1_, NULL);
-#line 161 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 161 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	stmt = _tmp1_;
-#line 161 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	res = _tmp2_;
-#line 163 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp3_ = res;
-#line 163 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 165 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp4_ = gee_array_list_new (TYPE_TAG_ROW, (GBoxedCopyFunc) tag_row_ref, (GDestroyNotify) tag_row_unref, NULL, NULL, NULL);
-#line 165 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	rows = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList);
-#line 1698 "TagTable.c"
-	{
-		gboolean _tmp5_ = FALSE;
-#line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_tmp5_ = TRUE;
-#line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		while (TRUE) {
-#line 1705 "TagTable.c"
-			sqlite3_stmt* _tmp6_;
-			gint _tmp7_;
-			TagRow* row = NULL;
-			TagRow* _tmp10_;
-			TagRow* _tmp11_;
-			sqlite3_stmt* _tmp12_;
-			TagRow* _tmp13_;
-			sqlite3_stmt* _tmp14_;
-			const gchar* _tmp15_;
-			gchar* _tmp16_;
-			TagRow* _tmp17_;
-			sqlite3_stmt* _tmp18_;
-			const gchar* _tmp19_;
-			GeeSet* _tmp20_;
-			TagRow* _tmp21_;
-			sqlite3_stmt* _tmp22_;
-			GeeList* _tmp23_;
-			TagRow* _tmp24_;
-#line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			if (!_tmp5_) {
-#line 1726 "TagTable.c"
-			}
-#line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp5_ = FALSE;
-#line 168 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp6_ = stmt;
-#line 168 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			res = sqlite3_step (_tmp6_);
-#line 169 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp7_ = res;
-#line 169 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			if (_tmp7_ == SQLITE_DONE) {
-#line 170 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				break;
-#line 1740 "TagTable.c"
-			} else {
-				gint _tmp8_;
-#line 171 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_tmp8_ = res;
-#line 171 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				if (_tmp8_ != SQLITE_ROW) {
-#line 1747 "TagTable.c"
-					gint _tmp9_;
-#line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					_tmp9_ = res;
-#line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					database_table_throw_error ("TagTable.get_all_rows", _tmp9_, &_inner_error_);
-#line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-						if (_inner_error_->domain == DATABASE_ERROR) {
-#line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-							g_propagate_error (error, _inner_error_);
-#line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-							_g_object_unref0 (rows);
-#line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-							return NULL;
-#line 1765 "TagTable.c"
-						} else {
-#line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-							_g_object_unref0 (rows);
-#line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 172 "/home/jens/Source/shotwell/src/db/TagTable.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 172 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-							g_clear_error (&_inner_error_);
-#line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-							return NULL;
-#line 1777 "TagTable.c"
-						}
-					}
-				}
-			}
-#line 175 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp10_ = tag_row_new ();
-#line 175 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			row = _tmp10_;
-#line 176 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp11_ = row;
-#line 176 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp12_ = stmt;
-#line 176 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			tag_id_init (&_tmp11_->tag_id, sqlite3_column_int64 (_tmp12_, 0));
-#line 177 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp13_ = row;
-#line 177 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp14_ = stmt;
-#line 177 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp15_ = sqlite3_column_text (_tmp14_, 1);
-#line 177 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp16_ = g_strdup (_tmp15_);
-#line 177 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_g_free0 (_tmp13_->name);
-#line 177 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp13_->name = _tmp16_;
-#line 178 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp17_ = row;
-#line 178 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp18_ = stmt;
-#line 178 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp19_ = sqlite3_column_text (_tmp18_, 2);
-#line 178 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp20_ = tag_table_unserialize_source_ids (self, _tmp19_);
-#line 178 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_g_object_unref0 (_tmp17_->source_id_list);
-#line 178 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp17_->source_id_list = _tmp20_;
-#line 179 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp21_ = row;
-#line 179 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp22_ = stmt;
-#line 179 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp21_->time_created = (time_t) sqlite3_column_int64 (_tmp22_, 3);
-#line 181 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp23_ = rows;
-#line 181 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp24_ = row;
-#line 181 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection), _tmp24_);
-#line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tag_row_unref0 (row);
-#line 1830 "TagTable.c"
-		}
-	}
-#line 184 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	result = rows;
-#line 184 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 184 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	return result;
-#line 1839 "TagTable.c"
-}
-
-
-void
-tag_table_rename (TagTable* self,
-                  TagID* tag_id,
-                  const gchar* new_name,
-                  GError** error)
-{
-	TagID _tmp0_;
-	gint64 _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 187 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_if_fail (IS_TAG_TABLE (self));
-#line 187 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_if_fail (tag_id != NULL);
-#line 187 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_if_fail (new_name != NULL);
-#line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp0_ = *tag_id;
-#line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "name", new_name, &_inner_error_);
-#line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			return;
-#line 1872 "TagTable.c"
-		} else {
-#line 188 "/home/jens/Source/shotwell/src/db/TagTable.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 188 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			g_clear_error (&_inner_error_);
-#line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			return;
-#line 1880 "TagTable.c"
-		}
-	}
-}
-
-
-void
-tag_table_set_tagged_sources (TagTable* self,
-                              TagID* tag_id,
-                              GeeCollection* source_ids,
-                              GError** error)
-{
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	gchar* _tmp5_;
-	GDestroyNotify _tmp6_;
-	gint _tmp7_;
-	sqlite3_stmt* _tmp8_;
-	TagID _tmp9_;
-	gint64 _tmp10_;
-	gint _tmp11_;
-	sqlite3_stmt* _tmp12_;
-	gint _tmp13_;
-	GError * _inner_error_ = NULL;
-#line 191 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_if_fail (IS_TAG_TABLE (self));
-#line 191 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_if_fail (tag_id != NULL);
-#line 191 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_if_fail (GEE_IS_COLLECTION (source_ids));
-#line 193 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp0_ = database_table_db;
-#line 193 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "UPDATE TagTable SET photo_id_list=? WHERE id=?", -1, &_tmp1_, NULL);
-#line 193 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 193 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	stmt = _tmp1_;
-#line 193 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	res = _tmp2_;
-#line 194 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp3_ = res;
-#line 194 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 196 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp4_ = stmt;
-#line 196 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp5_ = tag_table_serialize_source_ids (self, source_ids);
-#line 196 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp6_ = g_free;
-#line 196 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	res = sqlite3_bind_text (_tmp4_, 1, _tmp5_, -1, _tmp6_);
-#line 197 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp7_ = res;
-#line 197 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 198 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp8_ = stmt;
-#line 198 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp9_ = *tag_id;
-#line 198 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp10_ = _tmp9_.id;
-#line 198 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	res = sqlite3_bind_int64 (_tmp8_, 2, _tmp10_);
-#line 199 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp11_ = res;
-#line 199 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
-#line 201 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp12_ = stmt;
-#line 201 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	res = sqlite3_step (_tmp12_);
-#line 202 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp13_ = res;
-#line 202 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	if (_tmp13_ != SQLITE_DONE) {
-#line 1961 "TagTable.c"
-		gint _tmp14_;
-#line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_tmp14_ = res;
-#line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		database_table_throw_error ("TagTable.set_tagged_photos", _tmp14_, &_inner_error_);
-#line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				return;
-#line 1977 "TagTable.c"
-			} else {
-#line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 203 "/home/jens/Source/shotwell/src/db/TagTable.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 203 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				g_clear_error (&_inner_error_);
-#line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				return;
-#line 1987 "TagTable.c"
-			}
-		}
-	}
-#line 191 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 1993 "TagTable.c"
-}
-
-
-static gchar*
-tag_table_serialize_source_ids (TagTable* self,
-                                GeeCollection* source_ids)
-{
-	gchar* result = NULL;
-	GString* _result_ = NULL;
-	GString* _tmp0_;
-	const gchar* _tmp8_ = NULL;
-	GString* _tmp9_;
-	gssize _tmp10_;
-	gchar* _tmp13_;
-#line 206 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_val_if_fail (IS_TAG_TABLE (self), NULL);
-#line 206 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_val_if_fail ((source_ids == NULL) || GEE_IS_COLLECTION (source_ids), NULL);
-#line 207 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	if (source_ids == NULL) {
-#line 208 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		result = NULL;
-#line 208 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		return result;
-#line 2018 "TagTable.c"
-	}
-#line 210 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp0_ = g_string_new ("");
-#line 210 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_result_ = _tmp0_;
-#line 2024 "TagTable.c"
-	{
-		GeeIterator* _source_id_it = NULL;
-		GeeIterator* _tmp1_;
-#line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (source_ids, GEE_TYPE_ITERABLE, GeeIterable));
-#line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_source_id_it = _tmp1_;
-#line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		while (TRUE) {
-#line 2034 "TagTable.c"
-			GeeIterator* _tmp2_;
-			gchar* source_id = NULL;
-			GeeIterator* _tmp3_;
-			gpointer _tmp4_;
-			GString* _tmp5_;
-			const gchar* _tmp6_;
-			GString* _tmp7_;
-#line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp2_ = _source_id_it;
-#line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			if (!gee_iterator_next (_tmp2_)) {
-#line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				break;
-#line 2048 "TagTable.c"
-			}
-#line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp3_ = _source_id_it;
-#line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp4_ = gee_iterator_get (_tmp3_);
-#line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			source_id = (gchar*) _tmp4_;
-#line 213 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp5_ = _result_;
-#line 213 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp6_ = source_id;
-#line 213 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			g_string_append (_tmp5_, _tmp6_);
-#line 214 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp7_ = _result_;
-#line 214 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			g_string_append (_tmp7_, ",");
-#line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_g_free0 (source_id);
-#line 2068 "TagTable.c"
-		}
-#line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_g_object_unref0 (_source_id_it);
-#line 2072 "TagTable.c"
-	}
-#line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp9_ = _result_;
-#line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp10_ = _tmp9_->len;
-#line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	if (_tmp10_ != ((gssize) 0)) {
-#line 2080 "TagTable.c"
-		GString* _tmp11_;
-		const gchar* _tmp12_;
-#line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_tmp11_ = _result_;
-#line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_tmp12_ = _tmp11_->str;
-#line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_tmp8_ = _tmp12_;
-#line 2089 "TagTable.c"
-	} else {
-#line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		_tmp8_ = NULL;
-#line 2093 "TagTable.c"
-	}
-#line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp13_ = g_strdup (_tmp8_);
-#line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	result = _tmp13_;
-#line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_g_string_free0 (_result_);
-#line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	return result;
-#line 2103 "TagTable.c"
-}
-
-
-static gchar
-string_get (const gchar* self,
-            glong index)
-{
-	gchar result = '\0';
-	gchar _tmp0_;
-#line 1124 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, '\0');
-#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	_tmp0_ = ((gchar*) self)[index];
-#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	result = _tmp0_;
-#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	return result;
-#line 2121 "TagTable.c"
-}
-
-
-static GeeSet*
-tag_table_unserialize_source_ids (TagTable* self,
-                                  const gchar* text_list)
-{
-	GeeSet* result = NULL;
-	GeeSet* _result_ = NULL;
-	GeeHashSet* _tmp0_;
-	gchar** split = NULL;
-	gchar** _tmp1_;
-	gchar** _tmp2_;
-	gint split_length1;
-	gint _split_size_;
-	gchar** _tmp3_;
-	gint _tmp3__length1;
-#line 220 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	g_return_val_if_fail (IS_TAG_TABLE (self), NULL);
-#line 221 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 221 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_result_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet);
-#line 223 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	if (text_list == NULL) {
-#line 224 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		result = _result_;
-#line 224 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		return result;
-#line 2151 "TagTable.c"
-	}
-#line 226 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp2_ = _tmp1_ = g_strsplit (text_list, ",", 0);
-#line 226 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	split = _tmp2_;
-#line 226 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	split_length1 = _vala_array_length (_tmp1_);
-#line 226 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_split_size_ = split_length1;
-#line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp3_ = split;
-#line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp3__length1 = split_length1;
-#line 2165 "TagTable.c"
-	{
-		gchar** token_collection = NULL;
-		gint token_collection_length1 = 0;
-		gint _token_collection_size_ = 0;
-		gint token_it = 0;
-#line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		token_collection = _tmp3_;
-#line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		token_collection_length1 = _tmp3__length1;
-#line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-		for (token_it = 0; token_it < _tmp3__length1; token_it = token_it + 1) {
-#line 2177 "TagTable.c"
-			gchar* _tmp4_;
-			gchar* token = NULL;
-#line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			_tmp4_ = g_strdup (token_collection[token_it]);
-#line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-			token = _tmp4_;
-#line 2184 "TagTable.c"
-			{
-				const gchar* _tmp5_;
-				const gchar* _tmp6_;
-#line 228 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_tmp5_ = token;
-#line 228 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				if (is_string_empty (_tmp5_)) {
-#line 229 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					_g_free0 (token);
-#line 229 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					continue;
-#line 2196 "TagTable.c"
-				}
-#line 236 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_tmp6_ = token;
-#line 236 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				if (g_ascii_isdigit (string_get (_tmp6_, (glong) 0))) {
-#line 2202 "TagTable.c"
-					GeeSet* _tmp7_;
-					const gchar* _tmp8_;
-					PhotoID _tmp9_ = {0};
-					gchar* _tmp10_;
-					gchar* _tmp11_;
-#line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					_tmp7_ = _result_;
-#line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					_tmp8_ = token;
-#line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					photo_id_init (&_tmp9_, parse_int64 (_tmp8_, 10));
-#line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					_tmp10_ = photo_id_upgrade_photo_id_to_source_id (&_tmp9_);
-#line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					_tmp11_ = _tmp10_;
-#line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_);
-#line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					_g_free0 (_tmp11_);
-#line 2222 "TagTable.c"
-				} else {
-					const gchar* _tmp12_;
-#line 239 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					_tmp12_ = token;
-#line 239 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-					if (g_ascii_isalpha (string_get (_tmp12_, (glong) 0))) {
-#line 2229 "TagTable.c"
-						GeeSet* _tmp13_;
-						const gchar* _tmp14_;
-#line 241 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-						_tmp13_ = _result_;
-#line 241 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-						_tmp14_ = token;
-#line 241 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), _tmp14_);
-#line 2238 "TagTable.c"
-					}
-				}
-#line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-				_g_free0 (token);
-#line 2243 "TagTable.c"
-			}
-		}
-	}
-#line 245 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	result = _result_;
-#line 245 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
-#line 245 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	return result;
-#line 2253 "TagTable.c"
-}
-
-
-static void
-tag_table_class_init (TagTableClass * klass)
-{
-#line 32 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	tag_table_parent_class = g_type_class_peek_parent (klass);
-#line 32 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	((DatabaseTableClass *) klass)->finalize = tag_table_finalize;
-#line 2264 "TagTable.c"
-}
-
-
-static void
-tag_table_instance_init (TagTable * self)
-{
-}
-
-
-static void
-tag_table_finalize (DatabaseTable * obj)
-{
-	TagTable * self;
-#line 32 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TAG_TABLE, TagTable);
-#line 32 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	DATABASE_TABLE_CLASS (tag_table_parent_class)->finalize (obj);
-#line 2282 "TagTable.c"
-}
-
-
-GType
-tag_table_get_type (void)
-{
-	static volatile gsize tag_table_type_id__volatile = 0;
-	if (g_once_init_enter (&tag_table_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (TagTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tag_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TagTable), 0, (GInstanceInitFunc) tag_table_instance_init, NULL };
-		GType tag_table_type_id;
-		tag_table_type_id = g_type_register_static (TYPE_DATABASE_TABLE, "TagTable", &g_define_type_info, 0);
-		g_once_init_leave (&tag_table_type_id__volatile, tag_table_type_id);
-	}
-	return tag_table_type_id__volatile;
-}
-
-
-static void
-_vala_array_destroy (gpointer array,
-                     gint array_length,
-                     GDestroyNotify destroy_func)
-{
-	if ((array != NULL) && (destroy_func != NULL)) {
-		int i;
-		for (i = 0; i < array_length; i = i + 1) {
-			if (((gpointer*) array)[i] != NULL) {
-				destroy_func (((gpointer*) array)[i]);
-			}
-		}
-	}
-}
-
-
-static void
-_vala_array_free (gpointer array,
-                  gint array_length,
-                  GDestroyNotify destroy_func)
-{
-	_vala_array_destroy (array, array_length, destroy_func);
-	g_free (array);
-}
-
-
-static gint
-_vala_array_length (gpointer array)
-{
-	int length;
-	length = 0;
-	if (array) {
-		while (((gpointer*) array)[length]) {
-			length++;
-		}
-	}
-	return length;
-}
-
-
-
diff --git a/src/db/TombstoneTable.c b/src/db/TombstoneTable.c
deleted file mode 100644
index b7b9f58..0000000
--- a/src/db/TombstoneTable.c
+++ /dev/null
@@ -1,1356 +0,0 @@
-/* TombstoneTable.c generated by valac 0.40.4, the Vala compiler
- * generated from TombstoneTable.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <sqlite3.h>
-#include <gobject/gvaluecollector.h>
-
-
-#define TYPE_TOMBSTONE_ID (tombstone_id_get_type ())
-typedef struct _TombstoneID TombstoneID;
-
-#define TYPE_TOMBSTONE_ROW (tombstone_row_get_type ())
-#define TOMBSTONE_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TOMBSTONE_ROW, TombstoneRow))
-#define TOMBSTONE_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TOMBSTONE_ROW, TombstoneRowClass))
-#define IS_TOMBSTONE_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TOMBSTONE_ROW))
-#define IS_TOMBSTONE_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TOMBSTONE_ROW))
-#define TOMBSTONE_ROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TOMBSTONE_ROW, TombstoneRowClass))
-
-typedef struct _TombstoneRow TombstoneRow;
-typedef struct _TombstoneRowClass TombstoneRowClass;
-typedef struct _TombstoneRowPrivate TombstoneRowPrivate;
-
-#define TOMBSTONE_TYPE_REASON (tombstone_reason_get_type ())
-#define _g_free0(var) (var = (g_free (var), NULL))
-typedef struct _ParamSpecTombstoneRow ParamSpecTombstoneRow;
-
-#define TYPE_DATABASE_TABLE (database_table_get_type ())
-#define DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATABASE_TABLE, DatabaseTable))
-#define DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATABASE_TABLE, DatabaseTableClass))
-#define IS_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATABASE_TABLE))
-#define IS_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DATABASE_TABLE))
-#define DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DATABASE_TABLE, DatabaseTableClass))
-
-typedef struct _DatabaseTable DatabaseTable;
-typedef struct _DatabaseTableClass DatabaseTableClass;
-typedef struct _DatabaseTablePrivate DatabaseTablePrivate;
-
-#define TYPE_TOMBSTONE_TABLE (tombstone_table_get_type ())
-#define TOMBSTONE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TOMBSTONE_TABLE, TombstoneTable))
-#define TOMBSTONE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TOMBSTONE_TABLE, TombstoneTableClass))
-#define IS_TOMBSTONE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TOMBSTONE_TABLE))
-#define IS_TOMBSTONE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TOMBSTONE_TABLE))
-#define TOMBSTONE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TOMBSTONE_TABLE, TombstoneTableClass))
-
-typedef struct _TombstoneTable TombstoneTable;
-typedef struct _TombstoneTableClass TombstoneTableClass;
-typedef struct _TombstoneTablePrivate TombstoneTablePrivate;
-#define _sqlite3_finalize0(var) ((var == NULL) ? NULL : (var = (sqlite3_finalize (var), NULL)))
-#define _database_table_unref0(var) ((var == NULL) ? NULL : (var = (database_table_unref (var), NULL)))
-#define _tombstone_row_unref0(var) ((var == NULL) ? NULL : (var = (tombstone_row_unref (var), NULL)))
-#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
-#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
-#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-
-struct _TombstoneID {
-	gint64 id;
-};
-
-typedef enum  {
-	TOMBSTONE_REASON_REMOVED_BY_USER = 0,
-	TOMBSTONE_REASON_AUTO_DETECTED_DUPLICATE = 1
-} TombstoneReason;
-
-struct _TombstoneRow {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	TombstoneRowPrivate * priv;
-	TombstoneID id;
-	gchar* filepath;
-	gint64 filesize;
-	gchar* md5;
-	time_t time_created;
-	TombstoneReason reason;
-};
-
-struct _TombstoneRowClass {
-	GTypeClass parent_class;
-	void (*finalize) (TombstoneRow *self);
-};
-
-struct _ParamSpecTombstoneRow {
-	GParamSpec parent_instance;
-};
-
-struct _DatabaseTable {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	DatabaseTablePrivate * priv;
-	gchar* table_name;
-};
-
-struct _DatabaseTableClass {
-	GTypeClass parent_class;
-	void (*finalize) (DatabaseTable *self);
-};
-
-struct _TombstoneTable {
-	DatabaseTable parent_instance;
-	TombstoneTablePrivate * priv;
-};
-
-struct _TombstoneTableClass {
-	DatabaseTableClass parent_class;
-};
-
-typedef enum  {
-	DATABASE_ERROR_ERROR,
-	DATABASE_ERROR_BACKING,
-	DATABASE_ERROR_MEMORY,
-	DATABASE_ERROR_ABORT,
-	DATABASE_ERROR_LIMITS,
-	DATABASE_ERROR_TYPESPEC
-} DatabaseError;
-#define DATABASE_ERROR database_error_quark ()
-
-static gpointer tombstone_row_parent_class = NULL;
-static gpointer tombstone_table_parent_class = NULL;
-static TombstoneTable* tombstone_table_instance;
-static TombstoneTable* tombstone_table_instance = NULL;
-extern sqlite3* database_table_db;
-
-GType tombstone_id_get_type (void) G_GNUC_CONST;
-TombstoneID* tombstone_id_dup (const TombstoneID* self);
-void tombstone_id_free (TombstoneID* self);
-#define TOMBSTONE_ID_INVALID ((gint64) -1)
-void tombstone_id_init (TombstoneID *self,
-                        gint64 id);
-gboolean tombstone_id_is_invalid (TombstoneID *self);
-gboolean tombstone_id_is_valid (TombstoneID *self);
-gpointer tombstone_row_ref (gpointer instance);
-void tombstone_row_unref (gpointer instance);
-GParamSpec* param_spec_tombstone_row (const gchar* name,
-                                      const gchar* nick,
-                                      const gchar* blurb,
-                                      GType object_type,
-                                      GParamFlags flags);
-void value_set_tombstone_row (GValue* value,
-                              gpointer v_object);
-void value_take_tombstone_row (GValue* value,
-                               gpointer v_object);
-gpointer value_get_tombstone_row (const GValue* value);
-GType tombstone_row_get_type (void) G_GNUC_CONST;
-GType tombstone_reason_get_type (void) G_GNUC_CONST;
-TombstoneRow* tombstone_row_new (void);
-TombstoneRow* tombstone_row_construct (GType object_type);
-static void tombstone_row_finalize (TombstoneRow * obj);
-gpointer database_table_ref (gpointer instance);
-void database_table_unref (gpointer instance);
-GParamSpec* param_spec_database_table (const gchar* name,
-                                       const gchar* nick,
-                                       const gchar* blurb,
-                                       GType object_type,
-                                       GParamFlags flags);
-void value_set_database_table (GValue* value,
-                               gpointer v_object);
-void value_take_database_table (GValue* value,
-                                gpointer v_object);
-gpointer value_get_database_table (const GValue* value);
-GType database_table_get_type (void) G_GNUC_CONST;
-GType tombstone_table_get_type (void) G_GNUC_CONST;
-static TombstoneTable* tombstone_table_new (void);
-static TombstoneTable* tombstone_table_construct (GType object_type);
-DatabaseTable* database_table_construct (GType object_type);
-void database_table_set_table_name (DatabaseTable* self,
-                                    const gchar* table_name);
-void database_table_fatal (const gchar* op,
-                           gint res);
-TombstoneTable* tombstone_table_get_instance (void);
-GQuark database_error_quark (void);
-TombstoneRow* tombstone_table_add (TombstoneTable* self,
-                                   const gchar* filepath,
-                                   gint64 filesize,
-                                   const gchar* md5,
-                                   TombstoneReason reason,
-                                   GError** error);
-gulong now_sec (void);
-gint tombstone_reason_serialize (TombstoneReason self);
-void database_table_throw_error (const gchar* method,
-                                 gint res,
-                                 GError** error);
-TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self,
-                                          int* result_length1,
-                                          GError** error);
-gint database_table_get_row_count (DatabaseTable* self);
-TombstoneReason tombstone_reason_unserialize (gint value);
-void tombstone_table_update_file (TombstoneTable* self,
-                                  TombstoneID* tombstone_id,
-                                  const gchar* filepath,
-                                  GError** error);
-void database_table_update_text_by_id_2 (DatabaseTable* self,
-                                         gint64 id,
-                                         const gchar* column,
-                                         const gchar* text,
-                                         GError** error);
-void tombstone_table_remove (TombstoneTable* self,
-                             TombstoneID* tombstone_id,
-                             GError** error);
-void database_table_delete_by_id (DatabaseTable* self,
-                                  gint64 id,
-                                  GError** error);
-static void tombstone_table_finalize (DatabaseTable * obj);
-static void _vala_array_destroy (gpointer array,
-                          gint array_length,
-                          GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array,
-                       gint array_length,
-                       GDestroyNotify destroy_func);
-
-
-void
-tombstone_id_init (TombstoneID *self,
-                   gint64 id)
-{
-#line 12 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	memset (self, 0, sizeof (TombstoneID));
-#line 13 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	(*self).id = id;
-#line 231 "TombstoneTable.c"
-}
-
-
-gboolean
-tombstone_id_is_invalid (TombstoneID *self)
-{
-	gboolean result = FALSE;
-	gint64 _tmp0_;
-#line 17 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp0_ = (*self).id;
-#line 17 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	result = _tmp0_ == TOMBSTONE_ID_INVALID;
-#line 17 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	return result;
-#line 246 "TombstoneTable.c"
-}
-
-
-gboolean
-tombstone_id_is_valid (TombstoneID *self)
-{
-	gboolean result = FALSE;
-	gint64 _tmp0_;
-#line 21 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp0_ = (*self).id;
-#line 21 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	result = _tmp0_ != TOMBSTONE_ID_INVALID;
-#line 21 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	return result;
-#line 261 "TombstoneTable.c"
-}
-
-
-TombstoneID*
-tombstone_id_dup (const TombstoneID* self)
-{
-	TombstoneID* dup;
-#line 7 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	dup = g_new0 (TombstoneID, 1);
-#line 7 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	memcpy (dup, self, sizeof (TombstoneID));
-#line 7 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	return dup;
-#line 275 "TombstoneTable.c"
-}
-
-
-void
-tombstone_id_free (TombstoneID* self)
-{
-#line 7 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	g_free (self);
-#line 284 "TombstoneTable.c"
-}
-
-
-GType
-tombstone_id_get_type (void)
-{
-	static volatile gsize tombstone_id_type_id__volatile = 0;
-	if (g_once_init_enter (&tombstone_id_type_id__volatile)) {
-		GType tombstone_id_type_id;
-		tombstone_id_type_id = g_boxed_type_register_static ("TombstoneID", (GBoxedCopyFunc) tombstone_id_dup, (GBoxedFreeFunc) tombstone_id_free);
-		g_once_init_leave (&tombstone_id_type_id__volatile, tombstone_id_type_id);
-	}
-	return tombstone_id_type_id__volatile;
-}
-
-
-TombstoneRow*
-tombstone_row_construct (GType object_type)
-{
-	TombstoneRow* self = NULL;
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	self = (TombstoneRow*) g_type_create_instance (object_type);
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	return self;
-#line 309 "TombstoneTable.c"
-}
-
-
-TombstoneRow*
-tombstone_row_new (void)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	return tombstone_row_construct (TYPE_TOMBSTONE_ROW);
-#line 318 "TombstoneTable.c"
-}
-
-
-static void
-value_tombstone_row_init (GValue* value)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	value->data[0].v_pointer = NULL;
-#line 327 "TombstoneTable.c"
-}
-
-
-static void
-value_tombstone_row_free_value (GValue* value)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	if (value->data[0].v_pointer) {
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		tombstone_row_unref (value->data[0].v_pointer);
-#line 338 "TombstoneTable.c"
-	}
-}
-
-
-static void
-value_tombstone_row_copy_value (const GValue* src_value,
-                                GValue* dest_value)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	if (src_value->data[0].v_pointer) {
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		dest_value->data[0].v_pointer = tombstone_row_ref (src_value->data[0].v_pointer);
-#line 351 "TombstoneTable.c"
-	} else {
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 355 "TombstoneTable.c"
-	}
-}
-
-
-static gpointer
-value_tombstone_row_peek_pointer (const GValue* value)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	return value->data[0].v_pointer;
-#line 365 "TombstoneTable.c"
-}
-
-
-static gchar*
-value_tombstone_row_collect_value (GValue* value,
-                                   guint n_collect_values,
-                                   GTypeCValue* collect_values,
-                                   guint collect_flags)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	if (collect_values[0].v_pointer) {
-#line 377 "TombstoneTable.c"
-		TombstoneRow * object;
-		object = collect_values[0].v_pointer;
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 384 "TombstoneTable.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.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 388 "TombstoneTable.c"
-		}
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		value->data[0].v_pointer = tombstone_row_ref (object);
-#line 392 "TombstoneTable.c"
-	} else {
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 396 "TombstoneTable.c"
-	}
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	return NULL;
-#line 400 "TombstoneTable.c"
-}
-
-
-static gchar*
-value_tombstone_row_lcopy_value (const GValue* value,
-                                 guint n_collect_values,
-                                 GTypeCValue* collect_values,
-                                 guint collect_flags)
-{
-	TombstoneRow ** object_p;
-	object_p = collect_values[0].v_pointer;
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	if (!object_p) {
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 416 "TombstoneTable.c"
-	}
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	if (!value->data[0].v_pointer) {
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		*object_p = NULL;
-#line 422 "TombstoneTable.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		*object_p = value->data[0].v_pointer;
-#line 426 "TombstoneTable.c"
-	} else {
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		*object_p = tombstone_row_ref (value->data[0].v_pointer);
-#line 430 "TombstoneTable.c"
-	}
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	return NULL;
-#line 434 "TombstoneTable.c"
-}
-
-
-GParamSpec*
-param_spec_tombstone_row (const gchar* name,
-                          const gchar* nick,
-                          const gchar* blurb,
-                          GType object_type,
-                          GParamFlags flags)
-{
-	ParamSpecTombstoneRow* spec;
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, TYPE_TOMBSTONE_ROW), NULL);
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	return G_PARAM_SPEC (spec);
-#line 454 "TombstoneTable.c"
-}
-
-
-gpointer
-value_get_tombstone_row (const GValue* value)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONE_ROW), NULL);
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	return value->data[0].v_pointer;
-#line 465 "TombstoneTable.c"
-}
-
-
-void
-value_set_tombstone_row (GValue* value,
-                         gpointer v_object)
-{
-	TombstoneRow * old;
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONE_ROW));
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	old = value->data[0].v_pointer;
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	if (v_object) {
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_TOMBSTONE_ROW));
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		value->data[0].v_pointer = v_object;
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		tombstone_row_ref (value->data[0].v_pointer);
-#line 488 "TombstoneTable.c"
-	} else {
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 492 "TombstoneTable.c"
-	}
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	if (old) {
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		tombstone_row_unref (old);
-#line 498 "TombstoneTable.c"
-	}
-}
-
-
-void
-value_take_tombstone_row (GValue* value,
-                          gpointer v_object)
-{
-	TombstoneRow * old;
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONE_ROW));
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	old = value->data[0].v_pointer;
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	if (v_object) {
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_TOMBSTONE_ROW));
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		value->data[0].v_pointer = v_object;
-#line 520 "TombstoneTable.c"
-	} else {
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 524 "TombstoneTable.c"
-	}
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	if (old) {
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		tombstone_row_unref (old);
-#line 530 "TombstoneTable.c"
-	}
-}
-
-
-static void
-tombstone_row_class_init (TombstoneRowClass * klass)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	tombstone_row_parent_class = g_type_class_peek_parent (klass);
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	((TombstoneRowClass *) klass)->finalize = tombstone_row_finalize;
-#line 542 "TombstoneTable.c"
-}
-
-
-static void
-tombstone_row_instance_init (TombstoneRow * self)
-{
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	self->ref_count = 1;
-#line 551 "TombstoneTable.c"
-}
-
-
-static void
-tombstone_row_finalize (TombstoneRow * obj)
-{
-	TombstoneRow * self;
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TOMBSTONE_ROW, TombstoneRow);
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	g_signal_handlers_destroy (self);
-#line 27 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_g_free0 (self->filepath);
-#line 29 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_g_free0 (self->md5);
-#line 567 "TombstoneTable.c"
-}
-
-
-GType
-tombstone_row_get_type (void)
-{
-	static volatile gsize tombstone_row_type_id__volatile = 0;
-	if (g_once_init_enter (&tombstone_row_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_tombstone_row_init, value_tombstone_row_free_value, value_tombstone_row_copy_value, value_tombstone_row_peek_pointer, "p", value_tombstone_row_collect_value, "p", value_tombstone_row_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (TombstoneRowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tombstone_row_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TombstoneRow), 0, (GInstanceInitFunc) tombstone_row_instance_init, &g_define_type_value_table };
-		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
-		GType tombstone_row_type_id;
-		tombstone_row_type_id = g_type_register_fundamental (g_type_fundamental_next (), "TombstoneRow", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&tombstone_row_type_id__volatile, tombstone_row_type_id);
-	}
-	return tombstone_row_type_id__volatile;
-}
-
-
-gpointer
-tombstone_row_ref (gpointer instance)
-{
-	TombstoneRow * self;
-	self = instance;
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	return instance;
-#line 596 "TombstoneTable.c"
-}
-
-
-void
-tombstone_row_unref (gpointer instance)
-{
-	TombstoneRow * self;
-	self = instance;
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		TOMBSTONE_ROW_GET_CLASS (self)->finalize (self);
-#line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 611 "TombstoneTable.c"
-	}
-}
-
-
-static TombstoneTable*
-tombstone_table_construct (GType object_type)
-{
-	TombstoneTable* self = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	gint _tmp5_;
-#line 37 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	self = (TombstoneTable*) database_table_construct (object_type);
-#line 38 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	database_table_set_table_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), "TombstoneTable");
-#line 41 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp0_ = database_table_db;
-#line 41 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "CREATE TABLE IF NOT EXISTS " "TombstoneTable " "(" "id INTEGER PRIMARY KEY, " "filepath TEXT NOT NULL, " "filesize INTEGER, " "md5 TEXT, " "time_created INTEGER, " "reason INTEGER DEFAULT 0 " ")", -1, &_tmp1_, NULL);
-#line 41 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 41 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	stmt = _tmp1_;
-#line 41 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	res = _tmp2_;
-#line 51 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp3_ = res;
-#line 51 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 53 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp4_ = stmt;
-#line 53 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	res = sqlite3_step (_tmp4_);
-#line 54 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp5_ = res;
-#line 54 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	if (_tmp5_ != SQLITE_DONE) {
-#line 654 "TombstoneTable.c"
-		gint _tmp6_;
-#line 55 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		_tmp6_ = res;
-#line 55 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		database_table_fatal ("create TombstoneTable", _tmp6_);
-#line 660 "TombstoneTable.c"
-	}
-#line 37 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 37 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	return self;
-#line 666 "TombstoneTable.c"
-}
-
-
-static TombstoneTable*
-tombstone_table_new (void)
-{
-#line 37 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	return tombstone_table_construct (TYPE_TOMBSTONE_TABLE);
-#line 675 "TombstoneTable.c"
-}
-
-
-static gpointer
-_database_table_ref0 (gpointer self)
-{
-#line 62 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	return self ? database_table_ref (self) : NULL;
-#line 684 "TombstoneTable.c"
-}
-
-
-TombstoneTable*
-tombstone_table_get_instance (void)
-{
-	TombstoneTable* result = NULL;
-	TombstoneTable* _tmp0_;
-	TombstoneTable* _tmp2_;
-	TombstoneTable* _tmp3_;
-#line 59 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp0_ = tombstone_table_instance;
-#line 59 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	if (_tmp0_ == NULL) {
-#line 699 "TombstoneTable.c"
-		TombstoneTable* _tmp1_;
-#line 60 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		_tmp1_ = tombstone_table_new ();
-#line 60 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		_database_table_unref0 (tombstone_table_instance);
-#line 60 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		tombstone_table_instance = _tmp1_;
-#line 707 "TombstoneTable.c"
-	}
-#line 62 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp2_ = tombstone_table_instance;
-#line 62 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp3_ = _database_table_ref0 (_tmp2_);
-#line 62 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	result = _tmp3_;
-#line 62 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	return result;
-#line 717 "TombstoneTable.c"
-}
-
-
-TombstoneRow*
-tombstone_table_add (TombstoneTable* self,
-                     const gchar* filepath,
-                     gint64 filesize,
-                     const gchar* md5,
-                     TombstoneReason reason,
-                     GError** error)
-{
-	TombstoneRow* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	time_t time_created = 0;
-	sqlite3_stmt* _tmp4_;
-	gchar* _tmp5_;
-	GDestroyNotify _tmp6_;
-	gint _tmp7_;
-	sqlite3_stmt* _tmp8_;
-	gint _tmp9_;
-	sqlite3_stmt* _tmp10_;
-	gchar* _tmp11_;
-	GDestroyNotify _tmp12_;
-	gint _tmp13_;
-	sqlite3_stmt* _tmp14_;
-	time_t _tmp15_;
-	gint _tmp16_;
-	sqlite3_stmt* _tmp17_;
-	gint _tmp18_;
-	sqlite3_stmt* _tmp19_;
-	gint _tmp20_;
-	TombstoneRow* row = NULL;
-	TombstoneRow* _tmp22_;
-	TombstoneRow* _tmp23_;
-	sqlite3* _tmp24_;
-	TombstoneRow* _tmp25_;
-	gchar* _tmp26_;
-	TombstoneRow* _tmp27_;
-	TombstoneRow* _tmp28_;
-	gchar* _tmp29_;
-	TombstoneRow* _tmp30_;
-	time_t _tmp31_;
-	TombstoneRow* _tmp32_;
-	GError * _inner_error_ = NULL;
-#line 65 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	g_return_val_if_fail (IS_TOMBSTONE_TABLE (self), NULL);
-#line 65 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	g_return_val_if_fail (filepath != NULL, NULL);
-#line 68 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp0_ = database_table_db;
-#line 68 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "INSERT INTO TombstoneTable " "(filepath, filesize, md5, time_created, reason) " "VALUES (?, ?, ?, ?, ?)", -1, &_tmp1_, NULL);
-#line 68 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 68 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	stmt = _tmp1_;
-#line 68 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	res = _tmp2_;
-#line 72 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp3_ = res;
-#line 72 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 74 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	time_created = (time_t) now_sec ();
-#line 76 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp4_ = stmt;
-#line 76 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp5_ = g_strdup (filepath);
-#line 76 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp6_ = g_free;
-#line 76 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	res = sqlite3_bind_text (_tmp4_, 1, _tmp5_, -1, _tmp6_);
-#line 77 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp7_ = res;
-#line 77 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 78 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp8_ = stmt;
-#line 78 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	res = sqlite3_bind_int64 (_tmp8_, 2, filesize);
-#line 79 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp9_ = res;
-#line 79 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK");
-#line 80 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp10_ = stmt;
-#line 80 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp11_ = g_strdup (md5);
-#line 80 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp12_ = g_free;
-#line 80 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	res = sqlite3_bind_text (_tmp10_, 3, _tmp11_, -1, _tmp12_);
-#line 81 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp13_ = res;
-#line 81 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK");
-#line 82 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp14_ = stmt;
-#line 82 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp15_ = time_created;
-#line 82 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	res = sqlite3_bind_int64 (_tmp14_, 4, (gint64) _tmp15_);
-#line 83 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp16_ = res;
-#line 83 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_vala_assert (_tmp16_ == SQLITE_OK, "res == Sqlite.OK");
-#line 84 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp17_ = stmt;
-#line 84 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	res = sqlite3_bind_int (_tmp17_, 5, tombstone_reason_serialize (reason));
-#line 85 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp18_ = res;
-#line 85 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK");
-#line 87 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp19_ = stmt;
-#line 87 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	res = sqlite3_step (_tmp19_);
-#line 88 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp20_ = res;
-#line 88 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	if (_tmp20_ != SQLITE_DONE) {
-#line 845 "TombstoneTable.c"
-		gint _tmp21_;
-#line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		_tmp21_ = res;
-#line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		database_table_throw_error ("TombstoneTable.add", _tmp21_, &_inner_error_);
-#line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-				return NULL;
-#line 861 "TombstoneTable.c"
-			} else {
-#line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.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 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-				g_clear_error (&_inner_error_);
-#line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-				return NULL;
-#line 871 "TombstoneTable.c"
-			}
-		}
-	}
-#line 91 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp22_ = tombstone_row_new ();
-#line 91 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	row = _tmp22_;
-#line 92 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp23_ = row;
-#line 92 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp24_ = database_table_db;
-#line 92 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	tombstone_id_init (&_tmp23_->id, sqlite3_last_insert_rowid (_tmp24_));
-#line 93 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp25_ = row;
-#line 93 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp26_ = g_strdup (filepath);
-#line 93 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_g_free0 (_tmp25_->filepath);
-#line 93 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp25_->filepath = _tmp26_;
-#line 94 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp27_ = row;
-#line 94 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp27_->filesize = filesize;
-#line 95 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp28_ = row;
-#line 95 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp29_ = g_strdup (md5);
-#line 95 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_g_free0 (_tmp28_->md5);
-#line 95 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp28_->md5 = _tmp29_;
-#line 96 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp30_ = row;
-#line 96 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp31_ = time_created;
-#line 96 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp30_->time_created = _tmp31_;
-#line 97 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp32_ = row;
-#line 97 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp32_->reason = reason;
-#line 99 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	result = row;
-#line 99 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 99 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	return result;
-#line 921 "TombstoneTable.c"
-}
-
-
-static gpointer
-_tombstone_row_ref0 (gpointer self)
-{
-#line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	return self ? tombstone_row_ref (self) : NULL;
-#line 930 "TombstoneTable.c"
-}
-
-
-TombstoneRow**
-tombstone_table_fetch_all (TombstoneTable* self,
-                           int* result_length1,
-                           GError** error)
-{
-	TombstoneRow** result = NULL;
-	gint row_count = 0;
-	gint _tmp0_;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp2_;
-	sqlite3_stmt* _tmp3_ = NULL;
-	gint _tmp4_;
-	gint _tmp5_;
-	TombstoneRow** rows = NULL;
-	gint _tmp6_;
-	TombstoneRow** _tmp7_;
-	gint rows_length1;
-	gint _rows_size_;
-	gint index = 0;
-	gint _tmp35_;
-	gint _tmp36_;
-	TombstoneRow** _tmp37_;
-	gint _tmp37__length1;
-	GError * _inner_error_ = NULL;
-#line 102 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	g_return_val_if_fail (IS_TOMBSTONE_TABLE (self), NULL);
-#line 103 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	row_count = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable));
-#line 104 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp0_ = row_count;
-#line 104 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	if (_tmp0_ == 0) {
-#line 967 "TombstoneTable.c"
-		TombstoneRow** _tmp1_;
-		gint _tmp1__length1;
-#line 105 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		_tmp1_ = NULL;
-#line 105 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		_tmp1__length1 = 0;
-#line 105 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		if (result_length1) {
-#line 105 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			*result_length1 = _tmp1__length1;
-#line 978 "TombstoneTable.c"
-		}
-#line 105 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		result = _tmp1_;
-#line 105 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		return result;
-#line 984 "TombstoneTable.c"
-	}
-#line 108 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp2_ = database_table_db;
-#line 108 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp4_ = sqlite3_prepare_v2 (_tmp2_, "SELECT id, filepath, filesize, md5, time_created, reason " "FROM TombstoneTable", -1, &_tmp3_, NULL);
-#line 108 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 108 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	stmt = _tmp3_;
-#line 108 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	res = _tmp4_;
-#line 110 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp5_ = res;
-#line 110 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK");
-#line 112 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp6_ = row_count;
-#line 112 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp7_ = g_new0 (TombstoneRow*, _tmp6_ + 1);
-#line 112 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	rows = _tmp7_;
-#line 112 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	rows_length1 = _tmp6_;
-#line 112 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_rows_size_ = rows_length1;
-#line 114 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	index = 0;
-#line 1012 "TombstoneTable.c"
-	{
-		gboolean _tmp8_ = FALSE;
-#line 115 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		_tmp8_ = TRUE;
-#line 115 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		while (TRUE) {
-#line 1019 "TombstoneTable.c"
-			sqlite3_stmt* _tmp9_;
-			gint _tmp10_;
-			TombstoneRow* row = NULL;
-			TombstoneRow* _tmp13_;
-			TombstoneRow* _tmp14_;
-			sqlite3_stmt* _tmp15_;
-			TombstoneRow* _tmp16_;
-			sqlite3_stmt* _tmp17_;
-			const gchar* _tmp18_;
-			gchar* _tmp19_;
-			TombstoneRow* _tmp20_;
-			sqlite3_stmt* _tmp21_;
-			TombstoneRow* _tmp22_;
-			sqlite3_stmt* _tmp23_;
-			const gchar* _tmp24_;
-			gchar* _tmp25_;
-			TombstoneRow* _tmp26_;
-			sqlite3_stmt* _tmp27_;
-			TombstoneRow* _tmp28_;
-			sqlite3_stmt* _tmp29_;
-			TombstoneRow** _tmp30_;
-			gint _tmp30__length1;
-			gint _tmp31_;
-			TombstoneRow* _tmp32_;
-			TombstoneRow* _tmp33_;
-			TombstoneRow* _tmp34_;
-#line 115 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			if (!_tmp8_) {
-#line 1048 "TombstoneTable.c"
-			}
-#line 115 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp8_ = FALSE;
-#line 116 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp9_ = stmt;
-#line 116 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			res = sqlite3_step (_tmp9_);
-#line 117 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp10_ = res;
-#line 117 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			if (_tmp10_ == SQLITE_DONE) {
-#line 118 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-				break;
-#line 1062 "TombstoneTable.c"
-			} else {
-				gint _tmp11_;
-#line 119 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-				_tmp11_ = res;
-#line 119 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-				if (_tmp11_ != SQLITE_ROW) {
-#line 1069 "TombstoneTable.c"
-					gint _tmp12_;
-#line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-					_tmp12_ = res;
-#line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-					database_table_throw_error ("TombstoneTable.fetch_all", _tmp12_, &_inner_error_);
-#line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-						if (_inner_error_->domain == DATABASE_ERROR) {
-#line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-							g_propagate_error (error, _inner_error_);
-#line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-							rows = (_vala_array_free (rows, rows_length1, (GDestroyNotify) tombstone_row_unref), NULL);
-#line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-							return NULL;
-#line 1087 "TombstoneTable.c"
-						} else {
-#line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-							rows = (_vala_array_free (rows, rows_length1, (GDestroyNotify) tombstone_row_unref), NULL);
-#line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.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 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-							g_clear_error (&_inner_error_);
-#line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-							return NULL;
-#line 1099 "TombstoneTable.c"
-						}
-					}
-				}
-			}
-#line 122 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp13_ = tombstone_row_new ();
-#line 122 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			row = _tmp13_;
-#line 123 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp14_ = row;
-#line 123 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp15_ = stmt;
-#line 123 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			tombstone_id_init (&_tmp14_->id, sqlite3_column_int64 (_tmp15_, 0));
-#line 124 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp16_ = row;
-#line 124 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp17_ = stmt;
-#line 124 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp18_ = sqlite3_column_text (_tmp17_, 1);
-#line 124 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp19_ = g_strdup (_tmp18_);
-#line 124 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_g_free0 (_tmp16_->filepath);
-#line 124 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp16_->filepath = _tmp19_;
-#line 125 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp20_ = row;
-#line 125 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp21_ = stmt;
-#line 125 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp20_->filesize = sqlite3_column_int64 (_tmp21_, 2);
-#line 126 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp22_ = row;
-#line 126 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp23_ = stmt;
-#line 126 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp24_ = sqlite3_column_text (_tmp23_, 3);
-#line 126 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp25_ = g_strdup (_tmp24_);
-#line 126 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_g_free0 (_tmp22_->md5);
-#line 126 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp22_->md5 = _tmp25_;
-#line 127 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp26_ = row;
-#line 127 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp27_ = stmt;
-#line 127 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp26_->time_created = (time_t) sqlite3_column_int64 (_tmp27_, 4);
-#line 128 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp28_ = row;
-#line 128 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp29_ = stmt;
-#line 128 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp28_->reason = tombstone_reason_unserialize (sqlite3_column_int (_tmp29_, 5));
-#line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp30_ = rows;
-#line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp30__length1 = rows_length1;
-#line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp31_ = index;
-#line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			index = _tmp31_ + 1;
-#line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp32_ = row;
-#line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp33_ = _tombstone_row_ref0 (_tmp32_);
-#line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tombstone_row_unref0 (_tmp30_[_tmp31_]);
-#line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp30_[_tmp31_] = _tmp33_;
-#line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tmp34_ = _tmp30_[_tmp31_];
-#line 115 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			_tombstone_row_unref0 (row);
-#line 1176 "TombstoneTable.c"
-		}
-	}
-#line 133 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp35_ = index;
-#line 133 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp36_ = row_count;
-#line 133 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_vala_assert (_tmp35_ == _tmp36_, "index == row_count");
-#line 135 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp37_ = rows;
-#line 135 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp37__length1 = rows_length1;
-#line 135 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	if (result_length1) {
-#line 135 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		*result_length1 = _tmp37__length1;
-#line 1193 "TombstoneTable.c"
-	}
-#line 135 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	result = _tmp37_;
-#line 135 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 135 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	return result;
-#line 1201 "TombstoneTable.c"
-}
-
-
-void
-tombstone_table_update_file (TombstoneTable* self,
-                             TombstoneID* tombstone_id,
-                             const gchar* filepath,
-                             GError** error)
-{
-	TombstoneID _tmp0_;
-	gint64 _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 138 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	g_return_if_fail (IS_TOMBSTONE_TABLE (self));
-#line 138 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	g_return_if_fail (tombstone_id != NULL);
-#line 138 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	g_return_if_fail (filepath != NULL);
-#line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp0_ = *tombstone_id;
-#line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filepath", filepath, &_inner_error_);
-#line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			return;
-#line 1234 "TombstoneTable.c"
-		} else {
-#line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.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/TombstoneTable.vala"
-			g_clear_error (&_inner_error_);
-#line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			return;
-#line 1242 "TombstoneTable.c"
-		}
-	}
-}
-
-
-void
-tombstone_table_remove (TombstoneTable* self,
-                        TombstoneID* tombstone_id,
-                        GError** error)
-{
-	TombstoneID _tmp0_;
-	gint64 _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 142 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	g_return_if_fail (IS_TOMBSTONE_TABLE (self));
-#line 142 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	g_return_if_fail (tombstone_id != NULL);
-#line 143 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp0_ = *tombstone_id;
-#line 143 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 143 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	database_table_delete_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, &_inner_error_);
-#line 143 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 143 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 143 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 143 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			return;
-#line 1274 "TombstoneTable.c"
-		} else {
-#line 143 "/home/jens/Source/shotwell/src/db/TombstoneTable.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 143 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			g_clear_error (&_inner_error_);
-#line 143 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-			return;
-#line 1282 "TombstoneTable.c"
-		}
-	}
-}
-
-
-static void
-tombstone_table_class_init (TombstoneTableClass * klass)
-{
-#line 34 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	tombstone_table_parent_class = g_type_class_peek_parent (klass);
-#line 34 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	((DatabaseTableClass *) klass)->finalize = tombstone_table_finalize;
-#line 1295 "TombstoneTable.c"
-}
-
-
-static void
-tombstone_table_instance_init (TombstoneTable * self)
-{
-}
-
-
-static void
-tombstone_table_finalize (DatabaseTable * obj)
-{
-	TombstoneTable * self;
-#line 34 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TOMBSTONE_TABLE, TombstoneTable);
-#line 34 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala"
-	DATABASE_TABLE_CLASS (tombstone_table_parent_class)->finalize (obj);
-#line 1313 "TombstoneTable.c"
-}
-
-
-GType
-tombstone_table_get_type (void)
-{
-	static volatile gsize tombstone_table_type_id__volatile = 0;
-	if (g_once_init_enter (&tombstone_table_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (TombstoneTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tombstone_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TombstoneTable), 0, (GInstanceInitFunc) tombstone_table_instance_init, NULL };
-		GType tombstone_table_type_id;
-		tombstone_table_type_id = g_type_register_static (TYPE_DATABASE_TABLE, "TombstoneTable", &g_define_type_info, 0);
-		g_once_init_leave (&tombstone_table_type_id__volatile, tombstone_table_type_id);
-	}
-	return tombstone_table_type_id__volatile;
-}
-
-
-static void
-_vala_array_destroy (gpointer array,
-                     gint array_length,
-                     GDestroyNotify destroy_func)
-{
-	if ((array != NULL) && (destroy_func != NULL)) {
-		int i;
-		for (i = 0; i < array_length; i = i + 1) {
-			if (((gpointer*) array)[i] != NULL) {
-				destroy_func (((gpointer*) array)[i]);
-			}
-		}
-	}
-}
-
-
-static void
-_vala_array_free (gpointer array,
-                  gint array_length,
-                  GDestroyNotify destroy_func)
-{
-	_vala_array_destroy (array, array_length, destroy_func);
-	g_free (array);
-}
-
-
-
diff --git a/src/db/VersionTable.c b/src/db/VersionTable.c
deleted file mode 100644
index a5847d7..0000000
--- a/src/db/VersionTable.c
+++ /dev/null
@@ -1,597 +0,0 @@
-/* VersionTable.c generated by valac 0.40.4, the Vala compiler
- * generated from VersionTable.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sqlite3.h>
-
-
-#define TYPE_DATABASE_TABLE (database_table_get_type ())
-#define DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATABASE_TABLE, DatabaseTable))
-#define DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATABASE_TABLE, DatabaseTableClass))
-#define IS_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATABASE_TABLE))
-#define IS_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DATABASE_TABLE))
-#define DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DATABASE_TABLE, DatabaseTableClass))
-
-typedef struct _DatabaseTable DatabaseTable;
-typedef struct _DatabaseTableClass DatabaseTableClass;
-typedef struct _DatabaseTablePrivate DatabaseTablePrivate;
-
-#define TYPE_VERSION_TABLE (version_table_get_type ())
-#define VERSION_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VERSION_TABLE, VersionTable))
-#define VERSION_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_VERSION_TABLE, VersionTableClass))
-#define IS_VERSION_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_VERSION_TABLE))
-#define IS_VERSION_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_VERSION_TABLE))
-#define VERSION_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_VERSION_TABLE, VersionTableClass))
-
-typedef struct _VersionTable VersionTable;
-typedef struct _VersionTableClass VersionTableClass;
-typedef struct _VersionTablePrivate VersionTablePrivate;
-#define _sqlite3_finalize0(var) ((var == NULL) ? NULL : (var = (sqlite3_finalize (var), NULL)))
-#define _database_table_unref0(var) ((var == NULL) ? NULL : (var = (database_table_unref (var), NULL)))
-#define _g_free0(var) (var = (g_free (var), NULL))
-#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
-#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
-#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-
-struct _DatabaseTable {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	DatabaseTablePrivate * priv;
-	gchar* table_name;
-};
-
-struct _DatabaseTableClass {
-	GTypeClass parent_class;
-	void (*finalize) (DatabaseTable *self);
-};
-
-struct _VersionTable {
-	DatabaseTable parent_instance;
-	VersionTablePrivate * priv;
-};
-
-struct _VersionTableClass {
-	DatabaseTableClass parent_class;
-};
-
-
-static gpointer version_table_parent_class = NULL;
-static VersionTable* version_table_instance;
-static VersionTable* version_table_instance = NULL;
-extern sqlite3* database_table_db;
-
-gpointer database_table_ref (gpointer instance);
-void database_table_unref (gpointer instance);
-GParamSpec* param_spec_database_table (const gchar* name,
-                                       const gchar* nick,
-                                       const gchar* blurb,
-                                       GType object_type,
-                                       GParamFlags flags);
-void value_set_database_table (GValue* value,
-                               gpointer v_object);
-void value_take_database_table (GValue* value,
-                                gpointer v_object);
-gpointer value_get_database_table (const GValue* value);
-GType database_table_get_type (void) G_GNUC_CONST;
-GType version_table_get_type (void) G_GNUC_CONST;
-static VersionTable* version_table_new (void);
-static VersionTable* version_table_construct (GType object_type);
-DatabaseTable* database_table_construct (GType object_type);
-void database_table_fatal (const gchar* op,
-                           gint res);
-void database_table_set_table_name (DatabaseTable* self,
-                                    const gchar* table_name);
-VersionTable* version_table_get_instance (void);
-gint version_table_get_version (VersionTable* self,
-                                gchar* * app_version);
-void version_table_set_version (VersionTable* self,
-                                gint version,
-                                const gchar* app_version,
-                                const gchar* user_data);
-void version_table_update_version (VersionTable* self,
-                                   gint version,
-                                   const gchar* app_version);
-static void version_table_finalize (DatabaseTable * obj);
-
-
-static VersionTable*
-version_table_construct (GType object_type)
-{
-	VersionTable* self = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	gint _tmp5_;
-#line 10 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	self = (VersionTable*) database_table_construct (object_type);
-#line 12 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp0_ = database_table_db;
-#line 12 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "CREATE TABLE IF NOT EXISTS VersionTable (" "id INTEGER PRIMARY KEY, " "schema_version INTEGER, " "app_version TEXT, " "user_data TEXT NULL" ")", -1, &_tmp1_, NULL);
-#line 12 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 12 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	stmt = _tmp1_;
-#line 12 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	res = _tmp2_;
-#line 18 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp3_ = res;
-#line 18 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 20 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp4_ = stmt;
-#line 20 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	res = sqlite3_step (_tmp4_);
-#line 21 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp5_ = res;
-#line 21 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	if (_tmp5_ != SQLITE_DONE) {
-#line 145 "VersionTable.c"
-		gint _tmp6_;
-#line 22 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_tmp6_ = res;
-#line 22 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		database_table_fatal ("create version table", _tmp6_);
-#line 151 "VersionTable.c"
-	}
-#line 24 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	database_table_set_table_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), "VersionTable");
-#line 10 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 10 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	return self;
-#line 159 "VersionTable.c"
-}
-
-
-static VersionTable*
-version_table_new (void)
-{
-#line 10 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	return version_table_construct (TYPE_VERSION_TABLE);
-#line 168 "VersionTable.c"
-}
-
-
-static gpointer
-_database_table_ref0 (gpointer self)
-{
-#line 31 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	return self ? database_table_ref (self) : NULL;
-#line 177 "VersionTable.c"
-}
-
-
-VersionTable*
-version_table_get_instance (void)
-{
-	VersionTable* result = NULL;
-	VersionTable* _tmp0_;
-	VersionTable* _tmp2_;
-	VersionTable* _tmp3_;
-#line 28 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp0_ = version_table_instance;
-#line 28 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	if (_tmp0_ == NULL) {
-#line 192 "VersionTable.c"
-		VersionTable* _tmp1_;
-#line 29 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_tmp1_ = version_table_new ();
-#line 29 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_database_table_unref0 (version_table_instance);
-#line 29 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		version_table_instance = _tmp1_;
-#line 200 "VersionTable.c"
-	}
-#line 31 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp2_ = version_table_instance;
-#line 31 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp3_ = _database_table_ref0 (_tmp2_);
-#line 31 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	result = _tmp3_;
-#line 31 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	return result;
-#line 210 "VersionTable.c"
-}
-
-
-gint
-version_table_get_version (VersionTable* self,
-                           gchar* * app_version)
-{
-	gchar* _vala_app_version = NULL;
-	gint result = 0;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	gint _tmp5_;
-	sqlite3_stmt* _tmp8_;
-	const gchar* _tmp9_;
-	gchar* _tmp10_;
-	sqlite3_stmt* _tmp11_;
-#line 34 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	g_return_val_if_fail (IS_VERSION_TABLE (self), 0);
-#line 36 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp0_ = database_table_db;
-#line 36 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT schema_version, app_version FROM VersionTable ORDER BY schema_v" \
-"ersion DESC LIMIT 1", -1, &_tmp1_, NULL);
-#line 36 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 36 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	stmt = _tmp1_;
-#line 36 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	res = _tmp2_;
-#line 38 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp3_ = res;
-#line 38 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 40 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp4_ = stmt;
-#line 40 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	res = sqlite3_step (_tmp4_);
-#line 41 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp5_ = res;
-#line 41 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	if (_tmp5_ != SQLITE_ROW) {
-#line 256 "VersionTable.c"
-		gint _tmp6_;
-#line 42 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_tmp6_ = res;
-#line 42 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		if (_tmp6_ != SQLITE_DONE) {
-#line 262 "VersionTable.c"
-			gint _tmp7_;
-#line 43 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-			_tmp7_ = res;
-#line 43 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-			database_table_fatal ("get_version", _tmp7_);
-#line 268 "VersionTable.c"
-		}
-#line 45 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_g_free0 (_vala_app_version);
-#line 45 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_vala_app_version = NULL;
-#line 47 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		result = -1;
-#line 47 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 47 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		if (app_version) {
-#line 47 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-			*app_version = _vala_app_version;
-#line 282 "VersionTable.c"
-		} else {
-#line 47 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-			_g_free0 (_vala_app_version);
-#line 286 "VersionTable.c"
-		}
-#line 47 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		return result;
-#line 290 "VersionTable.c"
-	}
-#line 50 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp8_ = stmt;
-#line 50 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp9_ = sqlite3_column_text (_tmp8_, 1);
-#line 50 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp10_ = g_strdup (_tmp9_);
-#line 50 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_g_free0 (_vala_app_version);
-#line 50 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_vala_app_version = _tmp10_;
-#line 52 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp11_ = stmt;
-#line 52 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	result = sqlite3_column_int (_tmp11_, 0);
-#line 52 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 52 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	if (app_version) {
-#line 52 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		*app_version = _vala_app_version;
-#line 312 "VersionTable.c"
-	} else {
-#line 52 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_g_free0 (_vala_app_version);
-#line 316 "VersionTable.c"
-	}
-#line 52 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	return result;
-#line 320 "VersionTable.c"
-}
-
-
-void
-version_table_set_version (VersionTable* self,
-                           gint version,
-                           const gchar* app_version,
-                           const gchar* user_data)
-{
-	sqlite3_stmt* stmt = NULL;
-	gchar* bitbucket = NULL;
-	gchar* _tmp0_ = NULL;
-	gint _tmp1_;
-	gint res = 0;
-	sqlite3_stmt* _tmp10_;
-	gint _tmp11_;
-	sqlite3_stmt* _tmp12_;
-	gchar* _tmp13_;
-	GDestroyNotify _tmp14_;
-	gint _tmp15_;
-	sqlite3_stmt* _tmp16_;
-	gchar* _tmp17_;
-	GDestroyNotify _tmp18_;
-	gint _tmp19_;
-	sqlite3_stmt* _tmp20_;
-	gint _tmp21_;
-#line 55 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	g_return_if_fail (IS_VERSION_TABLE (self));
-#line 55 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	g_return_if_fail (app_version != NULL);
-#line 59 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp1_ = version_table_get_version (self, &_tmp0_);
-#line 59 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_g_free0 (bitbucket);
-#line 59 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	bitbucket = _tmp0_;
-#line 59 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	if (_tmp1_ != -1) {
-#line 359 "VersionTable.c"
-		gint res = 0;
-		sqlite3* _tmp2_;
-		sqlite3_stmt* _tmp3_ = NULL;
-		gint _tmp4_;
-		gint _tmp5_;
-#line 61 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_tmp2_ = database_table_db;
-#line 61 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_tmp4_ = sqlite3_prepare_v2 (_tmp2_, "UPDATE VersionTable SET schema_version=?, app_version=?, user_data=?", -1, &_tmp3_, NULL);
-#line 61 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 61 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		stmt = _tmp3_;
-#line 61 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		res = _tmp4_;
-#line 63 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_tmp5_ = res;
-#line 63 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK");
-#line 379 "VersionTable.c"
-	} else {
-		gint res = 0;
-		sqlite3* _tmp6_;
-		sqlite3_stmt* _tmp7_ = NULL;
-		gint _tmp8_;
-		gint _tmp9_;
-#line 66 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_tmp6_ = database_table_db;
-#line 66 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_tmp8_ = sqlite3_prepare_v2 (_tmp6_, "INSERT INTO VersionTable (schema_version, app_version, user_data) VALU" \
-"ES (?,?, ?)", -1, &_tmp7_, NULL);
-#line 66 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 66 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		stmt = _tmp7_;
-#line 66 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		res = _tmp8_;
-#line 68 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_tmp9_ = res;
-#line 68 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK");
-#line 400 "VersionTable.c"
-	}
-#line 71 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp10_ = stmt;
-#line 71 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	res = sqlite3_bind_int (_tmp10_, 1, version);
-#line 72 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp11_ = res;
-#line 72 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
-#line 73 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp12_ = stmt;
-#line 73 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp13_ = g_strdup (app_version);
-#line 73 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp14_ = g_free;
-#line 73 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	res = sqlite3_bind_text (_tmp12_, 2, _tmp13_, -1, _tmp14_);
-#line 74 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp15_ = res;
-#line 74 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK");
-#line 75 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp16_ = stmt;
-#line 75 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp17_ = g_strdup (user_data);
-#line 75 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp18_ = g_free;
-#line 75 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	res = sqlite3_bind_text (_tmp16_, 3, _tmp17_, -1, _tmp18_);
-#line 76 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp19_ = res;
-#line 76 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK");
-#line 78 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp20_ = stmt;
-#line 78 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	res = sqlite3_step (_tmp20_);
-#line 79 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp21_ = res;
-#line 79 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	if (_tmp21_ != SQLITE_DONE) {
-#line 442 "VersionTable.c"
-		gchar* _tmp22_;
-		gchar* _tmp23_;
-		gint _tmp24_;
-#line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_tmp22_ = g_strdup_printf ("set_version %d %s %s", version, app_version, user_data);
-#line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_tmp23_ = _tmp22_;
-#line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_tmp24_ = res;
-#line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		database_table_fatal (_tmp23_, _tmp24_);
-#line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_g_free0 (_tmp23_);
-#line 456 "VersionTable.c"
-	}
-#line 55 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_g_free0 (bitbucket);
-#line 55 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 462 "VersionTable.c"
-}
-
-
-void
-version_table_update_version (VersionTable* self,
-                              gint version,
-                              const gchar* app_version)
-{
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	gint _tmp5_;
-	sqlite3_stmt* _tmp6_;
-	gchar* _tmp7_;
-	GDestroyNotify _tmp8_;
-	gint _tmp9_;
-	sqlite3_stmt* _tmp10_;
-	gint _tmp11_;
-#line 83 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	g_return_if_fail (IS_VERSION_TABLE (self));
-#line 83 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	g_return_if_fail (app_version != NULL);
-#line 85 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp0_ = database_table_db;
-#line 85 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "UPDATE VersionTable SET schema_version=?, app_version=?", -1, &_tmp1_, NULL);
-#line 85 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 85 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	stmt = _tmp1_;
-#line 85 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	res = _tmp2_;
-#line 86 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp3_ = res;
-#line 86 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 88 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp4_ = stmt;
-#line 88 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	res = sqlite3_bind_int (_tmp4_, 1, version);
-#line 89 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp5_ = res;
-#line 89 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK");
-#line 90 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp6_ = stmt;
-#line 90 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp7_ = g_strdup (app_version);
-#line 90 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp8_ = g_free;
-#line 90 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	res = sqlite3_bind_text (_tmp6_, 2, _tmp7_, -1, _tmp8_);
-#line 91 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp9_ = res;
-#line 91 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK");
-#line 93 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp10_ = stmt;
-#line 93 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	res = sqlite3_step (_tmp10_);
-#line 94 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_tmp11_ = res;
-#line 94 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	if (_tmp11_ != SQLITE_DONE) {
-#line 531 "VersionTable.c"
-		gchar* _tmp12_;
-		gchar* _tmp13_;
-		gint _tmp14_;
-#line 95 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_tmp12_ = g_strdup_printf ("update_version %d", version);
-#line 95 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_tmp13_ = _tmp12_;
-#line 95 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_tmp14_ = res;
-#line 95 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		database_table_fatal (_tmp13_, _tmp14_);
-#line 95 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-		_g_free0 (_tmp13_);
-#line 545 "VersionTable.c"
-	}
-#line 83 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 549 "VersionTable.c"
-}
-
-
-static void
-version_table_class_init (VersionTableClass * klass)
-{
-#line 7 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	version_table_parent_class = g_type_class_peek_parent (klass);
-#line 7 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	((DatabaseTableClass *) klass)->finalize = version_table_finalize;
-#line 560 "VersionTable.c"
-}
-
-
-static void
-version_table_instance_init (VersionTable * self)
-{
-}
-
-
-static void
-version_table_finalize (DatabaseTable * obj)
-{
-	VersionTable * self;
-#line 7 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VERSION_TABLE, VersionTable);
-#line 7 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
-	DATABASE_TABLE_CLASS (version_table_parent_class)->finalize (obj);
-#line 578 "VersionTable.c"
-}
-
-
-GType
-version_table_get_type (void)
-{
-	static volatile gsize version_table_type_id__volatile = 0;
-	if (g_once_init_enter (&version_table_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (VersionTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) version_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (VersionTable), 0, (GInstanceInitFunc) version_table_instance_init, NULL };
-		GType version_table_type_id;
-		version_table_type_id = g_type_register_static (TYPE_DATABASE_TABLE, "VersionTable", &g_define_type_info, 0);
-		g_once_init_leave (&version_table_type_id__volatile, version_table_type_id);
-	}
-	return version_table_type_id__volatile;
-}
-
-
-
diff --git a/src/db/VideoTable.c b/src/db/VideoTable.c
deleted file mode 100644
index 0780862..0000000
--- a/src/db/VideoTable.c
+++ /dev/null
@@ -1,3266 +0,0 @@
-/* VideoTable.c generated by valac 0.40.4, the Vala compiler
- * generated from VideoTable.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <float.h>
-#include <math.h>
-#include <sqlite3.h>
-#include <gee.h>
-#include <gio/gio.h>
-#include <gobject/gvaluecollector.h>
-
-
-#define TYPE_VIDEO_ID (video_id_get_type ())
-typedef struct _VideoID VideoID;
-
-#define TYPE_VIDEO_ROW (video_row_get_type ())
-#define VIDEO_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIDEO_ROW, VideoRow))
-#define VIDEO_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_VIDEO_ROW, VideoRowClass))
-#define IS_VIDEO_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_VIDEO_ROW))
-#define IS_VIDEO_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_VIDEO_ROW))
-#define VIDEO_ROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_VIDEO_ROW, VideoRowClass))
-
-typedef struct _VideoRow VideoRow;
-typedef struct _VideoRowClass VideoRowClass;
-typedef struct _VideoRowPrivate VideoRowPrivate;
-
-#define TYPE_IMPORT_ID (import_id_get_type ())
-typedef struct _ImportID ImportID;
-
-#define TYPE_EVENT_ID (event_id_get_type ())
-typedef struct _EventID EventID;
-
-#define TYPE_RATING (rating_get_type ())
-#define _g_free0(var) (var = (g_free (var), NULL))
-typedef struct _ParamSpecVideoRow ParamSpecVideoRow;
-
-#define TYPE_DATABASE_TABLE (database_table_get_type ())
-#define DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATABASE_TABLE, DatabaseTable))
-#define DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATABASE_TABLE, DatabaseTableClass))
-#define IS_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATABASE_TABLE))
-#define IS_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DATABASE_TABLE))
-#define DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DATABASE_TABLE, DatabaseTableClass))
-
-typedef struct _DatabaseTable DatabaseTable;
-typedef struct _DatabaseTableClass DatabaseTableClass;
-typedef struct _DatabaseTablePrivate DatabaseTablePrivate;
-
-#define TYPE_VIDEO_TABLE (video_table_get_type ())
-#define VIDEO_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIDEO_TABLE, VideoTable))
-#define VIDEO_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_VIDEO_TABLE, VideoTableClass))
-#define IS_VIDEO_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_VIDEO_TABLE))
-#define IS_VIDEO_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_VIDEO_TABLE))
-#define VIDEO_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_VIDEO_TABLE, VideoTableClass))
-
-typedef struct _VideoTable VideoTable;
-typedef struct _VideoTableClass VideoTableClass;
-typedef struct _VideoTablePrivate VideoTablePrivate;
-#define _sqlite3_finalize0(var) ((var == NULL) ? NULL : (var = (sqlite3_finalize (var), NULL)))
-#define _database_table_unref0(var) ((var == NULL) ? NULL : (var = (database_table_unref (var), NULL)))
-#define _video_row_unref0(var) ((var == NULL) ? NULL : (var = (video_row_unref (var), NULL)))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
-#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
-#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-
-struct _VideoID {
-	gint64 id;
-};
-
-struct _ImportID {
-	gint64 id;
-};
-
-struct _EventID {
-	gint64 id;
-};
-
-typedef enum  {
-	RATING_REJECTED = -1,
-	RATING_UNRATED = 0,
-	RATING_ONE = 1,
-	RATING_TWO = 2,
-	RATING_THREE = 3,
-	RATING_FOUR = 4,
-	RATING_FIVE = 5
-} Rating;
-
-struct _VideoRow {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	VideoRowPrivate * priv;
-	VideoID video_id;
-	gchar* filepath;
-	gint64 filesize;
-	time_t timestamp;
-	gint width;
-	gint height;
-	gdouble clip_duration;
-	gboolean is_interpretable;
-	time_t exposure_time;
-	ImportID import_id;
-	EventID event_id;
-	gchar* md5;
-	time_t time_created;
-	Rating rating;
-	gchar* title;
-	gchar* backlinks;
-	time_t time_reimported;
-	guint64 flags;
-	gchar* comment;
-};
-
-struct _VideoRowClass {
-	GTypeClass parent_class;
-	void (*finalize) (VideoRow *self);
-};
-
-struct _ParamSpecVideoRow {
-	GParamSpec parent_instance;
-};
-
-struct _DatabaseTable {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	DatabaseTablePrivate * priv;
-	gchar* table_name;
-};
-
-struct _DatabaseTableClass {
-	GTypeClass parent_class;
-	void (*finalize) (DatabaseTable *self);
-};
-
-struct _VideoTable {
-	DatabaseTable parent_instance;
-	VideoTablePrivate * priv;
-};
-
-struct _VideoTableClass {
-	DatabaseTableClass parent_class;
-};
-
-typedef enum  {
-	DATABASE_ERROR_ERROR,
-	DATABASE_ERROR_BACKING,
-	DATABASE_ERROR_MEMORY,
-	DATABASE_ERROR_ABORT,
-	DATABASE_ERROR_LIMITS,
-	DATABASE_ERROR_TYPESPEC
-} DatabaseError;
-#define DATABASE_ERROR database_error_quark ()
-
-static gpointer video_row_parent_class = NULL;
-static gpointer video_table_parent_class = NULL;
-static VideoTable* video_table_instance;
-static VideoTable* video_table_instance = NULL;
-extern sqlite3* database_table_db;
-
-GType video_id_get_type (void) G_GNUC_CONST;
-VideoID* video_id_dup (const VideoID* self);
-void video_id_free (VideoID* self);
-#define VIDEO_ID_INVALID ((gint64) -1)
-void video_id_init (VideoID *self,
-                    gint64 id);
-gboolean video_id_is_invalid (VideoID *self);
-gboolean video_id_is_valid (VideoID *self);
-guint video_id_hash (VideoID* a);
-guint int64_hash (gint64* n);
-gboolean video_id_equal (void* a,
-                         void* b);
-gchar* video_id_upgrade_video_id_to_source_id (VideoID* video_id);
-#define VIDEO_TYPENAME "video"
-gpointer video_row_ref (gpointer instance);
-void video_row_unref (gpointer instance);
-GParamSpec* param_spec_video_row (const gchar* name,
-                                  const gchar* nick,
-                                  const gchar* blurb,
-                                  GType object_type,
-                                  GParamFlags flags);
-void value_set_video_row (GValue* value,
-                          gpointer v_object);
-void value_take_video_row (GValue* value,
-                           gpointer v_object);
-gpointer value_get_video_row (const GValue* value);
-GType video_row_get_type (void) G_GNUC_CONST;
-GType import_id_get_type (void) G_GNUC_CONST;
-ImportID* import_id_dup (const ImportID* self);
-void import_id_free (ImportID* self);
-GType event_id_get_type (void) G_GNUC_CONST;
-EventID* event_id_dup (const EventID* self);
-void event_id_free (EventID* self);
-GType rating_get_type (void) G_GNUC_CONST;
-VideoRow* video_row_new (void);
-VideoRow* video_row_construct (GType object_type);
-static void video_row_finalize (VideoRow * obj);
-gpointer database_table_ref (gpointer instance);
-void database_table_unref (gpointer instance);
-GParamSpec* param_spec_database_table (const gchar* name,
-                                       const gchar* nick,
-                                       const gchar* blurb,
-                                       GType object_type,
-                                       GParamFlags flags);
-void value_set_database_table (GValue* value,
-                               gpointer v_object);
-void value_take_database_table (GValue* value,
-                                gpointer v_object);
-gpointer value_get_database_table (const GValue* value);
-GType database_table_get_type (void) G_GNUC_CONST;
-GType video_table_get_type (void) G_GNUC_CONST;
-static VideoTable* video_table_new (void);
-static VideoTable* video_table_construct (GType object_type);
-DatabaseTable* database_table_construct (GType object_type);
-void database_table_fatal (const gchar* op,
-                           gint res);
-void database_table_set_table_name (DatabaseTable* self,
-                                    const gchar* table_name);
-VideoTable* video_table_get_instance (void);
-GQuark database_error_quark (void);
-void video_table_add (VideoTable* self,
-                      VideoRow* video_row,
-                      VideoID* result,
-                      GError** error);
-gulong now_sec (void);
-#define EVENT_ID_INVALID ((gint64) -1)
-void database_table_throw_error (const gchar* method,
-                                 gint res,
-                                 GError** error);
-void event_id_init (EventID *self,
-                    gint64 id);
-gboolean video_table_drop_event (VideoTable* self,
-                                 EventID* event_id);
-VideoRow* video_table_get_row (VideoTable* self,
-                               VideoID* video_id);
-Rating rating_unserialize (gint value);
-GeeArrayList* video_table_get_all (VideoTable* self);
-void video_table_set_filepath (VideoTable* self,
-                               VideoID* video_id,
-                               const gchar* filepath,
-                               GError** error);
-void database_table_update_text_by_id_2 (DatabaseTable* self,
-                                         gint64 id,
-                                         const gchar* column,
-                                         const gchar* text,
-                                         GError** error);
-void video_table_set_title (VideoTable* self,
-                            VideoID* video_id,
-                            const gchar* new_title,
-                            GError** error);
-void video_table_set_comment (VideoTable* self,
-                              VideoID* video_id,
-                              const gchar* new_comment,
-                              GError** error);
-void video_table_set_exposure_time (VideoTable* self,
-                                    VideoID* video_id,
-                                    time_t time,
-                                    GError** error);
-void database_table_update_int64_by_id_2 (DatabaseTable* self,
-                                          gint64 id,
-                                          const gchar* column,
-                                          gint64 value,
-                                          GError** error);
-void video_table_set_rating (VideoTable* self,
-                             VideoID* video_id,
-                             Rating rating,
-                             GError** error);
-gint rating_serialize (Rating self);
-void video_table_set_flags (VideoTable* self,
-                            VideoID* video_id,
-                            guint64 flags,
-                            GError** error);
-void video_table_update_backlinks (VideoTable* self,
-                                   VideoID* video_id,
-                                   const gchar* backlinks,
-                                   GError** error);
-void video_table_update_is_interpretable (VideoTable* self,
-                                          VideoID* video_id,
-                                          gboolean is_interpretable,
-                                          GError** error);
-void database_table_update_int_by_id_2 (DatabaseTable* self,
-                                        gint64 id,
-                                        const gchar* column,
-                                        gint value,
-                                        GError** error);
-gboolean video_table_set_event (VideoTable* self,
-                                VideoID* video_id,
-                                EventID* event_id);
-gboolean database_table_update_int64_by_id (DatabaseTable* self,
-                                            gint64 id,
-                                            const gchar* column,
-                                            gint64 value);
-void video_table_remove_by_file (VideoTable* self,
-                                 GFile* file,
-                                 GError** error);
-void video_table_remove (VideoTable* self,
-                         VideoID* videoID,
-                         GError** error);
-gboolean video_table_is_video_stored (VideoTable* self,
-                                      GFile* file);
-void video_table_get_id (VideoTable* self,
-                         GFile* file,
-                         VideoID* result);
-GeeArrayList* video_table_get_videos (VideoTable* self,
-                                      GError** error);
-static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self,
-                                              GFile* file,
-                                              const gchar* md5);
-gboolean video_table_has_duplicate (VideoTable* self,
-                                    GFile* file,
-                                    const gchar* md5);
-VideoID* video_table_get_duplicate_ids (VideoTable* self,
-                                        GFile* file,
-                                        const gchar* md5,
-                                        int* result_length1);
-static void _vala_array_add3 (VideoID* * array,
-                       int* length,
-                       int* size,
-                       const VideoID* value);
-GeeArrayList* video_table_get_event_source_ids (VideoTable* self,
-                                                EventID* event_id);
-void video_table_set_timestamp (VideoTable* self,
-                                VideoID* video_id,
-                                time_t timestamp,
-                                GError** error);
-static void video_table_finalize (DatabaseTable * obj);
-
-
-void
-video_id_init (VideoID *self,
-               gint64 id)
-{
-#line 12 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	memset (self, 0, sizeof (VideoID));
-#line 13 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	(*self).id = id;
-#line 348 "VideoTable.c"
-}
-
-
-gboolean
-video_id_is_invalid (VideoID *self)
-{
-	gboolean result = FALSE;
-	gint64 _tmp0_;
-#line 17 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = (*self).id;
-#line 17 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	result = _tmp0_ == VIDEO_ID_INVALID;
-#line 17 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return result;
-#line 363 "VideoTable.c"
-}
-
-
-gboolean
-video_id_is_valid (VideoID *self)
-{
-	gboolean result = FALSE;
-	gint64 _tmp0_;
-#line 21 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = (*self).id;
-#line 21 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	result = _tmp0_ != VIDEO_ID_INVALID;
-#line 21 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return result;
-#line 378 "VideoTable.c"
-}
-
-
-guint
-video_id_hash (VideoID* a)
-{
-	guint result = 0U;
-	gint64 _tmp0_;
-#line 25 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = (*a).id;
-#line 25 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	result = int64_hash (&_tmp0_);
-#line 25 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return result;
-#line 393 "VideoTable.c"
-}
-
-
-gboolean
-video_id_equal (void* a,
-                void* b)
-{
-	gboolean result = FALSE;
-	gint64 _tmp0_;
-	gint64 _tmp1_;
-#line 29 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = (*((VideoID*) a)).id;
-#line 29 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp1_ = (*((VideoID*) b)).id;
-#line 29 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	result = _tmp0_ == _tmp1_;
-#line 29 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return result;
-#line 412 "VideoTable.c"
-}
-
-
-gchar*
-video_id_upgrade_video_id_to_source_id (VideoID* video_id)
-{
-	gchar* result = NULL;
-	VideoID _tmp0_;
-	gint64 _tmp1_;
-	gchar* _tmp2_;
-#line 32 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_val_if_fail (video_id != NULL, NULL);
-#line 33 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = *video_id;
-#line 33 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 33 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp2_ = g_strdup_printf ("%s-%016" G_GINT64_MODIFIER "x", VIDEO_TYPENAME, _tmp1_);
-#line 33 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	result = _tmp2_;
-#line 33 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return result;
-#line 435 "VideoTable.c"
-}
-
-
-VideoID*
-video_id_dup (const VideoID* self)
-{
-	VideoID* dup;
-#line 7 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	dup = g_new0 (VideoID, 1);
-#line 7 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	memcpy (dup, self, sizeof (VideoID));
-#line 7 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return dup;
-#line 449 "VideoTable.c"
-}
-
-
-void
-video_id_free (VideoID* self)
-{
-#line 7 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_free (self);
-#line 458 "VideoTable.c"
-}
-
-
-GType
-video_id_get_type (void)
-{
-	static volatile gsize video_id_type_id__volatile = 0;
-	if (g_once_init_enter (&video_id_type_id__volatile)) {
-		GType video_id_type_id;
-		video_id_type_id = g_boxed_type_register_static ("VideoID", (GBoxedCopyFunc) video_id_dup, (GBoxedFreeFunc) video_id_free);
-		g_once_init_leave (&video_id_type_id__volatile, video_id_type_id);
-	}
-	return video_id_type_id__volatile;
-}
-
-
-VideoRow*
-video_row_construct (GType object_type)
-{
-	VideoRow* self = NULL;
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	self = (VideoRow*) g_type_create_instance (object_type);
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return self;
-#line 483 "VideoTable.c"
-}
-
-
-VideoRow*
-video_row_new (void)
-{
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return video_row_construct (TYPE_VIDEO_ROW);
-#line 492 "VideoTable.c"
-}
-
-
-static void
-value_video_row_init (GValue* value)
-{
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	value->data[0].v_pointer = NULL;
-#line 501 "VideoTable.c"
-}
-
-
-static void
-value_video_row_free_value (GValue* value)
-{
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (value->data[0].v_pointer) {
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		video_row_unref (value->data[0].v_pointer);
-#line 512 "VideoTable.c"
-	}
-}
-
-
-static void
-value_video_row_copy_value (const GValue* src_value,
-                            GValue* dest_value)
-{
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (src_value->data[0].v_pointer) {
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		dest_value->data[0].v_pointer = video_row_ref (src_value->data[0].v_pointer);
-#line 525 "VideoTable.c"
-	} else {
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 529 "VideoTable.c"
-	}
-}
-
-
-static gpointer
-value_video_row_peek_pointer (const GValue* value)
-{
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return value->data[0].v_pointer;
-#line 539 "VideoTable.c"
-}
-
-
-static gchar*
-value_video_row_collect_value (GValue* value,
-                               guint n_collect_values,
-                               GTypeCValue* collect_values,
-                               guint collect_flags)
-{
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (collect_values[0].v_pointer) {
-#line 551 "VideoTable.c"
-		VideoRow * object;
-		object = collect_values[0].v_pointer;
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 558 "VideoTable.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.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 562 "VideoTable.c"
-		}
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		value->data[0].v_pointer = video_row_ref (object);
-#line 566 "VideoTable.c"
-	} else {
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 570 "VideoTable.c"
-	}
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return NULL;
-#line 574 "VideoTable.c"
-}
-
-
-static gchar*
-value_video_row_lcopy_value (const GValue* value,
-                             guint n_collect_values,
-                             GTypeCValue* collect_values,
-                             guint collect_flags)
-{
-	VideoRow ** object_p;
-	object_p = collect_values[0].v_pointer;
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (!object_p) {
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 590 "VideoTable.c"
-	}
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (!value->data[0].v_pointer) {
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		*object_p = NULL;
-#line 596 "VideoTable.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		*object_p = value->data[0].v_pointer;
-#line 600 "VideoTable.c"
-	} else {
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		*object_p = video_row_ref (value->data[0].v_pointer);
-#line 604 "VideoTable.c"
-	}
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return NULL;
-#line 608 "VideoTable.c"
-}
-
-
-GParamSpec*
-param_spec_video_row (const gchar* name,
-                      const gchar* nick,
-                      const gchar* blurb,
-                      GType object_type,
-                      GParamFlags flags)
-{
-	ParamSpecVideoRow* spec;
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, TYPE_VIDEO_ROW), NULL);
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return G_PARAM_SPEC (spec);
-#line 628 "VideoTable.c"
-}
-
-
-gpointer
-value_get_video_row (const GValue* value)
-{
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_ROW), NULL);
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return value->data[0].v_pointer;
-#line 639 "VideoTable.c"
-}
-
-
-void
-value_set_video_row (GValue* value,
-                     gpointer v_object)
-{
-	VideoRow * old;
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_ROW));
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	old = value->data[0].v_pointer;
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (v_object) {
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_VIDEO_ROW));
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		value->data[0].v_pointer = v_object;
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		video_row_ref (value->data[0].v_pointer);
-#line 662 "VideoTable.c"
-	} else {
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 666 "VideoTable.c"
-	}
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (old) {
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		video_row_unref (old);
-#line 672 "VideoTable.c"
-	}
-}
-
-
-void
-value_take_video_row (GValue* value,
-                      gpointer v_object)
-{
-	VideoRow * old;
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_ROW));
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	old = value->data[0].v_pointer;
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (v_object) {
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_VIDEO_ROW));
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		value->data[0].v_pointer = v_object;
-#line 694 "VideoTable.c"
-	} else {
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		value->data[0].v_pointer = NULL;
-#line 698 "VideoTable.c"
-	}
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (old) {
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		video_row_unref (old);
-#line 704 "VideoTable.c"
-	}
-}
-
-
-static void
-video_row_class_init (VideoRowClass * klass)
-{
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	video_row_parent_class = g_type_class_peek_parent (klass);
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	((VideoRowClass *) klass)->finalize = video_row_finalize;
-#line 716 "VideoTable.c"
-}
-
-
-static void
-video_row_instance_init (VideoRow * self)
-{
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	self->ref_count = 1;
-#line 725 "VideoTable.c"
-}
-
-
-static void
-video_row_finalize (VideoRow * obj)
-{
-	VideoRow * self;
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_ROW, VideoRow);
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_signal_handlers_destroy (self);
-#line 39 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_g_free0 (self->filepath);
-#line 49 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_g_free0 (self->md5);
-#line 52 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_g_free0 (self->title);
-#line 53 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_g_free0 (self->backlinks);
-#line 56 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_g_free0 (self->comment);
-#line 747 "VideoTable.c"
-}
-
-
-GType
-video_row_get_type (void)
-{
-	static volatile gsize video_row_type_id__volatile = 0;
-	if (g_once_init_enter (&video_row_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_video_row_init, value_video_row_free_value, value_video_row_copy_value, value_video_row_peek_pointer, "p", value_video_row_collect_value, "p", value_video_row_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (VideoRowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) video_row_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (VideoRow), 0, (GInstanceInitFunc) video_row_instance_init, &g_define_type_value_table };
-		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
-		GType video_row_type_id;
-		video_row_type_id = g_type_register_fundamental (g_type_fundamental_next (), "VideoRow", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&video_row_type_id__volatile, video_row_type_id);
-	}
-	return video_row_type_id__volatile;
-}
-
-
-gpointer
-video_row_ref (gpointer instance)
-{
-	VideoRow * self;
-	self = instance;
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return instance;
-#line 776 "VideoTable.c"
-}
-
-
-void
-video_row_unref (gpointer instance)
-{
-	VideoRow * self;
-	self = instance;
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		VIDEO_ROW_GET_CLASS (self)->finalize (self);
-#line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 791 "VideoTable.c"
-	}
-}
-
-
-static VideoTable*
-video_table_construct (GType object_type)
-{
-	VideoTable* self = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	gint _tmp5_;
-	sqlite3_stmt* stmt2 = NULL;
-	gint res2 = 0;
-	sqlite3* _tmp7_;
-	sqlite3_stmt* _tmp8_ = NULL;
-	gint _tmp9_;
-	gint _tmp10_;
-	sqlite3_stmt* _tmp11_;
-	gint _tmp12_;
-#line 62 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	self = (VideoTable*) database_table_construct (object_type);
-#line 64 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = database_table_db;
-#line 64 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "CREATE TABLE IF NOT EXISTS VideoTable (" "id INTEGER PRIMARY KEY, " "filename TEXT UNIQUE NOT NULL, " "width INTEGER, " "height INTEGER, " "clip_duration REAL, " "is_interpretable INTEGER, " "filesize INTEGER, " "timestamp INTEGER, " "exposure_time INTEGER, " "import_id INTEGER, " "event_id INTEGER, " "md5 TEXT, " "time_created INTEGER, " "rating INTEGER DEFAULT 0, " "title TEXT, " "backlinks TEXT, " "time_reimported INTEGER, " "flags INTEGER DEFAULT 0, " "comment TEXT " ")", -1, &_tmp1_, NULL);
-#line 64 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 64 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	stmt = _tmp1_;
-#line 64 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = _tmp2_;
-#line 85 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp3_ = res;
-#line 85 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 87 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp4_ = stmt;
-#line 87 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_step (_tmp4_);
-#line 88 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp5_ = res;
-#line 88 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (_tmp5_ != SQLITE_DONE) {
-#line 840 "VideoTable.c"
-		gint _tmp6_;
-#line 89 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp6_ = res;
-#line 89 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		database_table_fatal ("VideoTable constructor", _tmp6_);
-#line 846 "VideoTable.c"
-	}
-#line 93 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp7_ = database_table_db;
-#line 93 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp9_ = sqlite3_prepare_v2 (_tmp7_, "CREATE INDEX IF NOT EXISTS VideoEventIDIndex ON VideoTable (event_id)", -1, &_tmp8_, NULL);
-#line 93 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt2);
-#line 93 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	stmt2 = _tmp8_;
-#line 93 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res2 = _tmp9_;
-#line 95 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp10_ = res2;
-#line 95 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp10_ == SQLITE_OK, "res2 == Sqlite.OK");
-#line 97 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp11_ = stmt2;
-#line 97 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res2 = sqlite3_step (_tmp11_);
-#line 98 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp12_ = res2;
-#line 98 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (_tmp12_ != SQLITE_DONE) {
-#line 870 "VideoTable.c"
-		gint _tmp13_;
-#line 99 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp13_ = res2;
-#line 99 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		database_table_fatal ("VideoTable constructor", _tmp13_);
-#line 876 "VideoTable.c"
-	}
-#line 101 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	database_table_set_table_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), "VideoTable");
-#line 62 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt2);
-#line 62 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 62 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return self;
-#line 886 "VideoTable.c"
-}
-
-
-static VideoTable*
-video_table_new (void)
-{
-#line 62 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return video_table_construct (TYPE_VIDEO_TABLE);
-#line 895 "VideoTable.c"
-}
-
-
-static gpointer
-_database_table_ref0 (gpointer self)
-{
-#line 108 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return self ? database_table_ref (self) : NULL;
-#line 904 "VideoTable.c"
-}
-
-
-VideoTable*
-video_table_get_instance (void)
-{
-	VideoTable* result = NULL;
-	VideoTable* _tmp0_;
-	VideoTable* _tmp2_;
-	VideoTable* _tmp3_;
-#line 105 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = video_table_instance;
-#line 105 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (_tmp0_ == NULL) {
-#line 919 "VideoTable.c"
-		VideoTable* _tmp1_;
-#line 106 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp1_ = video_table_new ();
-#line 106 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_database_table_unref0 (video_table_instance);
-#line 106 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		video_table_instance = _tmp1_;
-#line 927 "VideoTable.c"
-	}
-#line 108 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp2_ = video_table_instance;
-#line 108 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp3_ = _database_table_ref0 (_tmp2_);
-#line 108 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	result = _tmp3_;
-#line 108 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return result;
-#line 937 "VideoTable.c"
-}
-
-
-void
-video_table_add (VideoTable* self,
-                 VideoRow* video_row,
-                 VideoID* result,
-                 GError** error)
-{
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	gulong time_created = 0UL;
-	sqlite3_stmt* _tmp4_;
-	const gchar* _tmp5_;
-	gchar* _tmp6_;
-	GDestroyNotify _tmp7_;
-	gint _tmp8_;
-	sqlite3_stmt* _tmp9_;
-	gint _tmp10_;
-	gint _tmp11_;
-	sqlite3_stmt* _tmp12_;
-	gint _tmp13_;
-	gint _tmp14_;
-	sqlite3_stmt* _tmp15_;
-	gdouble _tmp16_;
-	gint _tmp17_;
-	gint _tmp18_ = 0;
-	gboolean _tmp19_;
-	sqlite3_stmt* _tmp20_;
-	gint _tmp21_;
-	sqlite3_stmt* _tmp22_;
-	gint64 _tmp23_;
-	gint _tmp24_;
-	sqlite3_stmt* _tmp25_;
-	time_t _tmp26_;
-	gint _tmp27_;
-	sqlite3_stmt* _tmp28_;
-	time_t _tmp29_;
-	gint _tmp30_;
-	sqlite3_stmt* _tmp31_;
-	ImportID _tmp32_;
-	gint64 _tmp33_;
-	gint _tmp34_;
-	sqlite3_stmt* _tmp35_;
-	gint _tmp36_;
-	sqlite3_stmt* _tmp37_;
-	const gchar* _tmp38_;
-	gchar* _tmp39_;
-	GDestroyNotify _tmp40_;
-	gint _tmp41_;
-	sqlite3_stmt* _tmp42_;
-	gulong _tmp43_;
-	gint _tmp44_;
-	sqlite3_stmt* _tmp45_;
-	const gchar* _tmp46_;
-	gchar* _tmp47_;
-	GDestroyNotify _tmp48_;
-	gint _tmp49_;
-	sqlite3_stmt* _tmp50_;
-	const gchar* _tmp51_;
-	gchar* _tmp52_;
-	GDestroyNotify _tmp53_;
-	gint _tmp54_;
-	sqlite3_stmt* _tmp55_;
-	gint _tmp56_;
-	sqlite3* _tmp59_;
-	gulong _tmp60_;
-	VideoID _tmp61_;
-	GError * _inner_error_ = NULL;
-#line 113 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (IS_VIDEO_TABLE (self));
-#line 113 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (IS_VIDEO_ROW (video_row));
-#line 115 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = database_table_db;
-#line 115 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "INSERT INTO VideoTable (filename, width, height, clip_duration, is_int" \
-"erpretable, " "filesize, timestamp, exposure_time, import_id, event_id, md5, time_cre" \
-"ated, title, comment) " "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", -1, &_tmp1_, NULL);
-#line 115 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 115 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	stmt = _tmp1_;
-#line 115 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = _tmp2_;
-#line 120 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp3_ = res;
-#line 120 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 122 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	time_created = now_sec ();
-#line 124 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp4_ = stmt;
-#line 124 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp5_ = video_row->filepath;
-#line 124 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp6_ = g_strdup (_tmp5_);
-#line 124 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp7_ = g_free;
-#line 124 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_);
-#line 125 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp8_ = res;
-#line 125 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
-#line 126 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp9_ = stmt;
-#line 126 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp10_ = video_row->width;
-#line 126 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_bind_int (_tmp9_, 2, _tmp10_);
-#line 127 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp11_ = res;
-#line 127 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
-#line 128 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp12_ = stmt;
-#line 128 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp13_ = video_row->height;
-#line 128 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_bind_int (_tmp12_, 3, _tmp13_);
-#line 129 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp14_ = res;
-#line 129 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp14_ == SQLITE_OK, "res == Sqlite.OK");
-#line 130 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp15_ = stmt;
-#line 130 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp16_ = video_row->clip_duration;
-#line 130 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_bind_double (_tmp15_, 4, _tmp16_);
-#line 131 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp17_ = res;
-#line 131 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK");
-#line 132 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp19_ = video_row->is_interpretable;
-#line 132 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (_tmp19_) {
-#line 132 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp18_ = 1;
-#line 1081 "VideoTable.c"
-	} else {
-#line 132 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp18_ = 0;
-#line 1085 "VideoTable.c"
-	}
-#line 132 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp20_ = stmt;
-#line 132 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_bind_int (_tmp20_, 5, _tmp18_);
-#line 133 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp21_ = res;
-#line 133 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp21_ == SQLITE_OK, "res == Sqlite.OK");
-#line 134 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp22_ = stmt;
-#line 134 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp23_ = video_row->filesize;
-#line 134 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_bind_int64 (_tmp22_, 6, _tmp23_);
-#line 135 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp24_ = res;
-#line 135 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp24_ == SQLITE_OK, "res == Sqlite.OK");
-#line 136 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp25_ = stmt;
-#line 136 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp26_ = video_row->timestamp;
-#line 136 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_bind_int64 (_tmp25_, 7, (gint64) _tmp26_);
-#line 137 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp27_ = res;
-#line 137 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK");
-#line 138 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp28_ = stmt;
-#line 138 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp29_ = video_row->exposure_time;
-#line 138 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_bind_int64 (_tmp28_, 8, (gint64) _tmp29_);
-#line 139 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp30_ = res;
-#line 139 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK");
-#line 140 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp31_ = stmt;
-#line 140 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp32_ = video_row->import_id;
-#line 140 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp33_ = _tmp32_.id;
-#line 140 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_bind_int64 (_tmp31_, 9, _tmp33_);
-#line 141 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp34_ = res;
-#line 141 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp34_ == SQLITE_OK, "res == Sqlite.OK");
-#line 142 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp35_ = stmt;
-#line 142 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_bind_int64 (_tmp35_, 10, EVENT_ID_INVALID);
-#line 143 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp36_ = res;
-#line 143 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp36_ == SQLITE_OK, "res == Sqlite.OK");
-#line 144 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp37_ = stmt;
-#line 144 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp38_ = video_row->md5;
-#line 144 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp39_ = g_strdup (_tmp38_);
-#line 144 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp40_ = g_free;
-#line 144 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_bind_text (_tmp37_, 11, _tmp39_, -1, _tmp40_);
-#line 145 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp41_ = res;
-#line 145 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp41_ == SQLITE_OK, "res == Sqlite.OK");
-#line 146 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp42_ = stmt;
-#line 146 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp43_ = time_created;
-#line 146 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_bind_int64 (_tmp42_, 12, (gint64) _tmp43_);
-#line 147 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp44_ = res;
-#line 147 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp44_ == SQLITE_OK, "res == Sqlite.OK");
-#line 148 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp45_ = stmt;
-#line 148 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp46_ = video_row->title;
-#line 148 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp47_ = g_strdup (_tmp46_);
-#line 148 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp48_ = g_free;
-#line 148 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_bind_text (_tmp45_, 13, _tmp47_, -1, _tmp48_);
-#line 149 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp49_ = res;
-#line 149 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp49_ == SQLITE_OK, "res == Sqlite.OK");
-#line 150 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp50_ = stmt;
-#line 150 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp51_ = video_row->comment;
-#line 150 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp52_ = g_strdup (_tmp51_);
-#line 150 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp53_ = g_free;
-#line 150 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_bind_text (_tmp50_, 14, _tmp52_, -1, _tmp53_);
-#line 151 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp54_ = res;
-#line 151 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp54_ == SQLITE_OK, "res == Sqlite.OK");
-#line 153 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp55_ = stmt;
-#line 153 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_step (_tmp55_);
-#line 154 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp56_ = res;
-#line 154 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (_tmp56_ != SQLITE_DONE) {
-#line 1205 "VideoTable.c"
-		gint _tmp57_;
-#line 155 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp57_ = res;
-#line 155 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		if (_tmp57_ != SQLITE_CONSTRAINT) {
-#line 1211 "VideoTable.c"
-			gint _tmp58_;
-#line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			_tmp58_ = res;
-#line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			database_table_throw_error ("VideoTable.add", _tmp58_, &_inner_error_);
-#line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-					g_propagate_error (error, _inner_error_);
-#line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-					_sqlite3_finalize0 (stmt);
-#line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-					return;
-#line 1227 "VideoTable.c"
-				} else {
-#line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-					_sqlite3_finalize0 (stmt);
-#line 156 "/home/jens/Source/shotwell/src/db/VideoTable.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 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-					g_clear_error (&_inner_error_);
-#line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-					return;
-#line 1237 "VideoTable.c"
-				}
-			}
-		}
-	}
-#line 160 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp59_ = database_table_db;
-#line 160 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	video_id_init (&video_row->video_id, sqlite3_last_insert_rowid (_tmp59_));
-#line 161 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	event_id_init (&video_row->event_id, EVENT_ID_INVALID);
-#line 162 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp60_ = time_created;
-#line 162 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	video_row->time_created = (time_t) _tmp60_;
-#line 163 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	video_row->flags = (guint64) 0;
-#line 165 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp61_ = video_row->video_id;
-#line 165 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	*result = _tmp61_;
-#line 165 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 165 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return;
-#line 1262 "VideoTable.c"
-}
-
-
-gboolean
-video_table_drop_event (VideoTable* self,
-                        EventID* event_id)
-{
-	gboolean result = FALSE;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	gint _tmp5_;
-	sqlite3_stmt* _tmp6_;
-	EventID _tmp7_;
-	gint64 _tmp8_;
-	gint _tmp9_;
-	sqlite3_stmt* _tmp10_;
-	gint _tmp11_;
-#line 168 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE);
-#line 168 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 170 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = database_table_db;
-#line 170 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "UPDATE VideoTable SET event_id = ? WHERE event_id = ?", -1, &_tmp1_, NULL);
-#line 170 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 170 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	stmt = _tmp1_;
-#line 170 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = _tmp2_;
-#line 171 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp3_ = res;
-#line 171 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 173 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp4_ = stmt;
-#line 173 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_bind_int64 (_tmp4_, 1, EVENT_ID_INVALID);
-#line 174 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp5_ = res;
-#line 174 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK");
-#line 175 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp6_ = stmt;
-#line 175 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp7_ = *event_id;
-#line 175 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp8_ = _tmp7_.id;
-#line 175 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_bind_int64 (_tmp6_, 2, _tmp8_);
-#line 176 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp9_ = res;
-#line 176 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK");
-#line 178 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp10_ = stmt;
-#line 178 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_step (_tmp10_);
-#line 179 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp11_ = res;
-#line 179 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (_tmp11_ != SQLITE_DONE) {
-#line 1331 "VideoTable.c"
-		gint _tmp12_;
-#line 180 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp12_ = res;
-#line 180 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		database_table_fatal ("VideoTable.drop_event", _tmp12_);
-#line 182 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		result = FALSE;
-#line 182 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 182 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		return result;
-#line 1343 "VideoTable.c"
-	}
-#line 185 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	result = TRUE;
-#line 185 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 185 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return result;
-#line 1351 "VideoTable.c"
-}
-
-
-VideoRow*
-video_table_get_row (VideoTable* self,
-                     VideoID* video_id)
-{
-	VideoRow* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	VideoID _tmp5_;
-	gint64 _tmp6_;
-	gint _tmp7_;
-	sqlite3_stmt* _tmp8_;
-	VideoRow* row = NULL;
-	VideoRow* _tmp9_;
-	VideoRow* _tmp10_;
-	VideoID _tmp11_;
-	VideoRow* _tmp12_;
-	sqlite3_stmt* _tmp13_;
-	const gchar* _tmp14_;
-	gchar* _tmp15_;
-	VideoRow* _tmp16_;
-	sqlite3_stmt* _tmp17_;
-	VideoRow* _tmp18_;
-	sqlite3_stmt* _tmp19_;
-	VideoRow* _tmp20_;
-	sqlite3_stmt* _tmp21_;
-	VideoRow* _tmp22_;
-	sqlite3_stmt* _tmp23_;
-	VideoRow* _tmp24_;
-	sqlite3_stmt* _tmp25_;
-	VideoRow* _tmp26_;
-	sqlite3_stmt* _tmp27_;
-	VideoRow* _tmp28_;
-	sqlite3_stmt* _tmp29_;
-	VideoRow* _tmp30_;
-	sqlite3_stmt* _tmp31_;
-	VideoRow* _tmp32_;
-	sqlite3_stmt* _tmp33_;
-	VideoRow* _tmp34_;
-	sqlite3_stmt* _tmp35_;
-	const gchar* _tmp36_;
-	gchar* _tmp37_;
-	VideoRow* _tmp38_;
-	sqlite3_stmt* _tmp39_;
-	VideoRow* _tmp40_;
-	sqlite3_stmt* _tmp41_;
-	VideoRow* _tmp42_;
-	sqlite3_stmt* _tmp43_;
-	const gchar* _tmp44_;
-	gchar* _tmp45_;
-	VideoRow* _tmp46_;
-	sqlite3_stmt* _tmp47_;
-	const gchar* _tmp48_;
-	gchar* _tmp49_;
-	VideoRow* _tmp50_;
-	sqlite3_stmt* _tmp51_;
-	VideoRow* _tmp52_;
-	sqlite3_stmt* _tmp53_;
-	VideoRow* _tmp54_;
-	sqlite3_stmt* _tmp55_;
-	const gchar* _tmp56_;
-	gchar* _tmp57_;
-#line 188 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL);
-#line 188 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_val_if_fail (video_id != NULL, NULL);
-#line 190 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = database_table_db;
-#line 190 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT filename, width, height, clip_duration, is_interpretable, files" \
-"ize, timestamp, " "exposure_time, import_id, event_id, md5, time_created, rating, title, " \
-"backlinks, " "time_reimported, flags, comment FROM VideoTable WHERE id=?", -1, &_tmp1_, NULL);
-#line 190 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 190 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	stmt = _tmp1_;
-#line 190 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = _tmp2_;
-#line 195 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp3_ = res;
-#line 195 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 197 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp4_ = stmt;
-#line 197 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp5_ = *video_id;
-#line 197 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp6_ = _tmp5_.id;
-#line 197 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_);
-#line 198 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp7_ = res;
-#line 198 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 200 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp8_ = stmt;
-#line 200 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (sqlite3_step (_tmp8_) != SQLITE_ROW) {
-#line 201 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		result = NULL;
-#line 201 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 201 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		return result;
-#line 1461 "VideoTable.c"
-	}
-#line 203 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp9_ = video_row_new ();
-#line 203 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	row = _tmp9_;
-#line 204 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp10_ = row;
-#line 204 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp11_ = *video_id;
-#line 204 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp10_->video_id = _tmp11_;
-#line 205 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp12_ = row;
-#line 205 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp13_ = stmt;
-#line 205 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp14_ = sqlite3_column_text (_tmp13_, 0);
-#line 205 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp15_ = g_strdup (_tmp14_);
-#line 205 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_g_free0 (_tmp12_->filepath);
-#line 205 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp12_->filepath = _tmp15_;
-#line 206 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp16_ = row;
-#line 206 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp17_ = stmt;
-#line 206 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp16_->width = sqlite3_column_int (_tmp17_, 1);
-#line 207 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp18_ = row;
-#line 207 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp19_ = stmt;
-#line 207 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp18_->height = sqlite3_column_int (_tmp19_, 2);
-#line 208 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp20_ = row;
-#line 208 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp21_ = stmt;
-#line 208 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp20_->clip_duration = sqlite3_column_double (_tmp21_, 3);
-#line 209 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp22_ = row;
-#line 209 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp23_ = stmt;
-#line 209 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp22_->is_interpretable = sqlite3_column_int (_tmp23_, 4) == 1;
-#line 210 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp24_ = row;
-#line 210 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp25_ = stmt;
-#line 210 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp24_->filesize = sqlite3_column_int64 (_tmp25_, 5);
-#line 211 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp26_ = row;
-#line 211 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp27_ = stmt;
-#line 211 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp26_->timestamp = (time_t) sqlite3_column_int64 (_tmp27_, 6);
-#line 212 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp28_ = row;
-#line 212 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp29_ = stmt;
-#line 212 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp28_->exposure_time = (time_t) sqlite3_column_int64 (_tmp29_, 7);
-#line 213 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp30_ = row;
-#line 213 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp31_ = stmt;
-#line 213 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp30_->import_id.id = sqlite3_column_int64 (_tmp31_, 8);
-#line 214 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp32_ = row;
-#line 214 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp33_ = stmt;
-#line 214 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp32_->event_id.id = sqlite3_column_int64 (_tmp33_, 9);
-#line 215 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp34_ = row;
-#line 215 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp35_ = stmt;
-#line 215 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp36_ = sqlite3_column_text (_tmp35_, 10);
-#line 215 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp37_ = g_strdup (_tmp36_);
-#line 215 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_g_free0 (_tmp34_->md5);
-#line 215 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp34_->md5 = _tmp37_;
-#line 216 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp38_ = row;
-#line 216 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp39_ = stmt;
-#line 216 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp38_->time_created = (time_t) sqlite3_column_int64 (_tmp39_, 11);
-#line 217 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp40_ = row;
-#line 217 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp41_ = stmt;
-#line 217 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp40_->rating = rating_unserialize (sqlite3_column_int (_tmp41_, 12));
-#line 218 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp42_ = row;
-#line 218 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp43_ = stmt;
-#line 218 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp44_ = sqlite3_column_text (_tmp43_, 13);
-#line 218 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp45_ = g_strdup (_tmp44_);
-#line 218 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_g_free0 (_tmp42_->title);
-#line 218 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp42_->title = _tmp45_;
-#line 219 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp46_ = row;
-#line 219 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp47_ = stmt;
-#line 219 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp48_ = sqlite3_column_text (_tmp47_, 14);
-#line 219 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp49_ = g_strdup (_tmp48_);
-#line 219 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_g_free0 (_tmp46_->backlinks);
-#line 219 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp46_->backlinks = _tmp49_;
-#line 220 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp50_ = row;
-#line 220 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp51_ = stmt;
-#line 220 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp50_->time_reimported = (time_t) sqlite3_column_int64 (_tmp51_, 15);
-#line 221 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp52_ = row;
-#line 221 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp53_ = stmt;
-#line 221 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp52_->flags = (guint64) sqlite3_column_int64 (_tmp53_, 16);
-#line 222 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp54_ = row;
-#line 222 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp55_ = stmt;
-#line 222 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp56_ = sqlite3_column_text (_tmp55_, 17);
-#line 222 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp57_ = g_strdup (_tmp56_);
-#line 222 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_g_free0 (_tmp54_->comment);
-#line 222 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp54_->comment = _tmp57_;
-#line 224 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	result = row;
-#line 224 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 224 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return result;
-#line 1617 "VideoTable.c"
-}
-
-
-GeeArrayList*
-video_table_get_all (VideoTable* self)
-{
-	GeeArrayList* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	GeeArrayList* all = NULL;
-	GeeArrayList* _tmp4_;
-#line 227 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL);
-#line 229 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = database_table_db;
-#line 229 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT id, filename, width, height, clip_duration, is_interpretable, f" \
-"ilesize, " "timestamp, exposure_time, import_id, event_id, md5, time_created, rati" \
-"ng, title, " "backlinks, time_reimported, flags, comment FROM VideoTable", -1, &_tmp1_, NULL);
-#line 229 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 229 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	stmt = _tmp1_;
-#line 229 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = _tmp2_;
-#line 234 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp3_ = res;
-#line 234 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 236 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp4_ = gee_array_list_new (TYPE_VIDEO_ROW, (GBoxedCopyFunc) video_row_ref, (GDestroyNotify) video_row_unref, NULL, NULL, NULL);
-#line 236 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	all = _tmp4_;
-#line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	while (TRUE) {
-#line 1655 "VideoTable.c"
-		sqlite3_stmt* _tmp5_;
-		gint _tmp6_;
-		VideoRow* row = NULL;
-		VideoRow* _tmp7_;
-		VideoRow* _tmp8_;
-		sqlite3_stmt* _tmp9_;
-		VideoRow* _tmp10_;
-		sqlite3_stmt* _tmp11_;
-		const gchar* _tmp12_;
-		gchar* _tmp13_;
-		VideoRow* _tmp14_;
-		sqlite3_stmt* _tmp15_;
-		VideoRow* _tmp16_;
-		sqlite3_stmt* _tmp17_;
-		VideoRow* _tmp18_;
-		sqlite3_stmt* _tmp19_;
-		VideoRow* _tmp20_;
-		sqlite3_stmt* _tmp21_;
-		VideoRow* _tmp22_;
-		sqlite3_stmt* _tmp23_;
-		VideoRow* _tmp24_;
-		sqlite3_stmt* _tmp25_;
-		VideoRow* _tmp26_;
-		sqlite3_stmt* _tmp27_;
-		VideoRow* _tmp28_;
-		sqlite3_stmt* _tmp29_;
-		VideoRow* _tmp30_;
-		sqlite3_stmt* _tmp31_;
-		VideoRow* _tmp32_;
-		sqlite3_stmt* _tmp33_;
-		const gchar* _tmp34_;
-		gchar* _tmp35_;
-		VideoRow* _tmp36_;
-		sqlite3_stmt* _tmp37_;
-		VideoRow* _tmp38_;
-		sqlite3_stmt* _tmp39_;
-		VideoRow* _tmp40_;
-		sqlite3_stmt* _tmp41_;
-		const gchar* _tmp42_;
-		gchar* _tmp43_;
-		VideoRow* _tmp44_;
-		sqlite3_stmt* _tmp45_;
-		const gchar* _tmp46_;
-		gchar* _tmp47_;
-		VideoRow* _tmp48_;
-		sqlite3_stmt* _tmp49_;
-		VideoRow* _tmp50_;
-		sqlite3_stmt* _tmp51_;
-		VideoRow* _tmp52_;
-		sqlite3_stmt* _tmp53_;
-		const gchar* _tmp54_;
-		gchar* _tmp55_;
-		GeeArrayList* _tmp56_;
-		VideoRow* _tmp57_;
-#line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp5_ = stmt;
-#line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		res = sqlite3_step (_tmp5_);
-#line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp6_ = res;
-#line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		if (!(_tmp6_ == SQLITE_ROW)) {
-#line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			break;
-#line 1720 "VideoTable.c"
-		}
-#line 239 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp7_ = video_row_new ();
-#line 239 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		row = _tmp7_;
-#line 240 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp8_ = row;
-#line 240 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp9_ = stmt;
-#line 240 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp8_->video_id.id = sqlite3_column_int64 (_tmp9_, 0);
-#line 241 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp10_ = row;
-#line 241 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp11_ = stmt;
-#line 241 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp12_ = sqlite3_column_text (_tmp11_, 1);
-#line 241 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp13_ = g_strdup (_tmp12_);
-#line 241 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_g_free0 (_tmp10_->filepath);
-#line 241 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp10_->filepath = _tmp13_;
-#line 242 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp14_ = row;
-#line 242 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp15_ = stmt;
-#line 242 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp14_->width = sqlite3_column_int (_tmp15_, 2);
-#line 243 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp16_ = row;
-#line 243 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp17_ = stmt;
-#line 243 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp16_->height = sqlite3_column_int (_tmp17_, 3);
-#line 244 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp18_ = row;
-#line 244 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp19_ = stmt;
-#line 244 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp18_->clip_duration = sqlite3_column_double (_tmp19_, 4);
-#line 245 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp20_ = row;
-#line 245 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp21_ = stmt;
-#line 245 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp20_->is_interpretable = sqlite3_column_int (_tmp21_, 5) == 1;
-#line 246 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp22_ = row;
-#line 246 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp23_ = stmt;
-#line 246 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp22_->filesize = sqlite3_column_int64 (_tmp23_, 6);
-#line 247 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp24_ = row;
-#line 247 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp25_ = stmt;
-#line 247 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp24_->timestamp = (time_t) sqlite3_column_int64 (_tmp25_, 7);
-#line 248 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp26_ = row;
-#line 248 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp27_ = stmt;
-#line 248 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp26_->exposure_time = (time_t) sqlite3_column_int64 (_tmp27_, 8);
-#line 249 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp28_ = row;
-#line 249 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp29_ = stmt;
-#line 249 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp28_->import_id.id = sqlite3_column_int64 (_tmp29_, 9);
-#line 250 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp30_ = row;
-#line 250 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp31_ = stmt;
-#line 250 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp30_->event_id.id = sqlite3_column_int64 (_tmp31_, 10);
-#line 251 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp32_ = row;
-#line 251 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp33_ = stmt;
-#line 251 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp34_ = sqlite3_column_text (_tmp33_, 11);
-#line 251 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp35_ = g_strdup (_tmp34_);
-#line 251 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_g_free0 (_tmp32_->md5);
-#line 251 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp32_->md5 = _tmp35_;
-#line 252 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp36_ = row;
-#line 252 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp37_ = stmt;
-#line 252 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp36_->time_created = (time_t) sqlite3_column_int64 (_tmp37_, 12);
-#line 253 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp38_ = row;
-#line 253 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp39_ = stmt;
-#line 253 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp38_->rating = rating_unserialize (sqlite3_column_int (_tmp39_, 13));
-#line 254 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp40_ = row;
-#line 254 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp41_ = stmt;
-#line 254 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp42_ = sqlite3_column_text (_tmp41_, 14);
-#line 254 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp43_ = g_strdup (_tmp42_);
-#line 254 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_g_free0 (_tmp40_->title);
-#line 254 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp40_->title = _tmp43_;
-#line 255 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp44_ = row;
-#line 255 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp45_ = stmt;
-#line 255 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp46_ = sqlite3_column_text (_tmp45_, 15);
-#line 255 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp47_ = g_strdup (_tmp46_);
-#line 255 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_g_free0 (_tmp44_->backlinks);
-#line 255 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp44_->backlinks = _tmp47_;
-#line 256 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp48_ = row;
-#line 256 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp49_ = stmt;
-#line 256 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp48_->time_reimported = (time_t) sqlite3_column_int64 (_tmp49_, 16);
-#line 257 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp50_ = row;
-#line 257 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp51_ = stmt;
-#line 257 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp50_->flags = (guint64) sqlite3_column_int64 (_tmp51_, 17);
-#line 258 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp52_ = row;
-#line 258 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp53_ = stmt;
-#line 258 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp54_ = sqlite3_column_text (_tmp53_, 18);
-#line 258 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp55_ = g_strdup (_tmp54_);
-#line 258 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_g_free0 (_tmp52_->comment);
-#line 258 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp52_->comment = _tmp55_;
-#line 260 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp56_ = all;
-#line 260 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp57_ = row;
-#line 260 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp57_);
-#line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_video_row_unref0 (row);
-#line 1878 "VideoTable.c"
-	}
-#line 263 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	result = all;
-#line 263 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 263 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return result;
-#line 1886 "VideoTable.c"
-}
-
-
-void
-video_table_set_filepath (VideoTable* self,
-                          VideoID* video_id,
-                          const gchar* filepath,
-                          GError** error)
-{
-	VideoID _tmp0_;
-	gint64 _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 266 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (IS_VIDEO_TABLE (self));
-#line 266 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (video_id != NULL);
-#line 266 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (filepath != NULL);
-#line 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = *video_id;
-#line 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filename", filepath, &_inner_error_);
-#line 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			return;
-#line 1919 "VideoTable.c"
-		} else {
-#line 267 "/home/jens/Source/shotwell/src/db/VideoTable.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 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			g_clear_error (&_inner_error_);
-#line 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			return;
-#line 1927 "VideoTable.c"
-		}
-	}
-}
-
-
-void
-video_table_set_title (VideoTable* self,
-                       VideoID* video_id,
-                       const gchar* new_title,
-                       GError** error)
-{
-	const gchar* _tmp0_ = NULL;
-	VideoID _tmp1_;
-	gint64 _tmp2_;
-	GError * _inner_error_ = NULL;
-#line 270 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (IS_VIDEO_TABLE (self));
-#line 270 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (video_id != NULL);
-#line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (new_title != NULL) {
-#line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp0_ = new_title;
-#line 1951 "VideoTable.c"
-	} else {
-#line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp0_ = "";
-#line 1955 "VideoTable.c"
-	}
-#line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp1_ = *video_id;
-#line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp2_ = _tmp1_.id;
-#line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "title", _tmp0_, &_inner_error_);
-#line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			return;
-#line 1971 "VideoTable.c"
-		} else {
-#line 271 "/home/jens/Source/shotwell/src/db/VideoTable.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 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			g_clear_error (&_inner_error_);
-#line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			return;
-#line 1979 "VideoTable.c"
-		}
-	}
-}
-
-
-void
-video_table_set_comment (VideoTable* self,
-                         VideoID* video_id,
-                         const gchar* new_comment,
-                         GError** error)
-{
-	const gchar* _tmp0_ = NULL;
-	VideoID _tmp1_;
-	gint64 _tmp2_;
-	GError * _inner_error_ = NULL;
-#line 274 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (IS_VIDEO_TABLE (self));
-#line 274 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (video_id != NULL);
-#line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (new_comment != NULL) {
-#line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp0_ = new_comment;
-#line 2003 "VideoTable.c"
-	} else {
-#line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp0_ = "";
-#line 2007 "VideoTable.c"
-	}
-#line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp1_ = *video_id;
-#line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp2_ = _tmp1_.id;
-#line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "comment", _tmp0_, &_inner_error_);
-#line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			return;
-#line 2023 "VideoTable.c"
-		} else {
-#line 275 "/home/jens/Source/shotwell/src/db/VideoTable.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 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			g_clear_error (&_inner_error_);
-#line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			return;
-#line 2031 "VideoTable.c"
-		}
-	}
-}
-
-
-void
-video_table_set_exposure_time (VideoTable* self,
-                               VideoID* video_id,
-                               time_t time,
-                               GError** error)
-{
-	VideoID _tmp0_;
-	gint64 _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 278 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (IS_VIDEO_TABLE (self));
-#line 278 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (video_id != NULL);
-#line 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = *video_id;
-#line 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "exposure_time", (gint64) time, &_inner_error_);
-#line 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			return;
-#line 2064 "VideoTable.c"
-		} else {
-#line 279 "/home/jens/Source/shotwell/src/db/VideoTable.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 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			g_clear_error (&_inner_error_);
-#line 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			return;
-#line 2072 "VideoTable.c"
-		}
-	}
-}
-
-
-void
-video_table_set_rating (VideoTable* self,
-                        VideoID* video_id,
-                        Rating rating,
-                        GError** error)
-{
-	VideoID _tmp0_;
-	gint64 _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 282 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (IS_VIDEO_TABLE (self));
-#line 282 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (video_id != NULL);
-#line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = *video_id;
-#line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "rating", (gint64) rating_serialize (rating), &_inner_error_);
-#line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			return;
-#line 2105 "VideoTable.c"
-		} else {
-#line 283 "/home/jens/Source/shotwell/src/db/VideoTable.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 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			g_clear_error (&_inner_error_);
-#line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			return;
-#line 2113 "VideoTable.c"
-		}
-	}
-}
-
-
-void
-video_table_set_flags (VideoTable* self,
-                       VideoID* video_id,
-                       guint64 flags,
-                       GError** error)
-{
-	VideoID _tmp0_;
-	gint64 _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 286 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (IS_VIDEO_TABLE (self));
-#line 286 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (video_id != NULL);
-#line 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = *video_id;
-#line 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "flags", (gint64) flags, &_inner_error_);
-#line 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			return;
-#line 2146 "VideoTable.c"
-		} else {
-#line 287 "/home/jens/Source/shotwell/src/db/VideoTable.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 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			g_clear_error (&_inner_error_);
-#line 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			return;
-#line 2154 "VideoTable.c"
-		}
-	}
-}
-
-
-void
-video_table_update_backlinks (VideoTable* self,
-                              VideoID* video_id,
-                              const gchar* backlinks,
-                              GError** error)
-{
-	const gchar* _tmp0_ = NULL;
-	VideoID _tmp1_;
-	gint64 _tmp2_;
-	GError * _inner_error_ = NULL;
-#line 290 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (IS_VIDEO_TABLE (self));
-#line 290 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (video_id != NULL);
-#line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (backlinks != NULL) {
-#line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp0_ = backlinks;
-#line 2178 "VideoTable.c"
-	} else {
-#line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp0_ = "";
-#line 2182 "VideoTable.c"
-	}
-#line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp1_ = *video_id;
-#line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp2_ = _tmp1_.id;
-#line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "backlinks", _tmp0_, &_inner_error_);
-#line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			return;
-#line 2198 "VideoTable.c"
-		} else {
-#line 291 "/home/jens/Source/shotwell/src/db/VideoTable.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 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			g_clear_error (&_inner_error_);
-#line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			return;
-#line 2206 "VideoTable.c"
-		}
-	}
-}
-
-
-void
-video_table_update_is_interpretable (VideoTable* self,
-                                     VideoID* video_id,
-                                     gboolean is_interpretable,
-                                     GError** error)
-{
-	gint _tmp0_ = 0;
-	VideoID _tmp1_;
-	gint64 _tmp2_;
-	GError * _inner_error_ = NULL;
-#line 294 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (IS_VIDEO_TABLE (self));
-#line 294 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (video_id != NULL);
-#line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (is_interpretable) {
-#line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp0_ = 1;
-#line 2230 "VideoTable.c"
-	} else {
-#line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp0_ = 0;
-#line 2234 "VideoTable.c"
-	}
-#line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp1_ = *video_id;
-#line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp2_ = _tmp1_.id;
-#line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	database_table_update_int_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "is_interpretable", _tmp0_, &_inner_error_);
-#line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			return;
-#line 2250 "VideoTable.c"
-		} else {
-#line 295 "/home/jens/Source/shotwell/src/db/VideoTable.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 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			g_clear_error (&_inner_error_);
-#line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			return;
-#line 2258 "VideoTable.c"
-		}
-	}
-}
-
-
-gboolean
-video_table_set_event (VideoTable* self,
-                       VideoID* video_id,
-                       EventID* event_id)
-{
-	gboolean result = FALSE;
-	VideoID _tmp0_;
-	gint64 _tmp1_;
-	EventID _tmp2_;
-	gint64 _tmp3_;
-#line 298 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE);
-#line 298 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_val_if_fail (video_id != NULL, FALSE);
-#line 298 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 299 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = *video_id;
-#line 299 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 299 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp2_ = *event_id;
-#line 299 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp3_ = _tmp2_.id;
-#line 299 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	result = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "event_id", _tmp3_);
-#line 299 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return result;
-#line 2292 "VideoTable.c"
-}
-
-
-void
-video_table_remove_by_file (VideoTable* self,
-                            GFile* file,
-                            GError** error)
-{
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	gchar* _tmp5_;
-	GDestroyNotify _tmp6_;
-	gint _tmp7_;
-	sqlite3_stmt* _tmp8_;
-	gint _tmp9_;
-	GError * _inner_error_ = NULL;
-#line 302 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (IS_VIDEO_TABLE (self));
-#line 302 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (G_IS_FILE (file));
-#line 304 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = database_table_db;
-#line 304 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "DELETE FROM VideoTable WHERE filename=?", -1, &_tmp1_, NULL);
-#line 304 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 304 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	stmt = _tmp1_;
-#line 304 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = _tmp2_;
-#line 305 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp3_ = res;
-#line 305 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 307 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp4_ = stmt;
-#line 307 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp5_ = g_file_get_path (file);
-#line 307 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp6_ = g_free;
-#line 307 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_bind_text (_tmp4_, 1, _tmp5_, -1, _tmp6_);
-#line 308 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp7_ = res;
-#line 308 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 310 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp8_ = stmt;
-#line 310 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_step (_tmp8_);
-#line 311 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp9_ = res;
-#line 311 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (_tmp9_ != SQLITE_DONE) {
-#line 2352 "VideoTable.c"
-		gint _tmp10_;
-#line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp10_ = res;
-#line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		database_table_throw_error ("VideoTable.remove_by_file", _tmp10_, &_inner_error_);
-#line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-				return;
-#line 2368 "VideoTable.c"
-			} else {
-#line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 312 "/home/jens/Source/shotwell/src/db/VideoTable.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 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-				g_clear_error (&_inner_error_);
-#line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-				return;
-#line 2378 "VideoTable.c"
-			}
-		}
-	}
-#line 302 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 2384 "VideoTable.c"
-}
-
-
-void
-video_table_remove (VideoTable* self,
-                    VideoID* videoID,
-                    GError** error)
-{
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	VideoID _tmp5_;
-	gint64 _tmp6_;
-	gint _tmp7_;
-	sqlite3_stmt* _tmp8_;
-	gint _tmp9_;
-	GError * _inner_error_ = NULL;
-#line 315 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (IS_VIDEO_TABLE (self));
-#line 315 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (videoID != NULL);
-#line 317 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = database_table_db;
-#line 317 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "DELETE FROM VideoTable WHERE id=?", -1, &_tmp1_, NULL);
-#line 317 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 317 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	stmt = _tmp1_;
-#line 317 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = _tmp2_;
-#line 318 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp3_ = res;
-#line 318 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 320 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp4_ = stmt;
-#line 320 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp5_ = *videoID;
-#line 320 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp6_ = _tmp5_.id;
-#line 320 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_);
-#line 321 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp7_ = res;
-#line 321 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 323 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp8_ = stmt;
-#line 323 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_step (_tmp8_);
-#line 324 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp9_ = res;
-#line 324 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (_tmp9_ != SQLITE_DONE) {
-#line 2444 "VideoTable.c"
-		gint _tmp10_;
-#line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp10_ = res;
-#line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		database_table_throw_error ("VideoTable.remove", _tmp10_, &_inner_error_);
-#line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-				return;
-#line 2460 "VideoTable.c"
-			} else {
-#line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 325 "/home/jens/Source/shotwell/src/db/VideoTable.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 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-				g_clear_error (&_inner_error_);
-#line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-				return;
-#line 2470 "VideoTable.c"
-			}
-		}
-	}
-#line 315 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 2476 "VideoTable.c"
-}
-
-
-gboolean
-video_table_is_video_stored (VideoTable* self,
-                             GFile* file)
-{
-	gboolean result = FALSE;
-	VideoID _tmp0_ = {0};
-#line 328 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE);
-#line 328 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 329 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	video_table_get_id (self, file, &_tmp0_);
-#line 329 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	result = video_id_is_valid (&_tmp0_);
-#line 329 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return result;
-#line 2496 "VideoTable.c"
-}
-
-
-void
-video_table_get_id (VideoTable* self,
-                    GFile* file,
-                    VideoID* result)
-{
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	gchar* _tmp5_;
-	GDestroyNotify _tmp6_;
-	gint _tmp7_;
-	sqlite3_stmt* _tmp8_;
-	VideoID _tmp9_ = {0};
-	gint _tmp10_;
-#line 332 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (IS_VIDEO_TABLE (self));
-#line 332 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (G_IS_FILE (file));
-#line 334 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = database_table_db;
-#line 334 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT ID FROM VideoTable WHERE filename=?", -1, &_tmp1_, NULL);
-#line 334 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 334 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	stmt = _tmp1_;
-#line 334 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = _tmp2_;
-#line 335 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp3_ = res;
-#line 335 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 337 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp4_ = stmt;
-#line 337 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp5_ = g_file_get_path (file);
-#line 337 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp6_ = g_free;
-#line 337 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_bind_text (_tmp4_, 1, _tmp5_, -1, _tmp6_);
-#line 338 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp7_ = res;
-#line 338 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 340 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp8_ = stmt;
-#line 340 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_step (_tmp8_);
-#line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp10_ = res;
-#line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (_tmp10_ == SQLITE_ROW) {
-#line 2556 "VideoTable.c"
-		sqlite3_stmt* _tmp11_;
-#line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp11_ = stmt;
-#line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		video_id_init (&_tmp9_, sqlite3_column_int64 (_tmp11_, 0));
-#line 2562 "VideoTable.c"
-	} else {
-#line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		video_id_init (&_tmp9_, VIDEO_ID_INVALID);
-#line 2566 "VideoTable.c"
-	}
-#line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	*result = _tmp9_;
-#line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return;
-#line 2574 "VideoTable.c"
-}
-
-
-GeeArrayList*
-video_table_get_videos (VideoTable* self,
-                        GError** error)
-{
-	GeeArrayList* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	GeeArrayList* video_ids = NULL;
-	GeeArrayList* _tmp4_;
-	GError * _inner_error_ = NULL;
-#line 345 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL);
-#line 347 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = database_table_db;
-#line 347 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT id FROM VideoTable", -1, &_tmp1_, NULL);
-#line 347 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 347 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	stmt = _tmp1_;
-#line 347 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = _tmp2_;
-#line 348 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp3_ = res;
-#line 348 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 350 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp4_ = gee_array_list_new (TYPE_VIDEO_ID, (GBoxedCopyFunc) video_id_dup, (GDestroyNotify) video_id_free, NULL, NULL, NULL);
-#line 350 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	video_ids = _tmp4_;
-#line 2612 "VideoTable.c"
-	{
-		gboolean _tmp5_ = FALSE;
-#line 351 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp5_ = TRUE;
-#line 351 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		while (TRUE) {
-#line 2619 "VideoTable.c"
-			sqlite3_stmt* _tmp6_;
-			gint _tmp7_;
-			GeeArrayList* _tmp10_;
-			sqlite3_stmt* _tmp11_;
-			VideoID _tmp12_ = {0};
-#line 351 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			if (!_tmp5_) {
-#line 2627 "VideoTable.c"
-			}
-#line 351 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			_tmp5_ = FALSE;
-#line 352 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			_tmp6_ = stmt;
-#line 352 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			res = sqlite3_step (_tmp6_);
-#line 353 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			_tmp7_ = res;
-#line 353 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			if (_tmp7_ == SQLITE_DONE) {
-#line 354 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-				break;
-#line 2641 "VideoTable.c"
-			} else {
-				gint _tmp8_;
-#line 355 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-				_tmp8_ = res;
-#line 355 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-				if (_tmp8_ != SQLITE_ROW) {
-#line 2648 "VideoTable.c"
-					gint _tmp9_;
-#line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-					_tmp9_ = res;
-#line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-					database_table_throw_error ("VideoTable.get_videos", _tmp9_, &_inner_error_);
-#line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-						if (_inner_error_->domain == DATABASE_ERROR) {
-#line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-							g_propagate_error (error, _inner_error_);
-#line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-							_g_object_unref0 (video_ids);
-#line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-							return NULL;
-#line 2666 "VideoTable.c"
-						} else {
-#line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-							_g_object_unref0 (video_ids);
-#line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-							_sqlite3_finalize0 (stmt);
-#line 356 "/home/jens/Source/shotwell/src/db/VideoTable.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 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-							g_clear_error (&_inner_error_);
-#line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-							return NULL;
-#line 2678 "VideoTable.c"
-						}
-					}
-				}
-			}
-#line 359 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			_tmp10_ = video_ids;
-#line 359 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			_tmp11_ = stmt;
-#line 359 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			video_id_init (&_tmp12_, sqlite3_column_int64 (_tmp11_, 0));
-#line 359 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp12_);
-#line 2691 "VideoTable.c"
-		}
-	}
-#line 362 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	result = video_ids;
-#line 362 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 362 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return result;
-#line 2700 "VideoTable.c"
-}
-
-
-static sqlite3_stmt*
-video_table_get_duplicate_stmt (VideoTable* self,
-                                GFile* file,
-                                const gchar* md5)
-{
-	sqlite3_stmt* result = NULL;
-	gboolean _tmp0_ = FALSE;
-	gchar* sql = NULL;
-	gchar* _tmp1_;
-	gboolean first = FALSE;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp9_;
-	const gchar* _tmp10_;
-	sqlite3_stmt* _tmp11_ = NULL;
-	gint _tmp12_;
-	gint _tmp13_;
-	gint col = 0;
-#line 365 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL);
-#line 365 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL);
-#line 366 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (file != NULL) {
-#line 366 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp0_ = TRUE;
-#line 2730 "VideoTable.c"
-	} else {
-#line 366 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp0_ = md5 != NULL;
-#line 2734 "VideoTable.c"
-	}
-#line 366 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp0_, "file != null || md5 != null");
-#line 368 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp1_ = g_strdup ("SELECT id FROM VideoTable WHERE");
-#line 368 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	sql = _tmp1_;
-#line 369 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	first = TRUE;
-#line 371 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (file != NULL) {
-#line 2746 "VideoTable.c"
-		const gchar* _tmp2_;
-		gchar* _tmp3_;
-#line 372 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp2_ = sql;
-#line 372 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp3_ = g_strconcat (_tmp2_, " filename=?", NULL);
-#line 372 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_g_free0 (sql);
-#line 372 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		sql = _tmp3_;
-#line 373 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		first = FALSE;
-#line 2759 "VideoTable.c"
-	}
-#line 376 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (md5 != NULL) {
-#line 2763 "VideoTable.c"
-		gboolean _tmp4_;
-		const gchar* _tmp7_;
-		gchar* _tmp8_;
-#line 377 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp4_ = first;
-#line 377 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		if (!_tmp4_) {
-#line 2771 "VideoTable.c"
-			const gchar* _tmp5_;
-			gchar* _tmp6_;
-#line 378 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			_tmp5_ = sql;
-#line 378 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			_tmp6_ = g_strconcat (_tmp5_, " OR ", NULL);
-#line 378 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			_g_free0 (sql);
-#line 378 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			sql = _tmp6_;
-#line 2782 "VideoTable.c"
-		}
-#line 380 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp7_ = sql;
-#line 380 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp8_ = g_strconcat (_tmp7_, " md5=?", NULL);
-#line 380 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_g_free0 (sql);
-#line 380 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		sql = _tmp8_;
-#line 2792 "VideoTable.c"
-	}
-#line 384 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp9_ = database_table_db;
-#line 384 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp10_ = sql;
-#line 384 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp12_ = sqlite3_prepare_v2 (_tmp9_, _tmp10_, -1, &_tmp11_, NULL);
-#line 384 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 384 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	stmt = _tmp11_;
-#line 384 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = _tmp12_;
-#line 385 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp13_ = res;
-#line 385 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK");
-#line 387 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	col = 1;
-#line 389 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (file != NULL) {
-#line 2814 "VideoTable.c"
-		sqlite3_stmt* _tmp14_;
-		gint _tmp15_;
-		gchar* _tmp16_;
-		GDestroyNotify _tmp17_;
-		gint _tmp18_;
-#line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp14_ = stmt;
-#line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp15_ = col;
-#line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		col = _tmp15_ + 1;
-#line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp16_ = g_file_get_path (file);
-#line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp17_ = g_free;
-#line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		res = sqlite3_bind_text (_tmp14_, _tmp15_, _tmp16_, -1, _tmp17_);
-#line 391 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp18_ = res;
-#line 391 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK");
-#line 2836 "VideoTable.c"
-	}
-#line 394 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (md5 != NULL) {
-#line 2840 "VideoTable.c"
-		sqlite3_stmt* _tmp19_;
-		gint _tmp20_;
-		gchar* _tmp21_;
-		GDestroyNotify _tmp22_;
-		gint _tmp23_;
-#line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp19_ = stmt;
-#line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp20_ = col;
-#line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		col = _tmp20_ + 1;
-#line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp21_ = g_strdup (md5);
-#line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp22_ = g_free;
-#line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		res = sqlite3_bind_text (_tmp19_, _tmp20_, _tmp21_, -1, _tmp22_);
-#line 396 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp23_ = res;
-#line 396 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK");
-#line 2862 "VideoTable.c"
-	}
-#line 399 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	result = stmt;
-#line 399 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_g_free0 (sql);
-#line 399 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return result;
-#line 2870 "VideoTable.c"
-}
-
-
-gboolean
-video_table_has_duplicate (VideoTable* self,
-                           GFile* file,
-                           const gchar* md5)
-{
-	gboolean result = FALSE;
-	sqlite3_stmt* stmt = NULL;
-	sqlite3_stmt* _tmp0_;
-	gint res = 0;
-	sqlite3_stmt* _tmp1_;
-	gint _tmp2_;
-#line 402 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE);
-#line 402 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
-#line 403 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = video_table_get_duplicate_stmt (self, file, md5);
-#line 403 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	stmt = _tmp0_;
-#line 404 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp1_ = stmt;
-#line 404 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_step (_tmp1_);
-#line 406 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp2_ = res;
-#line 406 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (_tmp2_ == SQLITE_DONE) {
-#line 408 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		result = FALSE;
-#line 408 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 408 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		return result;
-#line 2907 "VideoTable.c"
-	} else {
-		gint _tmp3_;
-#line 409 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp3_ = res;
-#line 409 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		if (_tmp3_ == SQLITE_ROW) {
-#line 411 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			result = TRUE;
-#line 411 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			_sqlite3_finalize0 (stmt);
-#line 411 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			return result;
-#line 2920 "VideoTable.c"
-		} else {
-			gint _tmp4_;
-#line 413 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			_tmp4_ = res;
-#line 413 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			database_table_fatal ("VideoTable.has_duplicate", _tmp4_);
-#line 2927 "VideoTable.c"
-		}
-	}
-#line 416 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	result = FALSE;
-#line 416 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 416 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return result;
-#line 2936 "VideoTable.c"
-}
-
-
-static void
-_vala_array_add3 (VideoID* * array,
-                  int* length,
-                  int* size,
-                  const VideoID* value)
-{
-#line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if ((*length) == (*size)) {
-#line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		*array = g_renew (VideoID, *array, *size);
-#line 2952 "VideoTable.c"
-	}
-#line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	(*array)[(*length)++] = *value;
-#line 2956 "VideoTable.c"
-}
-
-
-VideoID*
-video_table_get_duplicate_ids (VideoTable* self,
-                               GFile* file,
-                               const gchar* md5,
-                               int* result_length1)
-{
-	VideoID* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	sqlite3_stmt* _tmp0_;
-	VideoID* ids = NULL;
-	VideoID* _tmp1_;
-	gint ids_length1;
-	gint _ids_size_;
-	gint res = 0;
-	sqlite3_stmt* _tmp2_;
-	VideoID* _tmp8_;
-	gint _tmp8__length1;
-#line 419 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL);
-#line 419 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL);
-#line 420 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = video_table_get_duplicate_stmt (self, file, md5);
-#line 420 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	stmt = _tmp0_;
-#line 422 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp1_ = g_new0 (VideoID, 0);
-#line 422 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	ids = _tmp1_;
-#line 422 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	ids_length1 = 0;
-#line 422 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_ids_size_ = ids_length1;
-#line 424 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp2_ = stmt;
-#line 424 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_step (_tmp2_);
-#line 425 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	while (TRUE) {
-#line 2999 "VideoTable.c"
-		gint _tmp3_;
-		VideoID* _tmp4_;
-		gint _tmp4__length1;
-		sqlite3_stmt* _tmp5_;
-		VideoID _tmp6_ = {0};
-		sqlite3_stmt* _tmp7_;
-#line 425 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp3_ = res;
-#line 425 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		if (!(_tmp3_ == SQLITE_ROW)) {
-#line 425 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			break;
-#line 3012 "VideoTable.c"
-		}
-#line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp4_ = ids;
-#line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp4__length1 = ids_length1;
-#line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp5_ = stmt;
-#line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		video_id_init (&_tmp6_, sqlite3_column_int64 (_tmp5_, 0));
-#line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_vala_array_add3 (&ids, &ids_length1, &_ids_size_, &_tmp6_);
-#line 427 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp7_ = stmt;
-#line 427 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		res = sqlite3_step (_tmp7_);
-#line 3028 "VideoTable.c"
-	}
-#line 430 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp8_ = ids;
-#line 430 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp8__length1 = ids_length1;
-#line 430 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (result_length1) {
-#line 430 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		*result_length1 = _tmp8__length1;
-#line 3038 "VideoTable.c"
-	}
-#line 430 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	result = _tmp8_;
-#line 430 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 430 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return result;
-#line 3046 "VideoTable.c"
-}
-
-
-GeeArrayList*
-video_table_get_event_source_ids (VideoTable* self,
-                                  EventID* event_id)
-{
-	GeeArrayList* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp0_;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	gint _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	EventID _tmp5_;
-	gint64 _tmp6_;
-	gint _tmp7_;
-	GeeArrayList* _result_ = NULL;
-	GeeArrayList* _tmp8_;
-#line 433 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL);
-#line 433 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_val_if_fail (event_id != NULL, NULL);
-#line 435 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = database_table_db;
-#line 435 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT id FROM VideoTable WHERE event_id = ?", -1, &_tmp1_, NULL);
-#line 435 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 435 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	stmt = _tmp1_;
-#line 435 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = _tmp2_;
-#line 436 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp3_ = res;
-#line 436 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 438 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp4_ = stmt;
-#line 438 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp5_ = *event_id;
-#line 438 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp6_ = _tmp5_.id;
-#line 438 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_);
-#line 439 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp7_ = res;
-#line 439 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 441 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp8_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
-#line 441 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_result_ = _tmp8_;
-#line 3101 "VideoTable.c"
-	{
-		gboolean _tmp9_ = FALSE;
-#line 442 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		_tmp9_ = TRUE;
-#line 442 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		while (TRUE) {
-#line 3108 "VideoTable.c"
-			sqlite3_stmt* _tmp10_;
-			gint _tmp11_;
-			GeeArrayList* _tmp14_;
-			sqlite3_stmt* _tmp15_;
-			VideoID _tmp16_ = {0};
-			gchar* _tmp17_;
-			gchar* _tmp18_;
-#line 442 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			if (!_tmp9_) {
-#line 3118 "VideoTable.c"
-			}
-#line 442 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			_tmp9_ = FALSE;
-#line 443 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			_tmp10_ = stmt;
-#line 443 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			res = sqlite3_step (_tmp10_);
-#line 444 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			_tmp11_ = res;
-#line 444 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			if (_tmp11_ == SQLITE_DONE) {
-#line 445 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-				break;
-#line 3132 "VideoTable.c"
-			} else {
-				gint _tmp12_;
-#line 446 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-				_tmp12_ = res;
-#line 446 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-				if (_tmp12_ != SQLITE_ROW) {
-#line 3139 "VideoTable.c"
-					gint _tmp13_;
-#line 447 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-					_tmp13_ = res;
-#line 447 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-					database_table_fatal ("get_event_source_ids", _tmp13_);
-#line 449 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-					break;
-#line 3147 "VideoTable.c"
-				}
-			}
-#line 452 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			_tmp14_ = _result_;
-#line 452 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			_tmp15_ = stmt;
-#line 452 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			video_id_init (&_tmp16_, sqlite3_column_int64 (_tmp15_, 0));
-#line 452 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			_tmp17_ = video_id_upgrade_video_id_to_source_id (&_tmp16_);
-#line 452 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			_tmp18_ = _tmp17_;
-#line 452 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp18_);
-#line 452 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			_g_free0 (_tmp18_);
-#line 3164 "VideoTable.c"
-		}
-	}
-#line 455 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	result = _result_;
-#line 455 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 455 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	return result;
-#line 3173 "VideoTable.c"
-}
-
-
-void
-video_table_set_timestamp (VideoTable* self,
-                           VideoID* video_id,
-                           time_t timestamp,
-                           GError** error)
-{
-	VideoID _tmp0_;
-	gint64 _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 458 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (IS_VIDEO_TABLE (self));
-#line 458 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	g_return_if_fail (video_id != NULL);
-#line 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp0_ = *video_id;
-#line 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp1_ = _tmp0_.id;
-#line 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "timestamp", (gint64) timestamp, &_inner_error_);
-#line 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			return;
-#line 3204 "VideoTable.c"
-		} else {
-#line 459 "/home/jens/Source/shotwell/src/db/VideoTable.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 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			g_clear_error (&_inner_error_);
-#line 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-			return;
-#line 3212 "VideoTable.c"
-		}
-	}
-}
-
-
-static void
-video_table_class_init (VideoTableClass * klass)
-{
-#line 59 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	video_table_parent_class = g_type_class_peek_parent (klass);
-#line 59 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	((DatabaseTableClass *) klass)->finalize = video_table_finalize;
-#line 3225 "VideoTable.c"
-}
-
-
-static void
-video_table_instance_init (VideoTable * self)
-{
-}
-
-
-static void
-video_table_finalize (DatabaseTable * obj)
-{
-	VideoTable * self;
-#line 59 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_TABLE, VideoTable);
-#line 59 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	DATABASE_TABLE_CLASS (video_table_parent_class)->finalize (obj);
-#line 3243 "VideoTable.c"
-}
-
-
-GType
-video_table_get_type (void)
-{
-	static volatile gsize video_table_type_id__volatile = 0;
-	if (g_once_init_enter (&video_table_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (VideoTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) video_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (VideoTable), 0, (GInstanceInitFunc) video_table_instance_init, NULL };
-		GType video_table_type_id;
-		video_table_type_id = g_type_register_static (TYPE_DATABASE_TABLE, "VideoTable", &g_define_type_info, 0);
-		g_once_init_leave (&video_table_type_id__volatile, video_table_type_id);
-	}
-	return video_table_type_id__volatile;
-}
-
-
-
author	Jörg Frings-Fürst <debian@jff.email>	2018-09-30 14:09:32 +0200
committer	Jörg Frings-Fürst <debian@jff.email>	2018-09-30 14:09:32 +0200
commit	0537caaf4af94a9ead8b292679f6b34c90b55e06 (patch)
tree	6761cfdf959926be7af3147cf770e7f253390fe8 /src/db
parent	eca5837e235a356c8db9416bbbc13577db3e6f76 (diff)
parent	5e9f4eea451a77ba3b93db3747841ed2bd969e9f (diff)