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

1 files changed, 658 insertions, 658 deletions

diff --git a/src/db/SavedSearchDBTable.c b/src/db/SavedSearchDBTable.c
index 14f8c4c..bedc8f4 100644
--- a/src/db/SavedSearchDBTable.c
+++ b/src/db/SavedSearchDBTable.c
@@ -1,4 +1,4 @@
-/* SavedSearchDBTable.c generated by valac 0.34.7, the Vala compiler
+/* SavedSearchDBTable.c generated by valac 0.36.6, the Vala compiler
  * generated from SavedSearchDBTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -324,7 +324,7 @@ enum  {
 };
 SavedSearchRow* saved_search_row_new (void);
 SavedSearchRow* saved_search_row_construct (GType object_type);
-static void saved_search_row_finalize (SavedSearchRow* obj);
+static void saved_search_row_finalize (SavedSearchRow * obj);
 gpointer database_table_ref (gpointer instance);
 void database_table_unref (gpointer instance);
 GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -419,11 +419,11 @@ SearchOperator search_operator_from_string (const gchar* str);
 GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** error);
 void saved_search_db_table_rename (SavedSearchDBTable* self, SavedSearchID* search_id, const gchar* new_name, GError** error);
 void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error);
-static void saved_search_db_table_finalize (DatabaseTable* obj);
+static void saved_search_db_table_finalize (DatabaseTable * obj);
 
 
 void saved_search_id_init (SavedSearchID *self, gint64 id) {
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	memset (self, 0, sizeof (SavedSearchID));
 #line 13 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -436,7 +436,7 @@ void saved_search_id_init (SavedSearchID *self, gint64 id) {
 
 gboolean saved_search_id_is_invalid (SavedSearchID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 17 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	_tmp0_ = (*self).id;
 #line 17 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -449,7 +449,7 @@ gboolean saved_search_id_is_invalid (SavedSearchID *self) {
 
 gboolean saved_search_id_is_valid (SavedSearchID *self) {
 	gboolean result = FALSE;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	_tmp0_ = (*self).id;
 #line 21 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -549,7 +549,7 @@ static gchar* value_saved_search_row_collect_value (GValue* value, guint n_colle
 #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (collect_values[0].v_pointer) {
 #line 552 "SavedSearchDBTable.c"
-		SavedSearchRow* object;
+		SavedSearchRow * object;
 		object = collect_values[0].v_pointer;
 #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -576,7 +576,7 @@ static gchar* value_saved_search_row_collect_value (GValue* value, guint n_colle
 
 
 static gchar* value_saved_search_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	SavedSearchRow** object_p;
+	SavedSearchRow ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (!object_p) {
@@ -628,7 +628,7 @@ gpointer value_get_saved_search_row (const GValue* value) {
 
 
 void value_set_saved_search_row (GValue* value, gpointer v_object) {
-	SavedSearchRow* old;
+	SavedSearchRow * old;
 #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_ROW));
 #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -659,7 +659,7 @@ void value_set_saved_search_row (GValue* value, gpointer v_object) {
 
 
 void value_take_saved_search_row (GValue* value, gpointer v_object) {
-	SavedSearchRow* old;
+	SavedSearchRow * old;
 #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_ROW));
 #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -703,7 +703,7 @@ static void saved_search_row_instance_init (SavedSearchRow * self) {
 }
 
 
-static void saved_search_row_finalize (SavedSearchRow* obj) {
+static void saved_search_row_finalize (SavedSearchRow * obj) {
 	SavedSearchRow * self;
 #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_ROW, SavedSearchRow);
@@ -732,7 +732,7 @@ GType saved_search_row_get_type (void) {
 
 
 gpointer saved_search_row_ref (gpointer instance) {
-	SavedSearchRow* self;
+	SavedSearchRow * self;
 	self = instance;
 #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -743,7 +743,7 @@ gpointer saved_search_row_ref (gpointer instance) {
 
 
 void saved_search_row_unref (gpointer instance) {
-	SavedSearchRow* self;
+	SavedSearchRow * self;
 	self = instance;
 #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -760,97 +760,97 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 	SavedSearchDBTable* 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;
-	sqlite3* _tmp8_ = NULL;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	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;
-	sqlite3* _tmp48_ = NULL;
+	gint _tmp42_;
+	gint _tmp43_;
+	sqlite3_stmt* _tmp44_;
+	gint _tmp45_;
+	gint _tmp46_;
+	sqlite3* _tmp48_;
 	sqlite3_stmt* _tmp49_ = NULL;
-	gint _tmp50_ = 0;
-	gint _tmp51_ = 0;
-	sqlite3_stmt* _tmp52_ = NULL;
-	gint _tmp53_ = 0;
-	gint _tmp54_ = 0;
-	sqlite3* _tmp56_ = NULL;
+	gint _tmp50_;
+	gint _tmp51_;
+	sqlite3_stmt* _tmp52_;
+	gint _tmp53_;
+	gint _tmp54_;
+	sqlite3* _tmp56_;
 	sqlite3_stmt* _tmp57_ = NULL;
-	gint _tmp58_ = 0;
-	gint _tmp59_ = 0;
-	sqlite3_stmt* _tmp60_ = NULL;
-	gint _tmp61_ = 0;
-	gint _tmp62_ = 0;
-	sqlite3* _tmp64_ = NULL;
+	gint _tmp58_;
+	gint _tmp59_;
+	sqlite3_stmt* _tmp60_;
+	gint _tmp61_;
+	gint _tmp62_;
+	sqlite3* _tmp64_;
 	sqlite3_stmt* _tmp65_ = NULL;
-	gint _tmp66_ = 0;
-	gint _tmp67_ = 0;
-	sqlite3_stmt* _tmp68_ = NULL;
-	gint _tmp69_ = 0;
-	gint _tmp70_ = 0;
-	sqlite3* _tmp72_ = NULL;
+	gint _tmp66_;
+	gint _tmp67_;
+	sqlite3_stmt* _tmp68_;
+	gint _tmp69_;
+	gint _tmp70_;
+	sqlite3* _tmp72_;
 	sqlite3_stmt* _tmp73_ = NULL;
-	gint _tmp74_ = 0;
-	gint _tmp75_ = 0;
-	sqlite3_stmt* _tmp76_ = NULL;
-	gint _tmp77_ = 0;
-	gint _tmp78_ = 0;
-	sqlite3* _tmp80_ = NULL;
+	gint _tmp74_;
+	gint _tmp75_;
+	sqlite3_stmt* _tmp76_;
+	gint _tmp77_;
+	gint _tmp78_;
+	sqlite3* _tmp80_;
 	sqlite3_stmt* _tmp81_ = NULL;
-	gint _tmp82_ = 0;
-	gint _tmp83_ = 0;
-	sqlite3_stmt* _tmp84_ = NULL;
-	gint _tmp85_ = 0;
-	gint _tmp86_ = 0;
-	sqlite3* _tmp88_ = NULL;
+	gint _tmp82_;
+	gint _tmp83_;
+	sqlite3_stmt* _tmp84_;
+	gint _tmp85_;
+	gint _tmp86_;
+	sqlite3* _tmp88_;
 	sqlite3_stmt* _tmp89_ = NULL;
-	gint _tmp90_ = 0;
-	gint _tmp91_ = 0;
-	sqlite3_stmt* _tmp92_ = NULL;
-	gint _tmp93_ = 0;
-	gint _tmp94_ = 0;
-	sqlite3* _tmp96_ = NULL;
+	gint _tmp90_;
+	gint _tmp91_;
+	sqlite3_stmt* _tmp92_;
+	gint _tmp93_;
+	gint _tmp94_;
+	sqlite3* _tmp96_;
 	sqlite3_stmt* _tmp97_ = NULL;
-	gint _tmp98_ = 0;
-	gint _tmp99_ = 0;
-	sqlite3_stmt* _tmp100_ = NULL;
-	gint _tmp101_ = 0;
-	gint _tmp102_ = 0;
+	gint _tmp98_;
+	gint _tmp99_;
+	sqlite3_stmt* _tmp100_;
+	gint _tmp101_;
+	gint _tmp102_;
 #line 36 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	self = (SavedSearchDBTable*) database_table_construct (object_type);
 #line 37 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -880,7 +880,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 51 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp6_ != SQLITE_DONE) {
 #line 883 "SavedSearchDBTable.c"
-		gint _tmp7_ = 0;
+		gint _tmp7_;
 #line 52 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp7_ = res;
 #line 52 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -912,7 +912,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 67 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp14_ != SQLITE_DONE) {
 #line 915 "SavedSearchDBTable.c"
-		gint _tmp15_ = 0;
+		gint _tmp15_;
 #line 68 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp15_ = res;
 #line 68 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -944,7 +944,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 83 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp22_ != SQLITE_DONE) {
 #line 947 "SavedSearchDBTable.c"
-		gint _tmp23_ = 0;
+		gint _tmp23_;
 #line 84 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp23_ = res;
 #line 84 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -976,7 +976,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 98 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp30_ != SQLITE_DONE) {
 #line 979 "SavedSearchDBTable.c"
-		gint _tmp31_ = 0;
+		gint _tmp31_;
 #line 99 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp31_ = res;
 #line 99 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1008,7 +1008,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 114 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp38_ != SQLITE_DONE) {
 #line 1011 "SavedSearchDBTable.c"
-		gint _tmp39_ = 0;
+		gint _tmp39_;
 #line 115 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp39_ = res;
 #line 115 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1040,7 +1040,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 130 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp46_ != SQLITE_DONE) {
 #line 1043 "SavedSearchDBTable.c"
-		gint _tmp47_ = 0;
+		gint _tmp47_;
 #line 131 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp47_ = res;
 #line 131 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1072,7 +1072,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 147 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp54_ != SQLITE_DONE) {
 #line 1075 "SavedSearchDBTable.c"
-		gint _tmp55_ = 0;
+		gint _tmp55_;
 #line 148 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp55_ = res;
 #line 148 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1104,7 +1104,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 156 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp62_ != SQLITE_DONE) {
 #line 1107 "SavedSearchDBTable.c"
-		gint _tmp63_ = 0;
+		gint _tmp63_;
 #line 157 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp63_ = res;
 #line 157 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1136,7 +1136,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 164 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp70_ != SQLITE_DONE) {
 #line 1139 "SavedSearchDBTable.c"
-		gint _tmp71_ = 0;
+		gint _tmp71_;
 #line 165 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp71_ = res;
 #line 165 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1168,7 +1168,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 172 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp78_ != SQLITE_DONE) {
 #line 1171 "SavedSearchDBTable.c"
-		gint _tmp79_ = 0;
+		gint _tmp79_;
 #line 173 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp79_ = res;
 #line 173 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1200,7 +1200,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 180 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp86_ != SQLITE_DONE) {
 #line 1203 "SavedSearchDBTable.c"
-		gint _tmp87_ = 0;
+		gint _tmp87_;
 #line 181 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp87_ = res;
 #line 181 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1232,7 +1232,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 188 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp94_ != SQLITE_DONE) {
 #line 1235 "SavedSearchDBTable.c"
-		gint _tmp95_ = 0;
+		gint _tmp95_;
 #line 189 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp95_ = res;
 #line 189 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1264,7 +1264,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) {
 #line 196 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp102_ != SQLITE_DONE) {
 #line 1267 "SavedSearchDBTable.c"
-		gint _tmp103_ = 0;
+		gint _tmp103_;
 #line 197 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp103_ = res;
 #line 197 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1295,15 +1295,15 @@ static gpointer _database_table_ref0 (gpointer self) {
 
 SavedSearchDBTable* saved_search_db_table_get_instance (void) {
 	SavedSearchDBTable* result = NULL;
-	SavedSearchDBTable* _tmp0_ = NULL;
-	SavedSearchDBTable* _tmp2_ = NULL;
-	SavedSearchDBTable* _tmp3_ = NULL;
+	SavedSearchDBTable* _tmp0_;
+	SavedSearchDBTable* _tmp2_;
+	SavedSearchDBTable* _tmp3_;
 #line 201 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	_tmp0_ = saved_search_db_table_instance;
 #line 201 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp0_ == NULL) {
 #line 1306 "SavedSearchDBTable.c"
-		SavedSearchDBTable* _tmp1_ = NULL;
+		SavedSearchDBTable* _tmp1_;
 #line 202 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp1_ = saved_search_db_table_new ();
 #line 202 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1335,38 +1335,38 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar
 	SavedSearchRow* 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;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	GDestroyNotify _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	sqlite3_stmt* _tmp10_ = NULL;
-	SearchOperator _tmp11_ = 0;
-	gchar* _tmp12_ = NULL;
-	GDestroyNotify _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	sqlite3_stmt* _tmp16_ = NULL;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	GDestroyNotify _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	sqlite3_stmt* _tmp10_;
+	SearchOperator _tmp11_;
+	gchar* _tmp12_;
+	GDestroyNotify _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
+	sqlite3_stmt* _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
 	SavedSearchRow* row = NULL;
-	SavedSearchRow* _tmp20_ = NULL;
-	SavedSearchRow* _tmp21_ = NULL;
-	sqlite3* _tmp22_ = NULL;
-	gint64 _tmp23_ = 0LL;
-	SavedSearchRow* _tmp24_ = NULL;
-	const gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	SavedSearchRow* _tmp27_ = NULL;
-	SearchOperator _tmp28_ = 0;
-	SavedSearchRow* _tmp29_ = NULL;
-	GeeArrayList* _tmp30_ = NULL;
-	GeeList* _tmp31_ = NULL;
+	SavedSearchRow* _tmp20_;
+	SavedSearchRow* _tmp21_;
+	sqlite3* _tmp22_;
+	gint64 _tmp23_;
+	SavedSearchRow* _tmp24_;
+	const gchar* _tmp25_;
+	gchar* _tmp26_;
+	SavedSearchRow* _tmp27_;
+	SearchOperator _tmp28_;
+	SavedSearchRow* _tmp29_;
+	GeeArrayList* _tmp30_;
+	GeeList* _tmp31_;
 	GError * _inner_error_ = NULL;
 #line 207 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL);
@@ -1431,7 +1431,7 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar
 #line 220 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp18_ != SQLITE_DONE) {
 #line 1434 "SavedSearchDBTable.c"
-		gint _tmp19_ = 0;
+		gint _tmp19_;
 #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp19_ = res;
 #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1501,12 +1501,12 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar
 #line 1502 "SavedSearchDBTable.c"
 	{
 		GeeArrayList* _sc_list = NULL;
-		GeeArrayList* _tmp32_ = NULL;
-		GeeArrayList* _tmp33_ = NULL;
+		GeeArrayList* _tmp32_;
+		GeeArrayList* _tmp33_;
 		gint _sc_size = 0;
-		GeeArrayList* _tmp34_ = NULL;
-		gint _tmp35_ = 0;
-		gint _tmp36_ = 0;
+		GeeArrayList* _tmp34_;
+		gint _tmp35_;
+		gint _tmp36_;
 		gint _sc_index = 0;
 #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp32_ = conditions;
@@ -1527,16 +1527,16 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar
 #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		while (TRUE) {
 #line 1530 "SavedSearchDBTable.c"
-			gint _tmp37_ = 0;
-			gint _tmp38_ = 0;
-			gint _tmp39_ = 0;
+			gint _tmp37_;
+			gint _tmp38_;
+			gint _tmp39_;
 			SearchCondition* sc = NULL;
-			GeeArrayList* _tmp40_ = NULL;
-			gint _tmp41_ = 0;
-			gpointer _tmp42_ = NULL;
-			SavedSearchRow* _tmp43_ = NULL;
-			SavedSearchID _tmp44_ = {0};
-			SearchCondition* _tmp45_ = NULL;
+			GeeArrayList* _tmp40_;
+			gint _tmp41_;
+			gpointer _tmp42_;
+			SavedSearchRow* _tmp43_;
+			SavedSearchID _tmp44_;
+			SearchCondition* _tmp45_;
 #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			_tmp37_ = _sc_index;
 #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1628,7 +1628,7 @@ static gpointer _search_condition_ref0 (gpointer self) {
 
 
 static void saved_search_db_table_add_condition (SavedSearchDBTable* self, SavedSearchID* id, SearchCondition* condition, GError** error) {
-	SearchCondition* _tmp0_ = NULL;
+	SearchCondition* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 236 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self));
@@ -1642,46 +1642,46 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_TEXT)) {
 #line 1644 "SavedSearchDBTable.c"
 		SearchConditionText* text = NULL;
-		SearchCondition* _tmp1_ = NULL;
-		SearchConditionText* _tmp2_ = NULL;
+		SearchCondition* _tmp1_;
+		SearchConditionText* _tmp2_;
 		sqlite3_stmt* stmt = NULL;
 		gint res = 0;
-		sqlite3* _tmp3_ = NULL;
+		sqlite3* _tmp3_;
 		sqlite3_stmt* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
-		sqlite3_stmt* _tmp7_ = NULL;
-		SavedSearchID _tmp8_ = {0};
-		gint64 _tmp9_ = 0LL;
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
-		sqlite3_stmt* _tmp12_ = NULL;
-		SearchConditionText* _tmp13_ = NULL;
-		SearchConditionSearchType _tmp14_ = 0;
-		SearchConditionSearchType _tmp15_ = 0;
-		gchar* _tmp16_ = NULL;
-		GDestroyNotify _tmp17_ = NULL;
-		gint _tmp18_ = 0;
-		gint _tmp19_ = 0;
-		sqlite3_stmt* _tmp20_ = NULL;
-		SearchConditionText* _tmp21_ = NULL;
-		SearchConditionTextContext _tmp22_ = 0;
-		SearchConditionTextContext _tmp23_ = 0;
-		gchar* _tmp24_ = NULL;
-		GDestroyNotify _tmp25_ = NULL;
-		gint _tmp26_ = 0;
-		gint _tmp27_ = 0;
-		sqlite3_stmt* _tmp28_ = NULL;
-		SearchConditionText* _tmp29_ = NULL;
-		const gchar* _tmp30_ = NULL;
-		const gchar* _tmp31_ = NULL;
-		gchar* _tmp32_ = NULL;
-		GDestroyNotify _tmp33_ = NULL;
-		gint _tmp34_ = 0;
-		gint _tmp35_ = 0;
-		sqlite3_stmt* _tmp36_ = NULL;
-		gint _tmp37_ = 0;
-		gint _tmp38_ = 0;
+		gint _tmp5_;
+		gint _tmp6_;
+		sqlite3_stmt* _tmp7_;
+		SavedSearchID _tmp8_;
+		gint64 _tmp9_;
+		gint _tmp10_;
+		gint _tmp11_;
+		sqlite3_stmt* _tmp12_;
+		SearchConditionText* _tmp13_;
+		SearchConditionSearchType _tmp14_;
+		SearchConditionSearchType _tmp15_;
+		gchar* _tmp16_;
+		GDestroyNotify _tmp17_;
+		gint _tmp18_;
+		gint _tmp19_;
+		sqlite3_stmt* _tmp20_;
+		SearchConditionText* _tmp21_;
+		SearchConditionTextContext _tmp22_;
+		SearchConditionTextContext _tmp23_;
+		gchar* _tmp24_;
+		GDestroyNotify _tmp25_;
+		gint _tmp26_;
+		gint _tmp27_;
+		sqlite3_stmt* _tmp28_;
+		SearchConditionText* _tmp29_;
+		const gchar* _tmp30_;
+		const gchar* _tmp31_;
+		gchar* _tmp32_;
+		GDestroyNotify _tmp33_;
+		gint _tmp34_;
+		gint _tmp35_;
+		sqlite3_stmt* _tmp36_;
+		gint _tmp37_;
+		gint _tmp38_;
 #line 238 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp1_ = condition;
 #line 238 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1787,7 +1787,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 #line 258 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		if (_tmp38_ != SQLITE_DONE) {
 #line 1790 "SavedSearchDBTable.c"
-			gint _tmp39_ = 0;
+			gint _tmp39_;
 #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			_tmp39_ = res;
 #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1826,53 +1826,53 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 		_search_condition_unref0 (text);
 #line 1828 "SavedSearchDBTable.c"
 	} else {
-		SearchCondition* _tmp40_ = NULL;
+		SearchCondition* _tmp40_;
 #line 260 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp40_ = condition;
 #line 260 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, TYPE_SEARCH_CONDITION_MEDIA_TYPE)) {
 #line 1835 "SavedSearchDBTable.c"
 			SearchConditionMediaType* media_type = NULL;
-			SearchCondition* _tmp41_ = NULL;
-			SearchConditionMediaType* _tmp42_ = NULL;
+			SearchCondition* _tmp41_;
+			SearchConditionMediaType* _tmp42_;
 			sqlite3_stmt* stmt = NULL;
 			gint res = 0;
-			sqlite3* _tmp43_ = NULL;
+			sqlite3* _tmp43_;
 			sqlite3_stmt* _tmp44_ = NULL;
-			gint _tmp45_ = 0;
-			gint _tmp46_ = 0;
-			sqlite3_stmt* _tmp47_ = NULL;
-			SavedSearchID _tmp48_ = {0};
-			gint64 _tmp49_ = 0LL;
-			gint _tmp50_ = 0;
-			gint _tmp51_ = 0;
-			sqlite3_stmt* _tmp52_ = NULL;
-			SearchConditionMediaType* _tmp53_ = NULL;
-			SearchConditionSearchType _tmp54_ = 0;
-			SearchConditionSearchType _tmp55_ = 0;
-			gchar* _tmp56_ = NULL;
-			GDestroyNotify _tmp57_ = NULL;
-			gint _tmp58_ = 0;
-			gint _tmp59_ = 0;
-			sqlite3_stmt* _tmp60_ = NULL;
-			SearchConditionMediaType* _tmp61_ = NULL;
-			SearchConditionMediaTypeContext _tmp62_ = 0;
-			SearchConditionMediaTypeContext _tmp63_ = 0;
-			gchar* _tmp64_ = NULL;
-			GDestroyNotify _tmp65_ = NULL;
-			gint _tmp66_ = 0;
-			gint _tmp67_ = 0;
-			sqlite3_stmt* _tmp68_ = NULL;
-			SearchConditionMediaType* _tmp69_ = NULL;
-			SearchConditionMediaTypeMediaType _tmp70_ = 0;
-			SearchConditionMediaTypeMediaType _tmp71_ = 0;
-			gchar* _tmp72_ = NULL;
-			GDestroyNotify _tmp73_ = NULL;
-			gint _tmp74_ = 0;
-			gint _tmp75_ = 0;
-			sqlite3_stmt* _tmp76_ = NULL;
-			gint _tmp77_ = 0;
-			gint _tmp78_ = 0;
+			gint _tmp45_;
+			gint _tmp46_;
+			sqlite3_stmt* _tmp47_;
+			SavedSearchID _tmp48_;
+			gint64 _tmp49_;
+			gint _tmp50_;
+			gint _tmp51_;
+			sqlite3_stmt* _tmp52_;
+			SearchConditionMediaType* _tmp53_;
+			SearchConditionSearchType _tmp54_;
+			SearchConditionSearchType _tmp55_;
+			gchar* _tmp56_;
+			GDestroyNotify _tmp57_;
+			gint _tmp58_;
+			gint _tmp59_;
+			sqlite3_stmt* _tmp60_;
+			SearchConditionMediaType* _tmp61_;
+			SearchConditionMediaTypeContext _tmp62_;
+			SearchConditionMediaTypeContext _tmp63_;
+			gchar* _tmp64_;
+			GDestroyNotify _tmp65_;
+			gint _tmp66_;
+			gint _tmp67_;
+			sqlite3_stmt* _tmp68_;
+			SearchConditionMediaType* _tmp69_;
+			SearchConditionMediaTypeMediaType _tmp70_;
+			SearchConditionMediaTypeMediaType _tmp71_;
+			gchar* _tmp72_;
+			GDestroyNotify _tmp73_;
+			gint _tmp74_;
+			gint _tmp75_;
+			sqlite3_stmt* _tmp76_;
+			gint _tmp77_;
+			gint _tmp78_;
 #line 261 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			_tmp41_ = condition;
 #line 261 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -1979,7 +1979,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 #line 281 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			if (_tmp78_ != SQLITE_DONE) {
 #line 1981 "SavedSearchDBTable.c"
-				gint _tmp79_ = 0;
+				gint _tmp79_;
 #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				_tmp79_ = res;
 #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -2018,45 +2018,45 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 			_search_condition_unref0 (media_type);
 #line 2019 "SavedSearchDBTable.c"
 		} else {
-			SearchCondition* _tmp80_ = NULL;
+			SearchCondition* _tmp80_;
 #line 283 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			_tmp80_ = condition;
 #line 283 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp80_, TYPE_SEARCH_CONDITION_FLAGGED)) {
 #line 2026 "SavedSearchDBTable.c"
 				SearchConditionFlagged* flag_state = NULL;
-				SearchCondition* _tmp81_ = NULL;
-				SearchConditionFlagged* _tmp82_ = NULL;
+				SearchCondition* _tmp81_;
+				SearchConditionFlagged* _tmp82_;
 				sqlite3_stmt* stmt = NULL;
 				gint res = 0;
-				sqlite3* _tmp83_ = NULL;
+				sqlite3* _tmp83_;
 				sqlite3_stmt* _tmp84_ = NULL;
-				gint _tmp85_ = 0;
-				gint _tmp86_ = 0;
-				sqlite3_stmt* _tmp87_ = NULL;
-				SavedSearchID _tmp88_ = {0};
-				gint64 _tmp89_ = 0LL;
-				gint _tmp90_ = 0;
-				gint _tmp91_ = 0;
-				sqlite3_stmt* _tmp92_ = NULL;
-				SearchConditionFlagged* _tmp93_ = NULL;
-				SearchConditionSearchType _tmp94_ = 0;
-				SearchConditionSearchType _tmp95_ = 0;
-				gchar* _tmp96_ = NULL;
-				GDestroyNotify _tmp97_ = NULL;
-				gint _tmp98_ = 0;
-				gint _tmp99_ = 0;
-				sqlite3_stmt* _tmp100_ = NULL;
-				SearchConditionFlagged* _tmp101_ = NULL;
-				SearchConditionFlaggedState _tmp102_ = 0;
-				SearchConditionFlaggedState _tmp103_ = 0;
-				gchar* _tmp104_ = NULL;
-				GDestroyNotify _tmp105_ = NULL;
-				gint _tmp106_ = 0;
-				gint _tmp107_ = 0;
-				sqlite3_stmt* _tmp108_ = NULL;
-				gint _tmp109_ = 0;
-				gint _tmp110_ = 0;
+				gint _tmp85_;
+				gint _tmp86_;
+				sqlite3_stmt* _tmp87_;
+				SavedSearchID _tmp88_;
+				gint64 _tmp89_;
+				gint _tmp90_;
+				gint _tmp91_;
+				sqlite3_stmt* _tmp92_;
+				SearchConditionFlagged* _tmp93_;
+				SearchConditionSearchType _tmp94_;
+				SearchConditionSearchType _tmp95_;
+				gchar* _tmp96_;
+				GDestroyNotify _tmp97_;
+				gint _tmp98_;
+				gint _tmp99_;
+				sqlite3_stmt* _tmp100_;
+				SearchConditionFlagged* _tmp101_;
+				SearchConditionFlaggedState _tmp102_;
+				SearchConditionFlaggedState _tmp103_;
+				gchar* _tmp104_;
+				GDestroyNotify _tmp105_;
+				gint _tmp106_;
+				gint _tmp107_;
+				sqlite3_stmt* _tmp108_;
+				gint _tmp109_;
+				gint _tmp110_;
 #line 284 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				_tmp81_ = condition;
 #line 284 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -2142,7 +2142,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 #line 301 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				if (_tmp110_ != SQLITE_DONE) {
 #line 2144 "SavedSearchDBTable.c"
-					gint _tmp111_ = 0;
+					gint _tmp111_;
 #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					_tmp111_ = res;
 #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -2181,53 +2181,53 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 				_search_condition_unref0 (flag_state);
 #line 2182 "SavedSearchDBTable.c"
 			} else {
-				SearchCondition* _tmp112_ = NULL;
+				SearchCondition* _tmp112_;
 #line 303 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				_tmp112_ = condition;
 #line 303 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp112_, TYPE_SEARCH_CONDITION_MODIFIED)) {
 #line 2189 "SavedSearchDBTable.c"
 					SearchConditionModified* modified_state = NULL;
-					SearchCondition* _tmp113_ = NULL;
-					SearchConditionModified* _tmp114_ = NULL;
+					SearchCondition* _tmp113_;
+					SearchConditionModified* _tmp114_;
 					sqlite3_stmt* stmt = NULL;
 					gint res = 0;
-					sqlite3* _tmp115_ = NULL;
+					sqlite3* _tmp115_;
 					sqlite3_stmt* _tmp116_ = NULL;
-					gint _tmp117_ = 0;
-					gint _tmp118_ = 0;
-					sqlite3_stmt* _tmp119_ = NULL;
-					SavedSearchID _tmp120_ = {0};
-					gint64 _tmp121_ = 0LL;
-					gint _tmp122_ = 0;
-					gint _tmp123_ = 0;
-					sqlite3_stmt* _tmp124_ = NULL;
-					SearchConditionModified* _tmp125_ = NULL;
-					SearchConditionSearchType _tmp126_ = 0;
-					SearchConditionSearchType _tmp127_ = 0;
-					gchar* _tmp128_ = NULL;
-					GDestroyNotify _tmp129_ = NULL;
-					gint _tmp130_ = 0;
-					gint _tmp131_ = 0;
-					sqlite3_stmt* _tmp132_ = NULL;
-					SearchConditionModified* _tmp133_ = NULL;
-					SearchConditionModifiedContext _tmp134_ = 0;
-					SearchConditionModifiedContext _tmp135_ = 0;
-					gchar* _tmp136_ = NULL;
-					GDestroyNotify _tmp137_ = NULL;
-					gint _tmp138_ = 0;
-					gint _tmp139_ = 0;
-					sqlite3_stmt* _tmp140_ = NULL;
-					SearchConditionModified* _tmp141_ = NULL;
-					SearchConditionModifiedState _tmp142_ = 0;
-					SearchConditionModifiedState _tmp143_ = 0;
-					gchar* _tmp144_ = NULL;
-					GDestroyNotify _tmp145_ = NULL;
-					gint _tmp146_ = 0;
-					gint _tmp147_ = 0;
-					sqlite3_stmt* _tmp148_ = NULL;
-					gint _tmp149_ = 0;
-					gint _tmp150_ = 0;
+					gint _tmp117_;
+					gint _tmp118_;
+					sqlite3_stmt* _tmp119_;
+					SavedSearchID _tmp120_;
+					gint64 _tmp121_;
+					gint _tmp122_;
+					gint _tmp123_;
+					sqlite3_stmt* _tmp124_;
+					SearchConditionModified* _tmp125_;
+					SearchConditionSearchType _tmp126_;
+					SearchConditionSearchType _tmp127_;
+					gchar* _tmp128_;
+					GDestroyNotify _tmp129_;
+					gint _tmp130_;
+					gint _tmp131_;
+					sqlite3_stmt* _tmp132_;
+					SearchConditionModified* _tmp133_;
+					SearchConditionModifiedContext _tmp134_;
+					SearchConditionModifiedContext _tmp135_;
+					gchar* _tmp136_;
+					GDestroyNotify _tmp137_;
+					gint _tmp138_;
+					gint _tmp139_;
+					sqlite3_stmt* _tmp140_;
+					SearchConditionModified* _tmp141_;
+					SearchConditionModifiedState _tmp142_;
+					SearchConditionModifiedState _tmp143_;
+					gchar* _tmp144_;
+					GDestroyNotify _tmp145_;
+					gint _tmp146_;
+					gint _tmp147_;
+					sqlite3_stmt* _tmp148_;
+					gint _tmp149_;
+					gint _tmp150_;
 #line 304 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					_tmp113_ = condition;
 #line 304 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -2334,7 +2334,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 #line 324 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					if (_tmp150_ != SQLITE_DONE) {
 #line 2335 "SavedSearchDBTable.c"
-						gint _tmp151_ = 0;
+						gint _tmp151_;
 #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 						_tmp151_ = res;
 #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -2373,52 +2373,52 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 					_search_condition_unref0 (modified_state);
 #line 2373 "SavedSearchDBTable.c"
 				} else {
-					SearchCondition* _tmp152_ = NULL;
+					SearchCondition* _tmp152_;
 #line 326 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					_tmp152_ = condition;
 #line 326 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp152_, TYPE_SEARCH_CONDITION_RATING)) {
 #line 2380 "SavedSearchDBTable.c"
 						SearchConditionRating* rating = NULL;
-						SearchCondition* _tmp153_ = NULL;
-						SearchConditionRating* _tmp154_ = NULL;
+						SearchCondition* _tmp153_;
+						SearchConditionRating* _tmp154_;
 						sqlite3_stmt* stmt = NULL;
 						gint res = 0;
-						sqlite3* _tmp155_ = NULL;
+						sqlite3* _tmp155_;
 						sqlite3_stmt* _tmp156_ = NULL;
-						gint _tmp157_ = 0;
-						gint _tmp158_ = 0;
-						sqlite3_stmt* _tmp159_ = NULL;
-						SavedSearchID _tmp160_ = {0};
-						gint64 _tmp161_ = 0LL;
-						gint _tmp162_ = 0;
-						gint _tmp163_ = 0;
-						sqlite3_stmt* _tmp164_ = NULL;
-						SearchConditionRating* _tmp165_ = NULL;
-						SearchConditionSearchType _tmp166_ = 0;
-						SearchConditionSearchType _tmp167_ = 0;
-						gchar* _tmp168_ = NULL;
-						GDestroyNotify _tmp169_ = NULL;
-						gint _tmp170_ = 0;
-						gint _tmp171_ = 0;
-						sqlite3_stmt* _tmp172_ = NULL;
-						SearchConditionRating* _tmp173_ = NULL;
-						Rating _tmp174_ = 0;
-						Rating _tmp175_ = 0;
-						gint _tmp176_ = 0;
-						gint _tmp177_ = 0;
-						gint _tmp178_ = 0;
-						sqlite3_stmt* _tmp179_ = NULL;
-						SearchConditionRating* _tmp180_ = NULL;
-						SearchConditionRatingContext _tmp181_ = 0;
-						SearchConditionRatingContext _tmp182_ = 0;
-						gchar* _tmp183_ = NULL;
-						GDestroyNotify _tmp184_ = NULL;
-						gint _tmp185_ = 0;
-						gint _tmp186_ = 0;
-						sqlite3_stmt* _tmp187_ = NULL;
-						gint _tmp188_ = 0;
-						gint _tmp189_ = 0;
+						gint _tmp157_;
+						gint _tmp158_;
+						sqlite3_stmt* _tmp159_;
+						SavedSearchID _tmp160_;
+						gint64 _tmp161_;
+						gint _tmp162_;
+						gint _tmp163_;
+						sqlite3_stmt* _tmp164_;
+						SearchConditionRating* _tmp165_;
+						SearchConditionSearchType _tmp166_;
+						SearchConditionSearchType _tmp167_;
+						gchar* _tmp168_;
+						GDestroyNotify _tmp169_;
+						gint _tmp170_;
+						gint _tmp171_;
+						sqlite3_stmt* _tmp172_;
+						SearchConditionRating* _tmp173_;
+						Rating _tmp174_;
+						Rating _tmp175_;
+						gint _tmp176_;
+						gint _tmp177_;
+						gint _tmp178_;
+						sqlite3_stmt* _tmp179_;
+						SearchConditionRating* _tmp180_;
+						SearchConditionRatingContext _tmp181_;
+						SearchConditionRatingContext _tmp182_;
+						gchar* _tmp183_;
+						GDestroyNotify _tmp184_;
+						gint _tmp185_;
+						gint _tmp186_;
+						sqlite3_stmt* _tmp187_;
+						gint _tmp188_;
+						gint _tmp189_;
 #line 327 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 						_tmp153_ = condition;
 #line 327 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -2523,7 +2523,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 #line 347 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 						if (_tmp189_ != SQLITE_DONE) {
 #line 2523 "SavedSearchDBTable.c"
-							gint _tmp190_ = 0;
+							gint _tmp190_;
 #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 							_tmp190_ = res;
 #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -2562,59 +2562,59 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 						_search_condition_unref0 (rating);
 #line 2561 "SavedSearchDBTable.c"
 					} else {
-						SearchCondition* _tmp191_ = NULL;
+						SearchCondition* _tmp191_;
 #line 349 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 						_tmp191_ = condition;
 #line 349 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 						if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp191_, TYPE_SEARCH_CONDITION_DATE)) {
 #line 2568 "SavedSearchDBTable.c"
 							SearchConditionDate* date = NULL;
-							SearchCondition* _tmp192_ = NULL;
-							SearchConditionDate* _tmp193_ = NULL;
+							SearchCondition* _tmp192_;
+							SearchConditionDate* _tmp193_;
 							sqlite3_stmt* stmt = NULL;
 							gint res = 0;
-							sqlite3* _tmp194_ = NULL;
+							sqlite3* _tmp194_;
 							sqlite3_stmt* _tmp195_ = NULL;
-							gint _tmp196_ = 0;
-							gint _tmp197_ = 0;
-							sqlite3_stmt* _tmp198_ = NULL;
-							SavedSearchID _tmp199_ = {0};
-							gint64 _tmp200_ = 0LL;
-							gint _tmp201_ = 0;
-							gint _tmp202_ = 0;
-							sqlite3_stmt* _tmp203_ = NULL;
-							SearchConditionDate* _tmp204_ = NULL;
-							SearchConditionSearchType _tmp205_ = 0;
-							SearchConditionSearchType _tmp206_ = 0;
-							gchar* _tmp207_ = NULL;
-							GDestroyNotify _tmp208_ = NULL;
-							gint _tmp209_ = 0;
-							gint _tmp210_ = 0;
-							sqlite3_stmt* _tmp211_ = NULL;
-							SearchConditionDate* _tmp212_ = NULL;
-							SearchConditionDateContext _tmp213_ = 0;
-							SearchConditionDateContext _tmp214_ = 0;
-							gchar* _tmp215_ = NULL;
-							GDestroyNotify _tmp216_ = NULL;
-							gint _tmp217_ = 0;
-							gint _tmp218_ = 0;
-							sqlite3_stmt* _tmp219_ = NULL;
-							SearchConditionDate* _tmp220_ = NULL;
-							GDateTime* _tmp221_ = NULL;
-							GDateTime* _tmp222_ = NULL;
-							gint64 _tmp223_ = 0LL;
-							gint _tmp224_ = 0;
-							gint _tmp225_ = 0;
-							sqlite3_stmt* _tmp226_ = NULL;
-							SearchConditionDate* _tmp227_ = NULL;
-							GDateTime* _tmp228_ = NULL;
-							GDateTime* _tmp229_ = NULL;
-							gint64 _tmp230_ = 0LL;
-							gint _tmp231_ = 0;
-							gint _tmp232_ = 0;
-							sqlite3_stmt* _tmp233_ = NULL;
-							gint _tmp234_ = 0;
-							gint _tmp235_ = 0;
+							gint _tmp196_;
+							gint _tmp197_;
+							sqlite3_stmt* _tmp198_;
+							SavedSearchID _tmp199_;
+							gint64 _tmp200_;
+							gint _tmp201_;
+							gint _tmp202_;
+							sqlite3_stmt* _tmp203_;
+							SearchConditionDate* _tmp204_;
+							SearchConditionSearchType _tmp205_;
+							SearchConditionSearchType _tmp206_;
+							gchar* _tmp207_;
+							GDestroyNotify _tmp208_;
+							gint _tmp209_;
+							gint _tmp210_;
+							sqlite3_stmt* _tmp211_;
+							SearchConditionDate* _tmp212_;
+							SearchConditionDateContext _tmp213_;
+							SearchConditionDateContext _tmp214_;
+							gchar* _tmp215_;
+							GDestroyNotify _tmp216_;
+							gint _tmp217_;
+							gint _tmp218_;
+							sqlite3_stmt* _tmp219_;
+							SearchConditionDate* _tmp220_;
+							GDateTime* _tmp221_;
+							GDateTime* _tmp222_;
+							gint64 _tmp223_;
+							gint _tmp224_;
+							gint _tmp225_;
+							sqlite3_stmt* _tmp226_;
+							SearchConditionDate* _tmp227_;
+							GDateTime* _tmp228_;
+							GDateTime* _tmp229_;
+							gint64 _tmp230_;
+							gint _tmp231_;
+							gint _tmp232_;
+							sqlite3_stmt* _tmp233_;
+							gint _tmp234_;
+							gint _tmp235_;
 #line 350 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 							_tmp192_ = condition;
 #line 350 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -2736,7 +2736,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 #line 373 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 							if (_tmp235_ != SQLITE_DONE) {
 #line 2736 "SavedSearchDBTable.c"
-								gint _tmp236_ = 0;
+								gint _tmp236_;
 #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 								_tmp236_ = res;
 #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -2788,12 +2788,12 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved
 
 
 static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error) {
-	SavedSearchID _tmp0_ = {0};
-	SavedSearchID _tmp1_ = {0};
-	SavedSearchID _tmp2_ = {0};
-	SavedSearchID _tmp3_ = {0};
-	SavedSearchID _tmp4_ = {0};
-	SavedSearchID _tmp5_ = {0};
+	SavedSearchID _tmp0_;
+	SavedSearchID _tmp1_;
+	SavedSearchID _tmp2_;
+	SavedSearchID _tmp3_;
+	SavedSearchID _tmp4_;
+	SavedSearchID _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 381 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self));
@@ -2943,22 +2943,22 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB
 static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTable* self, const gchar* table_name, SavedSearchID* search_id, GError** error) {
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	sqlite3* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	sqlite3_stmt* _tmp8_ = NULL;
-	SavedSearchID _tmp9_ = {0};
-	gint64 _tmp10_ = 0LL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	sqlite3_stmt* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	sqlite3_stmt* _tmp8_;
+	SavedSearchID _tmp9_;
+	gint64 _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
+	sqlite3_stmt* _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
 	GError * _inner_error_ = NULL;
 #line 390 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self));
@@ -3015,10 +3015,10 @@ static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTabl
 #line 400 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp15_ != SQLITE_DONE) {
 #line 3015 "SavedSearchDBTable.c"
-		const gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
-		gint _tmp19_ = 0;
+		const gchar* _tmp16_;
+		gchar* _tmp17_;
+		gchar* _tmp18_;
+		gint _tmp19_;
 #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp16_ = table_name;
 #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -3064,63 +3064,63 @@ static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTabl
 static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error) {
 	GeeList* result = NULL;
 	GeeList* list = NULL;
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp1_ = NULL;
+	sqlite3* _tmp1_;
 	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	sqlite3_stmt* _tmp5_ = NULL;
-	SavedSearchID _tmp6_ = {0};
-	gint64 _tmp7_ = 0LL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	sqlite3* _tmp27_ = NULL;
+	gint _tmp3_;
+	gint _tmp4_;
+	sqlite3_stmt* _tmp5_;
+	SavedSearchID _tmp6_;
+	gint64 _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	sqlite3* _tmp27_;
 	sqlite3_stmt* _tmp28_ = NULL;
-	gint _tmp29_ = 0;
-	gint _tmp30_ = 0;
-	sqlite3_stmt* _tmp31_ = NULL;
-	SavedSearchID _tmp32_ = {0};
-	gint64 _tmp33_ = 0LL;
-	gint _tmp34_ = 0;
-	gint _tmp35_ = 0;
-	sqlite3* _tmp54_ = NULL;
+	gint _tmp29_;
+	gint _tmp30_;
+	sqlite3_stmt* _tmp31_;
+	SavedSearchID _tmp32_;
+	gint64 _tmp33_;
+	gint _tmp34_;
+	gint _tmp35_;
+	sqlite3* _tmp54_;
 	sqlite3_stmt* _tmp55_ = NULL;
-	gint _tmp56_ = 0;
-	gint _tmp57_ = 0;
-	sqlite3_stmt* _tmp58_ = NULL;
-	SavedSearchID _tmp59_ = {0};
-	gint64 _tmp60_ = 0LL;
-	gint _tmp61_ = 0;
-	gint _tmp62_ = 0;
-	sqlite3* _tmp78_ = NULL;
+	gint _tmp56_;
+	gint _tmp57_;
+	sqlite3_stmt* _tmp58_;
+	SavedSearchID _tmp59_;
+	gint64 _tmp60_;
+	gint _tmp61_;
+	gint _tmp62_;
+	sqlite3* _tmp78_;
 	sqlite3_stmt* _tmp79_ = NULL;
-	gint _tmp80_ = 0;
-	gint _tmp81_ = 0;
-	sqlite3_stmt* _tmp82_ = NULL;
-	SavedSearchID _tmp83_ = {0};
-	gint64 _tmp84_ = 0LL;
-	gint _tmp85_ = 0;
-	gint _tmp86_ = 0;
-	sqlite3* _tmp105_ = NULL;
+	gint _tmp80_;
+	gint _tmp81_;
+	sqlite3_stmt* _tmp82_;
+	SavedSearchID _tmp83_;
+	gint64 _tmp84_;
+	gint _tmp85_;
+	gint _tmp86_;
+	sqlite3* _tmp105_;
 	sqlite3_stmt* _tmp106_ = NULL;
-	gint _tmp107_ = 0;
-	gint _tmp108_ = 0;
-	sqlite3_stmt* _tmp109_ = NULL;
-	SavedSearchID _tmp110_ = {0};
-	gint64 _tmp111_ = 0LL;
-	gint _tmp112_ = 0;
-	gint _tmp113_ = 0;
-	sqlite3* _tmp132_ = NULL;
+	gint _tmp107_;
+	gint _tmp108_;
+	sqlite3_stmt* _tmp109_;
+	SavedSearchID _tmp110_;
+	gint64 _tmp111_;
+	gint _tmp112_;
+	gint _tmp113_;
+	sqlite3* _tmp132_;
 	sqlite3_stmt* _tmp133_ = NULL;
-	gint _tmp134_ = 0;
-	gint _tmp135_ = 0;
-	sqlite3_stmt* _tmp136_ = NULL;
-	SavedSearchID _tmp137_ = {0};
-	gint64 _tmp138_ = 0LL;
-	gint _tmp139_ = 0;
-	gint _tmp140_ = 0;
+	gint _tmp134_;
+	gint _tmp135_;
+	sqlite3_stmt* _tmp136_;
+	SavedSearchID _tmp137_;
+	gint64 _tmp138_;
+	gint _tmp139_;
+	gint _tmp140_;
 	GError * _inner_error_ = NULL;
 #line 405 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL);
@@ -3166,21 +3166,21 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 #line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		while (TRUE) {
 #line 3166 "SavedSearchDBTable.c"
-			sqlite3_stmt* _tmp11_ = NULL;
-			gint _tmp12_ = 0;
-			gint _tmp13_ = 0;
+			sqlite3_stmt* _tmp11_;
+			gint _tmp12_;
+			gint _tmp13_;
 			SearchConditionText* condition = NULL;
-			sqlite3_stmt* _tmp16_ = NULL;
-			const gchar* _tmp17_ = NULL;
-			SearchConditionSearchType _tmp18_ = 0;
-			sqlite3_stmt* _tmp19_ = NULL;
-			const gchar* _tmp20_ = NULL;
-			sqlite3_stmt* _tmp21_ = NULL;
-			const gchar* _tmp22_ = NULL;
-			SearchConditionTextContext _tmp23_ = 0;
-			SearchConditionText* _tmp24_ = NULL;
-			GeeList* _tmp25_ = NULL;
-			SearchConditionText* _tmp26_ = NULL;
+			sqlite3_stmt* _tmp16_;
+			const gchar* _tmp17_;
+			SearchConditionSearchType _tmp18_;
+			sqlite3_stmt* _tmp19_;
+			const gchar* _tmp20_;
+			sqlite3_stmt* _tmp21_;
+			const gchar* _tmp22_;
+			SearchConditionTextContext _tmp23_;
+			SearchConditionText* _tmp24_;
+			GeeList* _tmp25_;
+			SearchConditionText* _tmp26_;
 #line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			if (!_tmp10_) {
 #line 3184 "SavedSearchDBTable.c"
@@ -3201,13 +3201,13 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 				break;
 #line 3200 "SavedSearchDBTable.c"
 			} else {
-				gint _tmp14_ = 0;
+				gint _tmp14_;
 #line 424 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				_tmp14_ = res;
 #line 424 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				if (_tmp14_ != SQLITE_ROW) {
 #line 3207 "SavedSearchDBTable.c"
-					gint _tmp15_ = 0;
+					gint _tmp15_;
 #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					_tmp15_ = res;
 #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -3308,22 +3308,22 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 #line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		while (TRUE) {
 #line 3308 "SavedSearchDBTable.c"
-			sqlite3_stmt* _tmp37_ = NULL;
-			gint _tmp38_ = 0;
-			gint _tmp39_ = 0;
+			sqlite3_stmt* _tmp37_;
+			gint _tmp38_;
+			gint _tmp39_;
 			SearchConditionMediaType* condition = NULL;
-			sqlite3_stmt* _tmp42_ = NULL;
-			const gchar* _tmp43_ = NULL;
-			SearchConditionSearchType _tmp44_ = 0;
-			sqlite3_stmt* _tmp45_ = NULL;
-			const gchar* _tmp46_ = NULL;
-			SearchConditionMediaTypeContext _tmp47_ = 0;
-			sqlite3_stmt* _tmp48_ = NULL;
-			const gchar* _tmp49_ = NULL;
-			SearchConditionMediaTypeMediaType _tmp50_ = 0;
-			SearchConditionMediaType* _tmp51_ = NULL;
-			GeeList* _tmp52_ = NULL;
-			SearchConditionMediaType* _tmp53_ = NULL;
+			sqlite3_stmt* _tmp42_;
+			const gchar* _tmp43_;
+			SearchConditionSearchType _tmp44_;
+			sqlite3_stmt* _tmp45_;
+			const gchar* _tmp46_;
+			SearchConditionMediaTypeContext _tmp47_;
+			sqlite3_stmt* _tmp48_;
+			const gchar* _tmp49_;
+			SearchConditionMediaTypeMediaType _tmp50_;
+			SearchConditionMediaType* _tmp51_;
+			GeeList* _tmp52_;
+			SearchConditionMediaType* _tmp53_;
 #line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			if (!_tmp36_) {
 #line 3327 "SavedSearchDBTable.c"
@@ -3344,13 +3344,13 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 				break;
 #line 3343 "SavedSearchDBTable.c"
 			} else {
-				gint _tmp40_ = 0;
+				gint _tmp40_;
 #line 448 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				_tmp40_ = res;
 #line 448 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				if (_tmp40_ != SQLITE_ROW) {
 #line 3350 "SavedSearchDBTable.c"
-					gint _tmp41_ = 0;
+					gint _tmp41_;
 #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					_tmp41_ = res;
 #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -3453,19 +3453,19 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 #line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		while (TRUE) {
 #line 3453 "SavedSearchDBTable.c"
-			sqlite3_stmt* _tmp64_ = NULL;
-			gint _tmp65_ = 0;
-			gint _tmp66_ = 0;
+			sqlite3_stmt* _tmp64_;
+			gint _tmp65_;
+			gint _tmp66_;
 			SearchConditionFlagged* condition = NULL;
-			sqlite3_stmt* _tmp69_ = NULL;
-			const gchar* _tmp70_ = NULL;
-			SearchConditionSearchType _tmp71_ = 0;
-			sqlite3_stmt* _tmp72_ = NULL;
-			const gchar* _tmp73_ = NULL;
-			SearchConditionFlaggedState _tmp74_ = 0;
-			SearchConditionFlagged* _tmp75_ = NULL;
-			GeeList* _tmp76_ = NULL;
-			SearchConditionFlagged* _tmp77_ = NULL;
+			sqlite3_stmt* _tmp69_;
+			const gchar* _tmp70_;
+			SearchConditionSearchType _tmp71_;
+			sqlite3_stmt* _tmp72_;
+			const gchar* _tmp73_;
+			SearchConditionFlaggedState _tmp74_;
+			SearchConditionFlagged* _tmp75_;
+			GeeList* _tmp76_;
+			SearchConditionFlagged* _tmp77_;
 #line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			if (!_tmp63_) {
 #line 3469 "SavedSearchDBTable.c"
@@ -3486,13 +3486,13 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 				break;
 #line 3485 "SavedSearchDBTable.c"
 			} else {
-				gint _tmp67_ = 0;
+				gint _tmp67_;
 #line 472 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				_tmp67_ = res;
 #line 472 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				if (_tmp67_ != SQLITE_ROW) {
 #line 3492 "SavedSearchDBTable.c"
-					gint _tmp68_ = 0;
+					gint _tmp68_;
 #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					_tmp68_ = res;
 #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -3590,22 +3590,22 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 #line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		while (TRUE) {
 #line 3589 "SavedSearchDBTable.c"
-			sqlite3_stmt* _tmp88_ = NULL;
-			gint _tmp89_ = 0;
-			gint _tmp90_ = 0;
+			sqlite3_stmt* _tmp88_;
+			gint _tmp89_;
+			gint _tmp90_;
 			SearchConditionModified* condition = NULL;
-			sqlite3_stmt* _tmp93_ = NULL;
-			const gchar* _tmp94_ = NULL;
-			SearchConditionSearchType _tmp95_ = 0;
-			sqlite3_stmt* _tmp96_ = NULL;
-			const gchar* _tmp97_ = NULL;
-			SearchConditionModifiedContext _tmp98_ = 0;
-			sqlite3_stmt* _tmp99_ = NULL;
-			const gchar* _tmp100_ = NULL;
-			SearchConditionModifiedState _tmp101_ = 0;
-			SearchConditionModified* _tmp102_ = NULL;
-			GeeList* _tmp103_ = NULL;
-			SearchConditionModified* _tmp104_ = NULL;
+			sqlite3_stmt* _tmp93_;
+			const gchar* _tmp94_;
+			SearchConditionSearchType _tmp95_;
+			sqlite3_stmt* _tmp96_;
+			const gchar* _tmp97_;
+			SearchConditionModifiedContext _tmp98_;
+			sqlite3_stmt* _tmp99_;
+			const gchar* _tmp100_;
+			SearchConditionModifiedState _tmp101_;
+			SearchConditionModified* _tmp102_;
+			GeeList* _tmp103_;
+			SearchConditionModified* _tmp104_;
 #line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			if (!_tmp87_) {
 #line 3608 "SavedSearchDBTable.c"
@@ -3626,13 +3626,13 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 				break;
 #line 3624 "SavedSearchDBTable.c"
 			} else {
-				gint _tmp91_ = 0;
+				gint _tmp91_;
 #line 495 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				_tmp91_ = res;
 #line 495 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				if (_tmp91_ != SQLITE_ROW) {
 #line 3631 "SavedSearchDBTable.c"
-					gint _tmp92_ = 0;
+					gint _tmp92_;
 #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					_tmp92_ = res;
 #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -3735,22 +3735,22 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 #line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		while (TRUE) {
 #line 3734 "SavedSearchDBTable.c"
-			sqlite3_stmt* _tmp115_ = NULL;
-			gint _tmp116_ = 0;
-			gint _tmp117_ = 0;
+			sqlite3_stmt* _tmp115_;
+			gint _tmp116_;
+			gint _tmp117_;
 			SearchConditionRating* condition = NULL;
-			sqlite3_stmt* _tmp120_ = NULL;
-			const gchar* _tmp121_ = NULL;
-			SearchConditionSearchType _tmp122_ = 0;
-			sqlite3_stmt* _tmp123_ = NULL;
-			gint _tmp124_ = 0;
-			Rating _tmp125_ = 0;
-			sqlite3_stmt* _tmp126_ = NULL;
-			const gchar* _tmp127_ = NULL;
-			SearchConditionRatingContext _tmp128_ = 0;
-			SearchConditionRating* _tmp129_ = NULL;
-			GeeList* _tmp130_ = NULL;
-			SearchConditionRating* _tmp131_ = NULL;
+			sqlite3_stmt* _tmp120_;
+			const gchar* _tmp121_;
+			SearchConditionSearchType _tmp122_;
+			sqlite3_stmt* _tmp123_;
+			gint _tmp124_;
+			Rating _tmp125_;
+			sqlite3_stmt* _tmp126_;
+			const gchar* _tmp127_;
+			SearchConditionRatingContext _tmp128_;
+			SearchConditionRating* _tmp129_;
+			GeeList* _tmp130_;
+			SearchConditionRating* _tmp131_;
 #line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			if (!_tmp114_) {
 #line 3753 "SavedSearchDBTable.c"
@@ -3771,13 +3771,13 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 				break;
 #line 3769 "SavedSearchDBTable.c"
 			} else {
-				gint _tmp118_ = 0;
+				gint _tmp118_;
 #line 519 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				_tmp118_ = res;
 #line 519 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				if (_tmp118_ != SQLITE_ROW) {
 #line 3776 "SavedSearchDBTable.c"
-					gint _tmp119_ = 0;
+					gint _tmp119_;
 #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					_tmp119_ = res;
 #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -3881,28 +3881,28 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 #line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		while (TRUE) {
 #line 3879 "SavedSearchDBTable.c"
-			sqlite3_stmt* _tmp142_ = NULL;
-			gint _tmp143_ = 0;
-			gint _tmp144_ = 0;
+			sqlite3_stmt* _tmp142_;
+			gint _tmp143_;
+			gint _tmp144_;
 			SearchConditionDate* condition = NULL;
-			sqlite3_stmt* _tmp147_ = NULL;
-			const gchar* _tmp148_ = NULL;
-			SearchConditionSearchType _tmp149_ = 0;
-			sqlite3_stmt* _tmp150_ = NULL;
-			const gchar* _tmp151_ = NULL;
-			SearchConditionDateContext _tmp152_ = 0;
-			sqlite3_stmt* _tmp153_ = NULL;
-			gint64 _tmp154_ = 0LL;
-			GDateTime* _tmp155_ = NULL;
-			GDateTime* _tmp156_ = NULL;
-			sqlite3_stmt* _tmp157_ = NULL;
-			gint64 _tmp158_ = 0LL;
-			GDateTime* _tmp159_ = NULL;
-			GDateTime* _tmp160_ = NULL;
-			SearchConditionDate* _tmp161_ = NULL;
-			SearchConditionDate* _tmp162_ = NULL;
-			GeeList* _tmp163_ = NULL;
-			SearchConditionDate* _tmp164_ = NULL;
+			sqlite3_stmt* _tmp147_;
+			const gchar* _tmp148_;
+			SearchConditionSearchType _tmp149_;
+			sqlite3_stmt* _tmp150_;
+			const gchar* _tmp151_;
+			SearchConditionDateContext _tmp152_;
+			sqlite3_stmt* _tmp153_;
+			gint64 _tmp154_;
+			GDateTime* _tmp155_;
+			GDateTime* _tmp156_;
+			sqlite3_stmt* _tmp157_;
+			gint64 _tmp158_;
+			GDateTime* _tmp159_;
+			GDateTime* _tmp160_;
+			SearchConditionDate* _tmp161_;
+			SearchConditionDate* _tmp162_;
+			GeeList* _tmp163_;
+			SearchConditionDate* _tmp164_;
 #line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			if (!_tmp141_) {
 #line 3904 "SavedSearchDBTable.c"
@@ -3923,13 +3923,13 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 				break;
 #line 3920 "SavedSearchDBTable.c"
 			} else {
-				gint _tmp145_ = 0;
+				gint _tmp145_;
 #line 543 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				_tmp145_ = res;
 #line 543 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				if (_tmp145_ != SQLITE_ROW) {
 #line 3927 "SavedSearchDBTable.c"
-					gint _tmp146_ = 0;
+					gint _tmp146_;
 #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					_tmp146_ = res;
 #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -4025,30 +4025,30 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearchRow* row, SavedSearchID* result, GError** error) {
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	SavedSearchRow* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	GDestroyNotify _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	sqlite3_stmt* _tmp11_ = NULL;
-	SavedSearchRow* _tmp12_ = NULL;
-	SearchOperator _tmp13_ = 0;
-	gchar* _tmp14_ = NULL;
-	GDestroyNotify _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	sqlite3_stmt* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	SavedSearchRow* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
+	GDestroyNotify _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
+	sqlite3_stmt* _tmp11_;
+	SavedSearchRow* _tmp12_;
+	SearchOperator _tmp13_;
+	gchar* _tmp14_;
+	GDestroyNotify _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	sqlite3_stmt* _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
 	SavedSearchID search_id = {0};
-	sqlite3* _tmp22_ = NULL;
-	gint64 _tmp23_ = 0LL;
+	sqlite3* _tmp22_;
+	gint64 _tmp23_;
 	GError * _inner_error_ = NULL;
 #line 558 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self));
@@ -4115,7 +4115,7 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc
 #line 570 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	if (_tmp20_ != SQLITE_DONE) {
 #line 4113 "SavedSearchDBTable.c"
-		gint _tmp21_ = 0;
+		gint _tmp21_;
 #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp21_ = res;
 #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -4153,13 +4153,13 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc
 #line 4149 "SavedSearchDBTable.c"
 	{
 		GeeList* _sc_list = NULL;
-		SavedSearchRow* _tmp24_ = NULL;
-		GeeList* _tmp25_ = NULL;
-		GeeList* _tmp26_ = NULL;
+		SavedSearchRow* _tmp24_;
+		GeeList* _tmp25_;
+		GeeList* _tmp26_;
 		gint _sc_size = 0;
-		GeeList* _tmp27_ = NULL;
-		gint _tmp28_ = 0;
-		gint _tmp29_ = 0;
+		GeeList* _tmp27_;
+		gint _tmp28_;
+		gint _tmp29_;
 		gint _sc_index = 0;
 #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp24_ = row;
@@ -4182,15 +4182,15 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc
 #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		while (TRUE) {
 #line 4180 "SavedSearchDBTable.c"
-			gint _tmp30_ = 0;
-			gint _tmp31_ = 0;
-			gint _tmp32_ = 0;
+			gint _tmp30_;
+			gint _tmp31_;
+			gint _tmp32_;
 			SearchCondition* sc = NULL;
-			GeeList* _tmp33_ = NULL;
-			gint _tmp34_ = 0;
-			gpointer _tmp35_ = NULL;
-			SavedSearchID _tmp36_ = {0};
-			SearchCondition* _tmp37_ = NULL;
+			GeeList* _tmp33_;
+			gint _tmp34_;
+			gpointer _tmp35_;
+			SavedSearchID _tmp36_;
+			SearchCondition* _tmp37_;
 #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			_tmp30_ = _sc_index;
 #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -4269,9 +4269,9 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc
 
 
 void saved_search_db_table_remove (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error) {
-	SavedSearchID _tmp0_ = {0};
-	SavedSearchID _tmp1_ = {0};
-	gint64 _tmp2_ = 0LL;
+	SavedSearchID _tmp0_;
+	SavedSearchID _tmp1_;
+	gint64 _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 582 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self));
@@ -4332,30 +4332,30 @@ SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSe
 	SavedSearchRow* 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;
-	SavedSearchID _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_;
+	SavedSearchID _tmp5_;
+	gint64 _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
 	SavedSearchRow* row = NULL;
-	SavedSearchRow* _tmp14_ = NULL;
-	SavedSearchRow* _tmp15_ = NULL;
-	SavedSearchID _tmp16_ = {0};
-	SavedSearchRow* _tmp17_ = NULL;
-	sqlite3_stmt* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	SavedSearchRow* _tmp21_ = NULL;
-	sqlite3_stmt* _tmp22_ = NULL;
-	const gchar* _tmp23_ = NULL;
-	SearchOperator _tmp24_ = 0;
+	SavedSearchRow* _tmp14_;
+	SavedSearchRow* _tmp15_;
+	SavedSearchID _tmp16_;
+	SavedSearchRow* _tmp17_;
+	sqlite3_stmt* _tmp18_;
+	const gchar* _tmp19_;
+	gchar* _tmp20_;
+	SavedSearchRow* _tmp21_;
+	sqlite3_stmt* _tmp22_;
+	const gchar* _tmp23_;
+	SearchOperator _tmp24_;
 	GError * _inner_error_ = NULL;
 #line 587 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL);
@@ -4407,13 +4407,13 @@ SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSe
 		return result;
 #line 4404 "SavedSearchDBTable.c"
 	} else {
-		gint _tmp12_ = 0;
+		gint _tmp12_;
 #line 599 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp12_ = res;
 #line 599 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		if (_tmp12_ != SQLITE_ROW) {
 #line 4411 "SavedSearchDBTable.c"
-			gint _tmp13_ = 0;
+			gint _tmp13_;
 #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			_tmp13_ = res;
 #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -4489,12 +4489,12 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError**
 	GeeList* 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_;
 	GeeList* rows = NULL;
-	GeeArrayList* _tmp4_ = NULL;
+	GeeArrayList* _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 610 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL);
@@ -4524,30 +4524,30 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError**
 #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		while (TRUE) {
 #line 4522 "SavedSearchDBTable.c"
-			sqlite3_stmt* _tmp6_ = NULL;
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
+			sqlite3_stmt* _tmp6_;
+			gint _tmp7_;
+			gint _tmp8_;
 			SavedSearchRow* row = NULL;
-			SavedSearchRow* _tmp11_ = NULL;
-			SavedSearchRow* _tmp12_ = NULL;
-			sqlite3_stmt* _tmp13_ = NULL;
-			gint64 _tmp14_ = 0LL;
-			SavedSearchRow* _tmp15_ = NULL;
-			sqlite3_stmt* _tmp16_ = NULL;
-			const gchar* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
-			SavedSearchRow* _tmp19_ = NULL;
-			sqlite3_stmt* _tmp20_ = NULL;
-			const gchar* _tmp21_ = NULL;
-			SearchOperator _tmp22_ = 0;
+			SavedSearchRow* _tmp11_;
+			SavedSearchRow* _tmp12_;
+			sqlite3_stmt* _tmp13_;
+			gint64 _tmp14_;
+			SavedSearchRow* _tmp15_;
+			sqlite3_stmt* _tmp16_;
+			const gchar* _tmp17_;
+			gchar* _tmp18_;
+			SavedSearchRow* _tmp19_;
+			sqlite3_stmt* _tmp20_;
+			const gchar* _tmp21_;
+			SearchOperator _tmp22_;
 			GeeList* _tmp23_ = NULL;
-			SavedSearchRow* _tmp24_ = NULL;
-			SavedSearchID _tmp25_ = {0};
-			GeeList* _tmp26_ = NULL;
-			SavedSearchRow* _tmp27_ = NULL;
-			GeeList* _tmp28_ = NULL;
-			GeeList* _tmp29_ = NULL;
-			SavedSearchRow* _tmp30_ = NULL;
+			SavedSearchRow* _tmp24_;
+			SavedSearchID _tmp25_;
+			GeeList* _tmp26_;
+			SavedSearchRow* _tmp27_;
+			GeeList* _tmp28_;
+			GeeList* _tmp29_;
+			SavedSearchRow* _tmp30_;
 #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 			if (!_tmp5_) {
 #line 4549 "SavedSearchDBTable.c"
@@ -4568,13 +4568,13 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError**
 				break;
 #line 4565 "SavedSearchDBTable.c"
 			} else {
-				gint _tmp9_ = 0;
+				gint _tmp9_;
 #line 622 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				_tmp9_ = res;
 #line 622 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 				if (_tmp9_ != SQLITE_ROW) {
 #line 4572 "SavedSearchDBTable.c"
-					gint _tmp10_ = 0;
+					gint _tmp10_;
 #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 					_tmp10_ = res;
 #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -4715,9 +4715,9 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError**
 
 
 void saved_search_db_table_rename (SavedSearchDBTable* self, SavedSearchID* search_id, const gchar* new_name, GError** error) {
-	SavedSearchID _tmp0_ = {0};
-	gint64 _tmp1_ = 0LL;
-	const gchar* _tmp2_ = NULL;
+	SavedSearchID _tmp0_;
+	gint64 _tmp1_;
+	const gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 637 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self));
@@ -4768,7 +4768,7 @@ static void saved_search_db_table_instance_init (SavedSearchDBTable * self) {
 }
 
 
-static void saved_search_db_table_finalize (DatabaseTable* obj) {
+static void saved_search_db_table_finalize (DatabaseTable * obj) {
 	SavedSearchDBTable * self;
 #line 33 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_DB_TABLE, SavedSearchDBTable);