Update upstream source from tag 'upstream/0.26.4'

Update to upstream version '0.26.4'
with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4

1 files changed, 464 insertions, 464 deletions

diff --git a/src/db/VideoTable.c b/src/db/VideoTable.c
index da6cbc7..69ca2ca 100644
--- a/src/db/VideoTable.c
+++ b/src/db/VideoTable.c
@@ -1,4 +1,4 @@
-/* VideoTable.c generated by valac 0.34.7, the Vala compiler
+/* VideoTable.c generated by valac 0.36.6, the Vala compiler
  * generated from VideoTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -198,7 +198,7 @@ enum  {
 };
 VideoRow* video_row_new (void);
 VideoRow* video_row_construct (GType object_type);
-static void video_row_finalize (VideoRow* obj);
+static void video_row_finalize (VideoRow * obj);
 gpointer database_table_ref (gpointer instance);
 void database_table_unref (gpointer instance);
 GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -248,14 +248,14 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error);
 static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* file, const gchar* md5);
 gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar* md5);
 VideoID* video_table_get_duplicate_ids (VideoTable* self, GFile* file, const gchar* md5, int* result_length1);
-static void _vala_array_add3 (VideoID** array, int* length, int* size, const VideoID* value);
+static void _vala_array_add3 (VideoID* * array, int* length, int* size, const VideoID* value);
 GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event_id);
 void video_table_set_timestamp (VideoTable* self, VideoID* video_id, time_t timestamp, GError** error);
-static void video_table_finalize (DatabaseTable* obj);
+static void video_table_finalize (DatabaseTable * obj);
 
 
 void video_id_init (VideoID *self, gint64 id) {
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	memset (self, 0, sizeof (VideoID));
 #line 13 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -268,7 +268,7 @@ void video_id_init (VideoID *self, gint64 id) {
 
 gboolean video_id_is_invalid (VideoID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 17 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	_tmp0_ = (*self).id;
 #line 17 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -281,7 +281,7 @@ gboolean video_id_is_invalid (VideoID *self) {
 
 gboolean video_id_is_valid (VideoID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	_tmp0_ = (*self).id;
 #line 21 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -294,9 +294,9 @@ gboolean video_id_is_valid (VideoID *self) {
 
 guint video_id_hash (VideoID* a) {
 	guint result = 0U;
-	VideoID* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
-	guint _tmp2_ = 0U;
+	VideoID* _tmp0_;
+	gint64 _tmp1_;
+	guint _tmp2_;
 #line 25 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	_tmp0_ = a;
 #line 25 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -313,10 +313,10 @@ guint video_id_hash (VideoID* a) {
 
 gboolean video_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/VideoTable.vala"
 	_tmp0_ = a;
 #line 29 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -335,9 +335,9 @@ gboolean video_id_equal (void* a, void* b) {
 
 gchar* video_id_upgrade_video_id_to_source_id (VideoID* video_id) {
 	gchar* result = NULL;
-	VideoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	gchar* _tmp2_ = NULL;
+	VideoID _tmp0_;
+	gint64 _tmp1_;
+	gchar* _tmp2_;
 #line 32 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_val_if_fail (video_id != NULL, NULL);
 #line 33 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -443,7 +443,7 @@ static gchar* value_video_row_collect_value (GValue* value, guint n_collect_valu
 #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (collect_values[0].v_pointer) {
 #line 446 "VideoTable.c"
-		VideoRow* object;
+		VideoRow * object;
 		object = collect_values[0].v_pointer;
 #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -470,7 +470,7 @@ static gchar* value_video_row_collect_value (GValue* value, guint n_collect_valu
 
 
 static gchar* value_video_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	VideoRow** object_p;
+	VideoRow ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (!object_p) {
@@ -522,7 +522,7 @@ gpointer value_get_video_row (const GValue* value) {
 
 
 void value_set_video_row (GValue* value, gpointer v_object) {
-	VideoRow* old;
+	VideoRow * old;
 #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_ROW));
 #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -553,7 +553,7 @@ void value_set_video_row (GValue* value, gpointer v_object) {
 
 
 void value_take_video_row (GValue* value, gpointer v_object) {
-	VideoRow* old;
+	VideoRow * old;
 #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_ROW));
 #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -597,7 +597,7 @@ static void video_row_instance_init (VideoRow * self) {
 }
 
 
-static void video_row_finalize (VideoRow* obj) {
+static void video_row_finalize (VideoRow * obj) {
 	VideoRow * self;
 #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_ROW, VideoRow);
@@ -632,7 +632,7 @@ GType video_row_get_type (void) {
 
 
 gpointer video_row_ref (gpointer instance) {
-	VideoRow* self;
+	VideoRow * self;
 	self = instance;
 #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -643,7 +643,7 @@ gpointer video_row_ref (gpointer instance) {
 
 
 void video_row_unref (gpointer instance) {
-	VideoRow* self;
+	VideoRow * self;
 	self = instance;
 #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -660,22 +660,22 @@ static VideoTable* video_table_construct (GType object_type) {
 	VideoTable* 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;
+	gint _tmp10_;
+	gint _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
 #line 62 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	self = (VideoTable*) database_table_construct (object_type);
 #line 64 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -703,7 +703,7 @@ static VideoTable* video_table_construct (GType object_type) {
 #line 88 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp6_ != SQLITE_DONE) {
 #line 706 "VideoTable.c"
-		gint _tmp7_ = 0;
+		gint _tmp7_;
 #line 89 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp7_ = res;
 #line 89 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -735,7 +735,7 @@ static VideoTable* video_table_construct (GType object_type) {
 #line 98 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp14_ != SQLITE_DONE) {
 #line 738 "VideoTable.c"
-		gint _tmp15_ = 0;
+		gint _tmp15_;
 #line 99 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp15_ = res2;
 #line 99 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -770,15 +770,15 @@ static gpointer _database_table_ref0 (gpointer self) {
 
 VideoTable* video_table_get_instance (void) {
 	VideoTable* result = NULL;
-	VideoTable* _tmp0_ = NULL;
-	VideoTable* _tmp2_ = NULL;
-	VideoTable* _tmp3_ = NULL;
+	VideoTable* _tmp0_;
+	VideoTable* _tmp2_;
+	VideoTable* _tmp3_;
 #line 105 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	_tmp0_ = video_table_instance;
 #line 105 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp0_ == NULL) {
 #line 781 "VideoTable.c"
-		VideoTable* _tmp1_ = NULL;
+		VideoTable* _tmp1_;
 #line 106 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp1_ = video_table_new ();
 #line 106 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -802,101 +802,101 @@ VideoTable* video_table_get_instance (void) {
 void video_table_add (VideoTable* self, VideoRow* video_row, VideoID* result, 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_;
 	gulong time_created = 0UL;
-	gulong _tmp4_ = 0UL;
-	sqlite3_stmt* _tmp5_ = NULL;
-	VideoRow* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	GDestroyNotify _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	sqlite3_stmt* _tmp12_ = NULL;
-	VideoRow* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	sqlite3_stmt* _tmp17_ = NULL;
-	VideoRow* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
-	gint _tmp21_ = 0;
-	sqlite3_stmt* _tmp22_ = NULL;
-	VideoRow* _tmp23_ = NULL;
-	gdouble _tmp24_ = 0.0;
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
+	gulong _tmp4_;
+	sqlite3_stmt* _tmp5_;
+	VideoRow* _tmp6_;
+	const gchar* _tmp7_;
+	gchar* _tmp8_;
+	GDestroyNotify _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	VideoRow* _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	sqlite3_stmt* _tmp17_;
+	VideoRow* _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
+	gint _tmp21_;
+	sqlite3_stmt* _tmp22_;
+	VideoRow* _tmp23_;
+	gdouble _tmp24_;
+	gint _tmp25_;
+	gint _tmp26_;
 	gint _tmp27_ = 0;
-	VideoRow* _tmp28_ = NULL;
-	gboolean _tmp29_ = FALSE;
-	sqlite3_stmt* _tmp30_ = NULL;
-	gint _tmp31_ = 0;
-	gint _tmp32_ = 0;
-	sqlite3_stmt* _tmp33_ = NULL;
-	VideoRow* _tmp34_ = NULL;
-	gint64 _tmp35_ = 0LL;
-	gint _tmp36_ = 0;
-	gint _tmp37_ = 0;
-	sqlite3_stmt* _tmp38_ = NULL;
-	VideoRow* _tmp39_ = NULL;
-	time_t _tmp40_ = 0;
-	gint _tmp41_ = 0;
-	gint _tmp42_ = 0;
-	sqlite3_stmt* _tmp43_ = NULL;
-	VideoRow* _tmp44_ = NULL;
-	time_t _tmp45_ = 0;
-	gint _tmp46_ = 0;
-	gint _tmp47_ = 0;
-	sqlite3_stmt* _tmp48_ = NULL;
-	VideoRow* _tmp49_ = NULL;
-	ImportID _tmp50_ = {0};
-	gint64 _tmp51_ = 0LL;
-	gint _tmp52_ = 0;
-	gint _tmp53_ = 0;
-	sqlite3_stmt* _tmp54_ = NULL;
-	gint _tmp55_ = 0;
-	gint _tmp56_ = 0;
-	sqlite3_stmt* _tmp57_ = NULL;
-	VideoRow* _tmp58_ = NULL;
-	const gchar* _tmp59_ = NULL;
-	gchar* _tmp60_ = NULL;
-	GDestroyNotify _tmp61_ = NULL;
-	gint _tmp62_ = 0;
-	gint _tmp63_ = 0;
-	sqlite3_stmt* _tmp64_ = NULL;
-	gulong _tmp65_ = 0UL;
-	gint _tmp66_ = 0;
-	gint _tmp67_ = 0;
-	sqlite3_stmt* _tmp68_ = NULL;
-	VideoRow* _tmp69_ = NULL;
-	const gchar* _tmp70_ = NULL;
-	gchar* _tmp71_ = NULL;
-	GDestroyNotify _tmp72_ = NULL;
-	gint _tmp73_ = 0;
-	gint _tmp74_ = 0;
-	sqlite3_stmt* _tmp75_ = NULL;
-	VideoRow* _tmp76_ = NULL;
-	const gchar* _tmp77_ = NULL;
-	gchar* _tmp78_ = NULL;
-	GDestroyNotify _tmp79_ = NULL;
-	gint _tmp80_ = 0;
-	gint _tmp81_ = 0;
-	sqlite3_stmt* _tmp82_ = NULL;
-	gint _tmp83_ = 0;
-	gint _tmp84_ = 0;
-	VideoRow* _tmp87_ = NULL;
-	sqlite3* _tmp88_ = NULL;
-	gint64 _tmp89_ = 0LL;
-	VideoRow* _tmp90_ = NULL;
-	VideoRow* _tmp91_ = NULL;
-	gulong _tmp92_ = 0UL;
-	VideoRow* _tmp93_ = NULL;
-	VideoRow* _tmp94_ = NULL;
-	VideoID _tmp95_ = {0};
+	VideoRow* _tmp28_;
+	gboolean _tmp29_;
+	sqlite3_stmt* _tmp30_;
+	gint _tmp31_;
+	gint _tmp32_;
+	sqlite3_stmt* _tmp33_;
+	VideoRow* _tmp34_;
+	gint64 _tmp35_;
+	gint _tmp36_;
+	gint _tmp37_;
+	sqlite3_stmt* _tmp38_;
+	VideoRow* _tmp39_;
+	time_t _tmp40_;
+	gint _tmp41_;
+	gint _tmp42_;
+	sqlite3_stmt* _tmp43_;
+	VideoRow* _tmp44_;
+	time_t _tmp45_;
+	gint _tmp46_;
+	gint _tmp47_;
+	sqlite3_stmt* _tmp48_;
+	VideoRow* _tmp49_;
+	ImportID _tmp50_;
+	gint64 _tmp51_;
+	gint _tmp52_;
+	gint _tmp53_;
+	sqlite3_stmt* _tmp54_;
+	gint _tmp55_;
+	gint _tmp56_;
+	sqlite3_stmt* _tmp57_;
+	VideoRow* _tmp58_;
+	const gchar* _tmp59_;
+	gchar* _tmp60_;
+	GDestroyNotify _tmp61_;
+	gint _tmp62_;
+	gint _tmp63_;
+	sqlite3_stmt* _tmp64_;
+	gulong _tmp65_;
+	gint _tmp66_;
+	gint _tmp67_;
+	sqlite3_stmt* _tmp68_;
+	VideoRow* _tmp69_;
+	const gchar* _tmp70_;
+	gchar* _tmp71_;
+	GDestroyNotify _tmp72_;
+	gint _tmp73_;
+	gint _tmp74_;
+	sqlite3_stmt* _tmp75_;
+	VideoRow* _tmp76_;
+	const gchar* _tmp77_;
+	gchar* _tmp78_;
+	GDestroyNotify _tmp79_;
+	gint _tmp80_;
+	gint _tmp81_;
+	sqlite3_stmt* _tmp82_;
+	gint _tmp83_;
+	gint _tmp84_;
+	VideoRow* _tmp87_;
+	sqlite3* _tmp88_;
+	gint64 _tmp89_;
+	VideoRow* _tmp90_;
+	VideoRow* _tmp91_;
+	gulong _tmp92_;
+	VideoRow* _tmp93_;
+	VideoRow* _tmp94_;
+	VideoID _tmp95_;
 	GError * _inner_error_ = NULL;
 #line 113 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -1151,13 +1151,13 @@ void video_table_add (VideoTable* self, VideoRow* video_row, VideoID* result, GE
 #line 154 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp84_ != SQLITE_DONE) {
 #line 1152 "VideoTable.c"
-		gint _tmp85_ = 0;
+		gint _tmp85_;
 #line 155 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp85_ = res;
 #line 155 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		if (_tmp85_ != SQLITE_CONSTRAINT) {
 #line 1158 "VideoTable.c"
-			gint _tmp86_ = 0;
+			gint _tmp86_;
 #line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 			_tmp86_ = res;
 #line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -1227,21 +1227,21 @@ gboolean video_table_drop_event (VideoTable* 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 168 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE);
 #line 168 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -1295,7 +1295,7 @@ gboolean video_table_drop_event (VideoTable* self, EventID* event_id) {
 #line 179 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp14_ != SQLITE_DONE) {
 #line 1296 "VideoTable.c"
-		gint _tmp15_ = 0;
+		gint _tmp15_;
 #line 180 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp15_ = res;
 #line 180 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -1322,81 +1322,81 @@ VideoRow* video_table_get_row (VideoTable* self, VideoID* video_id) {
 	VideoRow* 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;
-	VideoID _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_;
+	VideoID _tmp5_;
+	gint64 _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
 	VideoRow* row = NULL;
-	VideoRow* _tmp11_ = NULL;
-	VideoRow* _tmp12_ = NULL;
-	VideoID _tmp13_ = {0};
-	VideoRow* _tmp14_ = NULL;
-	sqlite3_stmt* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	VideoRow* _tmp18_ = NULL;
-	sqlite3_stmt* _tmp19_ = NULL;
-	gint _tmp20_ = 0;
-	VideoRow* _tmp21_ = NULL;
-	sqlite3_stmt* _tmp22_ = NULL;
-	gint _tmp23_ = 0;
-	VideoRow* _tmp24_ = NULL;
-	sqlite3_stmt* _tmp25_ = NULL;
-	gdouble _tmp26_ = 0.0;
-	VideoRow* _tmp27_ = NULL;
-	sqlite3_stmt* _tmp28_ = NULL;
-	gint _tmp29_ = 0;
-	VideoRow* _tmp30_ = NULL;
-	sqlite3_stmt* _tmp31_ = NULL;
-	gint64 _tmp32_ = 0LL;
-	VideoRow* _tmp33_ = NULL;
-	sqlite3_stmt* _tmp34_ = NULL;
-	gint64 _tmp35_ = 0LL;
-	VideoRow* _tmp36_ = NULL;
-	sqlite3_stmt* _tmp37_ = NULL;
-	gint64 _tmp38_ = 0LL;
-	VideoRow* _tmp39_ = NULL;
-	sqlite3_stmt* _tmp40_ = NULL;
-	gint64 _tmp41_ = 0LL;
-	VideoRow* _tmp42_ = NULL;
-	sqlite3_stmt* _tmp43_ = NULL;
-	gint64 _tmp44_ = 0LL;
-	VideoRow* _tmp45_ = NULL;
-	sqlite3_stmt* _tmp46_ = NULL;
-	const gchar* _tmp47_ = NULL;
-	gchar* _tmp48_ = NULL;
-	VideoRow* _tmp49_ = NULL;
-	sqlite3_stmt* _tmp50_ = NULL;
-	gint64 _tmp51_ = 0LL;
-	VideoRow* _tmp52_ = NULL;
-	sqlite3_stmt* _tmp53_ = NULL;
-	gint _tmp54_ = 0;
-	Rating _tmp55_ = 0;
-	VideoRow* _tmp56_ = NULL;
-	sqlite3_stmt* _tmp57_ = NULL;
-	const gchar* _tmp58_ = NULL;
-	gchar* _tmp59_ = NULL;
-	VideoRow* _tmp60_ = NULL;
-	sqlite3_stmt* _tmp61_ = NULL;
-	const gchar* _tmp62_ = NULL;
-	gchar* _tmp63_ = NULL;
-	VideoRow* _tmp64_ = NULL;
-	sqlite3_stmt* _tmp65_ = NULL;
-	gint64 _tmp66_ = 0LL;
-	VideoRow* _tmp67_ = NULL;
-	sqlite3_stmt* _tmp68_ = NULL;
-	gint64 _tmp69_ = 0LL;
-	VideoRow* _tmp70_ = NULL;
-	sqlite3_stmt* _tmp71_ = NULL;
-	const gchar* _tmp72_ = NULL;
-	gchar* _tmp73_ = NULL;
+	VideoRow* _tmp11_;
+	VideoRow* _tmp12_;
+	VideoID _tmp13_;
+	VideoRow* _tmp14_;
+	sqlite3_stmt* _tmp15_;
+	const gchar* _tmp16_;
+	gchar* _tmp17_;
+	VideoRow* _tmp18_;
+	sqlite3_stmt* _tmp19_;
+	gint _tmp20_;
+	VideoRow* _tmp21_;
+	sqlite3_stmt* _tmp22_;
+	gint _tmp23_;
+	VideoRow* _tmp24_;
+	sqlite3_stmt* _tmp25_;
+	gdouble _tmp26_;
+	VideoRow* _tmp27_;
+	sqlite3_stmt* _tmp28_;
+	gint _tmp29_;
+	VideoRow* _tmp30_;
+	sqlite3_stmt* _tmp31_;
+	gint64 _tmp32_;
+	VideoRow* _tmp33_;
+	sqlite3_stmt* _tmp34_;
+	gint64 _tmp35_;
+	VideoRow* _tmp36_;
+	sqlite3_stmt* _tmp37_;
+	gint64 _tmp38_;
+	VideoRow* _tmp39_;
+	sqlite3_stmt* _tmp40_;
+	gint64 _tmp41_;
+	VideoRow* _tmp42_;
+	sqlite3_stmt* _tmp43_;
+	gint64 _tmp44_;
+	VideoRow* _tmp45_;
+	sqlite3_stmt* _tmp46_;
+	const gchar* _tmp47_;
+	gchar* _tmp48_;
+	VideoRow* _tmp49_;
+	sqlite3_stmt* _tmp50_;
+	gint64 _tmp51_;
+	VideoRow* _tmp52_;
+	sqlite3_stmt* _tmp53_;
+	gint _tmp54_;
+	Rating _tmp55_;
+	VideoRow* _tmp56_;
+	sqlite3_stmt* _tmp57_;
+	const gchar* _tmp58_;
+	gchar* _tmp59_;
+	VideoRow* _tmp60_;
+	sqlite3_stmt* _tmp61_;
+	const gchar* _tmp62_;
+	gchar* _tmp63_;
+	VideoRow* _tmp64_;
+	sqlite3_stmt* _tmp65_;
+	gint64 _tmp66_;
+	VideoRow* _tmp67_;
+	sqlite3_stmt* _tmp68_;
+	gint64 _tmp69_;
+	VideoRow* _tmp70_;
+	sqlite3_stmt* _tmp71_;
+	const gchar* _tmp72_;
+	gchar* _tmp73_;
 #line 188 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL);
 #line 188 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -1635,12 +1635,12 @@ GeeArrayList* video_table_get_all (VideoTable* 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 227 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL);
 #line 229 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -1666,76 +1666,76 @@ GeeArrayList* video_table_get_all (VideoTable* self) {
 #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	while (TRUE) {
 #line 1663 "VideoTable.c"
-		sqlite3_stmt* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
+		sqlite3_stmt* _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
 		VideoRow* row = NULL;
-		VideoRow* _tmp8_ = NULL;
-		VideoRow* _tmp9_ = NULL;
-		sqlite3_stmt* _tmp10_ = NULL;
-		gint64 _tmp11_ = 0LL;
-		VideoRow* _tmp12_ = NULL;
-		sqlite3_stmt* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		VideoRow* _tmp16_ = NULL;
-		sqlite3_stmt* _tmp17_ = NULL;
-		gint _tmp18_ = 0;
-		VideoRow* _tmp19_ = NULL;
-		sqlite3_stmt* _tmp20_ = NULL;
-		gint _tmp21_ = 0;
-		VideoRow* _tmp22_ = NULL;
-		sqlite3_stmt* _tmp23_ = NULL;
-		gdouble _tmp24_ = 0.0;
-		VideoRow* _tmp25_ = NULL;
-		sqlite3_stmt* _tmp26_ = NULL;
-		gint _tmp27_ = 0;
-		VideoRow* _tmp28_ = NULL;
-		sqlite3_stmt* _tmp29_ = NULL;
-		gint64 _tmp30_ = 0LL;
-		VideoRow* _tmp31_ = NULL;
-		sqlite3_stmt* _tmp32_ = NULL;
-		gint64 _tmp33_ = 0LL;
-		VideoRow* _tmp34_ = NULL;
-		sqlite3_stmt* _tmp35_ = NULL;
-		gint64 _tmp36_ = 0LL;
-		VideoRow* _tmp37_ = NULL;
-		sqlite3_stmt* _tmp38_ = NULL;
-		gint64 _tmp39_ = 0LL;
-		VideoRow* _tmp40_ = NULL;
-		sqlite3_stmt* _tmp41_ = NULL;
-		gint64 _tmp42_ = 0LL;
-		VideoRow* _tmp43_ = NULL;
-		sqlite3_stmt* _tmp44_ = NULL;
-		const gchar* _tmp45_ = NULL;
-		gchar* _tmp46_ = NULL;
-		VideoRow* _tmp47_ = NULL;
-		sqlite3_stmt* _tmp48_ = NULL;
-		gint64 _tmp49_ = 0LL;
-		VideoRow* _tmp50_ = NULL;
-		sqlite3_stmt* _tmp51_ = NULL;
-		gint _tmp52_ = 0;
-		Rating _tmp53_ = 0;
-		VideoRow* _tmp54_ = NULL;
-		sqlite3_stmt* _tmp55_ = NULL;
-		const gchar* _tmp56_ = NULL;
-		gchar* _tmp57_ = NULL;
-		VideoRow* _tmp58_ = NULL;
-		sqlite3_stmt* _tmp59_ = NULL;
-		const gchar* _tmp60_ = NULL;
-		gchar* _tmp61_ = NULL;
-		VideoRow* _tmp62_ = NULL;
-		sqlite3_stmt* _tmp63_ = NULL;
-		gint64 _tmp64_ = 0LL;
-		VideoRow* _tmp65_ = NULL;
-		sqlite3_stmt* _tmp66_ = NULL;
-		gint64 _tmp67_ = 0LL;
-		VideoRow* _tmp68_ = NULL;
-		sqlite3_stmt* _tmp69_ = NULL;
-		const gchar* _tmp70_ = NULL;
-		gchar* _tmp71_ = NULL;
-		GeeArrayList* _tmp72_ = NULL;
-		VideoRow* _tmp73_ = NULL;
+		VideoRow* _tmp8_;
+		VideoRow* _tmp9_;
+		sqlite3_stmt* _tmp10_;
+		gint64 _tmp11_;
+		VideoRow* _tmp12_;
+		sqlite3_stmt* _tmp13_;
+		const gchar* _tmp14_;
+		gchar* _tmp15_;
+		VideoRow* _tmp16_;
+		sqlite3_stmt* _tmp17_;
+		gint _tmp18_;
+		VideoRow* _tmp19_;
+		sqlite3_stmt* _tmp20_;
+		gint _tmp21_;
+		VideoRow* _tmp22_;
+		sqlite3_stmt* _tmp23_;
+		gdouble _tmp24_;
+		VideoRow* _tmp25_;
+		sqlite3_stmt* _tmp26_;
+		gint _tmp27_;
+		VideoRow* _tmp28_;
+		sqlite3_stmt* _tmp29_;
+		gint64 _tmp30_;
+		VideoRow* _tmp31_;
+		sqlite3_stmt* _tmp32_;
+		gint64 _tmp33_;
+		VideoRow* _tmp34_;
+		sqlite3_stmt* _tmp35_;
+		gint64 _tmp36_;
+		VideoRow* _tmp37_;
+		sqlite3_stmt* _tmp38_;
+		gint64 _tmp39_;
+		VideoRow* _tmp40_;
+		sqlite3_stmt* _tmp41_;
+		gint64 _tmp42_;
+		VideoRow* _tmp43_;
+		sqlite3_stmt* _tmp44_;
+		const gchar* _tmp45_;
+		gchar* _tmp46_;
+		VideoRow* _tmp47_;
+		sqlite3_stmt* _tmp48_;
+		gint64 _tmp49_;
+		VideoRow* _tmp50_;
+		sqlite3_stmt* _tmp51_;
+		gint _tmp52_;
+		Rating _tmp53_;
+		VideoRow* _tmp54_;
+		sqlite3_stmt* _tmp55_;
+		const gchar* _tmp56_;
+		gchar* _tmp57_;
+		VideoRow* _tmp58_;
+		sqlite3_stmt* _tmp59_;
+		const gchar* _tmp60_;
+		gchar* _tmp61_;
+		VideoRow* _tmp62_;
+		sqlite3_stmt* _tmp63_;
+		gint64 _tmp64_;
+		VideoRow* _tmp65_;
+		sqlite3_stmt* _tmp66_;
+		gint64 _tmp67_;
+		VideoRow* _tmp68_;
+		sqlite3_stmt* _tmp69_;
+		const gchar* _tmp70_;
+		gchar* _tmp71_;
+		GeeArrayList* _tmp72_;
+		VideoRow* _tmp73_;
 #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp5_ = stmt;
 #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -1949,9 +1949,9 @@ GeeArrayList* video_table_get_all (VideoTable* self) {
 
 
 void video_table_set_filepath (VideoTable* self, VideoID* video_id, const gchar* filepath, GError** error) {
-	VideoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	const gchar* _tmp2_ = NULL;
+	VideoID _tmp0_;
+	gint64 _tmp1_;
+	const gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 266 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -1991,9 +1991,9 @@ void video_table_set_filepath (VideoTable* self, VideoID* video_id, const gchar*
 
 void video_table_set_title (VideoTable* self, VideoID* video_id, const gchar* new_title, GError** error) {
 	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	VideoID _tmp3_ = {0};
-	gint64 _tmp4_ = 0LL;
+	const gchar* _tmp1_;
+	VideoID _tmp3_;
+	gint64 _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 270 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -2004,7 +2004,7 @@ void video_table_set_title (VideoTable* self, VideoID* video_id, const gchar* ne
 #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp1_ != NULL) {
 #line 2001 "VideoTable.c"
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp2_ = new_title;
 #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2045,9 +2045,9 @@ void video_table_set_title (VideoTable* self, VideoID* video_id, const gchar* ne
 
 void video_table_set_comment (VideoTable* self, VideoID* video_id, const gchar* new_comment, GError** error) {
 	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	VideoID _tmp3_ = {0};
-	gint64 _tmp4_ = 0LL;
+	const gchar* _tmp1_;
+	VideoID _tmp3_;
+	gint64 _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 274 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -2058,7 +2058,7 @@ void video_table_set_comment (VideoTable* self, VideoID* video_id, const gchar*
 #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp1_ != NULL) {
 #line 2055 "VideoTable.c"
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp2_ = new_comment;
 #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2098,9 +2098,9 @@ void video_table_set_comment (VideoTable* self, VideoID* video_id, const gchar*
 
 
 void video_table_set_exposure_time (VideoTable* self, VideoID* video_id, time_t time, GError** error) {
-	VideoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	time_t _tmp2_ = 0;
+	VideoID _tmp0_;
+	gint64 _tmp1_;
+	time_t _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 278 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -2137,10 +2137,10 @@ void video_table_set_exposure_time (VideoTable* self, VideoID* video_id, time_t
 
 
 void video_table_set_rating (VideoTable* self, VideoID* video_id, Rating rating, GError** error) {
-	VideoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	Rating _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	VideoID _tmp0_;
+	gint64 _tmp1_;
+	Rating _tmp2_;
+	gint _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 282 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -2179,9 +2179,9 @@ void video_table_set_rating (VideoTable* self, VideoID* video_id, Rating rating,
 
 
 void video_table_set_flags (VideoTable* self, VideoID* video_id, guint64 flags, GError** error) {
-	VideoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	guint64 _tmp2_ = 0ULL;
+	VideoID _tmp0_;
+	gint64 _tmp1_;
+	guint64 _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 286 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -2219,9 +2219,9 @@ void video_table_set_flags (VideoTable* self, VideoID* video_id, guint64 flags,
 
 void video_table_update_backlinks (VideoTable* self, VideoID* video_id, const gchar* backlinks, GError** error) {
 	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	VideoID _tmp3_ = {0};
-	gint64 _tmp4_ = 0LL;
+	const gchar* _tmp1_;
+	VideoID _tmp3_;
+	gint64 _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 290 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -2232,7 +2232,7 @@ void video_table_update_backlinks (VideoTable* self, VideoID* video_id, const gc
 #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp1_ != NULL) {
 #line 2229 "VideoTable.c"
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp2_ = backlinks;
 #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2273,9 +2273,9 @@ void video_table_update_backlinks (VideoTable* self, VideoID* video_id, const gc
 
 void video_table_update_is_interpretable (VideoTable* self, VideoID* video_id, gboolean is_interpretable, GError** error) {
 	gint _tmp0_ = 0;
-	gboolean _tmp1_ = FALSE;
-	VideoID _tmp2_ = {0};
-	gint64 _tmp3_ = 0LL;
+	gboolean _tmp1_;
+	VideoID _tmp2_;
+	gint64 _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 294 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -2323,11 +2323,11 @@ void video_table_update_is_interpretable (VideoTable* self, VideoID* video_id, g
 
 gboolean video_table_set_event (VideoTable* self, VideoID* video_id, EventID* event_id) {
 	gboolean result = FALSE;
-	VideoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	EventID _tmp2_ = {0};
-	gint64 _tmp3_ = 0LL;
-	gboolean _tmp4_ = FALSE;
+	VideoID _tmp0_;
+	gint64 _tmp1_;
+	EventID _tmp2_;
+	gint64 _tmp3_;
+	gboolean _tmp4_;
 #line 298 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE);
 #line 298 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2355,19 +2355,19 @@ gboolean video_table_set_event (VideoTable* self, VideoID* video_id, EventID* ev
 void video_table_remove_by_file (VideoTable* self, GFile* file, 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;
-	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_;
 	GError * _inner_error_ = NULL;
 #line 302 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -2414,7 +2414,7 @@ void video_table_remove_by_file (VideoTable* self, GFile* file, GError** error)
 #line 311 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp12_ != SQLITE_DONE) {
 #line 2411 "VideoTable.c"
-		gint _tmp13_ = 0;
+		gint _tmp13_;
 #line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp13_ = res;
 #line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2452,18 +2452,18 @@ void video_table_remove_by_file (VideoTable* self, GFile* file, GError** error)
 void video_table_remove (VideoTable* self, VideoID* videoID, 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;
-	VideoID _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_;
+	VideoID _tmp5_;
+	gint64 _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
 	GError * _inner_error_ = NULL;
 #line 315 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -2508,7 +2508,7 @@ void video_table_remove (VideoTable* self, VideoID* videoID, GError** error) {
 #line 324 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp11_ != SQLITE_DONE) {
 #line 2505 "VideoTable.c"
-		gint _tmp12_ = 0;
+		gint _tmp12_;
 #line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp12_ = res;
 #line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2545,9 +2545,9 @@ void video_table_remove (VideoTable* self, VideoID* videoID, GError** error) {
 
 gboolean video_table_is_video_stored (VideoTable* self, GFile* file) {
 	gboolean result = FALSE;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	VideoID _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp2_;
 #line 328 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE);
 #line 328 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2569,20 +2569,20 @@ gboolean video_table_is_video_stored (VideoTable* self, GFile* file) {
 void video_table_get_id (VideoTable* self, GFile* file, VideoID* result) {
 	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 _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	GFile* _tmp5_;
+	gchar* _tmp6_;
+	GDestroyNotify _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	sqlite3_stmt* _tmp10_;
+	gint _tmp11_;
 	VideoID _tmp12_ = {0};
-	gint _tmp13_ = 0;
+	gint _tmp13_;
 #line 332 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
 #line 332 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2628,8 +2628,8 @@ void video_table_get_id (VideoTable* self, GFile* file, VideoID* result) {
 #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp13_ == SQLITE_ROW) {
 #line 2625 "VideoTable.c"
-		sqlite3_stmt* _tmp14_ = NULL;
-		gint64 _tmp15_ = 0LL;
+		sqlite3_stmt* _tmp14_;
+		gint64 _tmp15_;
 #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp14_ = stmt;
 #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2656,12 +2656,12 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) {
 	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* video_ids = NULL;
-	GeeArrayList* _tmp4_ = NULL;
+	GeeArrayList* _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 345 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL);
@@ -2691,12 +2691,12 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) {
 #line 351 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		while (TRUE) {
 #line 2688 "VideoTable.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_;
 			VideoID _tmp14_ = {0};
 #line 351 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 			if (!_tmp5_) {
@@ -2718,13 +2718,13 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) {
 				break;
 #line 2714 "VideoTable.c"
 			} else {
-				gint _tmp9_ = 0;
+				gint _tmp9_;
 #line 355 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 				_tmp9_ = res;
 #line 355 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 				if (_tmp9_ != SQLITE_ROW) {
 #line 2721 "VideoTable.c"
-					gint _tmp10_ = 0;
+					gint _tmp10_;
 #line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 					_tmp10_ = res;
 #line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2784,22 +2784,22 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) {
 static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* file, const gchar* md5) {
 	sqlite3_stmt* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp1_;
 	gchar* sql = NULL;
-	gchar* _tmp3_ = NULL;
+	gchar* _tmp3_;
 	gboolean first = FALSE;
-	GFile* _tmp4_ = NULL;
-	const gchar* _tmp7_ = NULL;
+	GFile* _tmp4_;
+	const gchar* _tmp7_;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
+	sqlite3* _tmp13_;
+	const gchar* _tmp14_;
 	sqlite3_stmt* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
+	gint _tmp16_;
+	gint _tmp17_;
 	gint col = 0;
-	GFile* _tmp18_ = NULL;
-	const gchar* _tmp26_ = NULL;
+	GFile* _tmp18_;
+	const gchar* _tmp26_;
 #line 365 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL);
 #line 365 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2812,7 +2812,7 @@ static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* fi
 		_tmp0_ = TRUE;
 #line 2808 "VideoTable.c"
 	} else {
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 366 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp2_ = md5;
 #line 366 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2832,8 +2832,8 @@ static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* fi
 #line 371 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp4_ != NULL) {
 #line 2829 "VideoTable.c"
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+		const gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 372 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp5_ = sql;
 #line 372 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2851,16 +2851,16 @@ static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* fi
 #line 376 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp7_ != NULL) {
 #line 2848 "VideoTable.c"
-		gboolean _tmp8_ = FALSE;
-		const gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
+		gboolean _tmp8_;
+		const gchar* _tmp11_;
+		gchar* _tmp12_;
 #line 377 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp8_ = first;
 #line 377 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		if (!_tmp8_) {
 #line 2856 "VideoTable.c"
-			const gchar* _tmp9_ = NULL;
-			gchar* _tmp10_ = NULL;
+			const gchar* _tmp9_;
+			gchar* _tmp10_;
 #line 378 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 			_tmp9_ = sql;
 #line 378 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2904,13 +2904,13 @@ static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* fi
 #line 389 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp18_ != NULL) {
 #line 2901 "VideoTable.c"
-		sqlite3_stmt* _tmp19_ = NULL;
-		gint _tmp20_ = 0;
-		GFile* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
-		GDestroyNotify _tmp23_ = NULL;
-		gint _tmp24_ = 0;
-		gint _tmp25_ = 0;
+		sqlite3_stmt* _tmp19_;
+		gint _tmp20_;
+		GFile* _tmp21_;
+		gchar* _tmp22_;
+		GDestroyNotify _tmp23_;
+		gint _tmp24_;
+		gint _tmp25_;
 #line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp19_ = stmt;
 #line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2938,13 +2938,13 @@ static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* fi
 #line 394 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if (_tmp26_ != NULL) {
 #line 2935 "VideoTable.c"
-		sqlite3_stmt* _tmp27_ = NULL;
-		gint _tmp28_ = 0;
-		const gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
-		GDestroyNotify _tmp31_ = NULL;
-		gint _tmp32_ = 0;
-		gint _tmp33_ = 0;
+		sqlite3_stmt* _tmp27_;
+		gint _tmp28_;
+		const gchar* _tmp29_;
+		gchar* _tmp30_;
+		GDestroyNotify _tmp31_;
+		gint _tmp32_;
+		gint _tmp33_;
 #line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp27_ = stmt;
 #line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2980,13 +2980,13 @@ static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* fi
 gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar* md5) {
 	gboolean result = FALSE;
 	sqlite3_stmt* stmt = NULL;
-	GFile* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
+	GFile* _tmp0_;
+	const gchar* _tmp1_;
+	sqlite3_stmt* _tmp2_;
 	gint res = 0;
-	sqlite3_stmt* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	sqlite3_stmt* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 #line 402 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE);
 #line 402 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -3017,7 +3017,7 @@ gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar*
 		return result;
 #line 3013 "VideoTable.c"
 	} else {
-		gint _tmp6_ = 0;
+		gint _tmp6_;
 #line 409 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp6_ = res;
 #line 409 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -3030,7 +3030,7 @@ gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar*
 			return result;
 #line 3026 "VideoTable.c"
 		} else {
-			gint _tmp7_ = 0;
+			gint _tmp7_;
 #line 413 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 			_tmp7_ = res;
 #line 413 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -3048,7 +3048,7 @@ gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar*
 }
 
 
-static void _vala_array_add3 (VideoID** array, int* length, int* size, const VideoID* value) {
+static void _vala_array_add3 (VideoID* * array, int* length, int* size, const VideoID* value) {
 #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	if ((*length) == (*size)) {
 #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -3066,18 +3066,18 @@ static void _vala_array_add3 (VideoID** array, int* length, int* size, const Vid
 VideoID* video_table_get_duplicate_ids (VideoTable* self, GFile* file, const gchar* md5, int* result_length1) {
 	VideoID* result = NULL;
 	sqlite3_stmt* stmt = NULL;
-	GFile* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
+	GFile* _tmp0_;
+	const gchar* _tmp1_;
+	sqlite3_stmt* _tmp2_;
 	VideoID* ids = NULL;
-	VideoID* _tmp3_ = NULL;
-	gint ids_length1 = 0;
-	gint _ids_size_ = 0;
+	VideoID* _tmp3_;
+	gint ids_length1;
+	gint _ids_size_;
 	gint res = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	VideoID* _tmp13_ = NULL;
-	gint _tmp13__length1 = 0;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	VideoID* _tmp13_;
+	gint _tmp13__length1;
 #line 419 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL);
 #line 419 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -3107,14 +3107,14 @@ VideoID* video_table_get_duplicate_ids (VideoTable* self, GFile* file, const gch
 #line 425 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	while (TRUE) {
 #line 3104 "VideoTable.c"
-		gint _tmp6_ = 0;
-		VideoID* _tmp7_ = NULL;
-		gint _tmp7__length1 = 0;
-		sqlite3_stmt* _tmp8_ = NULL;
-		gint64 _tmp9_ = 0LL;
+		gint _tmp6_;
+		VideoID* _tmp7_;
+		gint _tmp7__length1;
+		sqlite3_stmt* _tmp8_;
+		gint64 _tmp9_;
 		VideoID _tmp10_ = {0};
-		sqlite3_stmt* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
+		sqlite3_stmt* _tmp11_;
+		gint _tmp12_;
 #line 425 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		_tmp6_ = res;
 #line 425 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -3167,17 +3167,17 @@ GeeArrayList* video_table_get_event_source_ids (VideoTable* 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 433 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL);
 #line 433 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -3222,15 +3222,15 @@ GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event
 #line 442 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 		while (TRUE) {
 #line 3219 "VideoTable.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_;
 			VideoID _tmp19_ = {0};
-			gchar* _tmp20_ = NULL;
-			gchar* _tmp21_ = NULL;
+			gchar* _tmp20_;
+			gchar* _tmp21_;
 #line 442 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 			if (!_tmp10_) {
 #line 3231 "VideoTable.c"
@@ -3251,13 +3251,13 @@ GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event
 				break;
 #line 3247 "VideoTable.c"
 			} else {
-				gint _tmp14_ = 0;
+				gint _tmp14_;
 #line 446 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 				_tmp14_ = res;
 #line 446 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 				if (_tmp14_ != SQLITE_ROW) {
 #line 3254 "VideoTable.c"
-					gint _tmp15_ = 0;
+					gint _tmp15_;
 #line 447 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 					_tmp15_ = res;
 #line 447 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -3297,9 +3297,9 @@ GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event
 
 
 void video_table_set_timestamp (VideoTable* self, VideoID* video_id, time_t timestamp, GError** error) {
-	VideoID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	time_t _tmp2_ = 0;
+	VideoID _tmp0_;
+	gint64 _tmp1_;
+	time_t _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 458 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	g_return_if_fail (IS_VIDEO_TABLE (self));
@@ -3348,7 +3348,7 @@ static void video_table_instance_init (VideoTable * self) {
 }
 
 
-static void video_table_finalize (DatabaseTable* obj) {
+static void video_table_finalize (DatabaseTable * obj) {
 	VideoTable * self;
 #line 59 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_TABLE, VideoTable);