Update upstream source from tag 'upstream/0.26.4'

Update to upstream version '0.26.4'
with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4

1 files changed, 280 insertions, 280 deletions

diff --git a/plugins/shotwell-data-imports/FSpotMetaTable.c b/plugins/shotwell-data-imports/FSpotMetaTable.c
index 55e20af..0b87d55 100644
--- a/plugins/shotwell-data-imports/FSpotMetaTable.c
+++ b/plugins/shotwell-data-imports/FSpotMetaTable.c
@@ -1,4 +1,4 @@
-/* FSpotMetaTable.c generated by valac 0.34.7, the Vala compiler
+/* FSpotMetaTable.c generated by valac 0.36.6, the Vala compiler
  * generated from FSpotMetaTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -154,7 +154,7 @@ static gpointer data_imports_fspot_db_fspot_meta_table_parent_class = NULL;
 static gpointer data_imports_fspot_db_fspot_meta_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_instance;
 static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_meta_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_meta_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 
 GType data_imports_fspot_db_fspot_meta_row_get_type (void) G_GNUC_CONST;
 enum  {
@@ -162,7 +162,7 @@ enum  {
 };
 DataImportsFSpotDbFSpotMetaRow* data_imports_fspot_db_fspot_meta_row_new (void);
 DataImportsFSpotDbFSpotMetaRow* data_imports_fspot_db_fspot_meta_row_construct (GType object_type);
-static void data_imports_fspot_db_fspot_meta_row_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_meta_row_finalize (GObject * obj);
 gpointer importable_database_table_ref (gpointer instance);
 void importable_database_table_unref (gpointer instance);
 GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -198,8 +198,8 @@ static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_beh
 static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_construct (GType object_type);
 static gchar* data_imports_fspot_db_fspot_meta_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_meta_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_meta_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotMetaRow** row, gint offset);
-static void data_imports_fspot_db_fspot_meta_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_meta_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotMetaRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_meta_behavior_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -234,7 +234,7 @@ static void data_imports_fspot_db_fspot_meta_row_instance_init (DataImportsFSpot
 }
 
 
-static void data_imports_fspot_db_fspot_meta_row_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_meta_row_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotMetaRow * self;
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_ROW, DataImportsFSpotDbFSpotMetaRow);
@@ -265,9 +265,9 @@ GType data_imports_fspot_db_fspot_meta_row_get_type (void) {
 
 DataImportsFSpotDbFSpotMetaTable* data_imports_fspot_db_fspot_meta_table_construct (GType object_type, sqlite3* db) {
 	DataImportsFSpotDbFSpotMetaTable* self = NULL;
-	sqlite3* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotMetaBehavior* _tmp1_ = NULL;
-	DataImportsFSpotDbFSpotMetaBehavior* _tmp2_ = NULL;
+	sqlite3* _tmp0_;
+	DataImportsFSpotDbFSpotMetaBehavior* _tmp1_;
+	DataImportsFSpotDbFSpotMetaBehavior* _tmp2_;
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	g_return_val_if_fail (db != NULL, NULL);
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
@@ -297,408 +297,408 @@ DataImportsFSpotDbFSpotMetaTable* data_imports_fspot_db_fspot_meta_table_new (sq
 
 static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		separator = "";
 #line 312 "FSpotMetaTable.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
 #line 322 "FSpotMetaTable.c"
 	} else {
-		gchar** _tmp4_ = NULL;
-		gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp4_;
+		gint _tmp4__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
 #line 332 "FSpotMetaTable.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
 #line 338 "FSpotMetaTable.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
-		gchar** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp6_;
+		gint _tmp6__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
 #line 349 "FSpotMetaTable.c"
-			gchar** _tmp7_ = NULL;
-			gint _tmp7__length1 = 0;
-			const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+			gchar** _tmp7_;
+			gint _tmp7__length1;
+			const gchar* _tmp8_;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
 #line 361 "FSpotMetaTable.c"
 		} else {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
 #line 365 "FSpotMetaTable.c"
 		}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
 #line 369 "FSpotMetaTable.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 373 "FSpotMetaTable.c"
 		gint i = 0;
 		gsize len = 0UL;
-		gint _tmp31_ = 0;
-		gint _tmp33_ = 0;
-		gint _tmp34_ = 0;
-		gsize _tmp35_ = 0UL;
-		const gchar* _tmp36_ = NULL;
-		gint _tmp37_ = 0;
-		gint _tmp38_ = 0;
-		gint _tmp39_ = 0;
+		gint _tmp31_;
+		gint _tmp33_;
+		gint _tmp34_;
+		gsize _tmp35_;
+		const gchar* _tmp36_;
+		gint _tmp37_;
+		gint _tmp38_;
+		gint _tmp39_;
 		const gchar* res = NULL;
-		gsize _tmp40_ = 0UL;
-		void* _tmp41_ = NULL;
+		gsize _tmp40_;
+		void* _tmp41_;
 		void* ptr = NULL;
-		const gchar* _tmp42_ = NULL;
-		gchar** _tmp43_ = NULL;
-		gint _tmp43__length1 = 0;
-		const gchar* _tmp44_ = NULL;
-		void* _tmp45_ = NULL;
-		const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp42_;
+		gchar** _tmp43_;
+		gint _tmp43__length1;
+		const gchar* _tmp44_;
+		void* _tmp45_;
+		const gchar* _tmp62_;
+#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
 #line 396 "FSpotMetaTable.c"
 		{
 			gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 405 "FSpotMetaTable.c"
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
-				gchar** _tmp13_ = NULL;
-				gint _tmp13__length1 = 0;
+				gchar** _tmp13_;
+				gint _tmp13__length1;
 				gint _tmp21_ = 0;
-				gchar** _tmp22_ = NULL;
-				gint _tmp22__length1 = 0;
-				gint _tmp23_ = 0;
-				const gchar* _tmp24_ = NULL;
-				gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				gchar** _tmp22_;
+				gint _tmp22__length1;
+				gint _tmp23_;
+				const gchar* _tmp24_;
+				gsize _tmp30_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
 #line 418 "FSpotMetaTable.c"
-					gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gint _tmp10_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
 #line 424 "FSpotMetaTable.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
 #line 434 "FSpotMetaTable.c"
-					gint _tmp14_ = 0;
-					gchar** _tmp15_ = NULL;
-					gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gint _tmp14_;
+					gchar** _tmp15_;
+					gint _tmp15__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
 #line 446 "FSpotMetaTable.c"
 				} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
 #line 450 "FSpotMetaTable.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
 #line 456 "FSpotMetaTable.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
-					gchar** _tmp17_ = NULL;
-					gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp17_;
+					gint _tmp17__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
 #line 467 "FSpotMetaTable.c"
-						gchar** _tmp18_ = NULL;
-						gint _tmp18__length1 = 0;
-						gint _tmp19_ = 0;
-						const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+						gchar** _tmp18_;
+						gint _tmp18__length1;
+						gint _tmp19_;
+						const gchar* _tmp20_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
 #line 482 "FSpotMetaTable.c"
 					} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
 #line 486 "FSpotMetaTable.c"
 					}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
 #line 490 "FSpotMetaTable.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
 #line 496 "FSpotMetaTable.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
 #line 508 "FSpotMetaTable.c"
-					gchar** _tmp25_ = NULL;
-					gint _tmp25__length1 = 0;
-					gint _tmp26_ = 0;
-					const gchar* _tmp27_ = NULL;
-					gint _tmp28_ = 0;
-					gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp25_;
+					gint _tmp25__length1;
+					gint _tmp26_;
+					const gchar* _tmp27_;
+					gint _tmp28_;
+					gint _tmp29_;
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
 #line 529 "FSpotMetaTable.c"
 				} else {
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
 #line 533 "FSpotMetaTable.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
 #line 539 "FSpotMetaTable.c"
 			}
 		}
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
 #line 546 "FSpotMetaTable.c"
-			gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+			gchar* _tmp32_;
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			result = _tmp32_;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return result;
 #line 554 "FSpotMetaTable.c"
 		}
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = _tmp41_;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
 #line 592 "FSpotMetaTable.c"
 		{
 			gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 601 "FSpotMetaTable.c"
-				gint _tmp48_ = 0;
-				gchar** _tmp49_ = NULL;
-				gint _tmp49__length1 = 0;
-				void* _tmp50_ = NULL;
-				const gchar* _tmp51_ = NULL;
-				void* _tmp52_ = NULL;
+				gint _tmp48_;
+				gchar** _tmp49_;
+				gint _tmp49__length1;
+				void* _tmp50_;
+				const gchar* _tmp51_;
+				void* _tmp52_;
 				const gchar* _tmp53_ = NULL;
-				gchar** _tmp54_ = NULL;
-				gint _tmp54__length1 = 0;
-				gint _tmp55_ = 0;
-				const gchar* _tmp56_ = NULL;
-				void* _tmp60_ = NULL;
-				void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				gchar** _tmp54_;
+				gint _tmp54__length1;
+				gint _tmp55_;
+				const gchar* _tmp56_;
+				void* _tmp60_;
+				void* _tmp61_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
 #line 617 "FSpotMetaTable.c"
-					gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gint _tmp47_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
 #line 623 "FSpotMetaTable.c"
 				}
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
 #line 637 "FSpotMetaTable.c"
 				}
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
 #line 657 "FSpotMetaTable.c"
-					gchar** _tmp57_ = NULL;
-					gint _tmp57__length1 = 0;
-					gint _tmp58_ = 0;
-					const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp57_;
+					gint _tmp57__length1;
+					gint _tmp58_;
+					const gchar* _tmp59_;
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
 #line 672 "FSpotMetaTable.c"
 				} else {
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
 #line 676 "FSpotMetaTable.c"
 				}
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
 #line 684 "FSpotMetaTable.c"
 			}
 		}
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 695 "FSpotMetaTable.c"
 	} else {
-		gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp63_;
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp63_;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 704 "FSpotMetaTable.c"
 	}
@@ -708,42 +708,42 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 gchar* data_imports_fspot_db_fspot_meta_table_get_data (DataImportsFSpotDbFSpotMetaTable* self, const gchar* name, GError** error) {
 	gchar* result = NULL;
 	gchar** columns = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gchar** _tmp2_ = NULL;
-	gint columns_length1 = 0;
-	gint _columns_size_ = 0;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
+	gint _tmp1_;
+	gchar** _tmp2_;
+	gint columns_length1;
+	gint _columns_size_;
 	gchar* column_list = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gchar* _tmp4_ = NULL;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+	gchar* _tmp4_;
 	gchar* sql = NULL;
-	const gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	const gchar* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
+	sqlite3* _tmp8_;
+	const gchar* _tmp9_;
 	sqlite3_stmt* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	sqlite3_stmt* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
-	GDestroyNotify _tmp20_ = NULL;
-	gint _tmp21_ = 0;
-	gint _tmp22_ = 0;
-	sqlite3_stmt* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	gint _tmp29_ = 0;
+	gint _tmp11_;
+	gint _tmp12_;
+	sqlite3_stmt* _tmp17_;
+	const gchar* _tmp18_;
+	gchar* _tmp19_;
+	GDestroyNotify _tmp20_;
+	gint _tmp21_;
+	gint _tmp22_;
+	sqlite3_stmt* _tmp27_;
+	gint _tmp28_;
+	gint _tmp29_;
 	DataImportsFSpotDbFSpotMetaRow* row = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp32_ = NULL;
-	sqlite3_stmt* _tmp33_ = NULL;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp32_;
+	sqlite3_stmt* _tmp33_;
 	gpointer _tmp34_ = NULL;
-	DataImportsFSpotDbFSpotMetaRow* _tmp35_ = NULL;
-	const gchar* _tmp36_ = NULL;
-	gchar* _tmp37_ = NULL;
+	DataImportsFSpotDbFSpotMetaRow* _tmp35_;
+	const gchar* _tmp36_;
+	gchar* _tmp37_;
 	GError * _inner_error_ = NULL;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_TABLE (self), NULL);
@@ -792,10 +792,10 @@ gchar* data_imports_fspot_db_fspot_meta_table_get_data (DataImportsFSpotDbFSpotM
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	if (_tmp12_ != SQLITE_OK) {
 #line 795 "FSpotMetaTable.c"
-		const gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		gint _tmp16_ = 0;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		gint _tmp16_;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 		_tmp13_ = sql;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
@@ -861,10 +861,10 @@ gchar* data_imports_fspot_db_fspot_meta_table_get_data (DataImportsFSpotDbFSpotM
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	if (_tmp22_ != SQLITE_OK) {
 #line 864 "FSpotMetaTable.c"
-		const gchar* _tmp23_ = NULL;
-		gchar* _tmp24_ = NULL;
-		gchar* _tmp25_ = NULL;
-		gint _tmp26_ = 0;
+		const gchar* _tmp23_;
+		gchar* _tmp24_;
+		gchar* _tmp25_;
+		gint _tmp26_;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 		_tmp23_ = name;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
@@ -924,13 +924,13 @@ gchar* data_imports_fspot_db_fspot_meta_table_get_data (DataImportsFSpotDbFSpotM
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	if (_tmp29_ != SQLITE_ROW) {
 #line 927 "FSpotMetaTable.c"
-		gint _tmp30_ = 0;
+		gint _tmp30_;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 		_tmp30_ = res;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 		if (_tmp30_ != SQLITE_DONE) {
 #line 933 "FSpotMetaTable.c"
-			gint _tmp31_ = 0;
+			gint _tmp31_;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 			_tmp31_ = res;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
@@ -1022,8 +1022,8 @@ gchar* data_imports_fspot_db_fspot_meta_table_get_data (DataImportsFSpotDbFSpotM
 gchar* data_imports_fspot_db_fspot_meta_table_get_app_version (DataImportsFSpotDbFSpotMetaTable* self, GError** error) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_TABLE (self), NULL);
@@ -1067,8 +1067,8 @@ gchar* data_imports_fspot_db_fspot_meta_table_get_app_version (DataImportsFSpotD
 gchar* data_imports_fspot_db_fspot_meta_table_get_db_version (DataImportsFSpotDbFSpotMetaTable* self, GError** error) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_TABLE (self), NULL);
@@ -1111,17 +1111,17 @@ gchar* data_imports_fspot_db_fspot_meta_table_get_db_version (DataImportsFSpotDb
 
 static gint64 int64_parse (const gchar* str) {
 	gint64 result = 0LL;
-	const gchar* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
-#line 679 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	const gchar* _tmp0_;
+	gint64 _tmp1_;
+#line 687 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (str != NULL, 0LL);
-#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0);
-#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 1127 "FSpotMetaTable.c"
 }
@@ -1130,7 +1130,7 @@ static gint64 int64_parse (const gchar* str) {
 gint64 data_imports_fspot_db_fspot_meta_table_get_hidden_tag_id (DataImportsFSpotDbFSpotMetaTable* self, GError** error) {
 	gint64 result = 0LL;
 	gchar* id_str = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_TABLE (self), 0LL);
@@ -1163,7 +1163,7 @@ gint64 data_imports_fspot_db_fspot_meta_table_get_hidden_tag_id (DataImportsFSpo
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	if (id_str != NULL) {
 #line 1166 "FSpotMetaTable.c"
-		gint64 _tmp3_ = 0LL;
+		gint64 _tmp3_;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 		_tmp3_ = int64_parse (id_str);
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
@@ -1251,15 +1251,15 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotMetaBehavior* result = NULL;
-	DataImportsFSpotDbFSpotMetaBehavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotMetaBehavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotMetaBehavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotMetaBehavior* _tmp0_;
+	DataImportsFSpotDbFSpotMetaBehavior* _tmp2_;
+	DataImportsFSpotDbFSpotMetaBehavior* _tmp3_;
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_meta_behavior_instance;
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	if (_tmp0_ == NULL) {
 #line 1262 "FSpotMetaTable.c"
-		DataImportsFSpotDbFSpotMetaBehavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotMetaBehavior* _tmp1_;
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_meta_behavior_new ();
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
@@ -1283,7 +1283,7 @@ DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_g
 static gchar* data_imports_fspot_db_fspot_meta_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotMetaBehavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR, DataImportsFSpotDbFSpotMetaBehavior);
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
@@ -1299,11 +1299,11 @@ static gchar* data_imports_fspot_db_fspot_meta_behavior_real_get_table_name (Dat
 static gchar** data_imports_fspot_db_fspot_meta_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotMetaBehavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar** _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR, DataImportsFSpotDbFSpotMetaBehavior);
 #line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
@@ -1334,18 +1334,18 @@ static gchar** data_imports_fspot_db_fspot_meta_behavior_real_list_columns (Data
 }
 
 
-static void data_imports_fspot_db_fspot_meta_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotMetaRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_meta_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotMetaRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotMetaBehavior * self;
 	DataImportsFSpotDbFSpotMetaRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotMetaRow* _tmp0_ = NULL;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	sqlite3_stmt* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	const gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	DataImportsFSpotDbFSpotMetaRow* _tmp0_;
+	sqlite3_stmt* _tmp1_;
+	gint _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	sqlite3_stmt* _tmp5_;
+	gint _tmp6_;
+	const gchar* _tmp7_;
+	gchar* _tmp8_;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR, DataImportsFSpotDbFSpotMetaBehavior);
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
@@ -1406,11 +1406,11 @@ static void data_imports_fspot_db_fspot_meta_behavior_data_imports_fspot_db_fspo
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	data_imports_fspot_db_fspot_meta_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_meta_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_meta_behavior_real_get_table_name;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_meta_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_meta_behavior_real_list_columns;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_meta_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_meta_behavior_real_build_row;
 #line 1415 "FSpotMetaTable.c"
 }
 
@@ -1419,7 +1419,7 @@ static void data_imports_fspot_db_fspot_meta_behavior_instance_init (DataImports
 }
 
 
-static void data_imports_fspot_db_fspot_meta_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_meta_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotMetaBehavior * self;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR, DataImportsFSpotDbFSpotMetaBehavior);