Update upstream source from tag 'upstream/0.26.4'

Update to upstream version '0.26.4'
with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4

1 files changed, 320 insertions, 320 deletions

diff --git a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c
index 267d1f1..d7b9079 100644
--- a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c
+++ b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c
@@ -1,4 +1,4 @@
-/* FSpotPhotoVersionsTable.c generated by valac 0.34.7, the Vala compiler
+/* FSpotPhotoVersionsTable.c generated by valac 0.36.6, the Vala compiler
  * generated from FSpotPhotoVersionsTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -251,23 +251,23 @@ static gpointer data_imports_fspot_db_fspot_photo_versions_table_parent_class =
 static gpointer data_imports_fspot_db_fspot_photo_versions_v0_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_photo_versions_v0_behavior_instance;
 static DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_photo_versions_v0_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photo_versions_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photo_versions_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 static gpointer data_imports_fspot_db_fspot_photo_versions_v9_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_photo_versions_v9_behavior_instance;
 static DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_photo_versions_v9_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photo_versions_v9_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photo_versions_v9_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 static gpointer data_imports_fspot_db_fspot_photo_versions_v16_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_photo_versions_v16_behavior_instance;
 static DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_photo_versions_v16_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photo_versions_v16_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photo_versions_v16_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 static gpointer data_imports_fspot_db_fspot_photo_versions_v17_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_photo_versions_v17_behavior_instance;
 static DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_photo_versions_v17_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photo_versions_v17_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photo_versions_v17_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 static gpointer data_imports_fspot_db_fspot_photo_versions_v18_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_photo_versions_v18_behavior_instance;
 static DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_photo_versions_v18_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photo_versions_v18_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photo_versions_v18_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 
 GType data_imports_fspot_db_fspot_photo_version_row_get_type (void) G_GNUC_CONST;
 enum  {
@@ -275,7 +275,7 @@ enum  {
 };
 DataImportsFSpotDbFSpotPhotoVersionRow* data_imports_fspot_db_fspot_photo_version_row_new (void);
 DataImportsFSpotDbFSpotPhotoVersionRow* data_imports_fspot_db_fspot_photo_version_row_construct (GType object_type);
-static void data_imports_fspot_db_fspot_photo_version_row_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photo_version_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);
@@ -310,8 +310,8 @@ static DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fsp
 DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_photo_versions_v0_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset);
-static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_photo_versions_v9_behavior_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR_DUMMY_PROPERTY
@@ -321,8 +321,8 @@ static DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fsp
 DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_photo_versions_v9_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset);
-static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_photo_versions_v16_behavior_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR_DUMMY_PROPERTY
@@ -332,8 +332,8 @@ static DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fs
 DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_photo_versions_v16_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset);
-static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_photo_versions_v17_behavior_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR_DUMMY_PROPERTY
@@ -343,8 +343,8 @@ static DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fs
 DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_photo_versions_v17_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset);
-static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_photo_versions_v18_behavior_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR_DUMMY_PROPERTY
@@ -354,8 +354,8 @@ static DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fs
 DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_photo_versions_v18_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset);
-static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_finalize (GObject * obj);
 
 
 DataImportsFSpotDbFSpotPhotoVersionRow* data_imports_fspot_db_fspot_photo_version_row_construct (GType object_type) {
@@ -388,7 +388,7 @@ static void data_imports_fspot_db_fspot_photo_version_row_instance_init (DataImp
 }
 
 
-static void data_imports_fspot_db_fspot_photo_version_row_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photo_version_row_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotoVersionRow * self;
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW, DataImportsFSpotDbFSpotPhotoVersionRow);
@@ -423,10 +423,10 @@ GType data_imports_fspot_db_fspot_photo_version_row_get_type (void) {
 
 DataImportsFSpotDbFSpotPhotoVersionsTable* data_imports_fspot_db_fspot_photo_versions_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior) {
 	DataImportsFSpotDbFSpotPhotoVersionsTable* self = NULL;
-	sqlite3* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp3_ = NULL;
+	sqlite3* _tmp0_;
+	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp2_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp3_;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	g_return_val_if_fail (db != NULL, NULL);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -461,26 +461,26 @@ DataImportsFSpotDbFSpotPhotoVersionsTable* data_imports_fspot_db_fspot_photo_ver
 GeeArrayList* data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id (DataImportsFSpotDbFSpotPhotoVersionsTable* self, gint64 photo_id, GError** error) {
 	GeeArrayList* result = NULL;
 	GeeArrayList* rows = NULL;
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 	sqlite3_stmt* stmt = NULL;
 	gchar* column_list = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp1_;
 	gchar* sql = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
 	gint res = 0;
-	sqlite3* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
+	sqlite3* _tmp5_;
+	const gchar* _tmp6_;
 	sqlite3_stmt* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	sqlite3_stmt* _tmp14_ = NULL;
-	gint64 _tmp15_ = 0LL;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	sqlite3_stmt* _tmp19_ = NULL;
-	gint _tmp20_ = 0;
+	gint _tmp8_;
+	gint _tmp9_;
+	sqlite3_stmt* _tmp14_;
+	gint64 _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	sqlite3_stmt* _tmp19_;
+	gint _tmp20_;
 	GError * _inner_error_ = NULL;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_TABLE (self), NULL);
@@ -517,10 +517,10 @@ GeeArrayList* data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id (
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	if (_tmp9_ != SQLITE_OK) {
 #line 520 "FSpotPhotoVersionsTable.c"
-		const gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gint _tmp13_ = 0;
+		const gchar* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		gint _tmp13_;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp10_ = sql;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -582,7 +582,7 @@ GeeArrayList* data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id (
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	if (_tmp17_ != SQLITE_OK) {
 #line 585 "FSpotPhotoVersionsTable.c"
-		gint _tmp18_ = 0;
+		gint _tmp18_;
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp18_ = res;
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -632,15 +632,15 @@ GeeArrayList* data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id (
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	while (TRUE) {
 #line 635 "FSpotPhotoVersionsTable.c"
-		gint _tmp21_ = 0;
+		gint _tmp21_;
 		DataImportsFSpotDbFSpotPhotoVersionRow* row = NULL;
-		DataImportsFSpotDbFSpotTableBehavior* _tmp22_ = NULL;
-		sqlite3_stmt* _tmp23_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp22_;
+		sqlite3_stmt* _tmp23_;
 		gpointer _tmp24_ = NULL;
-		GeeArrayList* _tmp25_ = NULL;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp26_ = NULL;
-		sqlite3_stmt* _tmp27_ = NULL;
-		gint _tmp28_ = 0;
+		GeeArrayList* _tmp25_;
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp26_;
+		sqlite3_stmt* _tmp27_;
+		gint _tmp28_;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp21_ = res;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -741,15 +741,15 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_photo_versions_v0_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp3_;
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photo_versions_v0_behavior_instance;
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	if (_tmp0_ == NULL) {
 #line 752 "FSpotPhotoVersionsTable.c"
-		DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp1_;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photo_versions_v0_behavior_new ();
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -773,7 +773,7 @@ DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_phot
 static gchar* data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV0Behavior);
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -789,13 +789,13 @@ static gchar* data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_get_ta
 static gchar** data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
-	gchar** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar** _tmp4_;
+	gchar** _tmp5_;
+	gint _tmp5__length1;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV0Behavior);
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -834,32 +834,32 @@ static gchar** data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_list_
 }
 
 
-static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior * self;
 	DataImportsFSpotDbFSpotPhotoVersionRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_ = NULL;
-	sqlite3_stmt* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_;
+	sqlite3_stmt* _tmp10_;
+	gint _tmp11_;
+	const gchar* _tmp12_;
+	gchar* _tmp13_;
 	gchar* full_path = NULL;
-	sqlite3_stmt* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp27_ = NULL;
-	gchar* _tmp28_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp29_ = NULL;
+	sqlite3_stmt* _tmp14_;
+	gint _tmp15_;
+	const gchar* _tmp16_;
+	gchar* _tmp17_;
+	const gchar* _tmp18_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp27_;
+	gchar* _tmp28_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp29_;
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV0Behavior);
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -920,14 +920,14 @@ static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_ro
 	if (_tmp18_ != NULL) {
 #line 922 "FSpotPhotoVersionsTable.c"
 		GFile* uri = NULL;
-		const gchar* _tmp19_ = NULL;
-		GFile* _tmp20_ = NULL;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp21_ = NULL;
-		GFile* _tmp22_ = NULL;
-		GFile* _tmp23_ = NULL;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_ = NULL;
-		GFile* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
+		const gchar* _tmp19_;
+		GFile* _tmp20_;
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp21_;
+		GFile* _tmp22_;
+		GFile* _tmp23_;
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_;
+		GFile* _tmp25_;
+		gchar* _tmp26_;
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp19_ = full_path;
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -998,11 +998,11 @@ static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_data_imports_
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	data_imports_fspot_db_fspot_photo_versions_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_get_table_name;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_list_columns;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_row;
 #line 1007 "FSpotPhotoVersionsTable.c"
 }
 
@@ -1011,7 +1011,7 @@ static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_instance_init
 }
 
 
-static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior * self;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV0Behavior);
@@ -1054,15 +1054,15 @@ static DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fsp
 
 DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_photo_versions_v9_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp3_;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photo_versions_v9_behavior_instance;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	if (_tmp0_ == NULL) {
 #line 1065 "FSpotPhotoVersionsTable.c"
-		DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp1_;
 #line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photo_versions_v9_behavior_new ();
 #line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1086,7 +1086,7 @@ DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_phot
 static gchar* data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV9Behavior);
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1102,14 +1102,14 @@ static gchar* data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_get_ta
 static gchar** data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar** _tmp5_ = NULL;
-	gchar** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar** _tmp5_;
+	gchar** _tmp6_;
+	gint _tmp6__length1;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV9Behavior);
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1152,35 +1152,35 @@ static gchar** data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_list_
 }
 
 
-static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior * self;
 	DataImportsFSpotDbFSpotPhotoVersionRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_ = NULL;
-	sqlite3_stmt* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_;
+	sqlite3_stmt* _tmp10_;
+	gint _tmp11_;
+	const gchar* _tmp12_;
+	gchar* _tmp13_;
 	gchar* full_path = NULL;
-	sqlite3_stmt* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp27_ = NULL;
-	gchar* _tmp28_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp29_ = NULL;
-	sqlite3_stmt* _tmp30_ = NULL;
-	gint _tmp31_ = 0;
-	gint _tmp32_ = 0;
+	sqlite3_stmt* _tmp14_;
+	gint _tmp15_;
+	const gchar* _tmp16_;
+	gchar* _tmp17_;
+	const gchar* _tmp18_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp27_;
+	gchar* _tmp28_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp29_;
+	sqlite3_stmt* _tmp30_;
+	gint _tmp31_;
+	gint _tmp32_;
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV9Behavior);
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1241,14 +1241,14 @@ static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_ro
 	if (_tmp18_ != NULL) {
 #line 1243 "FSpotPhotoVersionsTable.c"
 		GFile* uri = NULL;
-		const gchar* _tmp19_ = NULL;
-		GFile* _tmp20_ = NULL;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp21_ = NULL;
-		GFile* _tmp22_ = NULL;
-		GFile* _tmp23_ = NULL;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_ = NULL;
-		GFile* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
+		const gchar* _tmp19_;
+		GFile* _tmp20_;
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp21_;
+		GFile* _tmp22_;
+		GFile* _tmp23_;
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_;
+		GFile* _tmp25_;
+		gchar* _tmp26_;
 #line 136 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp19_ = full_path;
 #line 136 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1325,11 +1325,11 @@ static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_data_imports_
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	data_imports_fspot_db_fspot_photo_versions_v9_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_get_table_name;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_list_columns;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_row;
 #line 1334 "FSpotPhotoVersionsTable.c"
 }
 
@@ -1338,7 +1338,7 @@ static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_instance_init
 }
 
 
-static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior * self;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV9Behavior);
@@ -1381,15 +1381,15 @@ static DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fs
 
 DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_photo_versions_v16_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp3_;
 #line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photo_versions_v16_behavior_instance;
 #line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	if (_tmp0_ == NULL) {
 #line 1392 "FSpotPhotoVersionsTable.c"
-		DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp1_;
 #line 156 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photo_versions_v16_behavior_new ();
 #line 156 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1413,7 +1413,7 @@ DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_pho
 static gchar* data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 160 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV16Behavior);
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1429,15 +1429,15 @@ static gchar* data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_get_t
 static gchar** data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar** _tmp6_ = NULL;
-	gchar** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar** _tmp6_;
+	gchar** _tmp7_;
+	gint _tmp7__length1;
 #line 164 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV16Behavior);
 #line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1484,38 +1484,38 @@ static gchar** data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_list
 }
 
 
-static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior * self;
 	DataImportsFSpotDbFSpotPhotoVersionRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_ = NULL;
-	sqlite3_stmt* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_;
+	sqlite3_stmt* _tmp10_;
+	gint _tmp11_;
+	const gchar* _tmp12_;
+	gchar* _tmp13_;
 	gchar* full_path = NULL;
-	sqlite3_stmt* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp27_ = NULL;
-	sqlite3_stmt* _tmp28_ = NULL;
-	gint _tmp29_ = 0;
-	const gchar* _tmp30_ = NULL;
-	gchar* _tmp31_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp32_ = NULL;
-	sqlite3_stmt* _tmp33_ = NULL;
-	gint _tmp34_ = 0;
-	gint _tmp35_ = 0;
+	sqlite3_stmt* _tmp14_;
+	gint _tmp15_;
+	const gchar* _tmp16_;
+	gchar* _tmp17_;
+	const gchar* _tmp18_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp27_;
+	sqlite3_stmt* _tmp28_;
+	gint _tmp29_;
+	const gchar* _tmp30_;
+	gchar* _tmp31_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp32_;
+	sqlite3_stmt* _tmp33_;
+	gint _tmp34_;
+	gint _tmp35_;
 #line 169 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV16Behavior);
 #line 169 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1576,14 +1576,14 @@ static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_r
 	if (_tmp18_ != NULL) {
 #line 1578 "FSpotPhotoVersionsTable.c"
 		GFile* uri = NULL;
-		const gchar* _tmp19_ = NULL;
-		GFile* _tmp20_ = NULL;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp21_ = NULL;
-		GFile* _tmp22_ = NULL;
-		GFile* _tmp23_ = NULL;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_ = NULL;
-		GFile* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
+		const gchar* _tmp19_;
+		GFile* _tmp20_;
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp21_;
+		GFile* _tmp22_;
+		GFile* _tmp23_;
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_;
+		GFile* _tmp25_;
+		gchar* _tmp26_;
 #line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp19_ = full_path;
 #line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1666,11 +1666,11 @@ static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_data_imports
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	data_imports_fspot_db_fspot_photo_versions_v16_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_get_table_name;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_list_columns;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_row;
 #line 1675 "FSpotPhotoVersionsTable.c"
 }
 
@@ -1679,7 +1679,7 @@ static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_instance_ini
 }
 
 
-static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior * self;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV16Behavior);
@@ -1722,15 +1722,15 @@ static DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fs
 
 DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_photo_versions_v17_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp3_;
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photo_versions_v17_behavior_instance;
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	if (_tmp0_ == NULL) {
 #line 1733 "FSpotPhotoVersionsTable.c"
-		DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp1_;
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photo_versions_v17_behavior_new ();
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1754,7 +1754,7 @@ DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_pho
 static gchar* data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV17Behavior);
 #line 203 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1770,16 +1770,16 @@ static gchar* data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_get_t
 static gchar** data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar** _tmp7_ = NULL;
-	gchar** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar** _tmp7_;
+	gchar** _tmp8_;
+	gint _tmp8__length1;
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV17Behavior);
 #line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1830,44 +1830,44 @@ static gchar** data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_list
 }
 
 
-static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior * self;
 	DataImportsFSpotDbFSpotPhotoVersionRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_ = NULL;
-	sqlite3_stmt* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_;
+	sqlite3_stmt* _tmp10_;
+	gint _tmp11_;
+	const gchar* _tmp12_;
+	gchar* _tmp13_;
 	gchar* base_path = NULL;
-	sqlite3_stmt* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
+	sqlite3_stmt* _tmp14_;
+	gint _tmp15_;
+	const gchar* _tmp16_;
+	gchar* _tmp17_;
 	gchar* filename = NULL;
-	sqlite3_stmt* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	const gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
+	sqlite3_stmt* _tmp18_;
+	gint _tmp19_;
+	const gchar* _tmp20_;
+	gchar* _tmp21_;
 	gboolean _tmp22_ = FALSE;
-	const gchar* _tmp23_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp31_ = NULL;
-	sqlite3_stmt* _tmp32_ = NULL;
-	gint _tmp33_ = 0;
-	const gchar* _tmp34_ = NULL;
-	gchar* _tmp35_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp36_ = NULL;
-	sqlite3_stmt* _tmp37_ = NULL;
-	gint _tmp38_ = 0;
-	gint _tmp39_ = 0;
+	const gchar* _tmp23_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp31_;
+	sqlite3_stmt* _tmp32_;
+	gint _tmp33_;
+	const gchar* _tmp34_;
+	gchar* _tmp35_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp36_;
+	sqlite3_stmt* _tmp37_;
+	gint _tmp38_;
+	gint _tmp39_;
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV17Behavior);
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1937,7 +1937,7 @@ static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_r
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	if (_tmp23_ != NULL) {
 #line 1940 "FSpotPhotoVersionsTable.c"
-		const gchar* _tmp24_ = NULL;
+		const gchar* _tmp24_;
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp24_ = filename;
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1951,12 +1951,12 @@ static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_r
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	if (_tmp22_) {
 #line 1954 "FSpotPhotoVersionsTable.c"
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
-		GFile* _tmp27_ = NULL;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp28_ = NULL;
-		const gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp25_;
+		const gchar* _tmp26_;
+		GFile* _tmp27_;
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp28_;
+		const gchar* _tmp29_;
+		gchar* _tmp30_;
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp25_ = _vala_row;
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -2033,11 +2033,11 @@ static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_data_imports
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	data_imports_fspot_db_fspot_photo_versions_v17_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_get_table_name;
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_list_columns;
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_row;
 #line 2042 "FSpotPhotoVersionsTable.c"
 }
 
@@ -2046,7 +2046,7 @@ static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_instance_ini
 }
 
 
-static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior * self;
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV17Behavior);
@@ -2089,15 +2089,15 @@ static DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fs
 
 DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_photo_versions_v18_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp3_;
 #line 238 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photo_versions_v18_behavior_instance;
 #line 238 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	if (_tmp0_ == NULL) {
 #line 2100 "FSpotPhotoVersionsTable.c"
-		DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp1_;
 #line 239 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photo_versions_v18_behavior_new ();
 #line 239 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -2121,7 +2121,7 @@ DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_pho
 static gchar* data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 243 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV18Behavior);
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -2137,16 +2137,16 @@ static gchar* data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_get_t
 static gchar** data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar** _tmp7_ = NULL;
-	gchar** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar** _tmp7_;
+	gchar** _tmp8_;
+	gint _tmp8__length1;
 #line 247 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV18Behavior);
 #line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -2197,44 +2197,44 @@ static gchar** data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_list
 }
 
 
-static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior * self;
 	DataImportsFSpotDbFSpotPhotoVersionRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_ = NULL;
-	sqlite3_stmt* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_;
+	sqlite3_stmt* _tmp10_;
+	gint _tmp11_;
+	const gchar* _tmp12_;
+	gchar* _tmp13_;
 	gchar* base_path = NULL;
-	sqlite3_stmt* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
+	sqlite3_stmt* _tmp14_;
+	gint _tmp15_;
+	const gchar* _tmp16_;
+	gchar* _tmp17_;
 	gchar* filename = NULL;
-	sqlite3_stmt* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	const gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
+	sqlite3_stmt* _tmp18_;
+	gint _tmp19_;
+	const gchar* _tmp20_;
+	gchar* _tmp21_;
 	gboolean _tmp22_ = FALSE;
-	const gchar* _tmp23_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp31_ = NULL;
-	sqlite3_stmt* _tmp32_ = NULL;
-	gint _tmp33_ = 0;
-	const gchar* _tmp34_ = NULL;
-	gchar* _tmp35_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp36_ = NULL;
-	sqlite3_stmt* _tmp37_ = NULL;
-	gint _tmp38_ = 0;
-	gint _tmp39_ = 0;
+	const gchar* _tmp23_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp31_;
+	sqlite3_stmt* _tmp32_;
+	gint _tmp33_;
+	const gchar* _tmp34_;
+	gchar* _tmp35_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp36_;
+	sqlite3_stmt* _tmp37_;
+	gint _tmp38_;
+	gint _tmp39_;
 #line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV18Behavior);
 #line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -2304,7 +2304,7 @@ static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_r
 #line 260 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	if (_tmp23_ != NULL) {
 #line 2307 "FSpotPhotoVersionsTable.c"
-		const gchar* _tmp24_ = NULL;
+		const gchar* _tmp24_;
 #line 260 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp24_ = filename;
 #line 260 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -2318,12 +2318,12 @@ static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_r
 #line 260 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	if (_tmp22_) {
 #line 2321 "FSpotPhotoVersionsTable.c"
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
-		GFile* _tmp27_ = NULL;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp28_ = NULL;
-		const gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp25_;
+		const gchar* _tmp26_;
+		GFile* _tmp27_;
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp28_;
+		const gchar* _tmp29_;
+		gchar* _tmp30_;
 #line 261 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp25_ = _vala_row;
 #line 261 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -2400,11 +2400,11 @@ static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_data_imports
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	data_imports_fspot_db_fspot_photo_versions_v18_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_get_table_name;
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_list_columns;
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_row;
 #line 2409 "FSpotPhotoVersionsTable.c"
 }
 
@@ -2413,7 +2413,7 @@ static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_instance_ini
 }
 
 
-static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior * self;
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV18Behavior);