Merge branch 'release/0.26.4-1'0.26.4-1

1 files changed, 221 insertions, 221 deletions

diff --git a/src/db/EventTable.c b/src/db/EventTable.c
index 65a2508..462ebc8 100644
--- a/src/db/EventTable.c
+++ b/src/db/EventTable.c
@@ -1,4 +1,4 @@
-/* EventTable.c generated by valac 0.34.7, the Vala compiler
+/* EventTable.c generated by valac 0.36.6, the Vala compiler
  * generated from EventTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -161,7 +161,7 @@ enum  {
 };
 EventRow* event_row_new (void);
 EventRow* event_row_construct (GType object_type);
-static void event_row_finalize (EventRow* obj);
+static void event_row_finalize (EventRow * obj);
 gpointer database_table_ref (gpointer instance);
 void database_table_unref (gpointer instance);
 GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -207,16 +207,16 @@ GeeArrayList* event_table_get_events (EventTable* self);
 gboolean event_table_rename (EventTable* self, EventID* event_id, const gchar* name);
 gboolean database_table_update_text_by_id (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text);
 gchar* event_table_get_name (EventTable* self, EventID* event_id);
-gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt** stmt);
+gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt* * stmt);
 gchar* event_table_get_primary_source_id (EventTable* self, EventID* event_id);
 gboolean event_table_set_primary_source_id (EventTable* self, EventID* event_id, const gchar* primary_source_id);
 time_t event_table_get_time_created (EventTable* self, EventID* event_id);
 gboolean event_table_set_comment (EventTable* self, EventID* event_id, const gchar* new_comment);
-static void event_table_finalize (DatabaseTable* obj);
+static void event_table_finalize (DatabaseTable * obj);
 
 
 void event_id_init (EventID *self, gint64 id) {
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	memset (self, 0, sizeof (EventID));
 #line 13 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -229,7 +229,7 @@ void event_id_init (EventID *self, gint64 id) {
 
 gboolean event_id_is_invalid (EventID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 17 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	_tmp0_ = (*self).id;
 #line 17 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -242,7 +242,7 @@ gboolean event_id_is_invalid (EventID *self) {
 
 gboolean event_id_is_valid (EventID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	_tmp0_ = (*self).id;
 #line 21 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -342,7 +342,7 @@ static gchar* value_event_row_collect_value (GValue* value, guint n_collect_valu
 #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (collect_values[0].v_pointer) {
 #line 345 "EventTable.c"
-		EventRow* object;
+		EventRow * object;
 		object = collect_values[0].v_pointer;
 #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -369,7 +369,7 @@ static gchar* value_event_row_collect_value (GValue* value, guint n_collect_valu
 
 
 static gchar* value_event_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	EventRow** object_p;
+	EventRow ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (!object_p) {
@@ -421,7 +421,7 @@ gpointer value_get_event_row (const GValue* value) {
 
 
 void value_set_event_row (GValue* value, gpointer v_object) {
-	EventRow* old;
+	EventRow * old;
 #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EVENT_ROW));
 #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -452,7 +452,7 @@ void value_set_event_row (GValue* value, gpointer v_object) {
 
 
 void value_take_event_row (GValue* value, gpointer v_object) {
-	EventRow* old;
+	EventRow * old;
 #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EVENT_ROW));
 #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -496,7 +496,7 @@ static void event_row_instance_init (EventRow * self) {
 }
 
 
-static void event_row_finalize (EventRow* obj) {
+static void event_row_finalize (EventRow * obj) {
 	EventRow * self;
 #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT_ROW, EventRow);
@@ -527,7 +527,7 @@ GType event_row_get_type (void) {
 
 
 gpointer event_row_ref (gpointer instance) {
-	EventRow* self;
+	EventRow * self;
 	self = instance;
 #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -538,7 +538,7 @@ gpointer event_row_ref (gpointer instance) {
 
 
 void event_row_unref (gpointer instance) {
-	EventRow* self;
+	EventRow * self;
 	self = instance;
 #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -555,13 +555,13 @@ static EventTable* event_table_construct (GType object_type) {
 	EventTable* 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 36 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	self = (EventTable*) database_table_construct (object_type);
 #line 38 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -589,7 +589,7 @@ static EventTable* event_table_construct (GType object_type) {
 #line 49 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp6_ != SQLITE_DONE) {
 #line 592 "EventTable.c"
-		gint _tmp7_ = 0;
+		gint _tmp7_;
 #line 50 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp7_ = res;
 #line 50 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -622,15 +622,15 @@ static gpointer _database_table_ref0 (gpointer self) {
 
 EventTable* event_table_get_instance (void) {
 	EventTable* result = NULL;
-	EventTable* _tmp0_ = NULL;
-	EventTable* _tmp2_ = NULL;
-	EventTable* _tmp3_ = NULL;
+	EventTable* _tmp0_;
+	EventTable* _tmp2_;
+	EventTable* _tmp3_;
 #line 56 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	_tmp0_ = event_table_instance;
 #line 56 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp0_ == NULL) {
 #line 633 "EventTable.c"
-		EventTable* _tmp1_ = NULL;
+		EventTable* _tmp1_;
 #line 57 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp1_ = event_table_new ();
 #line 57 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -653,12 +653,12 @@ EventTable* event_table_get_instance (void) {
 
 static gchar* event_table_source_id_upgrade (EventTable* self, gint64 primary_photo_id, const gchar* primary_source_id) {
 	gchar* result = NULL;
-	MediaCollectionRegistry* _tmp0_ = NULL;
-	MediaCollectionRegistry* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	gint64 _tmp7_ = 0LL;
+	MediaCollectionRegistry* _tmp0_;
+	MediaCollectionRegistry* _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
+	gint64 _tmp7_;
 #line 63 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_val_if_fail (IS_EVENT_TABLE (self), NULL);
 #line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -676,8 +676,8 @@ static gchar* event_table_source_id_upgrade (EventTable* self, gint64 primary_ph
 #line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp4_) {
 #line 679 "EventTable.c"
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+		const gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 65 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp5_ = primary_source_id;
 #line 65 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -693,9 +693,9 @@ static gchar* event_table_source_id_upgrade (EventTable* self, gint64 primary_ph
 #line 67 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp7_ != PHOTO_ID_INVALID) {
 #line 696 "EventTable.c"
-		gint64 _tmp8_ = 0LL;
+		gint64 _tmp8_;
 		PhotoID _tmp9_ = {0};
-		gchar* _tmp10_ = NULL;
+		gchar* _tmp10_;
 #line 69 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp8_ = primary_photo_id;
 #line 69 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -719,48 +719,48 @@ static gchar* event_table_source_id_upgrade (EventTable* self, gint64 primary_ph
 EventRow* event_table_create (EventTable* self, const gchar* primary_source_id, const gchar* comment, GError** error) {
 	EventRow* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp1_;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp3_ = NULL;
+	sqlite3* _tmp3_;
 	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	gint _tmp5_;
+	gint _tmp6_;
 	time_t time_created = 0;
-	gulong _tmp7_ = 0UL;
-	sqlite3_stmt* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	GDestroyNotify _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	sqlite3_stmt* _tmp14_ = NULL;
-	time_t _tmp15_ = 0;
-	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;
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
+	gulong _tmp7_;
+	sqlite3_stmt* _tmp8_;
+	const gchar* _tmp9_;
+	gchar* _tmp10_;
+	GDestroyNotify _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
+	sqlite3_stmt* _tmp14_;
+	time_t _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	sqlite3_stmt* _tmp18_;
+	const gchar* _tmp19_;
+	gchar* _tmp20_;
+	GDestroyNotify _tmp21_;
+	gint _tmp22_;
+	gint _tmp23_;
+	sqlite3_stmt* _tmp24_;
+	gint _tmp25_;
+	gint _tmp26_;
 	EventRow* row = NULL;
-	EventRow* _tmp28_ = NULL;
-	EventRow* _tmp29_ = NULL;
-	sqlite3* _tmp30_ = NULL;
-	gint64 _tmp31_ = 0LL;
-	EventRow* _tmp32_ = NULL;
-	EventRow* _tmp33_ = NULL;
-	const gchar* _tmp34_ = NULL;
-	gchar* _tmp35_ = NULL;
-	EventRow* _tmp36_ = NULL;
-	time_t _tmp37_ = 0;
-	EventRow* _tmp38_ = NULL;
-	const gchar* _tmp39_ = NULL;
-	gchar* _tmp40_ = NULL;
+	EventRow* _tmp28_;
+	EventRow* _tmp29_;
+	sqlite3* _tmp30_;
+	gint64 _tmp31_;
+	EventRow* _tmp32_;
+	EventRow* _tmp33_;
+	const gchar* _tmp34_;
+	gchar* _tmp35_;
+	EventRow* _tmp36_;
+	time_t _tmp37_;
+	EventRow* _tmp38_;
+	const gchar* _tmp39_;
+	gchar* _tmp40_;
 	GError * _inner_error_ = NULL;
 #line 74 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_val_if_fail (IS_EVENT_TABLE (self), NULL);
@@ -769,7 +769,7 @@ EventRow* event_table_create (EventTable* self, const gchar* primary_source_id,
 #line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp1_ != NULL) {
 #line 772 "EventTable.c"
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp2_ = primary_source_id;
 #line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -856,7 +856,7 @@ EventRow* event_table_create (EventTable* self, const gchar* primary_source_id,
 #line 93 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp26_ != SQLITE_DONE) {
 #line 858 "EventTable.c"
-		gint _tmp27_ = 0;
+		gint _tmp27_;
 #line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp27_ = res;
 #line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -942,44 +942,44 @@ EventRow* event_table_create (EventTable* self, const gchar* primary_source_id,
 void event_table_create_from_row (EventTable* self, EventRow* row, EventID* 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;
-	EventRow* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	GDestroyNotify _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	sqlite3_stmt* _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	sqlite3_stmt* _tmp14_ = NULL;
-	EventRow* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	GDestroyNotify _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
-	sqlite3_stmt* _tmp21_ = NULL;
-	EventRow* _tmp22_ = NULL;
-	time_t _tmp23_ = 0;
-	gint _tmp24_ = 0;
-	gint _tmp25_ = 0;
-	sqlite3_stmt* _tmp26_ = NULL;
-	EventRow* _tmp27_ = NULL;
-	const gchar* _tmp28_ = NULL;
-	gchar* _tmp29_ = NULL;
-	GDestroyNotify _tmp30_ = NULL;
-	gint _tmp31_ = 0;
-	gint _tmp32_ = 0;
-	sqlite3_stmt* _tmp33_ = NULL;
-	gint _tmp34_ = 0;
-	gint _tmp35_ = 0;
-	sqlite3* _tmp38_ = NULL;
-	gint64 _tmp39_ = 0LL;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	EventRow* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
+	GDestroyNotify _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
+	sqlite3_stmt* _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
+	sqlite3_stmt* _tmp14_;
+	EventRow* _tmp15_;
+	const gchar* _tmp16_;
+	gchar* _tmp17_;
+	GDestroyNotify _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
+	sqlite3_stmt* _tmp21_;
+	EventRow* _tmp22_;
+	time_t _tmp23_;
+	gint _tmp24_;
+	gint _tmp25_;
+	sqlite3_stmt* _tmp26_;
+	EventRow* _tmp27_;
+	const gchar* _tmp28_;
+	gchar* _tmp29_;
+	GDestroyNotify _tmp30_;
+	gint _tmp31_;
+	gint _tmp32_;
+	sqlite3_stmt* _tmp33_;
+	gint _tmp34_;
+	gint _tmp35_;
+	sqlite3* _tmp38_;
+	gint64 _tmp39_;
 	EventID _tmp40_ = {0};
 #line 109 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_if_fail (IS_EVENT_TABLE (self));
@@ -1089,7 +1089,7 @@ void event_table_create_from_row (EventTable* self, EventRow* row, EventID* resu
 #line 127 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp35_ != SQLITE_DONE) {
 #line 1090 "EventTable.c"
-		gint _tmp36_ = 0;
+		gint _tmp36_;
 		EventID _tmp37_ = {0};
 #line 128 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp36_ = res;
@@ -1125,41 +1125,41 @@ EventRow* event_table_get_row (EventTable* self, EventID* event_id) {
 	EventRow* 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;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	EventID _tmp5_;
+	gint64 _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
 	EventRow* row = NULL;
-	EventRow* _tmp11_ = NULL;
-	EventRow* _tmp12_ = NULL;
-	EventID _tmp13_ = {0};
-	EventRow* _tmp14_ = NULL;
-	sqlite3_stmt* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
+	EventRow* _tmp11_;
+	EventRow* _tmp12_;
+	EventID _tmp13_;
+	EventRow* _tmp14_;
+	sqlite3_stmt* _tmp15_;
+	const gchar* _tmp16_;
+	gchar* _tmp17_;
 	gboolean _tmp18_ = FALSE;
-	EventRow* _tmp19_ = NULL;
-	const gchar* _tmp20_ = NULL;
-	EventRow* _tmp26_ = NULL;
-	sqlite3_stmt* _tmp27_ = NULL;
-	gint64 _tmp28_ = 0LL;
-	sqlite3_stmt* _tmp29_ = NULL;
-	const gchar* _tmp30_ = NULL;
-	gchar* _tmp31_ = NULL;
-	EventRow* _tmp32_ = NULL;
-	sqlite3_stmt* _tmp33_ = NULL;
-	gint64 _tmp34_ = 0LL;
-	EventRow* _tmp35_ = NULL;
-	sqlite3_stmt* _tmp36_ = NULL;
-	const gchar* _tmp37_ = NULL;
-	gchar* _tmp38_ = NULL;
+	EventRow* _tmp19_;
+	const gchar* _tmp20_;
+	EventRow* _tmp26_;
+	sqlite3_stmt* _tmp27_;
+	gint64 _tmp28_;
+	sqlite3_stmt* _tmp29_;
+	const gchar* _tmp30_;
+	gchar* _tmp31_;
+	EventRow* _tmp32_;
+	sqlite3_stmt* _tmp33_;
+	gint64 _tmp34_;
+	EventRow* _tmp35_;
+	sqlite3_stmt* _tmp36_;
+	const gchar* _tmp37_;
+	gchar* _tmp38_;
 #line 136 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_val_if_fail (IS_EVENT_TABLE (self), NULL);
 #line 136 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1236,10 +1236,10 @@ EventRow* event_table_get_row (EventTable* self, EventID* event_id) {
 #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp20_ != NULL) {
 #line 1236 "EventTable.c"
-		EventRow* _tmp21_ = NULL;
-		const gchar* _tmp22_ = NULL;
-		gint _tmp23_ = 0;
-		gint _tmp24_ = 0;
+		EventRow* _tmp21_;
+		const gchar* _tmp22_;
+		gint _tmp23_;
+		gint _tmp24_;
 #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp21_ = row;
 #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1259,7 +1259,7 @@ EventRow* event_table_get_row (EventTable* self, EventID* event_id) {
 #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp18_) {
 #line 1259 "EventTable.c"
-		EventRow* _tmp25_ = NULL;
+		EventRow* _tmp25_;
 #line 152 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp25_ = row;
 #line 152 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1315,8 +1315,8 @@ EventRow* event_table_get_row (EventTable* self, EventID* event_id) {
 
 
 void event_table_remove (EventTable* self, EventID* event_id, GError** error) {
-	EventID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
+	EventID _tmp0_;
+	gint64 _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 160 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_if_fail (IS_EVENT_TABLE (self));
@@ -1354,12 +1354,12 @@ GeeArrayList* event_table_get_events (EventTable* 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* event_rows = NULL;
-	GeeArrayList* _tmp4_ = NULL;
+	GeeArrayList* _tmp4_;
 #line 164 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_val_if_fail (IS_EVENT_TABLE (self), NULL);
 #line 166 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1389,33 +1389,33 @@ GeeArrayList* event_table_get_events (EventTable* self) {
 #line 171 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		while (TRUE) {
 #line 1388 "EventTable.c"
-			sqlite3_stmt* _tmp6_ = NULL;
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
+			sqlite3_stmt* _tmp6_;
+			gint _tmp7_;
+			gint _tmp8_;
 			EventRow* row = NULL;
-			EventRow* _tmp11_ = NULL;
-			EventRow* _tmp12_ = NULL;
-			sqlite3_stmt* _tmp13_ = NULL;
-			gint64 _tmp14_ = 0LL;
-			EventRow* _tmp15_ = NULL;
-			sqlite3_stmt* _tmp16_ = NULL;
-			const gchar* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
-			EventRow* _tmp19_ = NULL;
-			sqlite3_stmt* _tmp20_ = NULL;
-			gint64 _tmp21_ = 0LL;
-			sqlite3_stmt* _tmp22_ = NULL;
-			const gchar* _tmp23_ = NULL;
-			gchar* _tmp24_ = NULL;
-			EventRow* _tmp25_ = NULL;
-			sqlite3_stmt* _tmp26_ = NULL;
-			gint64 _tmp27_ = 0LL;
-			EventRow* _tmp28_ = NULL;
-			sqlite3_stmt* _tmp29_ = NULL;
-			const gchar* _tmp30_ = NULL;
-			gchar* _tmp31_ = NULL;
-			GeeArrayList* _tmp32_ = NULL;
-			EventRow* _tmp33_ = NULL;
+			EventRow* _tmp11_;
+			EventRow* _tmp12_;
+			sqlite3_stmt* _tmp13_;
+			gint64 _tmp14_;
+			EventRow* _tmp15_;
+			sqlite3_stmt* _tmp16_;
+			const gchar* _tmp17_;
+			gchar* _tmp18_;
+			EventRow* _tmp19_;
+			sqlite3_stmt* _tmp20_;
+			gint64 _tmp21_;
+			sqlite3_stmt* _tmp22_;
+			const gchar* _tmp23_;
+			gchar* _tmp24_;
+			EventRow* _tmp25_;
+			sqlite3_stmt* _tmp26_;
+			gint64 _tmp27_;
+			EventRow* _tmp28_;
+			sqlite3_stmt* _tmp29_;
+			const gchar* _tmp30_;
+			gchar* _tmp31_;
+			GeeArrayList* _tmp32_;
+			EventRow* _tmp33_;
 #line 171 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 			if (!_tmp5_) {
 #line 1418 "EventTable.c"
@@ -1436,13 +1436,13 @@ GeeArrayList* event_table_get_events (EventTable* self) {
 				break;
 #line 1434 "EventTable.c"
 			} else {
-				gint _tmp9_ = 0;
+				gint _tmp9_;
 #line 175 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 				_tmp9_ = res;
 #line 175 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 				if (_tmp9_ != SQLITE_ROW) {
 #line 1441 "EventTable.c"
-					gint _tmp10_ = 0;
+					gint _tmp10_;
 #line 176 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 					_tmp10_ = res;
 #line 176 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1536,10 +1536,10 @@ GeeArrayList* event_table_get_events (EventTable* self) {
 gboolean event_table_rename (EventTable* self, EventID* event_id, const gchar* name) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	EventID _tmp3_ = {0};
-	gint64 _tmp4_ = 0LL;
-	gboolean _tmp5_ = FALSE;
+	const gchar* _tmp1_;
+	EventID _tmp3_;
+	gint64 _tmp4_;
+	gboolean _tmp5_;
 #line 195 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_val_if_fail (IS_EVENT_TABLE (self), FALSE);
 #line 195 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1549,7 +1549,7 @@ gboolean event_table_rename (EventTable* self, EventID* event_id, const gchar* n
 #line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp1_ != NULL) {
 #line 1548 "EventTable.c"
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp2_ = name;
 #line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1577,18 +1577,18 @@ gboolean event_table_rename (EventTable* self, EventID* event_id, const gchar* n
 gchar* event_table_get_name (EventTable* self, EventID* event_id) {
 	gchar* result = NULL;
 	sqlite3_stmt* stmt = NULL;
-	EventID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
+	EventID _tmp0_;
+	gint64 _tmp1_;
 	sqlite3_stmt* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp3_;
 	gchar* name = NULL;
-	sqlite3_stmt* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	sqlite3_stmt* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
 	const gchar* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-	const gchar* _tmp9_ = NULL;
-	gchar* _tmp14_ = NULL;
+	const gchar* _tmp9_;
+	gchar* _tmp14_;
 #line 199 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_val_if_fail (IS_EVENT_TABLE (self), NULL);
 #line 199 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1626,9 +1626,9 @@ gchar* event_table_get_name (EventTable* self, EventID* event_id) {
 #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp9_ != NULL) {
 #line 1625 "EventTable.c"
-		const gchar* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
+		const gchar* _tmp10_;
+		gint _tmp11_;
+		gint _tmp12_;
 #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp10_ = name;
 #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1646,7 +1646,7 @@ gchar* event_table_get_name (EventTable* self, EventID* event_id) {
 #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp8_) {
 #line 1645 "EventTable.c"
-		const gchar* _tmp13_ = NULL;
+		const gchar* _tmp13_;
 #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp13_ = name;
 #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1674,13 +1674,13 @@ gchar* event_table_get_name (EventTable* self, EventID* event_id) {
 gchar* event_table_get_primary_source_id (EventTable* self, EventID* event_id) {
 	gchar* result = NULL;
 	sqlite3_stmt* stmt = NULL;
-	EventID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
+	EventID _tmp0_;
+	gint64 _tmp1_;
 	sqlite3_stmt* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	sqlite3_stmt* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	gboolean _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 209 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_val_if_fail (IS_EVENT_TABLE (self), NULL);
 #line 209 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1723,10 +1723,10 @@ gchar* event_table_get_primary_source_id (EventTable* self, EventID* event_id) {
 
 gboolean event_table_set_primary_source_id (EventTable* self, EventID* event_id, const gchar* primary_source_id) {
 	gboolean result = FALSE;
-	EventID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	EventID _tmp0_;
+	gint64 _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
 #line 217 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_val_if_fail (IS_EVENT_TABLE (self), FALSE);
 #line 217 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1752,12 +1752,12 @@ gboolean event_table_set_primary_source_id (EventTable* self, EventID* event_id,
 time_t event_table_get_time_created (EventTable* self, EventID* event_id) {
 	time_t result = 0;
 	sqlite3_stmt* stmt = NULL;
-	EventID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
+	EventID _tmp0_;
+	gint64 _tmp1_;
 	sqlite3_stmt* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint64 _tmp5_ = 0LL;
+	gboolean _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint64 _tmp5_;
 #line 221 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_val_if_fail (IS_EVENT_TABLE (self), 0);
 #line 221 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1799,10 +1799,10 @@ time_t event_table_get_time_created (EventTable* self, EventID* event_id) {
 gboolean event_table_set_comment (EventTable* self, EventID* event_id, const gchar* new_comment) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	EventID _tmp3_ = {0};
-	gint64 _tmp4_ = 0LL;
-	gboolean _tmp5_ = FALSE;
+	const gchar* _tmp1_;
+	EventID _tmp3_;
+	gint64 _tmp4_;
+	gboolean _tmp5_;
 #line 229 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	g_return_val_if_fail (IS_EVENT_TABLE (self), FALSE);
 #line 229 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1814,7 +1814,7 @@ gboolean event_table_set_comment (EventTable* self, EventID* event_id, const gch
 #line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	if (_tmp1_ != NULL) {
 #line 1813 "EventTable.c"
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 		_tmp2_ = new_comment;
 #line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala"
@@ -1852,7 +1852,7 @@ static void event_table_instance_init (EventTable * self) {
 }
 
 
-static void event_table_finalize (DatabaseTable* obj) {
+static void event_table_finalize (DatabaseTable * obj) {
 	EventTable * self;
 #line 33 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT_TABLE, EventTable);