Merge branch 'feature/upstream' into develop

1 files changed, 470 insertions, 470 deletions

diff --git a/plugins/shotwell-data-imports/FSpotPhotosTable.c b/plugins/shotwell-data-imports/FSpotPhotosTable.c
index af8cc0a..4eb3d76 100644
--- a/plugins/shotwell-data-imports/FSpotPhotosTable.c
+++ b/plugins/shotwell-data-imports/FSpotPhotosTable.c
@@ -1,4 +1,4 @@
-/* FSpotPhotosTable.c generated by valac 0.34.7, the Vala compiler
+/* FSpotPhotosTable.c generated by valac 0.36.6, the Vala compiler
  * generated from FSpotPhotosTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -294,31 +294,31 @@ static gpointer data_imports_fspot_db_fspot_photos_table_parent_class = NULL;
 static gpointer data_imports_fspot_db_fspot_photos_v0_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_behavior_instance;
 static DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photos_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 static gpointer data_imports_fspot_db_fspot_photos_v5_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_behavior_instance;
 static DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photos_v5_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v5_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 static gpointer data_imports_fspot_db_fspot_photos_v7_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_behavior_instance;
 static DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photos_v7_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v7_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 static gpointer data_imports_fspot_db_fspot_photos_v11_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11_behavior_instance;
 static DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photos_v11_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v11_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 static gpointer data_imports_fspot_db_fspot_photos_v16_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16_behavior_instance;
 static DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photos_v16_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v16_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 static gpointer data_imports_fspot_db_fspot_photos_v17_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17_behavior_instance;
 static DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photos_v17_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v17_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 static gpointer data_imports_fspot_db_fspot_photos_v18_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18_behavior_instance;
 static DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photos_v18_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v18_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 
 GType data_imports_fspot_db_fspot_photo_row_get_type (void) G_GNUC_CONST;
 enum  {
@@ -326,7 +326,7 @@ enum  {
 };
 DataImportsFSpotDbFSpotPhotoRow* data_imports_fspot_db_fspot_photo_row_new (void);
 DataImportsFSpotDbFSpotPhotoRow* data_imports_fspot_db_fspot_photo_row_construct (GType object_type);
-static void data_imports_fspot_db_fspot_photo_row_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photo_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);
@@ -349,7 +349,7 @@ void data_imports_fspot_db_fspot_database_table_set_behavior (DataImportsFSpotDb
 DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photos_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self);
 GQuark database_error_quark (void);
 GeeArrayList* data_imports_fspot_db_fspot_photos_table_get_all (DataImportsFSpotDbFSpotPhotosTable* self, GError** error);
-gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFSpotDatabaseTable* self, sqlite3_stmt** stmt, GError** error);
+gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFSpotDatabaseTable* self, sqlite3_stmt* * stmt, GError** error);
 void data_imports_fspot_db_fspot_table_behavior_build_row (DataImportsFSpotDbFSpotTableBehavior* self, sqlite3_stmt* stmt, gpointer* row, gint offset);
 GType data_imports_fspot_db_fspot_photos_v0_behavior_get_type (void) G_GNUC_CONST;
 enum  {
@@ -360,9 +360,9 @@ static DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_phot
 DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photos_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photos_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset);
+static void data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset);
 #define DATA_IMPORTS_FSPOT_DB_INVALID_ID ((gint64) -1)
-static void data_imports_fspot_db_fspot_photos_v0_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photos_v0_behavior_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_photos_v5_behavior_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V5_BEHAVIOR_DUMMY_PROPERTY
@@ -372,8 +372,8 @@ static DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_phot
 DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photos_v5_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photos_v5_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset);
-static void data_imports_fspot_db_fspot_photos_v5_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_photos_v5_behavior_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_photos_v7_behavior_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V7_BEHAVIOR_DUMMY_PROPERTY
@@ -383,8 +383,8 @@ static DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_phot
 DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photos_v7_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photos_v7_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset);
-static void data_imports_fspot_db_fspot_photos_v7_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_photos_v7_behavior_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_photos_v11_behavior_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V11_BEHAVIOR_DUMMY_PROPERTY
@@ -394,8 +394,8 @@ static DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_pho
 DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photos_v11_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photos_v11_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset);
-static void data_imports_fspot_db_fspot_photos_v11_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_photos_v11_behavior_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_photos_v16_behavior_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V16_BEHAVIOR_DUMMY_PROPERTY
@@ -405,8 +405,8 @@ static DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_pho
 DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photos_v16_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photos_v16_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset);
-static void data_imports_fspot_db_fspot_photos_v16_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_photos_v16_behavior_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_photos_v17_behavior_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V17_BEHAVIOR_DUMMY_PROPERTY
@@ -416,8 +416,8 @@ static DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_pho
 DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photos_v17_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photos_v17_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset);
-static void data_imports_fspot_db_fspot_photos_v17_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_photos_v17_behavior_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_photos_v18_behavior_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V18_BEHAVIOR_DUMMY_PROPERTY
@@ -427,8 +427,8 @@ static DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_pho
 DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photos_v18_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photos_v18_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset);
-static void data_imports_fspot_db_fspot_photos_v18_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_photos_v18_behavior_finalize (GObject * obj);
 
 
 DataImportsFSpotDbFSpotPhotoRow* data_imports_fspot_db_fspot_photo_row_construct (GType object_type) {
@@ -461,7 +461,7 @@ static void data_imports_fspot_db_fspot_photo_row_instance_init (DataImportsFSpo
 }
 
 
-static void data_imports_fspot_db_fspot_photo_row_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photo_row_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotoRow * self;
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW, DataImportsFSpotDbFSpotPhotoRow);
@@ -496,10 +496,10 @@ GType data_imports_fspot_db_fspot_photo_row_get_type (void) {
 
 DataImportsFSpotDbFSpotPhotosTable* data_imports_fspot_db_fspot_photos_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior) {
 	DataImportsFSpotDbFSpotPhotosTable* self = NULL;
-	sqlite3* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp3_ = NULL;
+	sqlite3* _tmp0_;
+	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp2_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp3_;
 #line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	g_return_val_if_fail (db != NULL, NULL);
 #line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -534,11 +534,11 @@ DataImportsFSpotDbFSpotPhotosTable* data_imports_fspot_db_fspot_photos_table_new
 GeeArrayList* data_imports_fspot_db_fspot_photos_table_get_all (DataImportsFSpotDbFSpotPhotosTable* self, GError** error) {
 	GeeArrayList* result = NULL;
 	GeeArrayList* all = NULL;
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	gint _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_TABLE (self), NULL);
@@ -584,12 +584,12 @@ GeeArrayList* data_imports_fspot_db_fspot_photos_table_get_all (DataImportsFSpot
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	while (TRUE) {
 #line 587 "FSpotPhotosTable.c"
-		gint _tmp3_ = 0;
+		gint _tmp3_;
 		DataImportsFSpotDbFSpotPhotoRow* row = NULL;
-		DataImportsFSpotDbFSpotTableBehavior* _tmp4_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp4_;
 		gpointer _tmp5_ = NULL;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp6_;
+		gint _tmp7_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp3_ = res;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -680,15 +680,15 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotosV0Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp3_;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photos_v0_behavior_instance;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp0_ == NULL) {
 #line 691 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp1_;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photos_v0_behavior_new ();
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -712,7 +712,7 @@ DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_b
 static gchar* data_imports_fspot_db_fspot_photos_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotosV0Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV0Behavior);
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -728,15 +728,15 @@ static gchar* data_imports_fspot_db_fspot_photos_v0_behavior_real_get_table_name
 static gchar** data_imports_fspot_db_fspot_photos_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotosV0Behavior * 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 69 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV0Behavior);
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -783,43 +783,43 @@ static gchar** data_imports_fspot_db_fspot_photos_v0_behavior_real_list_columns
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotosV0Behavior * self;
 	DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
 	gchar* base_path = NULL;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	const gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	const gchar* _tmp11_;
+	gchar* _tmp12_;
 	gchar* filename = NULL;
-	sqlite3_stmt* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
+	sqlite3_stmt* _tmp13_;
+	gint _tmp14_;
+	const gchar* _tmp15_;
+	gchar* _tmp16_;
 	gboolean _tmp17_ = FALSE;
-	const gchar* _tmp18_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp26_ = NULL;
-	sqlite3_stmt* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	const gchar* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp31_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp32_ = NULL;
-	sqlite3_stmt* _tmp33_ = NULL;
-	gint _tmp34_ = 0;
-	gint64 _tmp35_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp36_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp37_ = NULL;
-	gchar* _tmp38_ = NULL;
+	const gchar* _tmp18_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp26_;
+	sqlite3_stmt* _tmp27_;
+	gint _tmp28_;
+	const gchar* _tmp29_;
+	gchar* _tmp30_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp31_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp32_;
+	sqlite3_stmt* _tmp33_;
+	gint _tmp34_;
+	gint64 _tmp35_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp36_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp37_;
+	gchar* _tmp38_;
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV0Behavior);
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -875,7 +875,7 @@ static void data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row (DataI
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp18_ != NULL) {
 #line 878 "FSpotPhotosTable.c"
-		const gchar* _tmp19_ = NULL;
+		const gchar* _tmp19_;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp19_ = filename;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -889,12 +889,12 @@ static void data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row (DataI
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp17_) {
 #line 892 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotoRow* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
-		GFile* _tmp22_ = NULL;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp23_ = NULL;
-		const gchar* _tmp24_ = NULL;
-		gchar* _tmp25_ = NULL;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp20_;
+		const gchar* _tmp21_;
+		GFile* _tmp22_;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp23_;
+		const gchar* _tmp24_;
+		gchar* _tmp25_;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp20_ = _vala_row;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -987,11 +987,11 @@ static void data_imports_fspot_db_fspot_photos_v0_behavior_data_imports_fspot_db
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	data_imports_fspot_db_fspot_photos_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photos_v0_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v0_behavior_real_get_table_name;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photos_v0_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v0_behavior_real_list_columns;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row;
 #line 996 "FSpotPhotosTable.c"
 }
 
@@ -1000,7 +1000,7 @@ static void data_imports_fspot_db_fspot_photos_v0_behavior_instance_init (DataIm
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v0_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photos_v0_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotosV0Behavior * self;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV0Behavior);
@@ -1043,15 +1043,15 @@ static DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_phot
 
 DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotosV5Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp3_;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photos_v5_behavior_instance;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp0_ == NULL) {
 #line 1054 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp1_;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photos_v5_behavior_new ();
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1075,7 +1075,7 @@ DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_b
 static gchar* data_imports_fspot_db_fspot_photos_v5_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotosV5Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV5Behavior);
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1091,16 +1091,16 @@ static gchar* data_imports_fspot_db_fspot_photos_v5_behavior_real_get_table_name
 static gchar** data_imports_fspot_db_fspot_photos_v5_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotosV5Behavior * 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 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV5Behavior);
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1151,46 +1151,46 @@ static gchar** data_imports_fspot_db_fspot_photos_v5_behavior_real_list_columns
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotosV5Behavior * self;
 	DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
 	gchar* base_path = NULL;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	const gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	const gchar* _tmp11_;
+	gchar* _tmp12_;
 	gchar* filename = NULL;
-	sqlite3_stmt* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
+	sqlite3_stmt* _tmp13_;
+	gint _tmp14_;
+	const gchar* _tmp15_;
+	gchar* _tmp16_;
 	gboolean _tmp17_ = FALSE;
-	const gchar* _tmp18_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp26_ = NULL;
-	sqlite3_stmt* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	const gchar* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp31_ = NULL;
-	sqlite3_stmt* _tmp32_ = NULL;
-	gint _tmp33_ = 0;
-	gint64 _tmp34_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp35_ = NULL;
-	sqlite3_stmt* _tmp36_ = NULL;
-	gint _tmp37_ = 0;
-	gint64 _tmp38_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp39_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp40_ = NULL;
-	gchar* _tmp41_ = NULL;
+	const gchar* _tmp18_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp26_;
+	sqlite3_stmt* _tmp27_;
+	gint _tmp28_;
+	const gchar* _tmp29_;
+	gchar* _tmp30_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp31_;
+	sqlite3_stmt* _tmp32_;
+	gint _tmp33_;
+	gint64 _tmp34_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp35_;
+	sqlite3_stmt* _tmp36_;
+	gint _tmp37_;
+	gint64 _tmp38_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp39_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp40_;
+	gchar* _tmp41_;
 #line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV5Behavior);
 #line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1246,7 +1246,7 @@ static void data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row (DataI
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp18_ != NULL) {
 #line 1249 "FSpotPhotosTable.c"
-		const gchar* _tmp19_ = NULL;
+		const gchar* _tmp19_;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp19_ = filename;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1260,12 +1260,12 @@ static void data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row (DataI
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp17_) {
 #line 1263 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotoRow* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
-		GFile* _tmp22_ = NULL;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp23_ = NULL;
-		const gchar* _tmp24_ = NULL;
-		gchar* _tmp25_ = NULL;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp20_;
+		const gchar* _tmp21_;
+		GFile* _tmp22_;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp23_;
+		const gchar* _tmp24_;
+		gchar* _tmp25_;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp20_ = _vala_row;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1364,11 +1364,11 @@ static void data_imports_fspot_db_fspot_photos_v5_behavior_data_imports_fspot_db
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	data_imports_fspot_db_fspot_photos_v5_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photos_v5_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v5_behavior_real_get_table_name;
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photos_v5_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v5_behavior_real_list_columns;
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row;
 #line 1373 "FSpotPhotosTable.c"
 }
 
@@ -1377,7 +1377,7 @@ static void data_imports_fspot_db_fspot_photos_v5_behavior_instance_init (DataIm
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v5_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photos_v5_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotosV5Behavior * self;
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV5Behavior);
@@ -1420,15 +1420,15 @@ static DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_phot
 
 DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotosV7Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp3_;
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photos_v7_behavior_instance;
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp0_ == NULL) {
 #line 1431 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp1_;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photos_v7_behavior_new ();
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1452,7 +1452,7 @@ DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_b
 static gchar* data_imports_fspot_db_fspot_photos_v7_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotosV7Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV7Behavior);
 #line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1468,15 +1468,15 @@ static gchar* data_imports_fspot_db_fspot_photos_v7_behavior_real_get_table_name
 static gchar** data_imports_fspot_db_fspot_photos_v7_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotosV7Behavior * 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 158 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV7Behavior);
 #line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1523,40 +1523,40 @@ static gchar** data_imports_fspot_db_fspot_photos_v7_behavior_real_list_columns
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotosV7Behavior * self;
 	DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
 	gchar* full_path = NULL;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	const gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp22_ = NULL;
-	sqlite3_stmt* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	const gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp27_ = NULL;
-	sqlite3_stmt* _tmp28_ = NULL;
-	gint _tmp29_ = 0;
-	gint64 _tmp30_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp31_ = NULL;
-	sqlite3_stmt* _tmp32_ = NULL;
-	gint _tmp33_ = 0;
-	gint64 _tmp34_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp35_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp36_ = NULL;
-	gchar* _tmp37_ = NULL;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	const gchar* _tmp11_;
+	gchar* _tmp12_;
+	const gchar* _tmp13_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp22_;
+	sqlite3_stmt* _tmp23_;
+	gint _tmp24_;
+	const gchar* _tmp25_;
+	gchar* _tmp26_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp27_;
+	sqlite3_stmt* _tmp28_;
+	gint _tmp29_;
+	gint64 _tmp30_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp31_;
+	sqlite3_stmt* _tmp32_;
+	gint _tmp33_;
+	gint64 _tmp34_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp35_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp36_;
+	gchar* _tmp37_;
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV7Behavior);
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1603,14 +1603,14 @@ static void data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row (DataI
 	if (_tmp13_ != NULL) {
 #line 1605 "FSpotPhotosTable.c"
 		GFile* uri = NULL;
-		const gchar* _tmp14_ = NULL;
-		GFile* _tmp15_ = NULL;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp16_ = NULL;
-		GFile* _tmp17_ = NULL;
-		GFile* _tmp18_ = NULL;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp19_ = NULL;
-		GFile* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
+		const gchar* _tmp14_;
+		GFile* _tmp15_;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp16_;
+		GFile* _tmp17_;
+		GFile* _tmp18_;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp19_;
+		GFile* _tmp20_;
+		gchar* _tmp21_;
 #line 170 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp14_ = full_path;
 #line 170 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1715,11 +1715,11 @@ static void data_imports_fspot_db_fspot_photos_v7_behavior_data_imports_fspot_db
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	data_imports_fspot_db_fspot_photos_v7_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photos_v7_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v7_behavior_real_get_table_name;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photos_v7_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v7_behavior_real_list_columns;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row;
 #line 1724 "FSpotPhotosTable.c"
 }
 
@@ -1728,7 +1728,7 @@ static void data_imports_fspot_db_fspot_photos_v7_behavior_instance_init (DataIm
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v7_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photos_v7_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotosV7Behavior * self;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV7Behavior);
@@ -1771,15 +1771,15 @@ static DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_pho
 
 DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotosV11Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp3_;
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photos_v11_behavior_instance;
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp0_ == NULL) {
 #line 1782 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp1_;
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photos_v11_behavior_new ();
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1803,7 +1803,7 @@ DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11
 static gchar* data_imports_fspot_db_fspot_photos_v11_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotosV11Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV11Behavior);
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1819,16 +1819,16 @@ static gchar* data_imports_fspot_db_fspot_photos_v11_behavior_real_get_table_nam
 static gchar** data_imports_fspot_db_fspot_photos_v11_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotosV11Behavior * 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 201 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV11Behavior);
 #line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1879,43 +1879,43 @@ static gchar** data_imports_fspot_db_fspot_photos_v11_behavior_real_list_columns
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotosV11Behavior * self;
 	DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
 	gchar* full_path = NULL;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	const gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp22_ = NULL;
-	sqlite3_stmt* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	const gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp27_ = NULL;
-	sqlite3_stmt* _tmp28_ = NULL;
-	gint _tmp29_ = 0;
-	gint64 _tmp30_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp31_ = NULL;
-	sqlite3_stmt* _tmp32_ = NULL;
-	gint _tmp33_ = 0;
-	gint64 _tmp34_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp35_ = NULL;
-	sqlite3_stmt* _tmp36_ = NULL;
-	gint _tmp37_ = 0;
-	gint _tmp38_ = 0;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp39_ = NULL;
-	gchar* _tmp40_ = NULL;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	const gchar* _tmp11_;
+	gchar* _tmp12_;
+	const gchar* _tmp13_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp22_;
+	sqlite3_stmt* _tmp23_;
+	gint _tmp24_;
+	const gchar* _tmp25_;
+	gchar* _tmp26_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp27_;
+	sqlite3_stmt* _tmp28_;
+	gint _tmp29_;
+	gint64 _tmp30_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp31_;
+	sqlite3_stmt* _tmp32_;
+	gint _tmp33_;
+	gint64 _tmp34_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp35_;
+	sqlite3_stmt* _tmp36_;
+	gint _tmp37_;
+	gint _tmp38_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp39_;
+	gchar* _tmp40_;
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV11Behavior);
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1962,14 +1962,14 @@ static void data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row (Data
 	if (_tmp13_ != NULL) {
 #line 1964 "FSpotPhotosTable.c"
 		GFile* uri = NULL;
-		const gchar* _tmp14_ = NULL;
-		GFile* _tmp15_ = NULL;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp16_ = NULL;
-		GFile* _tmp17_ = NULL;
-		GFile* _tmp18_ = NULL;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp19_ = NULL;
-		GFile* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
+		const gchar* _tmp14_;
+		GFile* _tmp15_;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp16_;
+		GFile* _tmp17_;
+		GFile* _tmp18_;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp19_;
+		GFile* _tmp20_;
+		gchar* _tmp21_;
 #line 213 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp14_ = full_path;
 #line 213 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2080,11 +2080,11 @@ static void data_imports_fspot_db_fspot_photos_v11_behavior_data_imports_fspot_d
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	data_imports_fspot_db_fspot_photos_v11_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photos_v11_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v11_behavior_real_get_table_name;
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photos_v11_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v11_behavior_real_list_columns;
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row;
 #line 2089 "FSpotPhotosTable.c"
 }
 
@@ -2093,7 +2093,7 @@ static void data_imports_fspot_db_fspot_photos_v11_behavior_instance_init (DataI
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v11_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photos_v11_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotosV11Behavior * self;
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV11Behavior);
@@ -2136,15 +2136,15 @@ static DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_pho
 
 DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotosV16Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp3_;
 #line 235 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photos_v16_behavior_instance;
 #line 235 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp0_ == NULL) {
 #line 2147 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp1_;
 #line 236 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photos_v16_behavior_new ();
 #line 236 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2168,7 +2168,7 @@ DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16
 static gchar* data_imports_fspot_db_fspot_photos_v16_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotosV16Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 240 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV16Behavior);
 #line 241 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2184,17 +2184,17 @@ static gchar* data_imports_fspot_db_fspot_photos_v16_behavior_real_get_table_nam
 static gchar** data_imports_fspot_db_fspot_photos_v16_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotosV16Behavior * 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;
-	gchar** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar** _tmp8_;
+	gchar** _tmp9_;
+	gint _tmp9__length1;
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV16Behavior);
 #line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2249,46 +2249,46 @@ static gchar** data_imports_fspot_db_fspot_photos_v16_behavior_real_list_columns
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotosV16Behavior * self;
 	DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
 	gchar* full_path = NULL;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	const gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp22_ = NULL;
-	sqlite3_stmt* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	const gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp27_ = NULL;
-	sqlite3_stmt* _tmp28_ = NULL;
-	gint _tmp29_ = 0;
-	gint64 _tmp30_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp31_ = NULL;
-	sqlite3_stmt* _tmp32_ = NULL;
-	gint _tmp33_ = 0;
-	gint64 _tmp34_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp35_ = NULL;
-	sqlite3_stmt* _tmp36_ = NULL;
-	gint _tmp37_ = 0;
-	gint _tmp38_ = 0;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp39_ = NULL;
-	sqlite3_stmt* _tmp40_ = NULL;
-	gint _tmp41_ = 0;
-	const gchar* _tmp42_ = NULL;
-	gchar* _tmp43_ = NULL;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	const gchar* _tmp11_;
+	gchar* _tmp12_;
+	const gchar* _tmp13_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp22_;
+	sqlite3_stmt* _tmp23_;
+	gint _tmp24_;
+	const gchar* _tmp25_;
+	gchar* _tmp26_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp27_;
+	sqlite3_stmt* _tmp28_;
+	gint _tmp29_;
+	gint64 _tmp30_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp31_;
+	sqlite3_stmt* _tmp32_;
+	gint _tmp33_;
+	gint64 _tmp34_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp35_;
+	sqlite3_stmt* _tmp36_;
+	gint _tmp37_;
+	gint _tmp38_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp39_;
+	sqlite3_stmt* _tmp40_;
+	gint _tmp41_;
+	const gchar* _tmp42_;
+	gchar* _tmp43_;
 #line 249 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV16Behavior);
 #line 249 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2335,14 +2335,14 @@ static void data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row (Data
 	if (_tmp13_ != NULL) {
 #line 2337 "FSpotPhotosTable.c"
 		GFile* uri = NULL;
-		const gchar* _tmp14_ = NULL;
-		GFile* _tmp15_ = NULL;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp16_ = NULL;
-		GFile* _tmp17_ = NULL;
-		GFile* _tmp18_ = NULL;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp19_ = NULL;
-		GFile* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
+		const gchar* _tmp14_;
+		GFile* _tmp15_;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp16_;
+		GFile* _tmp17_;
+		GFile* _tmp18_;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp19_;
+		GFile* _tmp20_;
+		gchar* _tmp21_;
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp14_ = full_path;
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2459,11 +2459,11 @@ static void data_imports_fspot_db_fspot_photos_v16_behavior_data_imports_fspot_d
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	data_imports_fspot_db_fspot_photos_v16_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photos_v16_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v16_behavior_real_get_table_name;
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photos_v16_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v16_behavior_real_list_columns;
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row;
 #line 2468 "FSpotPhotosTable.c"
 }
 
@@ -2472,7 +2472,7 @@ static void data_imports_fspot_db_fspot_photos_v16_behavior_instance_init (DataI
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v16_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photos_v16_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotosV16Behavior * self;
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV16Behavior);
@@ -2515,15 +2515,15 @@ static DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_pho
 
 DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotosV17Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp3_;
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photos_v17_behavior_instance;
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp0_ == NULL) {
 #line 2526 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp1_;
 #line 280 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photos_v17_behavior_new ();
 #line 280 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2547,7 +2547,7 @@ DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17
 static gchar* data_imports_fspot_db_fspot_photos_v17_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotosV17Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 284 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV17Behavior);
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2563,18 +2563,18 @@ static gchar* data_imports_fspot_db_fspot_photos_v17_behavior_real_get_table_nam
 static gchar** data_imports_fspot_db_fspot_photos_v17_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotosV17Behavior * 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;
-	gchar** _tmp9_ = NULL;
-	gchar** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar** _tmp9_;
+	gchar** _tmp10_;
+	gint _tmp10__length1;
 #line 288 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV17Behavior);
 #line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2633,52 +2633,52 @@ static gchar** data_imports_fspot_db_fspot_photos_v17_behavior_real_list_columns
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotosV17Behavior * self;
 	DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
 	gchar* base_path = NULL;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	const gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	const gchar* _tmp11_;
+	gchar* _tmp12_;
 	gchar* filename = NULL;
-	sqlite3_stmt* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
+	sqlite3_stmt* _tmp13_;
+	gint _tmp14_;
+	const gchar* _tmp15_;
+	gchar* _tmp16_;
 	gboolean _tmp17_ = FALSE;
-	const gchar* _tmp18_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp26_ = NULL;
-	sqlite3_stmt* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	const gchar* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp31_ = NULL;
-	sqlite3_stmt* _tmp32_ = NULL;
-	gint _tmp33_ = 0;
-	gint64 _tmp34_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp35_ = NULL;
-	sqlite3_stmt* _tmp36_ = NULL;
-	gint _tmp37_ = 0;
-	gint64 _tmp38_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp39_ = NULL;
-	sqlite3_stmt* _tmp40_ = NULL;
-	gint _tmp41_ = 0;
-	gint _tmp42_ = 0;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp43_ = NULL;
-	sqlite3_stmt* _tmp44_ = NULL;
-	gint _tmp45_ = 0;
-	const gchar* _tmp46_ = NULL;
-	gchar* _tmp47_ = NULL;
+	const gchar* _tmp18_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp26_;
+	sqlite3_stmt* _tmp27_;
+	gint _tmp28_;
+	const gchar* _tmp29_;
+	gchar* _tmp30_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp31_;
+	sqlite3_stmt* _tmp32_;
+	gint _tmp33_;
+	gint64 _tmp34_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp35_;
+	sqlite3_stmt* _tmp36_;
+	gint _tmp37_;
+	gint64 _tmp38_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp39_;
+	sqlite3_stmt* _tmp40_;
+	gint _tmp41_;
+	gint _tmp42_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp43_;
+	sqlite3_stmt* _tmp44_;
+	gint _tmp45_;
+	const gchar* _tmp46_;
+	gchar* _tmp47_;
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV17Behavior);
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2734,7 +2734,7 @@ static void data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row (Data
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp18_ != NULL) {
 #line 2737 "FSpotPhotosTable.c"
-		const gchar* _tmp19_ = NULL;
+		const gchar* _tmp19_;
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp19_ = filename;
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2748,12 +2748,12 @@ static void data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row (Data
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp17_) {
 #line 2751 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotoRow* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
-		GFile* _tmp22_ = NULL;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp23_ = NULL;
-		const gchar* _tmp24_ = NULL;
-		gchar* _tmp25_ = NULL;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp20_;
+		const gchar* _tmp21_;
+		GFile* _tmp22_;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp23_;
+		const gchar* _tmp24_;
+		gchar* _tmp25_;
 #line 301 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp20_ = _vala_row;
 #line 301 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2864,11 +2864,11 @@ static void data_imports_fspot_db_fspot_photos_v17_behavior_data_imports_fspot_d
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	data_imports_fspot_db_fspot_photos_v17_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photos_v17_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v17_behavior_real_get_table_name;
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photos_v17_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v17_behavior_real_list_columns;
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row;
 #line 2873 "FSpotPhotosTable.c"
 }
 
@@ -2877,7 +2877,7 @@ static void data_imports_fspot_db_fspot_photos_v17_behavior_instance_init (DataI
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v17_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photos_v17_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotosV17Behavior * self;
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV17Behavior);
@@ -2920,15 +2920,15 @@ static DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_pho
 
 DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotosV18Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp3_;
 #line 321 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photos_v18_behavior_instance;
 #line 321 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp0_ == NULL) {
 #line 2931 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp1_;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photos_v18_behavior_new ();
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2952,7 +2952,7 @@ DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18
 static gchar* data_imports_fspot_db_fspot_photos_v18_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotosV18Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 326 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV18Behavior);
 #line 327 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2968,17 +2968,17 @@ static gchar* data_imports_fspot_db_fspot_photos_v18_behavior_real_get_table_nam
 static gchar** data_imports_fspot_db_fspot_photos_v18_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotosV18Behavior * 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;
-	gchar** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar** _tmp8_;
+	gchar** _tmp9_;
+	gint _tmp9__length1;
 #line 330 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV18Behavior);
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -3033,49 +3033,49 @@ static gchar** data_imports_fspot_db_fspot_photos_v18_behavior_real_list_columns
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotosV18Behavior * self;
 	DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
 	gchar* base_path = NULL;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	const gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	const gchar* _tmp11_;
+	gchar* _tmp12_;
 	gchar* filename = NULL;
-	sqlite3_stmt* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
+	sqlite3_stmt* _tmp13_;
+	gint _tmp14_;
+	const gchar* _tmp15_;
+	gchar* _tmp16_;
 	gboolean _tmp17_ = FALSE;
-	const gchar* _tmp18_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp26_ = NULL;
-	sqlite3_stmt* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	const gchar* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp31_ = NULL;
-	sqlite3_stmt* _tmp32_ = NULL;
-	gint _tmp33_ = 0;
-	gint64 _tmp34_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp35_ = NULL;
-	sqlite3_stmt* _tmp36_ = NULL;
-	gint _tmp37_ = 0;
-	gint64 _tmp38_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp39_ = NULL;
-	sqlite3_stmt* _tmp40_ = NULL;
-	gint _tmp41_ = 0;
-	gint _tmp42_ = 0;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp43_ = NULL;
-	gchar* _tmp44_ = NULL;
+	const gchar* _tmp18_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp26_;
+	sqlite3_stmt* _tmp27_;
+	gint _tmp28_;
+	const gchar* _tmp29_;
+	gchar* _tmp30_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp31_;
+	sqlite3_stmt* _tmp32_;
+	gint _tmp33_;
+	gint64 _tmp34_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp35_;
+	sqlite3_stmt* _tmp36_;
+	gint _tmp37_;
+	gint64 _tmp38_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp39_;
+	sqlite3_stmt* _tmp40_;
+	gint _tmp41_;
+	gint _tmp42_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp43_;
+	gchar* _tmp44_;
 #line 335 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV18Behavior);
 #line 335 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -3131,7 +3131,7 @@ static void data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row (Data
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp18_ != NULL) {
 #line 3134 "FSpotPhotosTable.c"
-		const gchar* _tmp19_ = NULL;
+		const gchar* _tmp19_;
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp19_ = filename;
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -3145,12 +3145,12 @@ static void data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row (Data
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp17_) {
 #line 3148 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotoRow* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
-		GFile* _tmp22_ = NULL;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp23_ = NULL;
-		const gchar* _tmp24_ = NULL;
-		gchar* _tmp25_ = NULL;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp20_;
+		const gchar* _tmp21_;
+		GFile* _tmp22_;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp23_;
+		const gchar* _tmp24_;
+		gchar* _tmp25_;
 #line 343 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp20_ = _vala_row;
 #line 343 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -3255,11 +3255,11 @@ static void data_imports_fspot_db_fspot_photos_v18_behavior_data_imports_fspot_d
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	data_imports_fspot_db_fspot_photos_v18_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photos_v18_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v18_behavior_real_get_table_name;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photos_v18_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v18_behavior_real_list_columns;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row;
 #line 3264 "FSpotPhotosTable.c"
 }
 
@@ -3268,7 +3268,7 @@ static void data_imports_fspot_db_fspot_photos_v18_behavior_instance_init (DataI
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v18_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photos_v18_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotosV18Behavior * self;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV18Behavior);