Update upstream source from tag 'upstream/0.26.4'

Update to upstream version '0.26.4' with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4
author: Jörg Frings-Fürst <debian@jff-webhosting.net> 2017-11-12 15:55:20 +0100
committer: Jörg Frings-Fürst <debian@jff-webhosting.net> 2017-11-12 15:55:20 +0100
commit: f6140ff1c9ec493d947da5b346508846e7a1a06f (patch)
tree: c01b9164ee4b0d46b6670ccee45f6181c6237d7f /src/db/PhotoTable.c
parent: 0f67b3cc674377559e66c5a6729fd499049a992f (diff)
parent: 2492891f112caac6076ce49721d9d5d78a152c3a (diff)
1 files changed, 1510 insertions, 1510 deletions
diff --git a/src/db/PhotoTable.c b/src/db/PhotoTable.c
index da28230..45e2254 100644
--- a/src/db/PhotoTable.c
+++ b/src/db/PhotoTable.c
@@ -1,4 +1,4 @@
-/* PhotoTable.c generated by valac 0.34.7, the Vala compiler
+/* PhotoTable.c generated by valac 0.36.6, the Vala compiler
  * generated from PhotoTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -352,7 +352,7 @@ 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);
+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);
@@ -420,7 +420,7 @@ 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);
+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);
 KeyValueMap* key_value_map_new (const gchar* group);
@@ -435,7 +435,7 @@ gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* phot
 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);
+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);
@@ -443,7 +443,7 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole
 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);
+static void photo_table_finalize (DatabaseTable * obj);
 gboolean backing_photo_id_is_invalid (BackingPhotoID *self);
 gboolean backing_photo_id_is_valid (BackingPhotoID *self);
 enum  {
@@ -452,7 +452,7 @@ enum  {
 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);
+static void backing_photo_row_finalize (BackingPhotoRow * obj);
 GType backing_photo_table_get_type (void) G_GNUC_CONST;
 enum  {
 	BACKING_PHOTO_TABLE_DUMMY_PROPERTY
@@ -467,13 +467,13 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot
 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 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) {
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #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"
@@ -486,7 +486,7 @@ void photo_id_init (PhotoID *self, gint64 id) {
 
 gboolean photo_id_is_invalid (PhotoID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	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"
@@ -499,7 +499,7 @@ gboolean photo_id_is_invalid (PhotoID *self) {
 
 gboolean photo_id_is_valid (PhotoID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	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"
@@ -512,8 +512,8 @@ gboolean photo_id_is_valid (PhotoID *self) {
 
 guint photo_id_hash (PhotoID *self) {
 	guint result = 0U;
-	gint64 _tmp0_ = 0LL;
-	guint _tmp1_ = 0U;
+	gint64 _tmp0_;
+	guint _tmp1_;
 #line 25 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = (*self).id;
 #line 25 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -528,10 +528,10 @@ guint photo_id_hash (PhotoID *self) {
 
 gboolean photo_id_equal (void* a, void* b) {
 	gboolean result = FALSE;
-	void* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
-	void* _tmp2_ = NULL;
-	gint64 _tmp3_ = 0LL;
+	void* _tmp0_;
+	gint64 _tmp1_;
+	void* _tmp2_;
+	gint64 _tmp3_;
 #line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = a;
 #line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -550,9 +550,9 @@ gboolean photo_id_equal (void* a, void* b) {
 
 gchar* photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id) {
 	gchar* result = NULL;
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	gchar* _tmp2_ = 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"
@@ -600,7 +600,7 @@ GType photo_id_get_type (void) {
 
 
 void import_id_init (ImportID *self, gint64 id) {
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #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"
@@ -614,8 +614,8 @@ void import_id_init (ImportID *self, gint64 id) {
 void import_id_generate (ImportID* result) {
 	GTimeVal timestamp = {0};
 	gint64 id = 0LL;
-	GTimeVal _tmp0_ = {0};
-	glong _tmp1_ = 0L;
+	GTimeVal _tmp0_;
+	glong _tmp1_;
 	ImportID _tmp2_ = {0};
 #line 47 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_get_current_time (&timestamp);
@@ -639,7 +639,7 @@ void import_id_generate (ImportID* result) {
 
 gboolean import_id_is_invalid (ImportID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	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"
@@ -652,7 +652,7 @@ gboolean import_id_is_invalid (ImportID *self) {
 
 gboolean import_id_is_valid (ImportID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	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"
@@ -666,17 +666,17 @@ gboolean import_id_is_valid (ImportID *self) {
 gint import_id_compare_func (ImportID* a, ImportID* b) {
 	gint result = 0;
 	gboolean _tmp0_ = FALSE;
-	ImportID* _tmp1_ = NULL;
-	ImportID* _tmp3_ = NULL;
-	gint64 _tmp4_ = 0LL;
-	ImportID* _tmp5_ = NULL;
-	gint64 _tmp6_ = 0LL;
+	ImportID* _tmp1_;
+	ImportID* _tmp3_;
+	gint64 _tmp4_;
+	ImportID* _tmp5_;
+	gint64 _tmp6_;
 #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = a;
 #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_ != NULL) {
 #line 679 "PhotoTable.c"
-		ImportID* _tmp2_ = NULL;
+		ImportID* _tmp2_;
 #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = b;
 #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -707,10 +707,10 @@ gint import_id_compare_func (ImportID* a, ImportID* b) {
 
 gint64 import_id_comparator (void* a, void* b) {
 	gint64 result = 0LL;
-	void* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
-	void* _tmp2_ = NULL;
-	gint64 _tmp3_ = 0LL;
+	void* _tmp0_;
+	gint64 _tmp1_;
+	void* _tmp2_;
+	gint64 _tmp3_;
 #line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = a;
 #line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -759,14 +759,14 @@ GType import_id_get_type (void) {
 
 PhotoRow* photo_row_construct (GType object_type) {
 	PhotoRow* self = NULL;
-	BackingPhotoRow* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	RawDeveloper* _tmp2_ = NULL;
-	RawDeveloper* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	BackingPhotoID* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	RawDeveloper* _tmp6_ = 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"
@@ -813,11 +813,11 @@ PhotoRow* photo_row_construct (GType object_type) {
 			d = d_collection[d_it];
 #line 815 "PhotoTable.c"
 			{
-				BackingPhotoID* _tmp7_ = NULL;
-				gint _tmp7__length1 = 0;
-				RawDeveloper _tmp8_ = 0;
+				BackingPhotoID* _tmp7_;
+				gint _tmp7__length1;
+				RawDeveloper _tmp8_;
 				BackingPhotoID _tmp9_ = {0};
-				BackingPhotoID _tmp10_ = {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"
@@ -892,7 +892,7 @@ static gchar* value_photo_row_collect_value (GValue* value, guint n_collect_valu
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (collect_values[0].v_pointer) {
 #line 895 "PhotoTable.c"
-		PhotoRow* object;
+		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) {
@@ -919,7 +919,7 @@ static gchar* value_photo_row_collect_value (GValue* value, guint n_collect_valu
 
 
 static gchar* value_photo_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PhotoRow** object_p;
+	PhotoRow ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (!object_p) {
@@ -971,7 +971,7 @@ gpointer value_get_photo_row (const GValue* value) {
 
 
 void value_set_photo_row (GValue* value, gpointer v_object) {
-	PhotoRow* old;
+	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"
@@ -1002,7 +1002,7 @@ void value_set_photo_row (GValue* value, gpointer v_object) {
 
 
 void value_take_photo_row (GValue* value, gpointer v_object) {
-	PhotoRow* old;
+	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"
@@ -1046,7 +1046,7 @@ static void photo_row_instance_init (PhotoRow * self) {
 }
 
 
-static void photo_row_finalize (PhotoRow* obj) {
+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);
@@ -1089,7 +1089,7 @@ GType photo_row_get_type (void) {
 
 
 gpointer photo_row_ref (gpointer instance) {
-	PhotoRow* self;
+	PhotoRow * self;
 	self = instance;
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1100,7 +1100,7 @@ gpointer photo_row_ref (gpointer instance) {
 
 
 void photo_row_unref (gpointer instance) {
-	PhotoRow* self;
+	PhotoRow * self;
 	self = instance;
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1117,50 +1117,50 @@ static PhotoTable* photo_table_construct (GType object_type) {
 	PhotoTable* self = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
 	sqlite3_stmt* stmt2 = NULL;
 	gint res2 = 0;
-	sqlite3* _tmp8_ = NULL;
+	sqlite3* _tmp8_;
 	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	sqlite3_stmt* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	sqlite3* _tmp16_ = NULL;
+	gint _tmp10_;
+	gint _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
+	sqlite3* _tmp16_;
 	sqlite3_stmt* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	sqlite3_stmt* _tmp20_ = NULL;
-	gint _tmp21_ = 0;
-	gint _tmp22_ = 0;
-	sqlite3* _tmp24_ = NULL;
+	gint _tmp18_;
+	gint _tmp19_;
+	sqlite3_stmt* _tmp20_;
+	gint _tmp21_;
+	gint _tmp22_;
+	sqlite3* _tmp24_;
 	sqlite3_stmt* _tmp25_ = NULL;
-	gint _tmp26_ = 0;
-	gint _tmp27_ = 0;
-	sqlite3_stmt* _tmp28_ = NULL;
-	gint _tmp29_ = 0;
-	gint _tmp30_ = 0;
-	sqlite3* _tmp32_ = NULL;
+	gint _tmp26_;
+	gint _tmp27_;
+	sqlite3_stmt* _tmp28_;
+	gint _tmp29_;
+	gint _tmp30_;
+	sqlite3* _tmp32_;
 	sqlite3_stmt* _tmp33_ = NULL;
-	gint _tmp34_ = 0;
-	gint _tmp35_ = 0;
-	sqlite3_stmt* _tmp36_ = NULL;
-	gint _tmp37_ = 0;
-	gint _tmp38_ = 0;
-	sqlite3* _tmp40_ = NULL;
+	gint _tmp34_;
+	gint _tmp35_;
+	sqlite3_stmt* _tmp36_;
+	gint _tmp37_;
+	gint _tmp38_;
+	sqlite3* _tmp40_;
 	sqlite3_stmt* _tmp41_ = NULL;
-	gint _tmp42_ = 0;
-	gint _tmp43_ = 0;
-	sqlite3_stmt* _tmp44_ = NULL;
-	gint _tmp45_ = 0;
-	gint _tmp46_ = 0;
+	gint _tmp42_;
+	gint _tmp43_;
+	sqlite3_stmt* _tmp44_;
+	gint _tmp45_;
+	gint _tmp46_;
 #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"
@@ -1188,7 +1188,7 @@ static PhotoTable* photo_table_construct (GType object_type) {
 #line 148 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp6_ != SQLITE_DONE) {
 #line 1191 "PhotoTable.c"
-		gint _tmp7_ = 0;
+		gint _tmp7_;
 #line 149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_ = res;
 #line 149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -1220,7 +1220,7 @@ static PhotoTable* photo_table_construct (GType object_type) {
 #line 158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp14_ != SQLITE_DONE) {
 #line 1223 "PhotoTable.c"
-		gint _tmp15_ = 0;
+		gint _tmp15_;
 #line 159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp15_ = res2;
 #line 159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -1252,7 +1252,7 @@ static PhotoTable* photo_table_construct (GType object_type) {
 #line 168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp22_ != SQLITE_DONE) {
 #line 1255 "PhotoTable.c"
-		gint _tmp23_ = 0;
+		gint _tmp23_;
 #line 169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp23_ = res;
 #line 169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -1285,7 +1285,7 @@ static PhotoTable* photo_table_construct (GType object_type) {
 #line 175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp30_ != SQLITE_DONE) {
 #line 1287 "PhotoTable.c"
-		gint _tmp31_ = 0;
+		gint _tmp31_;
 #line 176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp31_ = res;
 #line 176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -1318,7 +1318,7 @@ static PhotoTable* photo_table_construct (GType object_type) {
 #line 183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp38_ != SQLITE_DONE) {
 #line 1319 "PhotoTable.c"
-		gint _tmp39_ = 0;
+		gint _tmp39_;
 #line 184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp39_ = res;
 #line 184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -1351,7 +1351,7 @@ static PhotoTable* photo_table_construct (GType object_type) {
 #line 191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp46_ != SQLITE_DONE) {
 #line 1351 "PhotoTable.c"
-		gint _tmp47_ = 0;
+		gint _tmp47_;
 #line 192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp47_ = res;
 #line 192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -1386,15 +1386,15 @@ static gpointer _database_table_ref0 (gpointer self) {
 
 PhotoTable* photo_table_get_instance (void) {
 	PhotoTable* result = NULL;
-	PhotoTable* _tmp0_ = NULL;
-	PhotoTable* _tmp2_ = NULL;
-	PhotoTable* _tmp3_ = 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 1394 "PhotoTable.c"
-		PhotoTable* _tmp1_ = NULL;
+		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"
@@ -1418,150 +1418,150 @@ PhotoTable* photo_table_get_instance (void) {
 void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) {
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
 	gulong time_created = 0UL;
-	gulong _tmp4_ = 0UL;
-	sqlite3_stmt* _tmp5_ = NULL;
-	PhotoRow* _tmp6_ = NULL;
-	BackingPhotoRow* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	GDestroyNotify _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	sqlite3_stmt* _tmp13_ = NULL;
-	PhotoRow* _tmp14_ = NULL;
-	BackingPhotoRow* _tmp15_ = NULL;
-	Dimensions _tmp16_ = {0};
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	sqlite3_stmt* _tmp20_ = NULL;
-	PhotoRow* _tmp21_ = NULL;
-	BackingPhotoRow* _tmp22_ = NULL;
-	Dimensions _tmp23_ = {0};
-	gint _tmp24_ = 0;
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
-	sqlite3_stmt* _tmp27_ = NULL;
-	PhotoRow* _tmp28_ = NULL;
-	BackingPhotoRow* _tmp29_ = NULL;
-	gint64 _tmp30_ = 0LL;
-	gint _tmp31_ = 0;
-	gint _tmp32_ = 0;
-	sqlite3_stmt* _tmp33_ = NULL;
-	PhotoRow* _tmp34_ = NULL;
-	BackingPhotoRow* _tmp35_ = NULL;
-	time_t _tmp36_ = 0;
-	gint _tmp37_ = 0;
-	gint _tmp38_ = 0;
-	sqlite3_stmt* _tmp39_ = NULL;
-	PhotoRow* _tmp40_ = NULL;
-	time_t _tmp41_ = 0;
-	gint _tmp42_ = 0;
-	gint _tmp43_ = 0;
-	sqlite3_stmt* _tmp44_ = NULL;
-	PhotoRow* _tmp45_ = NULL;
-	BackingPhotoRow* _tmp46_ = NULL;
-	Orientation _tmp47_ = 0;
-	gint _tmp48_ = 0;
-	gint _tmp49_ = 0;
-	sqlite3_stmt* _tmp50_ = NULL;
-	PhotoRow* _tmp51_ = NULL;
-	BackingPhotoRow* _tmp52_ = NULL;
-	Orientation _tmp53_ = 0;
-	gint _tmp54_ = 0;
-	gint _tmp55_ = 0;
-	sqlite3_stmt* _tmp56_ = NULL;
-	PhotoRow* _tmp57_ = NULL;
-	ImportID _tmp58_ = {0};
-	gint64 _tmp59_ = 0LL;
-	gint _tmp60_ = 0;
-	gint _tmp61_ = 0;
-	sqlite3_stmt* _tmp62_ = NULL;
-	gint _tmp63_ = 0;
-	gint _tmp64_ = 0;
-	sqlite3_stmt* _tmp65_ = NULL;
-	PhotoRow* _tmp66_ = NULL;
-	const gchar* _tmp67_ = NULL;
-	gchar* _tmp68_ = NULL;
-	GDestroyNotify _tmp69_ = NULL;
-	gint _tmp70_ = 0;
-	gint _tmp71_ = 0;
-	sqlite3_stmt* _tmp72_ = NULL;
-	PhotoRow* _tmp73_ = NULL;
-	const gchar* _tmp74_ = NULL;
-	gchar* _tmp75_ = NULL;
-	GDestroyNotify _tmp76_ = NULL;
-	gint _tmp77_ = 0;
-	gint _tmp78_ = 0;
-	sqlite3_stmt* _tmp79_ = NULL;
-	PhotoRow* _tmp80_ = NULL;
-	const gchar* _tmp81_ = NULL;
-	gchar* _tmp82_ = NULL;
-	GDestroyNotify _tmp83_ = NULL;
-	gint _tmp84_ = 0;
-	gint _tmp85_ = 0;
-	sqlite3_stmt* _tmp86_ = NULL;
-	gulong _tmp87_ = 0UL;
-	gint _tmp88_ = 0;
-	gint _tmp89_ = 0;
-	sqlite3_stmt* _tmp90_ = NULL;
-	PhotoRow* _tmp91_ = NULL;
-	BackingPhotoRow* _tmp92_ = NULL;
-	PhotoFileFormat _tmp93_ = 0;
-	gint _tmp94_ = 0;
-	gint _tmp95_ = 0;
-	gint _tmp96_ = 0;
-	sqlite3_stmt* _tmp97_ = NULL;
-	PhotoRow* _tmp98_ = NULL;
-	const gchar* _tmp99_ = NULL;
-	gchar* _tmp100_ = NULL;
-	GDestroyNotify _tmp101_ = NULL;
-	gint _tmp102_ = 0;
-	gint _tmp103_ = 0;
-	sqlite3_stmt* _tmp104_ = NULL;
-	PhotoRow* _tmp105_ = NULL;
-	Rating _tmp106_ = 0;
-	gint _tmp107_ = 0;
-	gint _tmp108_ = 0;
-	gint _tmp109_ = 0;
-	sqlite3_stmt* _tmp110_ = NULL;
-	gint _tmp111_ = 0;
-	gint _tmp112_ = 0;
-	sqlite3_stmt* _tmp113_ = NULL;
-	PhotoRow* _tmp114_ = NULL;
-	RawDeveloper _tmp115_ = 0;
-	gchar* _tmp116_ = NULL;
-	GDestroyNotify _tmp117_ = NULL;
-	gint _tmp118_ = 0;
-	gint _tmp119_ = 0;
-	sqlite3_stmt* _tmp120_ = NULL;
-	PhotoRow* _tmp121_ = NULL;
-	const gchar* _tmp122_ = NULL;
-	gchar* _tmp123_ = NULL;
-	GDestroyNotify _tmp124_ = NULL;
-	gint _tmp125_ = 0;
-	gint _tmp126_ = 0;
-	sqlite3_stmt* _tmp127_ = NULL;
-	gint _tmp128_ = 0;
-	gint _tmp129_ = 0;
-	PhotoRow* _tmp133_ = NULL;
-	sqlite3* _tmp134_ = NULL;
-	gint64 _tmp135_ = 0LL;
-	PhotoRow* _tmp136_ = NULL;
-	PhotoRow* _tmp137_ = NULL;
-	BackingPhotoRow* _tmp138_ = NULL;
-	Orientation _tmp139_ = 0;
-	PhotoRow* _tmp140_ = NULL;
-	PhotoRow* _tmp141_ = NULL;
-	gulong _tmp142_ = 0UL;
-	PhotoRow* _tmp143_ = NULL;
-	PhotoRow* _tmp144_ = NULL;
-	PhotoID _tmp145_ = {0};
+	gulong _tmp4_;
+	sqlite3_stmt* _tmp5_;
+	PhotoRow* _tmp6_;
+	BackingPhotoRow* _tmp7_;
+	const gchar* _tmp8_;
+	gchar* _tmp9_;
+	GDestroyNotify _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
+	sqlite3_stmt* _tmp13_;
+	PhotoRow* _tmp14_;
+	BackingPhotoRow* _tmp15_;
+	Dimensions _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
+	sqlite3_stmt* _tmp20_;
+	PhotoRow* _tmp21_;
+	BackingPhotoRow* _tmp22_;
+	Dimensions _tmp23_;
+	gint _tmp24_;
+	gint _tmp25_;
+	gint _tmp26_;
+	sqlite3_stmt* _tmp27_;
+	PhotoRow* _tmp28_;
+	BackingPhotoRow* _tmp29_;
+	gint64 _tmp30_;
+	gint _tmp31_;
+	gint _tmp32_;
+	sqlite3_stmt* _tmp33_;
+	PhotoRow* _tmp34_;
+	BackingPhotoRow* _tmp35_;
+	time_t _tmp36_;
+	gint _tmp37_;
+	gint _tmp38_;
+	sqlite3_stmt* _tmp39_;
+	PhotoRow* _tmp40_;
+	time_t _tmp41_;
+	gint _tmp42_;
+	gint _tmp43_;
+	sqlite3_stmt* _tmp44_;
+	PhotoRow* _tmp45_;
+	BackingPhotoRow* _tmp46_;
+	Orientation _tmp47_;
+	gint _tmp48_;
+	gint _tmp49_;
+	sqlite3_stmt* _tmp50_;
+	PhotoRow* _tmp51_;
+	BackingPhotoRow* _tmp52_;
+	Orientation _tmp53_;
+	gint _tmp54_;
+	gint _tmp55_;
+	sqlite3_stmt* _tmp56_;
+	PhotoRow* _tmp57_;
+	ImportID _tmp58_;
+	gint64 _tmp59_;
+	gint _tmp60_;
+	gint _tmp61_;
+	sqlite3_stmt* _tmp62_;
+	gint _tmp63_;
+	gint _tmp64_;
+	sqlite3_stmt* _tmp65_;
+	PhotoRow* _tmp66_;
+	const gchar* _tmp67_;
+	gchar* _tmp68_;
+	GDestroyNotify _tmp69_;
+	gint _tmp70_;
+	gint _tmp71_;
+	sqlite3_stmt* _tmp72_;
+	PhotoRow* _tmp73_;
+	const gchar* _tmp74_;
+	gchar* _tmp75_;
+	GDestroyNotify _tmp76_;
+	gint _tmp77_;
+	gint _tmp78_;
+	sqlite3_stmt* _tmp79_;
+	PhotoRow* _tmp80_;
+	const gchar* _tmp81_;
+	gchar* _tmp82_;
+	GDestroyNotify _tmp83_;
+	gint _tmp84_;
+	gint _tmp85_;
+	sqlite3_stmt* _tmp86_;
+	gulong _tmp87_;
+	gint _tmp88_;
+	gint _tmp89_;
+	sqlite3_stmt* _tmp90_;
+	PhotoRow* _tmp91_;
+	BackingPhotoRow* _tmp92_;
+	PhotoFileFormat _tmp93_;
+	gint _tmp94_;
+	gint _tmp95_;
+	gint _tmp96_;
+	sqlite3_stmt* _tmp97_;
+	PhotoRow* _tmp98_;
+	const gchar* _tmp99_;
+	gchar* _tmp100_;
+	GDestroyNotify _tmp101_;
+	gint _tmp102_;
+	gint _tmp103_;
+	sqlite3_stmt* _tmp104_;
+	PhotoRow* _tmp105_;
+	Rating _tmp106_;
+	gint _tmp107_;
+	gint _tmp108_;
+	gint _tmp109_;
+	sqlite3_stmt* _tmp110_;
+	gint _tmp111_;
+	gint _tmp112_;
+	sqlite3_stmt* _tmp113_;
+	PhotoRow* _tmp114_;
+	RawDeveloper _tmp115_;
+	gchar* _tmp116_;
+	GDestroyNotify _tmp117_;
+	gint _tmp118_;
+	gint _tmp119_;
+	sqlite3_stmt* _tmp120_;
+	PhotoRow* _tmp121_;
+	const gchar* _tmp122_;
+	gchar* _tmp123_;
+	GDestroyNotify _tmp124_;
+	gint _tmp125_;
+	gint _tmp126_;
+	sqlite3_stmt* _tmp127_;
+	gint _tmp128_;
+	gint _tmp129_;
+	PhotoRow* _tmp133_;
+	sqlite3* _tmp134_;
+	gint64 _tmp135_;
+	PhotoRow* _tmp136_;
+	PhotoRow* _tmp137_;
+	BackingPhotoRow* _tmp138_;
+	Orientation _tmp139_;
+	PhotoRow* _tmp140_;
+	PhotoRow* _tmp141_;
+	gulong _tmp142_;
+	PhotoRow* _tmp143_;
+	PhotoRow* _tmp144_;
+	PhotoID _tmp145_;
 #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"
@@ -1922,14 +1922,14 @@ void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) {
 #line 261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp129_ != SQLITE_DONE) {
 #line 1919 "PhotoTable.c"
-		gint _tmp130_ = 0;
+		gint _tmp130_;
 		PhotoID _tmp132_ = {0};
 #line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp130_ = res;
 #line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp130_ != SQLITE_CONSTRAINT) {
 #line 1926 "PhotoTable.c"
-			gint _tmp131_ = 0;
+			gint _tmp131_;
 #line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp131_ = res;
 #line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -1995,109 +1995,109 @@ void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) {
 void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) {
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
 	time_t time_reimported = 0;
-	gulong _tmp4_ = 0UL;
-	sqlite3_stmt* _tmp5_ = NULL;
-	PhotoRow* _tmp6_ = NULL;
-	BackingPhotoRow* _tmp7_ = NULL;
-	Dimensions _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	sqlite3_stmt* _tmp12_ = NULL;
-	PhotoRow* _tmp13_ = NULL;
-	BackingPhotoRow* _tmp14_ = NULL;
-	Dimensions _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	sqlite3_stmt* _tmp19_ = NULL;
-	PhotoRow* _tmp20_ = NULL;
-	BackingPhotoRow* _tmp21_ = NULL;
-	gint64 _tmp22_ = 0LL;
-	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
-	sqlite3_stmt* _tmp25_ = NULL;
-	PhotoRow* _tmp26_ = NULL;
-	BackingPhotoRow* _tmp27_ = NULL;
-	time_t _tmp28_ = 0;
-	gint _tmp29_ = 0;
-	gint _tmp30_ = 0;
-	sqlite3_stmt* _tmp31_ = NULL;
-	PhotoRow* _tmp32_ = NULL;
-	time_t _tmp33_ = 0;
-	gint _tmp34_ = 0;
-	gint _tmp35_ = 0;
-	sqlite3_stmt* _tmp36_ = NULL;
-	PhotoRow* _tmp37_ = NULL;
-	BackingPhotoRow* _tmp38_ = NULL;
-	Orientation _tmp39_ = 0;
-	gint _tmp40_ = 0;
-	gint _tmp41_ = 0;
-	sqlite3_stmt* _tmp42_ = NULL;
-	PhotoRow* _tmp43_ = NULL;
-	BackingPhotoRow* _tmp44_ = NULL;
-	Orientation _tmp45_ = 0;
-	gint _tmp46_ = 0;
-	gint _tmp47_ = 0;
-	sqlite3_stmt* _tmp48_ = NULL;
-	PhotoRow* _tmp49_ = NULL;
-	const gchar* _tmp50_ = NULL;
-	gchar* _tmp51_ = NULL;
-	GDestroyNotify _tmp52_ = NULL;
-	gint _tmp53_ = 0;
-	gint _tmp54_ = 0;
-	sqlite3_stmt* _tmp55_ = NULL;
-	PhotoRow* _tmp56_ = NULL;
-	const gchar* _tmp57_ = NULL;
-	gchar* _tmp58_ = NULL;
-	GDestroyNotify _tmp59_ = NULL;
-	gint _tmp60_ = 0;
-	gint _tmp61_ = 0;
-	sqlite3_stmt* _tmp62_ = NULL;
-	PhotoRow* _tmp63_ = NULL;
-	const gchar* _tmp64_ = NULL;
-	gchar* _tmp65_ = NULL;
-	GDestroyNotify _tmp66_ = NULL;
-	gint _tmp67_ = 0;
-	gint _tmp68_ = 0;
-	sqlite3_stmt* _tmp69_ = NULL;
-	PhotoRow* _tmp70_ = NULL;
-	BackingPhotoRow* _tmp71_ = NULL;
-	PhotoFileFormat _tmp72_ = 0;
-	gint _tmp73_ = 0;
-	gint _tmp74_ = 0;
-	gint _tmp75_ = 0;
-	sqlite3_stmt* _tmp76_ = NULL;
-	PhotoRow* _tmp77_ = NULL;
-	const gchar* _tmp78_ = NULL;
-	gchar* _tmp79_ = NULL;
-	GDestroyNotify _tmp80_ = NULL;
-	gint _tmp81_ = 0;
-	gint _tmp82_ = 0;
-	sqlite3_stmt* _tmp83_ = NULL;
-	time_t _tmp84_ = 0;
-	gint _tmp85_ = 0;
-	gint _tmp86_ = 0;
-	sqlite3_stmt* _tmp87_ = NULL;
-	PhotoRow* _tmp88_ = NULL;
-	PhotoID _tmp89_ = {0};
-	gint64 _tmp90_ = 0LL;
-	gint _tmp91_ = 0;
-	gint _tmp92_ = 0;
-	sqlite3_stmt* _tmp93_ = NULL;
-	gint _tmp94_ = 0;
-	gint _tmp95_ = 0;
-	PhotoRow* _tmp97_ = NULL;
-	time_t _tmp98_ = 0;
-	PhotoRow* _tmp99_ = NULL;
-	PhotoRow* _tmp100_ = NULL;
-	BackingPhotoRow* _tmp101_ = NULL;
-	Orientation _tmp102_ = 0;
+	gulong _tmp4_;
+	sqlite3_stmt* _tmp5_;
+	PhotoRow* _tmp6_;
+	BackingPhotoRow* _tmp7_;
+	Dimensions _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	PhotoRow* _tmp13_;
+	BackingPhotoRow* _tmp14_;
+	Dimensions _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
+	sqlite3_stmt* _tmp19_;
+	PhotoRow* _tmp20_;
+	BackingPhotoRow* _tmp21_;
+	gint64 _tmp22_;
+	gint _tmp23_;
+	gint _tmp24_;
+	sqlite3_stmt* _tmp25_;
+	PhotoRow* _tmp26_;
+	BackingPhotoRow* _tmp27_;
+	time_t _tmp28_;
+	gint _tmp29_;
+	gint _tmp30_;
+	sqlite3_stmt* _tmp31_;
+	PhotoRow* _tmp32_;
+	time_t _tmp33_;
+	gint _tmp34_;
+	gint _tmp35_;
+	sqlite3_stmt* _tmp36_;
+	PhotoRow* _tmp37_;
+	BackingPhotoRow* _tmp38_;
+	Orientation _tmp39_;
+	gint _tmp40_;
+	gint _tmp41_;
+	sqlite3_stmt* _tmp42_;
+	PhotoRow* _tmp43_;
+	BackingPhotoRow* _tmp44_;
+	Orientation _tmp45_;
+	gint _tmp46_;
+	gint _tmp47_;
+	sqlite3_stmt* _tmp48_;
+	PhotoRow* _tmp49_;
+	const gchar* _tmp50_;
+	gchar* _tmp51_;
+	GDestroyNotify _tmp52_;
+	gint _tmp53_;
+	gint _tmp54_;
+	sqlite3_stmt* _tmp55_;
+	PhotoRow* _tmp56_;
+	const gchar* _tmp57_;
+	gchar* _tmp58_;
+	GDestroyNotify _tmp59_;
+	gint _tmp60_;
+	gint _tmp61_;
+	sqlite3_stmt* _tmp62_;
+	PhotoRow* _tmp63_;
+	const gchar* _tmp64_;
+	gchar* _tmp65_;
+	GDestroyNotify _tmp66_;
+	gint _tmp67_;
+	gint _tmp68_;
+	sqlite3_stmt* _tmp69_;
+	PhotoRow* _tmp70_;
+	BackingPhotoRow* _tmp71_;
+	PhotoFileFormat _tmp72_;
+	gint _tmp73_;
+	gint _tmp74_;
+	gint _tmp75_;
+	sqlite3_stmt* _tmp76_;
+	PhotoRow* _tmp77_;
+	const gchar* _tmp78_;
+	gchar* _tmp79_;
+	GDestroyNotify _tmp80_;
+	gint _tmp81_;
+	gint _tmp82_;
+	sqlite3_stmt* _tmp83_;
+	time_t _tmp84_;
+	gint _tmp85_;
+	gint _tmp86_;
+	sqlite3_stmt* _tmp87_;
+	PhotoRow* _tmp88_;
+	PhotoID _tmp89_;
+	gint64 _tmp90_;
+	gint _tmp91_;
+	gint _tmp92_;
+	sqlite3_stmt* _tmp93_;
+	gint _tmp94_;
+	gint _tmp95_;
+	PhotoRow* _tmp97_;
+	time_t _tmp98_;
+	PhotoRow* _tmp99_;
+	PhotoRow* _tmp100_;
+	BackingPhotoRow* _tmp101_;
+	Orientation _tmp102_;
 	GError * _inner_error_ = NULL;
 #line 283 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
@@ -2367,7 +2367,7 @@ void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) {
 #line 324 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp95_ != SQLITE_DONE) {
 #line 2361 "PhotoTable.c"
-		gint _tmp96_ = 0;
+		gint _tmp96_;
 #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp96_ = res;
 #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -2422,59 +2422,59 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi
 	gboolean result = FALSE;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint64 _tmp5_ = 0LL;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	sqlite3_stmt* _tmp8_ = NULL;
-	glong _tmp9_ = 0L;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	sqlite3_stmt* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	GDestroyNotify _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	sqlite3_stmt* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	GDestroyNotify _tmp21_ = NULL;
-	gint _tmp22_ = 0;
-	gint _tmp23_ = 0;
-	sqlite3_stmt* _tmp24_ = NULL;
-	const gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	GDestroyNotify _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	gint _tmp29_ = 0;
-	sqlite3_stmt* _tmp30_ = NULL;
-	PhotoID _tmp31_ = {0};
-	gint64 _tmp32_ = 0LL;
-	gint _tmp33_ = 0;
-	gint _tmp34_ = 0;
-	sqlite3_stmt* _tmp35_ = NULL;
-	gint _tmp36_ = 0;
-	gint _tmp37_ = 0;
-	PhotoRow* _tmp40_ = NULL;
-	BackingPhotoRow* _tmp41_ = NULL;
-	gint64 _tmp42_ = 0LL;
-	PhotoRow* _tmp43_ = NULL;
-	BackingPhotoRow* _tmp44_ = NULL;
-	glong _tmp45_ = 0L;
-	PhotoRow* _tmp46_ = NULL;
-	const gchar* _tmp47_ = NULL;
-	gchar* _tmp48_ = NULL;
-	PhotoRow* _tmp49_ = NULL;
-	const gchar* _tmp50_ = NULL;
-	gchar* _tmp51_ = NULL;
-	PhotoRow* _tmp52_ = NULL;
-	const gchar* _tmp53_ = NULL;
-	gchar* _tmp54_ = NULL;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint64 _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	sqlite3_stmt* _tmp8_;
+	glong _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	const gchar* _tmp13_;
+	gchar* _tmp14_;
+	GDestroyNotify _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	sqlite3_stmt* _tmp18_;
+	const gchar* _tmp19_;
+	gchar* _tmp20_;
+	GDestroyNotify _tmp21_;
+	gint _tmp22_;
+	gint _tmp23_;
+	sqlite3_stmt* _tmp24_;
+	const gchar* _tmp25_;
+	gchar* _tmp26_;
+	GDestroyNotify _tmp27_;
+	gint _tmp28_;
+	gint _tmp29_;
+	sqlite3_stmt* _tmp30_;
+	PhotoID _tmp31_;
+	gint64 _tmp32_;
+	gint _tmp33_;
+	gint _tmp34_;
+	sqlite3_stmt* _tmp35_;
+	gint _tmp36_;
+	gint _tmp37_;
+	PhotoRow* _tmp40_;
+	BackingPhotoRow* _tmp41_;
+	gint64 _tmp42_;
+	PhotoRow* _tmp43_;
+	BackingPhotoRow* _tmp44_;
+	glong _tmp45_;
+	PhotoRow* _tmp46_;
+	const gchar* _tmp47_;
+	gchar* _tmp48_;
+	PhotoRow* _tmp49_;
+	const gchar* _tmp50_;
+	gchar* _tmp51_;
+	PhotoRow* _tmp52_;
+	const gchar* _tmp53_;
+	gchar* _tmp54_;
 #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"
@@ -2595,13 +2595,13 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi
 #line 353 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp37_ != SQLITE_DONE) {
 #line 2588 "PhotoTable.c"
-		gint _tmp38_ = 0;
+		gint _tmp38_;
 #line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp38_ = res;
 #line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp38_ != SQLITE_CONSTRAINT) {
 #line 2594 "PhotoTable.c"
-			gint _tmp39_ = 0;
+			gint _tmp39_;
 #line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp39_ = res;
 #line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -2674,8 +2674,8 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi
 
 static void photo_table_validate_orientation (PhotoTable* self, PhotoRow* row) {
 	gboolean _tmp0_ = FALSE;
-	PhotoRow* _tmp1_ = NULL;
-	Orientation _tmp2_ = 0;
+	PhotoRow* _tmp1_;
+	Orientation _tmp2_;
 #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"
@@ -2690,8 +2690,8 @@ static void photo_table_validate_orientation (PhotoTable* self, PhotoRow* row) {
 		_tmp0_ = TRUE;
 #line 2682 "PhotoTable.c"
 	} else {
-		PhotoRow* _tmp3_ = NULL;
-		Orientation _tmp4_ = 0;
+		PhotoRow* _tmp3_;
+		Orientation _tmp4_;
 #line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp3_ = row;
 #line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -2703,9 +2703,9 @@ static void photo_table_validate_orientation (PhotoTable* self, PhotoRow* row) {
 #line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp0_) {
 #line 2696 "PhotoTable.c"
-		PhotoRow* _tmp5_ = NULL;
-		PhotoID _tmp6_ = {0};
-		PhotoRow* _tmp7_ = NULL;
+		PhotoRow* _tmp5_;
+		PhotoID _tmp6_;
+		PhotoRow* _tmp7_;
 #line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp5_ = row;
 #line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -2725,133 +2725,133 @@ PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) {
 	PhotoRow* result = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	PhotoID _tmp5_ = {0};
-	gint64 _tmp6_ = 0LL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	PhotoID _tmp5_;
+	gint64 _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
 	PhotoRow* row = NULL;
-	PhotoRow* _tmp11_ = NULL;
-	PhotoRow* _tmp12_ = NULL;
-	PhotoID _tmp13_ = {0};
-	PhotoRow* _tmp14_ = NULL;
-	BackingPhotoRow* _tmp15_ = NULL;
-	sqlite3_stmt* _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	PhotoRow* _tmp19_ = NULL;
-	BackingPhotoRow* _tmp20_ = NULL;
-	sqlite3_stmt* _tmp21_ = NULL;
-	gint _tmp22_ = 0;
-	sqlite3_stmt* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	PhotoRow* _tmp25_ = NULL;
-	BackingPhotoRow* _tmp26_ = NULL;
-	sqlite3_stmt* _tmp27_ = NULL;
-	gint64 _tmp28_ = 0LL;
-	PhotoRow* _tmp29_ = NULL;
-	BackingPhotoRow* _tmp30_ = NULL;
-	sqlite3_stmt* _tmp31_ = NULL;
-	gint64 _tmp32_ = 0LL;
-	PhotoRow* _tmp33_ = NULL;
-	sqlite3_stmt* _tmp34_ = NULL;
-	gint64 _tmp35_ = 0LL;
-	PhotoRow* _tmp36_ = NULL;
-	sqlite3_stmt* _tmp37_ = NULL;
-	gint _tmp38_ = 0;
-	PhotoRow* _tmp39_ = NULL;
-	BackingPhotoRow* _tmp40_ = NULL;
-	sqlite3_stmt* _tmp41_ = NULL;
-	gint _tmp42_ = 0;
-	PhotoRow* _tmp43_ = NULL;
-	sqlite3_stmt* _tmp44_ = NULL;
-	gint64 _tmp45_ = 0LL;
-	PhotoRow* _tmp46_ = NULL;
-	sqlite3_stmt* _tmp47_ = NULL;
-	gint64 _tmp48_ = 0LL;
-	PhotoRow* _tmp49_ = NULL;
-	sqlite3_stmt* _tmp50_ = NULL;
-	const gchar* _tmp51_ = NULL;
-	GeeHashMap* _tmp52_ = NULL;
-	PhotoRow* _tmp53_ = NULL;
-	sqlite3_stmt* _tmp54_ = NULL;
-	const gchar* _tmp55_ = NULL;
-	gchar* _tmp56_ = NULL;
-	PhotoRow* _tmp57_ = NULL;
-	sqlite3_stmt* _tmp58_ = NULL;
-	const gchar* _tmp59_ = NULL;
-	gchar* _tmp60_ = NULL;
-	PhotoRow* _tmp61_ = NULL;
-	sqlite3_stmt* _tmp62_ = NULL;
-	const gchar* _tmp63_ = NULL;
-	gchar* _tmp64_ = NULL;
-	PhotoRow* _tmp65_ = NULL;
-	sqlite3_stmt* _tmp66_ = NULL;
-	gint64 _tmp67_ = 0LL;
-	PhotoRow* _tmp68_ = NULL;
-	sqlite3_stmt* _tmp69_ = NULL;
-	gint64 _tmp70_ = 0LL;
-	PhotoRow* _tmp71_ = NULL;
-	sqlite3_stmt* _tmp72_ = NULL;
-	gint _tmp73_ = 0;
-	Rating _tmp74_ = 0;
-	PhotoRow* _tmp75_ = NULL;
-	BackingPhotoRow* _tmp76_ = NULL;
-	sqlite3_stmt* _tmp77_ = NULL;
-	gint _tmp78_ = 0;
-	PhotoFileFormat _tmp79_ = 0;
-	PhotoRow* _tmp80_ = NULL;
-	sqlite3_stmt* _tmp81_ = NULL;
-	const gchar* _tmp82_ = NULL;
-	gchar* _tmp83_ = NULL;
-	PhotoRow* _tmp84_ = NULL;
-	sqlite3_stmt* _tmp85_ = NULL;
-	const gchar* _tmp86_ = NULL;
-	gchar* _tmp87_ = NULL;
-	PhotoRow* _tmp88_ = NULL;
-	sqlite3_stmt* _tmp89_ = NULL;
-	gint64 _tmp90_ = 0LL;
-	PhotoRow* _tmp91_ = NULL;
-	sqlite3_stmt* _tmp92_ = NULL;
-	gint64 _tmp93_ = 0LL;
-	PhotoRow* _tmp94_ = NULL;
-	sqlite3_stmt* _tmp95_ = NULL;
-	gint _tmp96_ = 0;
+	PhotoRow* _tmp11_;
+	PhotoRow* _tmp12_;
+	PhotoID _tmp13_;
+	PhotoRow* _tmp14_;
+	BackingPhotoRow* _tmp15_;
+	sqlite3_stmt* _tmp16_;
+	const gchar* _tmp17_;
+	gchar* _tmp18_;
+	PhotoRow* _tmp19_;
+	BackingPhotoRow* _tmp20_;
+	sqlite3_stmt* _tmp21_;
+	gint _tmp22_;
+	sqlite3_stmt* _tmp23_;
+	gint _tmp24_;
+	PhotoRow* _tmp25_;
+	BackingPhotoRow* _tmp26_;
+	sqlite3_stmt* _tmp27_;
+	gint64 _tmp28_;
+	PhotoRow* _tmp29_;
+	BackingPhotoRow* _tmp30_;
+	sqlite3_stmt* _tmp31_;
+	gint64 _tmp32_;
+	PhotoRow* _tmp33_;
+	sqlite3_stmt* _tmp34_;
+	gint64 _tmp35_;
+	PhotoRow* _tmp36_;
+	sqlite3_stmt* _tmp37_;
+	gint _tmp38_;
+	PhotoRow* _tmp39_;
+	BackingPhotoRow* _tmp40_;
+	sqlite3_stmt* _tmp41_;
+	gint _tmp42_;
+	PhotoRow* _tmp43_;
+	sqlite3_stmt* _tmp44_;
+	gint64 _tmp45_;
+	PhotoRow* _tmp46_;
+	sqlite3_stmt* _tmp47_;
+	gint64 _tmp48_;
+	PhotoRow* _tmp49_;
+	sqlite3_stmt* _tmp50_;
+	const gchar* _tmp51_;
+	GeeHashMap* _tmp52_;
+	PhotoRow* _tmp53_;
+	sqlite3_stmt* _tmp54_;
+	const gchar* _tmp55_;
+	gchar* _tmp56_;
+	PhotoRow* _tmp57_;
+	sqlite3_stmt* _tmp58_;
+	const gchar* _tmp59_;
+	gchar* _tmp60_;
+	PhotoRow* _tmp61_;
+	sqlite3_stmt* _tmp62_;
+	const gchar* _tmp63_;
+	gchar* _tmp64_;
+	PhotoRow* _tmp65_;
+	sqlite3_stmt* _tmp66_;
+	gint64 _tmp67_;
+	PhotoRow* _tmp68_;
+	sqlite3_stmt* _tmp69_;
+	gint64 _tmp70_;
+	PhotoRow* _tmp71_;
+	sqlite3_stmt* _tmp72_;
+	gint _tmp73_;
+	Rating _tmp74_;
+	PhotoRow* _tmp75_;
+	BackingPhotoRow* _tmp76_;
+	sqlite3_stmt* _tmp77_;
+	gint _tmp78_;
+	PhotoFileFormat _tmp79_;
+	PhotoRow* _tmp80_;
+	sqlite3_stmt* _tmp81_;
+	const gchar* _tmp82_;
+	gchar* _tmp83_;
+	PhotoRow* _tmp84_;
+	sqlite3_stmt* _tmp85_;
+	const gchar* _tmp86_;
+	gchar* _tmp87_;
+	PhotoRow* _tmp88_;
+	sqlite3_stmt* _tmp89_;
+	gint64 _tmp90_;
+	PhotoRow* _tmp91_;
+	sqlite3_stmt* _tmp92_;
+	gint64 _tmp93_;
+	PhotoRow* _tmp94_;
+	sqlite3_stmt* _tmp95_;
+	gint _tmp96_;
 	RawDeveloper _tmp97_ = 0;
-	sqlite3_stmt* _tmp98_ = NULL;
-	const gchar* _tmp99_ = NULL;
-	PhotoRow* _tmp103_ = NULL;
-	PhotoRow* _tmp104_ = NULL;
-	BackingPhotoID* _tmp105_ = NULL;
-	gint _tmp105__length1 = 0;
-	sqlite3_stmt* _tmp106_ = NULL;
-	gint64 _tmp107_ = 0LL;
+	sqlite3_stmt* _tmp98_;
+	const gchar* _tmp99_;
+	PhotoRow* _tmp103_;
+	PhotoRow* _tmp104_;
+	BackingPhotoID* _tmp105_;
+	gint _tmp105__length1;
+	sqlite3_stmt* _tmp106_;
+	gint64 _tmp107_;
 	BackingPhotoID _tmp108_ = {0};
-	BackingPhotoID _tmp109_ = {0};
-	PhotoRow* _tmp110_ = NULL;
-	BackingPhotoID* _tmp111_ = NULL;
-	gint _tmp111__length1 = 0;
-	sqlite3_stmt* _tmp112_ = NULL;
-	gint64 _tmp113_ = 0LL;
+	BackingPhotoID _tmp109_;
+	PhotoRow* _tmp110_;
+	BackingPhotoID* _tmp111_;
+	gint _tmp111__length1;
+	sqlite3_stmt* _tmp112_;
+	gint64 _tmp113_;
 	BackingPhotoID _tmp114_ = {0};
-	BackingPhotoID _tmp115_ = {0};
-	PhotoRow* _tmp116_ = NULL;
-	BackingPhotoID* _tmp117_ = NULL;
-	gint _tmp117__length1 = 0;
-	sqlite3_stmt* _tmp118_ = NULL;
-	gint64 _tmp119_ = 0LL;
+	BackingPhotoID _tmp115_;
+	PhotoRow* _tmp116_;
+	BackingPhotoID* _tmp117_;
+	gint _tmp117__length1;
+	sqlite3_stmt* _tmp118_;
+	gint64 _tmp119_;
 	BackingPhotoID _tmp120_ = {0};
-	BackingPhotoID _tmp121_ = {0};
-	PhotoRow* _tmp122_ = NULL;
-	sqlite3_stmt* _tmp123_ = NULL;
-	const gchar* _tmp124_ = NULL;
-	gchar* _tmp125_ = NULL;
+	BackingPhotoID _tmp121_;
+	PhotoRow* _tmp122_;
+	sqlite3_stmt* _tmp123_;
+	const gchar* _tmp124_;
+	gchar* _tmp125_;
 #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"
@@ -3142,9 +3142,9 @@ PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) {
 #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp99_ != NULL) {
 #line 3132 "PhotoTable.c"
-		sqlite3_stmt* _tmp100_ = NULL;
-		const gchar* _tmp101_ = NULL;
-		RawDeveloper _tmp102_ = 0;
+		sqlite3_stmt* _tmp100_;
+		const gchar* _tmp101_;
+		RawDeveloper _tmp102_;
 #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp100_ = stmt;
 #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -3237,12 +3237,12 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) {
 	GeeArrayList* result = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
 	GeeArrayList* all = NULL;
-	GeeArrayList* _tmp4_ = 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"
@@ -3270,129 +3270,129 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) {
 #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	while (TRUE) {
 #line 3256 "PhotoTable.c"
-		sqlite3_stmt* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
+		sqlite3_stmt* _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
 		PhotoRow* row = NULL;
-		PhotoRow* _tmp8_ = NULL;
-		PhotoRow* _tmp9_ = NULL;
-		sqlite3_stmt* _tmp10_ = NULL;
-		gint64 _tmp11_ = 0LL;
-		PhotoRow* _tmp12_ = NULL;
-		BackingPhotoRow* _tmp13_ = NULL;
-		sqlite3_stmt* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-		PhotoRow* _tmp17_ = NULL;
-		BackingPhotoRow* _tmp18_ = NULL;
-		sqlite3_stmt* _tmp19_ = NULL;
-		gint _tmp20_ = 0;
-		sqlite3_stmt* _tmp21_ = NULL;
-		gint _tmp22_ = 0;
-		PhotoRow* _tmp23_ = NULL;
-		BackingPhotoRow* _tmp24_ = NULL;
-		sqlite3_stmt* _tmp25_ = NULL;
-		gint64 _tmp26_ = 0LL;
-		PhotoRow* _tmp27_ = NULL;
-		BackingPhotoRow* _tmp28_ = NULL;
-		sqlite3_stmt* _tmp29_ = NULL;
-		gint64 _tmp30_ = 0LL;
-		PhotoRow* _tmp31_ = NULL;
-		sqlite3_stmt* _tmp32_ = NULL;
-		gint64 _tmp33_ = 0LL;
-		PhotoRow* _tmp34_ = NULL;
-		sqlite3_stmt* _tmp35_ = NULL;
-		gint _tmp36_ = 0;
-		PhotoRow* _tmp37_ = NULL;
-		BackingPhotoRow* _tmp38_ = NULL;
-		sqlite3_stmt* _tmp39_ = NULL;
-		gint _tmp40_ = 0;
-		PhotoRow* _tmp41_ = NULL;
-		sqlite3_stmt* _tmp42_ = NULL;
-		gint64 _tmp43_ = 0LL;
-		PhotoRow* _tmp44_ = NULL;
-		sqlite3_stmt* _tmp45_ = NULL;
-		gint64 _tmp46_ = 0LL;
-		PhotoRow* _tmp47_ = NULL;
-		sqlite3_stmt* _tmp48_ = NULL;
-		const gchar* _tmp49_ = NULL;
-		GeeHashMap* _tmp50_ = NULL;
-		PhotoRow* _tmp51_ = NULL;
-		sqlite3_stmt* _tmp52_ = NULL;
-		const gchar* _tmp53_ = NULL;
-		gchar* _tmp54_ = NULL;
-		PhotoRow* _tmp55_ = NULL;
-		sqlite3_stmt* _tmp56_ = NULL;
-		const gchar* _tmp57_ = NULL;
-		gchar* _tmp58_ = NULL;
-		PhotoRow* _tmp59_ = NULL;
-		sqlite3_stmt* _tmp60_ = NULL;
-		const gchar* _tmp61_ = NULL;
-		gchar* _tmp62_ = NULL;
-		PhotoRow* _tmp63_ = NULL;
-		sqlite3_stmt* _tmp64_ = NULL;
-		gint64 _tmp65_ = 0LL;
-		PhotoRow* _tmp66_ = NULL;
-		sqlite3_stmt* _tmp67_ = NULL;
-		gint64 _tmp68_ = 0LL;
-		PhotoRow* _tmp69_ = NULL;
-		sqlite3_stmt* _tmp70_ = NULL;
-		gint _tmp71_ = 0;
-		Rating _tmp72_ = 0;
-		PhotoRow* _tmp73_ = NULL;
-		BackingPhotoRow* _tmp74_ = NULL;
-		sqlite3_stmt* _tmp75_ = NULL;
-		gint _tmp76_ = 0;
-		PhotoFileFormat _tmp77_ = 0;
-		PhotoRow* _tmp78_ = NULL;
-		sqlite3_stmt* _tmp79_ = NULL;
-		const gchar* _tmp80_ = NULL;
-		gchar* _tmp81_ = NULL;
-		PhotoRow* _tmp82_ = NULL;
-		sqlite3_stmt* _tmp83_ = NULL;
-		const gchar* _tmp84_ = NULL;
-		gchar* _tmp85_ = NULL;
-		PhotoRow* _tmp86_ = NULL;
-		sqlite3_stmt* _tmp87_ = NULL;
-		gint64 _tmp88_ = 0LL;
-		PhotoRow* _tmp89_ = NULL;
-		sqlite3_stmt* _tmp90_ = NULL;
-		gint64 _tmp91_ = 0LL;
-		PhotoRow* _tmp92_ = NULL;
-		sqlite3_stmt* _tmp93_ = NULL;
-		gint _tmp94_ = 0;
+		PhotoRow* _tmp8_;
+		PhotoRow* _tmp9_;
+		sqlite3_stmt* _tmp10_;
+		gint64 _tmp11_;
+		PhotoRow* _tmp12_;
+		BackingPhotoRow* _tmp13_;
+		sqlite3_stmt* _tmp14_;
+		const gchar* _tmp15_;
+		gchar* _tmp16_;
+		PhotoRow* _tmp17_;
+		BackingPhotoRow* _tmp18_;
+		sqlite3_stmt* _tmp19_;
+		gint _tmp20_;
+		sqlite3_stmt* _tmp21_;
+		gint _tmp22_;
+		PhotoRow* _tmp23_;
+		BackingPhotoRow* _tmp24_;
+		sqlite3_stmt* _tmp25_;
+		gint64 _tmp26_;
+		PhotoRow* _tmp27_;
+		BackingPhotoRow* _tmp28_;
+		sqlite3_stmt* _tmp29_;
+		gint64 _tmp30_;
+		PhotoRow* _tmp31_;
+		sqlite3_stmt* _tmp32_;
+		gint64 _tmp33_;
+		PhotoRow* _tmp34_;
+		sqlite3_stmt* _tmp35_;
+		gint _tmp36_;
+		PhotoRow* _tmp37_;
+		BackingPhotoRow* _tmp38_;
+		sqlite3_stmt* _tmp39_;
+		gint _tmp40_;
+		PhotoRow* _tmp41_;
+		sqlite3_stmt* _tmp42_;
+		gint64 _tmp43_;
+		PhotoRow* _tmp44_;
+		sqlite3_stmt* _tmp45_;
+		gint64 _tmp46_;
+		PhotoRow* _tmp47_;
+		sqlite3_stmt* _tmp48_;
+		const gchar* _tmp49_;
+		GeeHashMap* _tmp50_;
+		PhotoRow* _tmp51_;
+		sqlite3_stmt* _tmp52_;
+		const gchar* _tmp53_;
+		gchar* _tmp54_;
+		PhotoRow* _tmp55_;
+		sqlite3_stmt* _tmp56_;
+		const gchar* _tmp57_;
+		gchar* _tmp58_;
+		PhotoRow* _tmp59_;
+		sqlite3_stmt* _tmp60_;
+		const gchar* _tmp61_;
+		gchar* _tmp62_;
+		PhotoRow* _tmp63_;
+		sqlite3_stmt* _tmp64_;
+		gint64 _tmp65_;
+		PhotoRow* _tmp66_;
+		sqlite3_stmt* _tmp67_;
+		gint64 _tmp68_;
+		PhotoRow* _tmp69_;
+		sqlite3_stmt* _tmp70_;
+		gint _tmp71_;
+		Rating _tmp72_;
+		PhotoRow* _tmp73_;
+		BackingPhotoRow* _tmp74_;
+		sqlite3_stmt* _tmp75_;
+		gint _tmp76_;
+		PhotoFileFormat _tmp77_;
+		PhotoRow* _tmp78_;
+		sqlite3_stmt* _tmp79_;
+		const gchar* _tmp80_;
+		gchar* _tmp81_;
+		PhotoRow* _tmp82_;
+		sqlite3_stmt* _tmp83_;
+		const gchar* _tmp84_;
+		gchar* _tmp85_;
+		PhotoRow* _tmp86_;
+		sqlite3_stmt* _tmp87_;
+		gint64 _tmp88_;
+		PhotoRow* _tmp89_;
+		sqlite3_stmt* _tmp90_;
+		gint64 _tmp91_;
+		PhotoRow* _tmp92_;
+		sqlite3_stmt* _tmp93_;
+		gint _tmp94_;
 		RawDeveloper _tmp95_ = 0;
-		sqlite3_stmt* _tmp96_ = NULL;
-		const gchar* _tmp97_ = NULL;
-		PhotoRow* _tmp101_ = NULL;
-		PhotoRow* _tmp102_ = NULL;
-		BackingPhotoID* _tmp103_ = NULL;
-		gint _tmp103__length1 = 0;
-		sqlite3_stmt* _tmp104_ = NULL;
-		gint64 _tmp105_ = 0LL;
+		sqlite3_stmt* _tmp96_;
+		const gchar* _tmp97_;
+		PhotoRow* _tmp101_;
+		PhotoRow* _tmp102_;
+		BackingPhotoID* _tmp103_;
+		gint _tmp103__length1;
+		sqlite3_stmt* _tmp104_;
+		gint64 _tmp105_;
 		BackingPhotoID _tmp106_ = {0};
-		BackingPhotoID _tmp107_ = {0};
-		PhotoRow* _tmp108_ = NULL;
-		BackingPhotoID* _tmp109_ = NULL;
-		gint _tmp109__length1 = 0;
-		sqlite3_stmt* _tmp110_ = NULL;
-		gint64 _tmp111_ = 0LL;
+		BackingPhotoID _tmp107_;
+		PhotoRow* _tmp108_;
+		BackingPhotoID* _tmp109_;
+		gint _tmp109__length1;
+		sqlite3_stmt* _tmp110_;
+		gint64 _tmp111_;
 		BackingPhotoID _tmp112_ = {0};
-		BackingPhotoID _tmp113_ = {0};
-		PhotoRow* _tmp114_ = NULL;
-		BackingPhotoID* _tmp115_ = NULL;
-		gint _tmp115__length1 = 0;
-		sqlite3_stmt* _tmp116_ = NULL;
-		gint64 _tmp117_ = 0LL;
+		BackingPhotoID _tmp113_;
+		PhotoRow* _tmp114_;
+		BackingPhotoID* _tmp115_;
+		gint _tmp115__length1;
+		sqlite3_stmt* _tmp116_;
+		gint64 _tmp117_;
 		BackingPhotoID _tmp118_ = {0};
-		BackingPhotoID _tmp119_ = {0};
-		PhotoRow* _tmp120_ = NULL;
-		sqlite3_stmt* _tmp121_ = NULL;
-		const gchar* _tmp122_ = NULL;
-		gchar* _tmp123_ = NULL;
-		PhotoRow* _tmp124_ = NULL;
-		GeeArrayList* _tmp125_ = NULL;
-		PhotoRow* _tmp126_ = NULL;
+		BackingPhotoID _tmp119_;
+		PhotoRow* _tmp120_;
+		sqlite3_stmt* _tmp121_;
+		const gchar* _tmp122_;
+		gchar* _tmp123_;
+		PhotoRow* _tmp124_;
+		GeeArrayList* _tmp125_;
+		PhotoRow* _tmp126_;
 #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp5_ = stmt;
 #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -3650,9 +3650,9 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) {
 #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp97_ != NULL) {
 #line 3636 "PhotoTable.c"
-			sqlite3_stmt* _tmp98_ = NULL;
-			const gchar* _tmp99_ = NULL;
-			RawDeveloper _tmp100_ = 0;
+			sqlite3_stmt* _tmp98_;
+			const gchar* _tmp99_;
+			RawDeveloper _tmp100_;
 #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp98_ = stmt;
 #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -3757,170 +3757,170 @@ 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) {
 	PhotoRow* original = NULL;
-	PhotoID _tmp0_ = {0};
-	PhotoRow* _tmp1_ = NULL;
+	PhotoID _tmp0_;
+	PhotoRow* _tmp1_;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp2_ = NULL;
+	sqlite3* _tmp2_;
 	sqlite3_stmt* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	sqlite3_stmt* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	GDestroyNotify _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	sqlite3_stmt* _tmp12_ = NULL;
-	PhotoRow* _tmp13_ = NULL;
-	BackingPhotoRow* _tmp14_ = NULL;
-	Dimensions _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	sqlite3_stmt* _tmp19_ = NULL;
-	PhotoRow* _tmp20_ = NULL;
-	BackingPhotoRow* _tmp21_ = NULL;
-	Dimensions _tmp22_ = {0};
-	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
-	gint _tmp25_ = 0;
-	sqlite3_stmt* _tmp26_ = NULL;
-	PhotoRow* _tmp27_ = NULL;
-	BackingPhotoRow* _tmp28_ = NULL;
-	gint64 _tmp29_ = 0LL;
-	gint _tmp30_ = 0;
-	gint _tmp31_ = 0;
-	sqlite3_stmt* _tmp32_ = NULL;
-	PhotoRow* _tmp33_ = NULL;
-	BackingPhotoRow* _tmp34_ = NULL;
-	time_t _tmp35_ = 0;
-	gint _tmp36_ = 0;
-	gint _tmp37_ = 0;
-	sqlite3_stmt* _tmp38_ = NULL;
-	PhotoRow* _tmp39_ = NULL;
-	time_t _tmp40_ = 0;
-	gint _tmp41_ = 0;
-	gint _tmp42_ = 0;
-	sqlite3_stmt* _tmp43_ = NULL;
-	PhotoRow* _tmp44_ = NULL;
-	Orientation _tmp45_ = 0;
-	gint _tmp46_ = 0;
-	gint _tmp47_ = 0;
-	sqlite3_stmt* _tmp48_ = NULL;
-	PhotoRow* _tmp49_ = NULL;
-	BackingPhotoRow* _tmp50_ = NULL;
-	Orientation _tmp51_ = 0;
-	gint _tmp52_ = 0;
-	gint _tmp53_ = 0;
-	sqlite3_stmt* _tmp54_ = NULL;
-	PhotoRow* _tmp55_ = NULL;
-	ImportID _tmp56_ = {0};
-	gint64 _tmp57_ = 0LL;
-	gint _tmp58_ = 0;
-	gint _tmp59_ = 0;
-	sqlite3_stmt* _tmp60_ = NULL;
-	PhotoRow* _tmp61_ = NULL;
-	EventID _tmp62_ = {0};
-	gint64 _tmp63_ = 0LL;
-	gint _tmp64_ = 0;
-	gint _tmp65_ = 0;
-	sqlite3_stmt* _tmp66_ = NULL;
-	PhotoRow* _tmp67_ = NULL;
-	GeeHashMap* _tmp68_ = NULL;
-	gchar* _tmp69_ = NULL;
-	GDestroyNotify _tmp70_ = NULL;
-	gint _tmp71_ = 0;
-	gint _tmp72_ = 0;
-	sqlite3_stmt* _tmp73_ = NULL;
-	PhotoRow* _tmp74_ = NULL;
-	const gchar* _tmp75_ = NULL;
-	gchar* _tmp76_ = NULL;
-	GDestroyNotify _tmp77_ = NULL;
-	gint _tmp78_ = 0;
-	gint _tmp79_ = 0;
-	sqlite3_stmt* _tmp80_ = NULL;
-	PhotoRow* _tmp81_ = NULL;
-	const gchar* _tmp82_ = NULL;
-	gchar* _tmp83_ = NULL;
-	GDestroyNotify _tmp84_ = NULL;
-	gint _tmp85_ = 0;
-	gint _tmp86_ = 0;
-	sqlite3_stmt* _tmp87_ = NULL;
-	PhotoRow* _tmp88_ = NULL;
-	const gchar* _tmp89_ = NULL;
-	gchar* _tmp90_ = NULL;
-	GDestroyNotify _tmp91_ = NULL;
-	gint _tmp92_ = 0;
-	gint _tmp93_ = 0;
-	sqlite3_stmt* _tmp94_ = NULL;
-	gulong _tmp95_ = 0UL;
-	gint _tmp96_ = 0;
-	gint _tmp97_ = 0;
-	sqlite3_stmt* _tmp98_ = NULL;
-	PhotoRow* _tmp99_ = NULL;
-	guint64 _tmp100_ = 0ULL;
-	gint _tmp101_ = 0;
-	gint _tmp102_ = 0;
-	sqlite3_stmt* _tmp103_ = NULL;
-	PhotoRow* _tmp104_ = NULL;
-	Rating _tmp105_ = 0;
-	gint _tmp106_ = 0;
-	gint _tmp107_ = 0;
-	gint _tmp108_ = 0;
-	sqlite3_stmt* _tmp109_ = NULL;
-	PhotoRow* _tmp110_ = NULL;
-	BackingPhotoRow* _tmp111_ = NULL;
-	PhotoFileFormat _tmp112_ = 0;
-	gint _tmp113_ = 0;
-	gint _tmp114_ = 0;
-	gint _tmp115_ = 0;
-	sqlite3_stmt* _tmp116_ = NULL;
-	PhotoRow* _tmp117_ = NULL;
-	const gchar* _tmp118_ = NULL;
-	gchar* _tmp119_ = NULL;
-	GDestroyNotify _tmp120_ = NULL;
-	gint _tmp121_ = 0;
-	gint _tmp122_ = 0;
-	sqlite3_stmt* _tmp123_ = NULL;
-	BackingPhotoID _tmp124_ = {0};
-	gint64 _tmp125_ = 0LL;
-	gint _tmp126_ = 0;
-	gint _tmp127_ = 0;
-	sqlite3_stmt* _tmp128_ = NULL;
-	PhotoRow* _tmp129_ = NULL;
-	RawDeveloper _tmp130_ = 0;
-	gchar* _tmp131_ = NULL;
-	GDestroyNotify _tmp132_ = NULL;
-	gint _tmp133_ = 0;
-	gint _tmp134_ = 0;
-	sqlite3_stmt* _tmp135_ = NULL;
-	BackingPhotoID _tmp136_ = {0};
-	gint64 _tmp137_ = 0LL;
-	gint _tmp138_ = 0;
-	gint _tmp139_ = 0;
-	sqlite3_stmt* _tmp140_ = NULL;
-	BackingPhotoID _tmp141_ = {0};
-	gint64 _tmp142_ = 0LL;
-	gint _tmp143_ = 0;
-	gint _tmp144_ = 0;
-	sqlite3_stmt* _tmp145_ = NULL;
-	BackingPhotoID _tmp146_ = {0};
-	gint64 _tmp147_ = 0LL;
-	gint _tmp148_ = 0;
-	gint _tmp149_ = 0;
-	sqlite3_stmt* _tmp150_ = NULL;
-	PhotoRow* _tmp151_ = NULL;
-	const gchar* _tmp152_ = NULL;
-	gchar* _tmp153_ = NULL;
-	GDestroyNotify _tmp154_ = NULL;
-	gint _tmp155_ = 0;
-	gint _tmp156_ = 0;
-	sqlite3_stmt* _tmp157_ = NULL;
-	gint _tmp158_ = 0;
-	gint _tmp159_ = 0;
-	sqlite3* _tmp163_ = NULL;
-	gint64 _tmp164_ = 0LL;
+	gint _tmp4_;
+	gint _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	const gchar* _tmp7_;
+	gchar* _tmp8_;
+	GDestroyNotify _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	PhotoRow* _tmp13_;
+	BackingPhotoRow* _tmp14_;
+	Dimensions _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
+	sqlite3_stmt* _tmp19_;
+	PhotoRow* _tmp20_;
+	BackingPhotoRow* _tmp21_;
+	Dimensions _tmp22_;
+	gint _tmp23_;
+	gint _tmp24_;
+	gint _tmp25_;
+	sqlite3_stmt* _tmp26_;
+	PhotoRow* _tmp27_;
+	BackingPhotoRow* _tmp28_;
+	gint64 _tmp29_;
+	gint _tmp30_;
+	gint _tmp31_;
+	sqlite3_stmt* _tmp32_;
+	PhotoRow* _tmp33_;
+	BackingPhotoRow* _tmp34_;
+	time_t _tmp35_;
+	gint _tmp36_;
+	gint _tmp37_;
+	sqlite3_stmt* _tmp38_;
+	PhotoRow* _tmp39_;
+	time_t _tmp40_;
+	gint _tmp41_;
+	gint _tmp42_;
+	sqlite3_stmt* _tmp43_;
+	PhotoRow* _tmp44_;
+	Orientation _tmp45_;
+	gint _tmp46_;
+	gint _tmp47_;
+	sqlite3_stmt* _tmp48_;
+	PhotoRow* _tmp49_;
+	BackingPhotoRow* _tmp50_;
+	Orientation _tmp51_;
+	gint _tmp52_;
+	gint _tmp53_;
+	sqlite3_stmt* _tmp54_;
+	PhotoRow* _tmp55_;
+	ImportID _tmp56_;
+	gint64 _tmp57_;
+	gint _tmp58_;
+	gint _tmp59_;
+	sqlite3_stmt* _tmp60_;
+	PhotoRow* _tmp61_;
+	EventID _tmp62_;
+	gint64 _tmp63_;
+	gint _tmp64_;
+	gint _tmp65_;
+	sqlite3_stmt* _tmp66_;
+	PhotoRow* _tmp67_;
+	GeeHashMap* _tmp68_;
+	gchar* _tmp69_;
+	GDestroyNotify _tmp70_;
+	gint _tmp71_;
+	gint _tmp72_;
+	sqlite3_stmt* _tmp73_;
+	PhotoRow* _tmp74_;
+	const gchar* _tmp75_;
+	gchar* _tmp76_;
+	GDestroyNotify _tmp77_;
+	gint _tmp78_;
+	gint _tmp79_;
+	sqlite3_stmt* _tmp80_;
+	PhotoRow* _tmp81_;
+	const gchar* _tmp82_;
+	gchar* _tmp83_;
+	GDestroyNotify _tmp84_;
+	gint _tmp85_;
+	gint _tmp86_;
+	sqlite3_stmt* _tmp87_;
+	PhotoRow* _tmp88_;
+	const gchar* _tmp89_;
+	gchar* _tmp90_;
+	GDestroyNotify _tmp91_;
+	gint _tmp92_;
+	gint _tmp93_;
+	sqlite3_stmt* _tmp94_;
+	gulong _tmp95_;
+	gint _tmp96_;
+	gint _tmp97_;
+	sqlite3_stmt* _tmp98_;
+	PhotoRow* _tmp99_;
+	guint64 _tmp100_;
+	gint _tmp101_;
+	gint _tmp102_;
+	sqlite3_stmt* _tmp103_;
+	PhotoRow* _tmp104_;
+	Rating _tmp105_;
+	gint _tmp106_;
+	gint _tmp107_;
+	gint _tmp108_;
+	sqlite3_stmt* _tmp109_;
+	PhotoRow* _tmp110_;
+	BackingPhotoRow* _tmp111_;
+	PhotoFileFormat _tmp112_;
+	gint _tmp113_;
+	gint _tmp114_;
+	gint _tmp115_;
+	sqlite3_stmt* _tmp116_;
+	PhotoRow* _tmp117_;
+	const gchar* _tmp118_;
+	gchar* _tmp119_;
+	GDestroyNotify _tmp120_;
+	gint _tmp121_;
+	gint _tmp122_;
+	sqlite3_stmt* _tmp123_;
+	BackingPhotoID _tmp124_;
+	gint64 _tmp125_;
+	gint _tmp126_;
+	gint _tmp127_;
+	sqlite3_stmt* _tmp128_;
+	PhotoRow* _tmp129_;
+	RawDeveloper _tmp130_;
+	gchar* _tmp131_;
+	GDestroyNotify _tmp132_;
+	gint _tmp133_;
+	gint _tmp134_;
+	sqlite3_stmt* _tmp135_;
+	BackingPhotoID _tmp136_;
+	gint64 _tmp137_;
+	gint _tmp138_;
+	gint _tmp139_;
+	sqlite3_stmt* _tmp140_;
+	BackingPhotoID _tmp141_;
+	gint64 _tmp142_;
+	gint _tmp143_;
+	gint _tmp144_;
+	sqlite3_stmt* _tmp145_;
+	BackingPhotoID _tmp146_;
+	gint64 _tmp147_;
+	gint _tmp148_;
+	gint _tmp149_;
+	sqlite3_stmt* _tmp150_;
+	PhotoRow* _tmp151_;
+	const gchar* _tmp152_;
+	gchar* _tmp153_;
+	GDestroyNotify _tmp154_;
+	gint _tmp155_;
+	gint _tmp156_;
+	sqlite3_stmt* _tmp157_;
+	gint _tmp158_;
+	gint _tmp159_;
+	sqlite3* _tmp163_;
+	gint64 _tmp164_;
 	PhotoID _tmp165_ = {0};
 #line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
@@ -4373,14 +4373,14 @@ void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* ne
 #line 562 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp159_ != SQLITE_DONE) {
 #line 4355 "PhotoTable.c"
-		gint _tmp160_ = 0;
+		gint _tmp160_;
 		PhotoID _tmp162_ = {0};
 #line 563 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp160_ = res;
 #line 563 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp160_ != SQLITE_CONSTRAINT) {
 #line 4362 "PhotoTable.c"
-			gint _tmp161_ = 0;
+			gint _tmp161_;
 #line 564 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp161_ = res;
 #line 564 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -4420,10 +4420,10 @@ void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* ne
 gboolean photo_table_set_title (PhotoTable* self, PhotoID* photo_id, const gchar* new_title) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PhotoID _tmp3_ = {0};
-	gint64 _tmp4_ = 0LL;
-	gboolean _tmp5_ = FALSE;
+	const gchar* _tmp1_;
+	PhotoID _tmp3_;
+	gint64 _tmp4_;
+	gboolean _tmp5_;
 #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"
@@ -4433,7 +4433,7 @@ gboolean photo_table_set_title (PhotoTable* self, PhotoID* photo_id, const gchar
 #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_ != NULL) {
 #line 4415 "PhotoTable.c"
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = new_title;
 #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -4461,10 +4461,10 @@ gboolean photo_table_set_title (PhotoTable* self, PhotoID* photo_id, const gchar
 gboolean photo_table_set_comment (PhotoTable* self, PhotoID* photo_id, const gchar* new_comment) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PhotoID _tmp3_ = {0};
-	gint64 _tmp4_ = 0LL;
-	gboolean _tmp5_ = FALSE;
+	const gchar* _tmp1_;
+	PhotoID _tmp3_;
+	gint64 _tmp4_;
+	gboolean _tmp5_;
 #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"
@@ -4474,7 +4474,7 @@ gboolean photo_table_set_comment (PhotoTable* self, PhotoID* photo_id, const gch
 #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_ != NULL) {
 #line 4456 "PhotoTable.c"
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = new_comment;
 #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -4500,9 +4500,9 @@ gboolean photo_table_set_comment (PhotoTable* self, PhotoID* photo_id, const gch
 
 
 void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* filepath, GError** error) {
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	const gchar* _tmp2_ = NULL;
+	PhotoID _tmp0_;
+	gint64 _tmp1_;
+	const gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 580 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
@@ -4541,9 +4541,9 @@ void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar*
 
 
 void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t timestamp, GError** error) {
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	time_t _tmp2_ = 0;
+	PhotoID _tmp0_;
+	gint64 _tmp1_;
+	time_t _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 584 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
@@ -4581,10 +4581,10 @@ void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t t
 
 gboolean photo_table_set_exposure_time (PhotoTable* self, PhotoID* photo_id, time_t time) {
 	gboolean result = FALSE;
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	time_t _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	PhotoID _tmp0_;
+	gint64 _tmp1_;
+	time_t _tmp2_;
+	gboolean _tmp3_;
 #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"
@@ -4606,10 +4606,10 @@ gboolean photo_table_set_exposure_time (PhotoTable* self, PhotoID* photo_id, tim
 
 
 void photo_table_set_import_id (PhotoTable* self, PhotoID* photo_id, ImportID* import_id, GError** error) {
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	ImportID _tmp2_ = {0};
-	gint64 _tmp3_ = 0LL;
+	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));
@@ -4653,19 +4653,19 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) {
 	gboolean result = FALSE;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	GDestroyNotify _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	sqlite3_stmt* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	GFile* _tmp5_;
+	gchar* _tmp6_;
+	GDestroyNotify _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	sqlite3_stmt* _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
 #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"
@@ -4711,7 +4711,7 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) {
 #line 605 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp12_ != SQLITE_DONE) {
 #line 4693 "PhotoTable.c"
-		gint _tmp13_ = 0;
+		gint _tmp13_;
 #line 606 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp13_ = res;
 #line 606 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -4735,8 +4735,8 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) {
 
 
 void photo_table_remove (PhotoTable* self, PhotoID* photo_id, GError** error) {
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
+	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));
@@ -4774,12 +4774,12 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) {
 	GeeArrayList* result = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
 	GeeArrayList* photo_ids = NULL;
-	GeeArrayList* _tmp4_ = 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"
@@ -4808,12 +4808,12 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) {
 #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		while (TRUE) {
 #line 4790 "PhotoTable.c"
-			sqlite3_stmt* _tmp6_ = NULL;
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
-			GeeArrayList* _tmp11_ = NULL;
-			sqlite3_stmt* _tmp12_ = NULL;
-			gint64 _tmp13_ = 0LL;
+			sqlite3_stmt* _tmp6_;
+			gint _tmp7_;
+			gint _tmp8_;
+			GeeArrayList* _tmp11_;
+			sqlite3_stmt* _tmp12_;
+			gint64 _tmp13_;
 			PhotoID _tmp14_ = {0};
 #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (!_tmp5_) {
@@ -4835,13 +4835,13 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) {
 				break;
 #line 4816 "PhotoTable.c"
 			} else {
-				gint _tmp9_ = 0;
+				gint _tmp9_;
 #line 628 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp9_ = res;
 #line 628 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				if (_tmp9_ != SQLITE_ROW) {
 #line 4823 "PhotoTable.c"
-					gint _tmp10_ = 0;
+					gint _tmp10_;
 #line 629 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp10_ = res;
 #line 629 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -4876,10 +4876,10 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) {
 
 gboolean photo_table_set_orientation (PhotoTable* self, PhotoID* photo_id, Orientation orientation) {
 	gboolean result = FALSE;
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	Orientation _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	PhotoID _tmp0_;
+	gint64 _tmp1_;
+	Orientation _tmp2_;
+	gboolean _tmp3_;
 #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"
@@ -4902,10 +4902,10 @@ gboolean photo_table_set_orientation (PhotoTable* self, PhotoID* photo_id, Orien
 
 gboolean photo_table_replace_flags (PhotoTable* self, PhotoID* photo_id, guint64 flags) {
 	gboolean result = FALSE;
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	guint64 _tmp2_ = 0ULL;
-	gboolean _tmp3_ = FALSE;
+	PhotoID _tmp0_;
+	gint64 _tmp1_;
+	guint64 _tmp2_;
+	gboolean _tmp3_;
 #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"
@@ -4928,11 +4928,11 @@ gboolean photo_table_replace_flags (PhotoTable* self, PhotoID* photo_id, guint64
 
 gboolean photo_table_set_rating (PhotoTable* self, PhotoID* photo_id, Rating rating) {
 	gboolean result = FALSE;
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	Rating _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gboolean _tmp4_ = FALSE;
+	PhotoID _tmp0_;
+	gint64 _tmp1_;
+	Rating _tmp2_;
+	gint _tmp3_;
+	gboolean _tmp4_;
 #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"
@@ -4959,15 +4959,15 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) {
 	gint result = 0;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	EventID _tmp5_ = {0};
-	gint64 _tmp6_ = 0LL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	EventID _tmp5_;
+	gint64 _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
 	gint count = 0;
 #line 652 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), 0);
@@ -5011,10 +5011,10 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) {
 #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		while (TRUE) {
 #line 4993 "PhotoTable.c"
-			sqlite3_stmt* _tmp10_ = NULL;
-			gint _tmp11_ = 0;
-			gint _tmp12_ = 0;
-			gint _tmp15_ = 0;
+			sqlite3_stmt* _tmp10_;
+			gint _tmp11_;
+			gint _tmp12_;
+			gint _tmp15_;
 #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (!_tmp9_) {
 #line 5000 "PhotoTable.c"
@@ -5035,13 +5035,13 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) {
 				break;
 #line 5016 "PhotoTable.c"
 			} else {
-				gint _tmp13_ = 0;
+				gint _tmp13_;
 #line 665 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp13_ = res;
 #line 665 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				if (_tmp13_ != SQLITE_ROW) {
 #line 5023 "PhotoTable.c"
-					gint _tmp14_ = 0;
+					gint _tmp14_;
 #line 666 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp14_ = res;
 #line 666 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5072,17 +5072,17 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event
 	GeeArrayList* result = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	EventID _tmp5_ = {0};
-	gint64 _tmp6_ = 0LL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	EventID _tmp5_;
+	gint64 _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
 	GeeArrayList* _result_ = NULL;
-	GeeArrayList* _tmp9_ = NULL;
+	GeeArrayList* _tmp9_;
 #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"
@@ -5127,15 +5127,15 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event
 #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		while (TRUE) {
 #line 5109 "PhotoTable.c"
-			sqlite3_stmt* _tmp11_ = NULL;
-			gint _tmp12_ = 0;
-			gint _tmp13_ = 0;
-			GeeArrayList* _tmp16_ = NULL;
-			sqlite3_stmt* _tmp17_ = NULL;
-			gint64 _tmp18_ = 0LL;
+			sqlite3_stmt* _tmp11_;
+			gint _tmp12_;
+			gint _tmp13_;
+			GeeArrayList* _tmp16_;
+			sqlite3_stmt* _tmp17_;
+			gint64 _tmp18_;
 			PhotoID _tmp19_ = {0};
-			gchar* _tmp20_ = NULL;
-			gchar* _tmp21_ = NULL;
+			gchar* _tmp20_;
+			gchar* _tmp21_;
 #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (!_tmp10_) {
 #line 5121 "PhotoTable.c"
@@ -5156,13 +5156,13 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event
 				break;
 #line 5137 "PhotoTable.c"
 			} else {
-				gint _tmp14_ = 0;
+				gint _tmp14_;
 #line 690 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp14_ = res;
 #line 690 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				if (_tmp14_ != SQLITE_ROW) {
 #line 5144 "PhotoTable.c"
-					gint _tmp15_ = 0;
+					gint _tmp15_;
 #line 691 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp15_ = res;
 #line 691 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5205,18 +5205,18 @@ gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) {
 	gboolean result = FALSE;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	EventID _tmp5_ = {0};
-	gint64 _tmp6_ = 0LL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	EventID _tmp5_;
+	gint64 _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
 #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"
@@ -5267,13 +5267,13 @@ gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) {
 		return result;
 #line 5248 "PhotoTable.c"
 	} else {
-		gint _tmp12_ = 0;
+		gint _tmp12_;
 #line 713 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp12_ = res;
 #line 713 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp12_ != SQLITE_ROW) {
 #line 5255 "PhotoTable.c"
-			gint _tmp13_ = 0;
+			gint _tmp13_;
 #line 714 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp13_ = res;
 #line 714 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5301,21 +5301,21 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) {
 	gboolean result = FALSE;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	sqlite3_stmt* _tmp7_ = NULL;
-	EventID _tmp8_ = {0};
-	gint64 _tmp9_ = 0LL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	sqlite3_stmt* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	sqlite3_stmt* _tmp7_;
+	EventID _tmp8_;
+	gint64 _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
 #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"
@@ -5369,7 +5369,7 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) {
 #line 733 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp14_ != SQLITE_DONE) {
 #line 5351 "PhotoTable.c"
-		gint _tmp15_ = 0;
+		gint _tmp15_;
 #line 734 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp15_ = res;
 #line 734 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5394,11 +5394,11 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) {
 
 gboolean photo_table_set_event (PhotoTable* self, PhotoID* photo_id, EventID* event_id) {
 	gboolean result = FALSE;
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	EventID _tmp2_ = {0};
-	gint64 _tmp3_ = 0LL;
-	gboolean _tmp4_ = FALSE;
+	PhotoID _tmp0_;
+	gint64 _tmp1_;
+	EventID _tmp2_;
+	gint64 _tmp3_;
+	gboolean _tmp4_;
 #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"
@@ -5426,16 +5426,16 @@ gboolean photo_table_set_event (PhotoTable* self, PhotoID* photo_id, EventID* ev
 static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* photo_id) {
 	gchar* result = NULL;
 	sqlite3_stmt* stmt = NULL;
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
+	PhotoID _tmp0_;
+	gint64 _tmp1_;
 	sqlite3_stmt* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp3_;
 	gchar* trans = NULL;
-	sqlite3_stmt* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	sqlite3_stmt* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
 	gboolean _tmp7_ = FALSE;
-	const gchar* _tmp8_ = NULL;
+	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"
@@ -5476,9 +5476,9 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph
 		_tmp7_ = TRUE;
 #line 5457 "PhotoTable.c"
 	} else {
-		const gchar* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
+		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"
@@ -5513,10 +5513,10 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph
 
 static gboolean photo_table_set_raw_transformations (PhotoTable* self, PhotoID* photo_id, const gchar* trans) {
 	gboolean result = FALSE;
-	PhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	PhotoID _tmp0_;
+	gint64 _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
 #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"
@@ -5543,28 +5543,28 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_
 	gboolean result = FALSE;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	Orientation _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	sqlite3_stmt* _tmp8_ = NULL;
-	GeeHashMap* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	GDestroyNotify _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	sqlite3_stmt* _tmp14_ = NULL;
-	PhotoID _tmp15_ = {0};
-	gint64 _tmp16_ = 0LL;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	sqlite3_stmt* _tmp19_ = NULL;
-	gint _tmp20_ = 0;
-	gint _tmp21_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	Orientation _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	sqlite3_stmt* _tmp8_;
+	GeeHashMap* _tmp9_;
+	gchar* _tmp10_;
+	GDestroyNotify _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
+	sqlite3_stmt* _tmp14_;
+	PhotoID _tmp15_;
+	gint64 _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
+	sqlite3_stmt* _tmp19_;
+	gint _tmp20_;
+	gint _tmp21_;
 #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"
@@ -5639,7 +5639,7 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_
 #line 777 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp21_ != SQLITE_DONE) {
 #line 5620 "PhotoTable.c"
-		gint _tmp22_ = 0;
+		gint _tmp22_;
 #line 778 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp22_ = res;
 #line 778 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5665,7 +5665,7 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_
 GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 	GeeHashMap* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = trans;
@@ -5675,9 +5675,9 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 		_tmp0_ = TRUE;
 #line 5655 "PhotoTable.c"
 	} else {
-		const gchar* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		const gchar* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = trans;
 #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5698,24 +5698,24 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 	}
 	{
 		GKeyFile* keyfile = NULL;
-		GKeyFile* _tmp5_ = NULL;
+		GKeyFile* _tmp5_;
 		gboolean _tmp6_ = FALSE;
-		GKeyFile* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
-		gboolean _tmp12_ = FALSE;
+		GKeyFile* _tmp7_;
+		const gchar* _tmp8_;
+		const gchar* _tmp9_;
+		gint _tmp10_;
+		gint _tmp11_;
+		gboolean _tmp12_;
 		GeeHashMap* map = NULL;
-		GeeHashMap* _tmp13_ = NULL;
+		GeeHashMap* _tmp13_;
 		gchar** objects = NULL;
-		GKeyFile* _tmp14_ = NULL;
+		GKeyFile* _tmp14_;
 		gsize _tmp15_;
-		gchar** _tmp16_ = NULL;
-		gint objects_length1 = 0;
-		gint _objects_size_ = 0;
-		gchar** _tmp17_ = NULL;
-		gint _tmp17__length1 = 0;
+		gchar** _tmp16_;
+		gint objects_length1;
+		gint _objects_size_;
+		gchar** _tmp17_;
+		gint _tmp17__length1;
 #line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp5_ = g_key_file_new ();
 #line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5782,7 +5782,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			for (object_it = 0; object_it < _tmp17__length1; object_it = object_it + 1) {
 #line 5763 "PhotoTable.c"
-				gchar* _tmp18_ = NULL;
+				gchar* _tmp18_;
 				gchar* object = NULL;
 #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp18_ = g_strdup (object_collection[object_it]);
@@ -5791,21 +5791,21 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 #line 5770 "PhotoTable.c"
 				{
 					gchar** keys = NULL;
-					GKeyFile* _tmp19_ = NULL;
-					const gchar* _tmp20_ = NULL;
+					GKeyFile* _tmp19_;
+					const gchar* _tmp20_;
 					gsize _tmp21_;
-					gchar** _tmp22_ = NULL;
-					gint keys_length1 = 0;
-					gint _keys_size_ = 0;
+					gchar** _tmp22_;
+					gint keys_length1;
+					gint _keys_size_;
 					gboolean _tmp23_ = FALSE;
-					gchar** _tmp24_ = NULL;
-					gint _tmp24__length1 = 0;
+					gchar** _tmp24_;
+					gint _tmp24__length1;
 					KeyValueMap* key_map = NULL;
-					const gchar* _tmp26_ = NULL;
-					KeyValueMap* _tmp27_ = NULL;
-					GeeHashMap* _tmp43_ = NULL;
-					const gchar* _tmp44_ = NULL;
-					KeyValueMap* _tmp45_ = NULL;
+					const gchar* _tmp26_;
+					KeyValueMap* _tmp27_;
+					GeeHashMap* _tmp43_;
+					const gchar* _tmp44_;
+					KeyValueMap* _tmp45_;
 #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp19_ = keyfile;
 #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5841,8 +5841,8 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 						_tmp23_ = TRUE;
 #line 5821 "PhotoTable.c"
 					} else {
-						gchar** _tmp25_ = NULL;
-						gint _tmp25__length1 = 0;
+						gchar** _tmp25_;
+						gint _tmp25__length1;
 #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 						_tmp25_ = keys;
 #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5880,26 +5880,26 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 							while (TRUE) {
 #line 5861 "PhotoTable.c"
-								gint _tmp30_ = 0;
-								gchar** _tmp31_ = NULL;
-								gint _tmp31__length1 = 0;
+								gint _tmp30_;
+								gchar** _tmp31_;
+								gint _tmp31__length1;
 								gchar* _tmp32_ = NULL;
-								GKeyFile* _tmp33_ = NULL;
-								const gchar* _tmp34_ = NULL;
-								gchar** _tmp35_ = NULL;
-								gint _tmp35__length1 = 0;
-								gint _tmp36_ = 0;
-								const gchar* _tmp37_ = NULL;
-								gchar* _tmp38_ = NULL;
-								KeyValueMap* _tmp39_ = NULL;
-								gchar** _tmp40_ = NULL;
-								gint _tmp40__length1 = 0;
-								gint _tmp41_ = 0;
-								const gchar* _tmp42_ = NULL;
+								GKeyFile* _tmp33_;
+								const gchar* _tmp34_;
+								gchar** _tmp35_;
+								gint _tmp35__length1;
+								gint _tmp36_;
+								const gchar* _tmp37_;
+								gchar* _tmp38_;
+								KeyValueMap* _tmp39_;
+								gchar** _tmp40_;
+								gint _tmp40__length1;
+								gint _tmp41_;
+								const gchar* _tmp42_;
 #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								if (!_tmp28_) {
 #line 5880 "PhotoTable.c"
-									gint _tmp29_ = 0;
+									gint _tmp29_;
 #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 									_tmp29_ = ctr;
 #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6003,7 +6003,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 	__catch17_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp46_ = NULL;
+		const gchar* _tmp46_;
 #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		err = _inner_error_;
 #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6030,18 +6030,18 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) {
 	gchar* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	GeeHashMap* _tmp1_ = NULL;
+	GeeHashMap* _tmp1_;
 	GKeyFile* keyfile = NULL;
-	GKeyFile* _tmp8_ = NULL;
+	GKeyFile* _tmp8_;
 	gsize length = 0UL;
 	gchar* unmarshalled = NULL;
-	GKeyFile* _tmp39_ = NULL;
+	GKeyFile* _tmp39_;
 	gsize _tmp40_ = 0UL;
-	gchar* _tmp41_ = NULL;
-	const gchar* _tmp42_ = NULL;
-	const gchar* _tmp43_ = NULL;
-	gint _tmp44_ = 0;
-	gint _tmp45_ = 0;
+	gchar* _tmp41_;
+	const gchar* _tmp42_;
+	const gchar* _tmp43_;
+	gint _tmp44_;
+	gint _tmp45_;
 #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"
@@ -6052,12 +6052,12 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 		_tmp0_ = TRUE;
 #line 6032 "PhotoTable.c"
 	} else {
-		GeeHashMap* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeSet* _tmp4_ = NULL;
-		GeeSet* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
+		GeeHashMap* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeSet* _tmp4_;
+		GeeSet* _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
 #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = transformations;
 #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6091,12 +6091,12 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 #line 6070 "PhotoTable.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeHashMap* _tmp9_ = NULL;
-		GeeSet* _tmp10_ = NULL;
-		GeeSet* _tmp11_ = NULL;
-		GeeSet* _tmp12_ = NULL;
-		GeeIterator* _tmp13_ = NULL;
-		GeeIterator* _tmp14_ = NULL;
+		GeeHashMap* _tmp9_;
+		GeeSet* _tmp10_;
+		GeeSet* _tmp11_;
+		GeeSet* _tmp12_;
+		GeeIterator* _tmp13_;
+		GeeIterator* _tmp14_;
 #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9_ = transformations;
 #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6116,15 +6116,15 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		while (TRUE) {
 #line 6097 "PhotoTable.c"
-			GeeIterator* _tmp15_ = NULL;
-			gboolean _tmp16_ = FALSE;
+			GeeIterator* _tmp15_;
+			gboolean _tmp16_;
 			gchar* object = NULL;
-			GeeIterator* _tmp17_ = NULL;
-			gpointer _tmp18_ = NULL;
+			GeeIterator* _tmp17_;
+			gpointer _tmp18_;
 			KeyValueMap* map = NULL;
-			GeeHashMap* _tmp19_ = NULL;
-			const gchar* _tmp20_ = NULL;
-			gpointer _tmp21_ = NULL;
+			GeeHashMap* _tmp19_;
+			const gchar* _tmp20_;
+			gpointer _tmp21_;
 #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp15_ = _object_it;
 #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6152,11 +6152,11 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 #line 6131 "PhotoTable.c"
 			{
 				GeeIterator* _key_it = NULL;
-				KeyValueMap* _tmp22_ = NULL;
-				GeeSet* _tmp23_ = NULL;
-				GeeSet* _tmp24_ = NULL;
-				GeeIterator* _tmp25_ = NULL;
-				GeeIterator* _tmp26_ = NULL;
+				KeyValueMap* _tmp22_;
+				GeeSet* _tmp23_;
+				GeeSet* _tmp24_;
+				GeeIterator* _tmp25_;
+				GeeIterator* _tmp26_;
 #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp22_ = map;
 #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6174,20 +6174,20 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				while (TRUE) {
 #line 6155 "PhotoTable.c"
-					GeeIterator* _tmp27_ = NULL;
-					gboolean _tmp28_ = FALSE;
+					GeeIterator* _tmp27_;
+					gboolean _tmp28_;
 					gchar* key = NULL;
-					GeeIterator* _tmp29_ = NULL;
-					gpointer _tmp30_ = NULL;
+					GeeIterator* _tmp29_;
+					gpointer _tmp30_;
 					gchar* value = NULL;
-					KeyValueMap* _tmp31_ = NULL;
-					const gchar* _tmp32_ = NULL;
-					gchar* _tmp33_ = NULL;
-					const gchar* _tmp34_ = NULL;
-					GKeyFile* _tmp35_ = NULL;
-					const gchar* _tmp36_ = NULL;
-					const gchar* _tmp37_ = NULL;
-					const gchar* _tmp38_ = NULL;
+					KeyValueMap* _tmp31_;
+					const gchar* _tmp32_;
+					gchar* _tmp33_;
+					const gchar* _tmp34_;
+					GKeyFile* _tmp35_;
+					const gchar* _tmp36_;
+					const gchar* _tmp37_;
+					const gchar* _tmp38_;
 #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp27_ = _key_it;
 #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6279,11 +6279,11 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, KeyValueMap* map) {
 	gboolean result = FALSE;
 	gchar* trans = NULL;
-	PhotoID _tmp0_ = {0};
-	gchar* _tmp1_ = NULL;
-	PhotoID _tmp38_ = {0};
-	const gchar* _tmp39_ = NULL;
-	gboolean _tmp40_ = FALSE;
+	PhotoID _tmp0_;
+	gchar* _tmp1_;
+	PhotoID _tmp38_;
+	const gchar* _tmp39_;
+	gboolean _tmp40_;
 	GError * _inner_error_ = NULL;
 #line 841 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
@@ -6300,19 +6300,19 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 #line 6279 "PhotoTable.c"
 	{
 		GKeyFile* keyfile = NULL;
-		GKeyFile* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
+		GKeyFile* _tmp2_;
+		const gchar* _tmp3_;
 		GeeSet* keys = NULL;
-		KeyValueMap* _tmp11_ = NULL;
-		GeeSet* _tmp12_ = NULL;
+		KeyValueMap* _tmp11_;
+		GeeSet* _tmp12_;
 		gsize length = 0UL;
-		GKeyFile* _tmp29_ = NULL;
+		GKeyFile* _tmp29_;
 		gsize _tmp30_ = 0UL;
-		gchar* _tmp31_ = NULL;
-		const gchar* _tmp32_ = NULL;
-		const gchar* _tmp33_ = NULL;
-		gint _tmp34_ = 0;
-		gint _tmp35_ = 0;
+		gchar* _tmp31_;
+		const gchar* _tmp32_;
+		const gchar* _tmp33_;
+		gint _tmp34_;
+		gint _tmp35_;
 #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"
@@ -6323,12 +6323,12 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 		if (_tmp3_ != NULL) {
 #line 6303 "PhotoTable.c"
 			gboolean _tmp4_ = FALSE;
-			GKeyFile* _tmp5_ = NULL;
-			const gchar* _tmp6_ = NULL;
-			const gchar* _tmp7_ = NULL;
-			gint _tmp8_ = 0;
-			gint _tmp9_ = 0;
-			gboolean _tmp10_ = FALSE;
+			GKeyFile* _tmp5_;
+			const gchar* _tmp6_;
+			const gchar* _tmp7_;
+			gint _tmp8_;
+			gint _tmp9_;
+			gboolean _tmp10_;
 #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp5_ = keyfile;
 #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6372,8 +6372,8 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 #line 6351 "PhotoTable.c"
 		{
 			GeeIterator* _key_it = NULL;
-			GeeSet* _tmp13_ = NULL;
-			GeeIterator* _tmp14_ = NULL;
+			GeeSet* _tmp13_;
+			GeeIterator* _tmp14_;
 #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp13_ = keys;
 #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6383,22 +6383,22 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			while (TRUE) {
 #line 6364 "PhotoTable.c"
-				GeeIterator* _tmp15_ = NULL;
-				gboolean _tmp16_ = FALSE;
+				GeeIterator* _tmp15_;
+				gboolean _tmp16_;
 				gchar* key = NULL;
-				GeeIterator* _tmp17_ = NULL;
-				gpointer _tmp18_ = NULL;
+				GeeIterator* _tmp17_;
+				gpointer _tmp18_;
 				gchar* value = NULL;
-				KeyValueMap* _tmp19_ = NULL;
-				const gchar* _tmp20_ = NULL;
-				gchar* _tmp21_ = NULL;
-				const gchar* _tmp22_ = NULL;
-				GKeyFile* _tmp23_ = NULL;
-				KeyValueMap* _tmp24_ = NULL;
-				gchar* _tmp25_ = NULL;
-				gchar* _tmp26_ = NULL;
-				const gchar* _tmp27_ = NULL;
-				const gchar* _tmp28_ = NULL;
+				KeyValueMap* _tmp19_;
+				const gchar* _tmp20_;
+				gchar* _tmp21_;
+				const gchar* _tmp22_;
+				GKeyFile* _tmp23_;
+				KeyValueMap* _tmp24_;
+				gchar* _tmp25_;
+				gchar* _tmp26_;
+				const gchar* _tmp27_;
+				const gchar* _tmp28_;
 #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp15_ = _key_it;
 #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6485,7 +6485,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 	__catch18_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp36_ = NULL;
+		const gchar* _tmp36_;
 #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		err = _inner_error_;
 #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6532,12 +6532,12 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, const gchar* object) {
 	gboolean result = FALSE;
 	gchar* trans = NULL;
-	PhotoID _tmp0_ = {0};
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PhotoID _tmp22_ = {0};
-	const gchar* _tmp23_ = NULL;
-	gboolean _tmp24_ = FALSE;
+	PhotoID _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	PhotoID _tmp22_;
+	const gchar* _tmp23_;
+	gboolean _tmp24_;
 	GError * _inner_error_ = NULL;
 #line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
@@ -6565,24 +6565,24 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 	}
 	{
 		GKeyFile* keyfile = NULL;
-		GKeyFile* _tmp3_ = NULL;
+		GKeyFile* _tmp3_;
 		gboolean _tmp4_ = FALSE;
-		GKeyFile* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
-		gboolean _tmp10_ = FALSE;
-		GKeyFile* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
-		gboolean _tmp13_ = FALSE;
-		GKeyFile* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
+		GKeyFile* _tmp5_;
+		const gchar* _tmp6_;
+		const gchar* _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
+		gboolean _tmp10_;
+		GKeyFile* _tmp11_;
+		const gchar* _tmp12_;
+		gboolean _tmp13_;
+		GKeyFile* _tmp14_;
+		const gchar* _tmp15_;
 		gsize length = 0UL;
-		GKeyFile* _tmp16_ = NULL;
+		GKeyFile* _tmp16_;
 		gsize _tmp17_ = 0UL;
-		gchar* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
+		gchar* _tmp18_;
+		const gchar* _tmp19_;
 #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"
@@ -6673,7 +6673,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 	__catch19_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp20_ = NULL;
+		const gchar* _tmp20_;
 #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		err = _inner_error_;
 #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6719,13 +6719,13 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 
 gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* photo_id) {
 	gboolean result = FALSE;
-	PhotoID _tmp0_ = {0};
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	PhotoID _tmp4_ = {0};
-	gint64 _tmp5_ = 0LL;
-	gboolean _tmp6_ = FALSE;
+	PhotoID _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gboolean _tmp3_;
+	PhotoID _tmp4_;
+	gint64 _tmp5_;
+	gboolean _tmp6_;
 #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"
@@ -6766,27 +6766,27 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 	sqlite3_stmt* result = NULL;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	GFile* _tmp2_ = NULL;
+	GFile* _tmp2_;
 	gchar* sql = NULL;
-	gchar* _tmp5_ = NULL;
+	gchar* _tmp5_;
 	gboolean first = FALSE;
-	GFile* _tmp6_ = NULL;
+	GFile* _tmp6_;
 	gboolean _tmp9_ = FALSE;
-	const gchar* _tmp10_ = NULL;
+	const gchar* _tmp10_;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp33_ = NULL;
-	const gchar* _tmp34_ = NULL;
+	sqlite3* _tmp33_;
+	const gchar* _tmp34_;
 	sqlite3_stmt* _tmp35_ = NULL;
-	gint _tmp36_ = 0;
-	gint _tmp37_ = 0;
+	gint _tmp36_;
+	gint _tmp37_;
 	gint col = 0;
-	GFile* _tmp38_ = NULL;
-	const gchar* _tmp46_ = NULL;
-	const gchar* _tmp54_ = NULL;
+	GFile* _tmp38_;
+	const gchar* _tmp46_;
+	const gchar* _tmp54_;
 	gboolean _tmp62_ = FALSE;
 	gboolean _tmp63_ = FALSE;
-	const gchar* _tmp64_ = NULL;
+	const gchar* _tmp64_;
 #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"
@@ -6799,7 +6799,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_tmp1_ = TRUE;
 #line 6779 "PhotoTable.c"
 	} else {
-		const gchar* _tmp3_ = NULL;
+		const gchar* _tmp3_;
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp3_ = thumbnail_md5;
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6812,7 +6812,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_tmp0_ = TRUE;
 #line 6792 "PhotoTable.c"
 	} else {
-		const gchar* _tmp4_ = NULL;
+		const gchar* _tmp4_;
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp4_ = md5;
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6832,8 +6832,8 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 #line 911 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp6_ != NULL) {
 #line 6813 "PhotoTable.c"
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
+		const gchar* _tmp7_;
+		gchar* _tmp8_;
 #line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_ = sql;
 #line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6854,7 +6854,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_tmp9_ = TRUE;
 #line 6834 "PhotoTable.c"
 	} else {
-		const gchar* _tmp11_ = NULL;
+		const gchar* _tmp11_;
 #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp11_ = md5;
 #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6864,21 +6864,21 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp9_) {
 #line 6845 "PhotoTable.c"
-		gboolean _tmp12_ = FALSE;
-		const gchar* _tmp17_ = NULL;
-		const gchar* _tmp20_ = NULL;
-		const gchar* _tmp26_ = NULL;
-		gchar* _tmp27_ = NULL;
-		PhotoFileFormat _tmp28_ = 0;
-		const gchar* _tmp31_ = NULL;
-		gchar* _tmp32_ = NULL;
+		gboolean _tmp12_;
+		const gchar* _tmp17_;
+		const gchar* _tmp20_;
+		const gchar* _tmp26_;
+		gchar* _tmp27_;
+		PhotoFileFormat _tmp28_;
+		const gchar* _tmp31_;
+		gchar* _tmp32_;
 #line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp12_ = first;
 #line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp12_) {
 #line 6858 "PhotoTable.c"
-			const gchar* _tmp13_ = NULL;
-			gchar* _tmp14_ = NULL;
+			const gchar* _tmp13_;
+			gchar* _tmp14_;
 #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp13_ = sql;
 #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6889,8 +6889,8 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 			sql = _tmp14_;
 #line 6869 "PhotoTable.c"
 		} else {
-			const gchar* _tmp15_ = NULL;
-			gchar* _tmp16_ = NULL;
+			const gchar* _tmp15_;
+			gchar* _tmp16_;
 #line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp15_ = sql;
 #line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6908,8 +6908,8 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 #line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp17_ != NULL) {
 #line 6889 "PhotoTable.c"
-			const gchar* _tmp18_ = NULL;
-			gchar* _tmp19_ = NULL;
+			const gchar* _tmp18_;
+			gchar* _tmp19_;
 #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp18_ = sql;
 #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6925,14 +6925,14 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 #line 927 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp20_ != NULL) {
 #line 6906 "PhotoTable.c"
-			const gchar* _tmp21_ = NULL;
+			const gchar* _tmp21_;
 #line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp21_ = md5;
 #line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (_tmp21_ == NULL) {
 #line 6912 "PhotoTable.c"
-				const gchar* _tmp22_ = NULL;
-				gchar* _tmp23_ = NULL;
+				const gchar* _tmp22_;
+				gchar* _tmp23_;
 #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp22_ = sql;
 #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6943,8 +6943,8 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 				sql = _tmp23_;
 #line 6923 "PhotoTable.c"
 			} else {
-				const gchar* _tmp24_ = NULL;
-				gchar* _tmp25_ = NULL;
+				const gchar* _tmp24_;
+				gchar* _tmp25_;
 #line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp24_ = sql;
 #line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6969,8 +6969,8 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 #line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp28_ != PHOTO_FILE_FORMAT_UNKNOWN) {
 #line 6950 "PhotoTable.c"
-			const gchar* _tmp29_ = NULL;
-			gchar* _tmp30_ = NULL;
+			const gchar* _tmp29_;
+			gchar* _tmp30_;
 #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp29_ = sql;
 #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7014,13 +7014,13 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 #line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp38_ != NULL) {
 #line 6995 "PhotoTable.c"
-		sqlite3_stmt* _tmp39_ = NULL;
-		gint _tmp40_ = 0;
-		GFile* _tmp41_ = NULL;
-		gchar* _tmp42_ = NULL;
-		GDestroyNotify _tmp43_ = NULL;
-		gint _tmp44_ = 0;
-		gint _tmp45_ = 0;
+		sqlite3_stmt* _tmp39_;
+		gint _tmp40_;
+		GFile* _tmp41_;
+		gchar* _tmp42_;
+		GDestroyNotify _tmp43_;
+		gint _tmp44_;
+		gint _tmp45_;
 #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp39_ = stmt;
 #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7048,13 +7048,13 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 #line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp46_ != NULL) {
 #line 7029 "PhotoTable.c"
-		sqlite3_stmt* _tmp47_ = NULL;
-		gint _tmp48_ = 0;
-		const gchar* _tmp49_ = NULL;
-		gchar* _tmp50_ = NULL;
-		GDestroyNotify _tmp51_ = NULL;
-		gint _tmp52_ = 0;
-		gint _tmp53_ = 0;
+		sqlite3_stmt* _tmp47_;
+		gint _tmp48_;
+		const gchar* _tmp49_;
+		gchar* _tmp50_;
+		GDestroyNotify _tmp51_;
+		gint _tmp52_;
+		gint _tmp53_;
 #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp47_ = stmt;
 #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7082,13 +7082,13 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 #line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp54_ != NULL) {
 #line 7063 "PhotoTable.c"
-		sqlite3_stmt* _tmp55_ = NULL;
-		gint _tmp56_ = 0;
-		const gchar* _tmp57_ = NULL;
-		gchar* _tmp58_ = NULL;
-		GDestroyNotify _tmp59_ = NULL;
-		gint _tmp60_ = 0;
-		gint _tmp61_ = 0;
+		sqlite3_stmt* _tmp55_;
+		gint _tmp56_;
+		const gchar* _tmp57_;
+		gchar* _tmp58_;
+		GDestroyNotify _tmp59_;
+		gint _tmp60_;
+		gint _tmp61_;
 #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp55_ = stmt;
 #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7119,7 +7119,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_tmp63_ = TRUE;
 #line 7099 "PhotoTable.c"
 	} else {
-		const gchar* _tmp65_ = NULL;
+		const gchar* _tmp65_;
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp65_ = md5;
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7129,7 +7129,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp63_) {
 #line 7110 "PhotoTable.c"
-		PhotoFileFormat _tmp66_ = 0;
+		PhotoFileFormat _tmp66_;
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp66_ = file_format;
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7143,12 +7143,12 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp62_) {
 #line 7124 "PhotoTable.c"
-		sqlite3_stmt* _tmp67_ = NULL;
-		gint _tmp68_ = 0;
-		PhotoFileFormat _tmp69_ = 0;
-		gint _tmp70_ = 0;
-		gint _tmp71_ = 0;
-		gint _tmp72_ = 0;
+		sqlite3_stmt* _tmp67_;
+		gint _tmp68_;
+		PhotoFileFormat _tmp69_;
+		gint _tmp70_;
+		gint _tmp71_;
+		gint _tmp72_;
 #line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp67_ = stmt;
 #line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7182,15 +7182,15 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 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;
-	GFile* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PhotoFileFormat _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
+	GFile* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	PhotoFileFormat _tmp3_;
+	sqlite3_stmt* _tmp4_;
 	gint res = 0;
-	sqlite3_stmt* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	sqlite3_stmt* _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 #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"
@@ -7225,7 +7225,7 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar*
 		return result;
 #line 7205 "PhotoTable.c"
 	} else {
-		gint _tmp8_ = 0;
+		gint _tmp8_;
 #line 978 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp8_ = res;
 #line 978 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7238,7 +7238,7 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar*
 			return result;
 #line 7218 "PhotoTable.c"
 		} else {
-			gint _tmp9_ = 0;
+			gint _tmp9_;
 #line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp9_ = res;
 #line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7258,7 +7258,7 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar*
 }
 
 
-static void _vala_array_add2 (PhotoID** array, int* length, int* size, const PhotoID* value) {
+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"
@@ -7276,20 +7276,20 @@ static void _vala_array_add2 (PhotoID** array, int* length, int* size, const Pho
 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;
-	GFile* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PhotoFileFormat _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
+	GFile* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	PhotoFileFormat _tmp3_;
+	sqlite3_stmt* _tmp4_;
 	PhotoID* ids = NULL;
-	PhotoID* _tmp5_ = NULL;
-	gint ids_length1 = 0;
-	gint _ids_size_ = 0;
+	PhotoID* _tmp5_;
+	gint ids_length1;
+	gint _ids_size_;
 	gint res = 0;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	PhotoID* _tmp15_ = NULL;
-	gint _tmp15__length1 = 0;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	PhotoID* _tmp15_;
+	gint _tmp15__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"
@@ -7323,14 +7323,14 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch
 #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	while (TRUE) {
 #line 7304 "PhotoTable.c"
-		gint _tmp8_ = 0;
-		PhotoID* _tmp9_ = NULL;
-		gint _tmp9__length1 = 0;
-		sqlite3_stmt* _tmp10_ = NULL;
-		gint64 _tmp11_ = 0LL;
+		gint _tmp8_;
+		PhotoID* _tmp9_;
+		gint _tmp9__length1;
+		sqlite3_stmt* _tmp10_;
+		gint64 _tmp11_;
 		PhotoID _tmp12_ = {0};
-		sqlite3_stmt* _tmp13_ = NULL;
-		gint _tmp14_ = 0;
+		sqlite3_stmt* _tmp13_;
+		gint _tmp14_;
 #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp8_ = res;
 #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7381,9 +7381,9 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch
 
 void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gchar* backlinks, GError** error) {
 	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PhotoID _tmp3_ = {0};
-	gint64 _tmp4_ = 0LL;
+	const gchar* _tmp1_;
+	PhotoID _tmp3_;
+	gint64 _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
@@ -7394,7 +7394,7 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc
 #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_ != NULL) {
 #line 7375 "PhotoTable.c"
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = backlinks;
 #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7434,13 +7434,13 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc
 
 
 void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoID* editable_id, GError** error) {
-	PhotoRow* _tmp0_ = NULL;
-	PhotoID _tmp1_ = {0};
-	gint64 _tmp2_ = 0LL;
-	BackingPhotoID _tmp3_ = {0};
-	gint64 _tmp4_ = 0LL;
-	PhotoRow* _tmp5_ = NULL;
-	BackingPhotoID _tmp6_ = {0};
+	PhotoRow* _tmp0_;
+	PhotoID _tmp1_;
+	gint64 _tmp2_;
+	BackingPhotoID _tmp3_;
+	gint64 _tmp4_;
+	PhotoRow* _tmp5_;
+	BackingPhotoID _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
@@ -7490,10 +7490,10 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI
 
 
 void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** error) {
-	PhotoRow* _tmp0_ = NULL;
-	PhotoID _tmp1_ = {0};
-	gint64 _tmp2_ = 0LL;
-	PhotoRow* _tmp3_ = NULL;
+	PhotoRow* _tmp0_;
+	PhotoID _tmp1_;
+	gint64 _tmp2_;
+	PhotoRow* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
@@ -7536,9 +7536,9 @@ void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** erro
 
 void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboolean dirty, GError** error) {
 	gint _tmp0_ = 0;
-	gboolean _tmp1_ = FALSE;
-	PhotoID _tmp2_ = {0};
-	gint64 _tmp3_ = 0LL;
+	gboolean _tmp1_;
+	PhotoID _tmp2_;
+	gint64 _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
@@ -7586,21 +7586,21 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole
 
 void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, BackingPhotoID* backing_photo_id, GError** error) {
 	gchar* col = NULL;
-	RawDeveloper _tmp0_ = 0;
-	PhotoRow* _tmp4_ = NULL;
-	BackingPhotoID* _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	RawDeveloper _tmp6_ = 0;
-	BackingPhotoID _tmp7_ = {0};
-	BackingPhotoID _tmp8_ = {0};
-	PhotoRow* _tmp9_ = NULL;
-	PhotoID _tmp10_ = {0};
-	gint64 _tmp11_ = 0LL;
-	const gchar* _tmp12_ = NULL;
-	BackingPhotoID _tmp13_ = {0};
-	gint64 _tmp14_ = 0LL;
-	BackingPhotoID _tmp15_ = {0};
-	gint64 _tmp16_ = 0LL;
+	RawDeveloper _tmp0_;
+	PhotoRow* _tmp4_;
+	BackingPhotoID* _tmp5_;
+	gint _tmp5__length1;
+	RawDeveloper _tmp6_;
+	BackingPhotoID _tmp7_;
+	BackingPhotoID _tmp8_;
+	PhotoRow* _tmp9_;
+	PhotoID _tmp10_;
+	gint64 _tmp11_;
+	const gchar* _tmp12_;
+	BackingPhotoID _tmp13_;
+	gint64 _tmp14_;
+	BackingPhotoID _tmp15_;
+	gint64 _tmp16_;
 	GError * _inner_error_ = NULL;
 #line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
@@ -7616,7 +7616,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 		case RAW_DEVELOPER_SHOTWELL:
 #line 7596 "PhotoTable.c"
 		{
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 #line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp1_ = g_strdup ("develop_shotwell_id");
 #line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7631,7 +7631,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 		case RAW_DEVELOPER_CAMERA:
 #line 7611 "PhotoTable.c"
 		{
-			gchar* _tmp2_ = NULL;
+			gchar* _tmp2_;
 #line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp2_ = g_strdup ("develop_camera_id");
 #line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7646,7 +7646,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 		case RAW_DEVELOPER_EMBEDDED:
 #line 7626 "PhotoTable.c"
 		{
-			gchar* _tmp3_ = NULL;
+			gchar* _tmp3_;
 #line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp3_ = g_strdup ("develop_embedded_id");
 #line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7722,12 +7722,12 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 #line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp16_ != BACKING_PHOTO_ID_INVALID) {
 #line 7703 "PhotoTable.c"
-		PhotoRow* _tmp17_ = NULL;
-		PhotoID _tmp18_ = {0};
-		gint64 _tmp19_ = 0LL;
-		RawDeveloper _tmp20_ = 0;
-		gchar* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
+		PhotoRow* _tmp17_;
+		PhotoID _tmp18_;
+		gint64 _tmp19_;
+		RawDeveloper _tmp20_;
+		gchar* _tmp21_;
+		gchar* _tmp22_;
 #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp17_ = row;
 #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7775,8 +7775,8 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 
 
 void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, GError** error) {
-	PhotoRow* _tmp0_ = NULL;
-	RawDeveloper _tmp1_ = 0;
+	PhotoRow* _tmp0_;
+	RawDeveloper _tmp1_;
 	BackingPhotoID _tmp2_ = {0};
 	GError * _inner_error_ = NULL;
 #line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7826,7 +7826,7 @@ static void photo_table_instance_init (PhotoTable * self) {
 }
 
 
-static void photo_table_finalize (DatabaseTable* obj) {
+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);
@@ -7849,7 +7849,7 @@ GType photo_table_get_type (void) {
 
 
 void backing_photo_id_init (BackingPhotoID *self, gint64 id) {
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #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"
@@ -7862,7 +7862,7 @@ void backing_photo_id_init (BackingPhotoID *self, gint64 id) {
 
 gboolean backing_photo_id_is_invalid (BackingPhotoID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	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"
@@ -7875,7 +7875,7 @@ gboolean backing_photo_id_is_invalid (BackingPhotoID *self) {
 
 gboolean backing_photo_id_is_valid (BackingPhotoID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	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"
@@ -7918,13 +7918,13 @@ GType backing_photo_id_get_type (void) {
 
 gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* info) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
-	GFileInfo* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
-	time_t _tmp3_ = 0;
-	GFileInfo* _tmp4_ = NULL;
+	gint64 _tmp0_;
+	GFileInfo* _tmp1_;
+	gint64 _tmp2_;
+	time_t _tmp3_;
+	GFileInfo* _tmp4_;
 	GTimeVal _tmp5_ = {0};
-	glong _tmp6_ = 0L;
+	glong _tmp6_;
 #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"
@@ -7961,13 +7961,13 @@ gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo*
 
 gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
-	GFileInfo* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
-	time_t _tmp3_ = 0;
-	GFileInfo* _tmp4_ = NULL;
+	gint64 _tmp0_;
+	GFileInfo* _tmp1_;
+	gint64 _tmp2_;
+	time_t _tmp3_;
+	GFileInfo* _tmp4_;
 	GTimeVal _tmp5_ = {0};
-	glong _tmp6_ = 0L;
+	glong _tmp6_;
 #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"
@@ -8003,23 +8003,23 @@ gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info) {
 
 
 void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from) {
-	BackingPhotoRow* _tmp0_ = NULL;
-	BackingPhotoID _tmp1_ = {0};
-	BackingPhotoRow* _tmp2_ = NULL;
-	time_t _tmp3_ = 0;
-	BackingPhotoRow* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	BackingPhotoRow* _tmp7_ = NULL;
-	gint64 _tmp8_ = 0LL;
-	BackingPhotoRow* _tmp9_ = NULL;
-	time_t _tmp10_ = 0;
-	BackingPhotoRow* _tmp11_ = NULL;
-	PhotoFileFormat _tmp12_ = 0;
-	BackingPhotoRow* _tmp13_ = NULL;
-	Dimensions _tmp14_ = {0};
-	BackingPhotoRow* _tmp15_ = NULL;
-	Orientation _tmp16_ = 0;
+	BackingPhotoRow* _tmp0_;
+	BackingPhotoID _tmp1_;
+	BackingPhotoRow* _tmp2_;
+	time_t _tmp3_;
+	BackingPhotoRow* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	BackingPhotoRow* _tmp7_;
+	gint64 _tmp8_;
+	BackingPhotoRow* _tmp9_;
+	time_t _tmp10_;
+	BackingPhotoRow* _tmp11_;
+	PhotoFileFormat _tmp12_;
+	BackingPhotoRow* _tmp13_;
+	Dimensions _tmp14_;
+	BackingPhotoRow* _tmp15_;
+	Orientation _tmp16_;
 #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"
@@ -8139,7 +8139,7 @@ static gchar* value_backing_photo_row_collect_value (GValue* value, guint n_coll
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (collect_values[0].v_pointer) {
 #line 8120 "PhotoTable.c"
-		BackingPhotoRow* object;
+		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) {
@@ -8166,7 +8166,7 @@ static gchar* value_backing_photo_row_collect_value (GValue* value, guint n_coll
 
 
 static gchar* value_backing_photo_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	BackingPhotoRow** object_p;
+	BackingPhotoRow ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (!object_p) {
@@ -8218,7 +8218,7 @@ gpointer value_get_backing_photo_row (const GValue* value) {
 
 
 void value_set_backing_photo_row (GValue* value, gpointer v_object) {
-	BackingPhotoRow* old;
+	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"
@@ -8249,7 +8249,7 @@ void value_set_backing_photo_row (GValue* value, gpointer v_object) {
 
 
 void value_take_backing_photo_row (GValue* value, gpointer v_object) {
-	BackingPhotoRow* old;
+	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"
@@ -8295,7 +8295,7 @@ static void backing_photo_row_instance_init (BackingPhotoRow * self) {
 }
 
 
-static void backing_photo_row_finalize (BackingPhotoRow* obj) {
+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);
@@ -8322,7 +8322,7 @@ GType backing_photo_row_get_type (void) {
 
 
 gpointer backing_photo_row_ref (gpointer instance) {
-	BackingPhotoRow* self;
+	BackingPhotoRow * self;
 	self = instance;
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -8333,7 +8333,7 @@ gpointer backing_photo_row_ref (gpointer instance) {
 
 
 void backing_photo_row_unref (gpointer instance) {
-	BackingPhotoRow* self;
+	BackingPhotoRow * self;
 	self = instance;
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -8350,13 +8350,13 @@ static BackingPhotoTable* backing_photo_table_construct (GType object_type) {
 	BackingPhotoTable* self = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
 #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"
@@ -8386,7 +8386,7 @@ static BackingPhotoTable* backing_photo_table_construct (GType object_type) {
 #line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp6_ != SQLITE_DONE) {
 #line 8367 "PhotoTable.c"
-		gint _tmp7_ = 0;
+		gint _tmp7_;
 #line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_ = res;
 #line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -8410,15 +8410,15 @@ static BackingPhotoTable* backing_photo_table_new (void) {
 
 BackingPhotoTable* backing_photo_table_get_instance (void) {
 	BackingPhotoTable* result = NULL;
-	BackingPhotoTable* _tmp0_ = NULL;
-	BackingPhotoTable* _tmp2_ = NULL;
-	BackingPhotoTable* _tmp3_ = 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 8399 "PhotoTable.c"
-		BackingPhotoTable* _tmp1_ = NULL;
+		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"
@@ -8442,64 +8442,64 @@ BackingPhotoTable* backing_photo_table_get_instance (void) {
 void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, GError** error) {
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
 	time_t time_created = 0;
-	gulong _tmp4_ = 0UL;
-	sqlite3_stmt* _tmp5_ = NULL;
-	BackingPhotoRow* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	GDestroyNotify _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	sqlite3_stmt* _tmp12_ = NULL;
-	BackingPhotoRow* _tmp13_ = NULL;
-	time_t _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	sqlite3_stmt* _tmp17_ = NULL;
-	BackingPhotoRow* _tmp18_ = NULL;
-	gint64 _tmp19_ = 0LL;
-	gint _tmp20_ = 0;
-	gint _tmp21_ = 0;
-	sqlite3_stmt* _tmp22_ = NULL;
-	BackingPhotoRow* _tmp23_ = NULL;
-	Dimensions _tmp24_ = {0};
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
-	gint _tmp27_ = 0;
-	sqlite3_stmt* _tmp28_ = NULL;
-	BackingPhotoRow* _tmp29_ = NULL;
-	Dimensions _tmp30_ = {0};
-	gint _tmp31_ = 0;
-	gint _tmp32_ = 0;
-	gint _tmp33_ = 0;
-	sqlite3_stmt* _tmp34_ = NULL;
-	BackingPhotoRow* _tmp35_ = NULL;
-	Orientation _tmp36_ = 0;
-	gint _tmp37_ = 0;
-	gint _tmp38_ = 0;
-	sqlite3_stmt* _tmp39_ = NULL;
-	BackingPhotoRow* _tmp40_ = NULL;
-	PhotoFileFormat _tmp41_ = 0;
-	gint _tmp42_ = 0;
-	gint _tmp43_ = 0;
-	gint _tmp44_ = 0;
-	sqlite3_stmt* _tmp45_ = NULL;
-	time_t _tmp46_ = 0;
-	gint _tmp47_ = 0;
-	gint _tmp48_ = 0;
-	sqlite3_stmt* _tmp49_ = NULL;
-	gint _tmp50_ = 0;
-	gint _tmp51_ = 0;
-	BackingPhotoRow* _tmp53_ = NULL;
-	sqlite3* _tmp54_ = NULL;
-	gint64 _tmp55_ = 0LL;
-	BackingPhotoRow* _tmp56_ = NULL;
-	time_t _tmp57_ = 0;
+	gulong _tmp4_;
+	sqlite3_stmt* _tmp5_;
+	BackingPhotoRow* _tmp6_;
+	const gchar* _tmp7_;
+	gchar* _tmp8_;
+	GDestroyNotify _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	BackingPhotoRow* _tmp13_;
+	time_t _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	sqlite3_stmt* _tmp17_;
+	BackingPhotoRow* _tmp18_;
+	gint64 _tmp19_;
+	gint _tmp20_;
+	gint _tmp21_;
+	sqlite3_stmt* _tmp22_;
+	BackingPhotoRow* _tmp23_;
+	Dimensions _tmp24_;
+	gint _tmp25_;
+	gint _tmp26_;
+	gint _tmp27_;
+	sqlite3_stmt* _tmp28_;
+	BackingPhotoRow* _tmp29_;
+	Dimensions _tmp30_;
+	gint _tmp31_;
+	gint _tmp32_;
+	gint _tmp33_;
+	sqlite3_stmt* _tmp34_;
+	BackingPhotoRow* _tmp35_;
+	Orientation _tmp36_;
+	gint _tmp37_;
+	gint _tmp38_;
+	sqlite3_stmt* _tmp39_;
+	BackingPhotoRow* _tmp40_;
+	PhotoFileFormat _tmp41_;
+	gint _tmp42_;
+	gint _tmp43_;
+	gint _tmp44_;
+	sqlite3_stmt* _tmp45_;
+	time_t _tmp46_;
+	gint _tmp47_;
+	gint _tmp48_;
+	sqlite3_stmt* _tmp49_;
+	gint _tmp50_;
+	gint _tmp51_;
+	BackingPhotoRow* _tmp53_;
+	sqlite3* _tmp54_;
+	gint64 _tmp55_;
+	BackingPhotoRow* _tmp56_;
+	time_t _tmp57_;
 	GError * _inner_error_ = NULL;
 #line 1156 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
@@ -8654,7 +8654,7 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G
 #line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp51_ != SQLITE_DONE) {
 #line 8635 "PhotoTable.c"
-		gint _tmp52_ = 0;
+		gint _tmp52_;
 #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp52_ = res;
 #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -8707,47 +8707,47 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot
 	BackingPhotoRow* result = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	BackingPhotoID _tmp5_ = {0};
-	gint64 _tmp6_ = 0LL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	BackingPhotoID _tmp5_;
+	gint64 _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
 	BackingPhotoRow* row = NULL;
-	BackingPhotoRow* _tmp14_ = NULL;
-	BackingPhotoRow* _tmp15_ = NULL;
-	BackingPhotoID _tmp16_ = {0};
-	BackingPhotoRow* _tmp17_ = NULL;
-	sqlite3_stmt* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	BackingPhotoRow* _tmp21_ = NULL;
-	sqlite3_stmt* _tmp22_ = NULL;
-	gint64 _tmp23_ = 0LL;
-	BackingPhotoRow* _tmp24_ = NULL;
-	sqlite3_stmt* _tmp25_ = NULL;
-	gint64 _tmp26_ = 0LL;
-	BackingPhotoRow* _tmp27_ = NULL;
-	sqlite3_stmt* _tmp28_ = NULL;
-	gint _tmp29_ = 0;
-	sqlite3_stmt* _tmp30_ = NULL;
-	gint _tmp31_ = 0;
-	BackingPhotoRow* _tmp32_ = NULL;
-	sqlite3_stmt* _tmp33_ = NULL;
-	gint _tmp34_ = 0;
-	BackingPhotoRow* _tmp35_ = NULL;
-	sqlite3_stmt* _tmp36_ = NULL;
-	gint _tmp37_ = 0;
-	PhotoFileFormat _tmp38_ = 0;
-	BackingPhotoRow* _tmp39_ = NULL;
-	sqlite3_stmt* _tmp40_ = NULL;
-	gint64 _tmp41_ = 0LL;
+	BackingPhotoRow* _tmp14_;
+	BackingPhotoRow* _tmp15_;
+	BackingPhotoID _tmp16_;
+	BackingPhotoRow* _tmp17_;
+	sqlite3_stmt* _tmp18_;
+	const gchar* _tmp19_;
+	gchar* _tmp20_;
+	BackingPhotoRow* _tmp21_;
+	sqlite3_stmt* _tmp22_;
+	gint64 _tmp23_;
+	BackingPhotoRow* _tmp24_;
+	sqlite3_stmt* _tmp25_;
+	gint64 _tmp26_;
+	BackingPhotoRow* _tmp27_;
+	sqlite3_stmt* _tmp28_;
+	gint _tmp29_;
+	sqlite3_stmt* _tmp30_;
+	gint _tmp31_;
+	BackingPhotoRow* _tmp32_;
+	sqlite3_stmt* _tmp33_;
+	gint _tmp34_;
+	BackingPhotoRow* _tmp35_;
+	sqlite3_stmt* _tmp36_;
+	gint _tmp37_;
+	PhotoFileFormat _tmp38_;
+	BackingPhotoRow* _tmp39_;
+	sqlite3_stmt* _tmp40_;
+	gint64 _tmp41_;
 	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);
@@ -8800,13 +8800,13 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot
 		return result;
 #line 8779 "PhotoTable.c"
 	} else {
-		gint _tmp12_ = 0;
+		gint _tmp12_;
 #line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp12_ = res;
 #line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp12_ != SQLITE_ROW) {
 #line 8786 "PhotoTable.c"
-			gint _tmp13_ = 0;
+			gint _tmp13_;
 #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp13_ = res;
 #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -8925,52 +8925,52 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot
 void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, GError** error) {
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	BackingPhotoRow* _tmp5_ = NULL;
-	time_t _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	sqlite3_stmt* _tmp9_ = NULL;
-	BackingPhotoRow* _tmp10_ = NULL;
-	gint64 _tmp11_ = 0LL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	sqlite3_stmt* _tmp14_ = NULL;
-	BackingPhotoRow* _tmp15_ = NULL;
-	Dimensions _tmp16_ = {0};
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	sqlite3_stmt* _tmp20_ = NULL;
-	BackingPhotoRow* _tmp21_ = NULL;
-	Dimensions _tmp22_ = {0};
-	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
-	gint _tmp25_ = 0;
-	sqlite3_stmt* _tmp26_ = NULL;
-	BackingPhotoRow* _tmp27_ = NULL;
-	Orientation _tmp28_ = 0;
-	gint _tmp29_ = 0;
-	gint _tmp30_ = 0;
-	sqlite3_stmt* _tmp31_ = NULL;
-	BackingPhotoRow* _tmp32_ = NULL;
-	PhotoFileFormat _tmp33_ = 0;
-	gint _tmp34_ = 0;
-	gint _tmp35_ = 0;
-	gint _tmp36_ = 0;
-	sqlite3_stmt* _tmp37_ = NULL;
-	BackingPhotoRow* _tmp38_ = NULL;
-	BackingPhotoID _tmp39_ = {0};
-	gint64 _tmp40_ = 0LL;
-	gint _tmp41_ = 0;
-	gint _tmp42_ = 0;
-	sqlite3_stmt* _tmp43_ = NULL;
-	gint _tmp44_ = 0;
-	gint _tmp45_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	BackingPhotoRow* _tmp5_;
+	time_t _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	sqlite3_stmt* _tmp9_;
+	BackingPhotoRow* _tmp10_;
+	gint64 _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
+	sqlite3_stmt* _tmp14_;
+	BackingPhotoRow* _tmp15_;
+	Dimensions _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
+	sqlite3_stmt* _tmp20_;
+	BackingPhotoRow* _tmp21_;
+	Dimensions _tmp22_;
+	gint _tmp23_;
+	gint _tmp24_;
+	gint _tmp25_;
+	sqlite3_stmt* _tmp26_;
+	BackingPhotoRow* _tmp27_;
+	Orientation _tmp28_;
+	gint _tmp29_;
+	gint _tmp30_;
+	sqlite3_stmt* _tmp31_;
+	BackingPhotoRow* _tmp32_;
+	PhotoFileFormat _tmp33_;
+	gint _tmp34_;
+	gint _tmp35_;
+	gint _tmp36_;
+	sqlite3_stmt* _tmp37_;
+	BackingPhotoRow* _tmp38_;
+	BackingPhotoID _tmp39_;
+	gint64 _tmp40_;
+	gint _tmp41_;
+	gint _tmp42_;
+	sqlite3_stmt* _tmp43_;
+	gint _tmp44_;
+	gint _tmp45_;
 	GError * _inner_error_ = NULL;
 #line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
@@ -9107,7 +9107,7 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row,
 #line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp45_ != SQLITE_DONE) {
 #line 9087 "PhotoTable.c"
-		gint _tmp46_ = 0;
+		gint _tmp46_;
 #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp46_ = res;
 #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -9145,26 +9145,26 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row,
 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_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	time_t _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	sqlite3_stmt* _tmp8_ = NULL;
-	gint64 _tmp9_ = 0LL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	sqlite3_stmt* _tmp12_ = NULL;
-	BackingPhotoID _tmp13_ = {0};
-	gint64 _tmp14_ = 0LL;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	sqlite3_stmt* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	time_t _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	sqlite3_stmt* _tmp8_;
+	gint64 _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	BackingPhotoID _tmp13_;
+	gint64 _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	sqlite3_stmt* _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
 	GError * _inner_error_ = NULL;
 #line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
@@ -9233,7 +9233,7 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot
 #line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp19_ != SQLITE_DONE) {
 #line 9213 "PhotoTable.c"
-		gint _tmp20_ = 0;
+		gint _tmp20_;
 #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp20_ = res;
 #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -9269,8 +9269,8 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot
 
 
 void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backing_id, GError** error) {
-	BackingPhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
+	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));
@@ -9305,9 +9305,9 @@ void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backin
 
 
 void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* id, const gchar* filepath, GError** error) {
-	BackingPhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	const gchar* _tmp2_ = NULL;
+	BackingPhotoID _tmp0_;
+	gint64 _tmp1_;
+	const gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
@@ -9346,9 +9346,9 @@ void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID*
 
 
 void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, GError** error) {
-	BackingPhotoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	time_t _tmp2_ = 0;
+	BackingPhotoID _tmp0_;
+	gint64 _tmp1_;
+	time_t _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
@@ -9397,7 +9397,7 @@ static void backing_photo_table_instance_init (BackingPhotoTable * self) {
 }
 
 
-static void backing_photo_table_finalize (DatabaseTable* obj) {
+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);
author	Jörg Frings-Fürst <debian@jff-webhosting.net>	2017-11-12 15:55:20 +0100
committer	Jörg Frings-Fürst <debian@jff-webhosting.net>	2017-11-12 15:55:20 +0100
commit	f6140ff1c9ec493d947da5b346508846e7a1a06f (patch)
tree	c01b9164ee4b0d46b6670ccee45f6181c6237d7f /src/db/PhotoTable.c
parent	0f67b3cc674377559e66c5a6729fd499049a992f (diff)
parent	2492891f112caac6076ce49721d9d5d78a152c3a (diff)