Update upstream source from tag 'upstream/0.26.4'

Update to upstream version '0.26.4'
with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4

1 files changed, 81 insertions, 81 deletions

diff --git a/plugins/shotwell-data-imports/FSpotRollsTable.c b/plugins/shotwell-data-imports/FSpotRollsTable.c
index f232dd9..3b3e3e4 100644
--- a/plugins/shotwell-data-imports/FSpotRollsTable.c
+++ b/plugins/shotwell-data-imports/FSpotRollsTable.c
@@ -1,4 +1,4 @@
-/* FSpotRollsTable.c generated by valac 0.34.7, the Vala compiler
+/* FSpotRollsTable.c generated by valac 0.36.6, the Vala compiler
  * generated from FSpotRollsTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -185,11 +185,11 @@ static gpointer data_imports_fspot_db_fspot_rolls_table_parent_class = NULL;
 static gpointer data_imports_fspot_db_fspot_rolls_v0_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_behavior_instance;
 static DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_rolls_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_rolls_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 static gpointer data_imports_fspot_db_fspot_rolls_v5_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_behavior_instance;
 static DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_rolls_v5_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_rolls_v5_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 
 GType data_imports_fspot_db_fspot_roll_row_get_type (void) G_GNUC_CONST;
 enum  {
@@ -197,7 +197,7 @@ enum  {
 };
 DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_roll_row_new (void);
 DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_roll_row_construct (GType object_type);
-static void data_imports_fspot_db_fspot_roll_row_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_roll_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);
@@ -233,8 +233,8 @@ static DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls
 DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_rolls_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_rolls_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_rolls_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow** row, gint offset);
-static void data_imports_fspot_db_fspot_rolls_v0_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_rolls_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_rolls_v0_behavior_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_rolls_v5_behavior_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_V5_BEHAVIOR_DUMMY_PROPERTY
@@ -244,8 +244,8 @@ static DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls
 DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_rolls_v5_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_rolls_v5_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_rolls_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow** row, gint offset);
-static void data_imports_fspot_db_fspot_rolls_v5_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_rolls_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_rolls_v5_behavior_finalize (GObject * obj);
 
 
 DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_roll_row_construct (GType object_type) {
@@ -278,7 +278,7 @@ static void data_imports_fspot_db_fspot_roll_row_instance_init (DataImportsFSpot
 }
 
 
-static void data_imports_fspot_db_fspot_roll_row_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_roll_row_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotRollRow * self;
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW, DataImportsFSpotDbFSpotRollRow);
@@ -305,10 +305,10 @@ GType data_imports_fspot_db_fspot_roll_row_get_type (void) {
 
 DataImportsFSpotDbFSpotRollsTable* data_imports_fspot_db_fspot_rolls_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior) {
 	DataImportsFSpotDbFSpotRollsTable* self = NULL;
-	sqlite3* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp3_ = NULL;
+	sqlite3* _tmp0_;
+	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp2_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp3_;
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	g_return_val_if_fail (db != NULL, NULL);
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -345,24 +345,24 @@ DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_rolls_table_get_by_i
 	sqlite3_stmt* stmt = NULL;
 	DataImportsFSpotDbFSpotRollRow* row = NULL;
 	gchar* column_list = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 	gchar* sql = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 	gint res = 0;
-	sqlite3* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	sqlite3* _tmp4_;
+	const gchar* _tmp5_;
 	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	sqlite3_stmt* _tmp13_ = NULL;
-	gint64 _tmp14_ = 0LL;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	sqlite3_stmt* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
+	gint _tmp7_;
+	gint _tmp8_;
+	sqlite3_stmt* _tmp13_;
+	gint64 _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	sqlite3_stmt* _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
 	GError * _inner_error_ = NULL;
 #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLLS_TABLE (self), NULL);
@@ -397,10 +397,10 @@ DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_rolls_table_get_by_i
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	if (_tmp8_ != SQLITE_OK) {
 #line 400 "FSpotRollsTable.c"
-		const gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
+		const gchar* _tmp9_;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
+		gint _tmp12_;
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 		_tmp9_ = sql;
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -462,7 +462,7 @@ DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_rolls_table_get_by_i
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	if (_tmp16_ != SQLITE_OK) {
 #line 465 "FSpotRollsTable.c"
-		gint _tmp17_ = 0;
+		gint _tmp17_;
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 		_tmp17_ = res;
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -514,8 +514,8 @@ DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_rolls_table_get_by_i
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	if (_tmp20_ == SQLITE_ROW) {
 #line 517 "FSpotRollsTable.c"
-		DataImportsFSpotDbFSpotTableBehavior* _tmp21_ = NULL;
-		sqlite3_stmt* _tmp22_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp21_;
+		sqlite3_stmt* _tmp22_;
 		gpointer _tmp23_ = NULL;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 		_tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable)->behavior;
@@ -529,13 +529,13 @@ DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_rolls_table_get_by_i
 		row = _tmp23_;
 #line 531 "FSpotRollsTable.c"
 	} else {
-		gint _tmp24_ = 0;
+		gint _tmp24_;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 		_tmp24_ = res;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 		if (_tmp24_ == SQLITE_DONE) {
 #line 538 "FSpotRollsTable.c"
-			gint64 _tmp25_ = 0LL;
+			gint64 _tmp25_;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 			_tmp25_ = roll_id;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -609,15 +609,15 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotRollsV0Behavior* result = NULL;
-	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp3_;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_rolls_v0_behavior_instance;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	if (_tmp0_ == NULL) {
 #line 620 "FSpotRollsTable.c"
-		DataImportsFSpotDbFSpotRollsV0Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotRollsV0Behavior* _tmp1_;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_rolls_v0_behavior_new ();
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -641,7 +641,7 @@ DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_beh
 static gchar* data_imports_fspot_db_fspot_rolls_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotRollsV0Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR, DataImportsFSpotDbFSpotRollsV0Behavior);
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -657,11 +657,11 @@ static gchar* data_imports_fspot_db_fspot_rolls_v0_behavior_real_get_table_name
 static gchar** data_imports_fspot_db_fspot_rolls_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotRollsV0Behavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar** _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR, DataImportsFSpotDbFSpotRollsV0Behavior);
 #line 71 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -692,16 +692,16 @@ static gchar** data_imports_fspot_db_fspot_rolls_v0_behavior_real_list_columns (
 }
 
 
-static void data_imports_fspot_db_fspot_rolls_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_rolls_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotRollsV0Behavior * self;
 	DataImportsFSpotDbFSpotRollRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotRollRow* _tmp0_ = NULL;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint64 _tmp3_ = 0LL;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint64 _tmp6_ = 0LL;
+	DataImportsFSpotDbFSpotRollRow* _tmp0_;
+	sqlite3_stmt* _tmp1_;
+	gint _tmp2_;
+	gint64 _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint64 _tmp6_;
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR, DataImportsFSpotDbFSpotRollsV0Behavior);
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -754,11 +754,11 @@ static void data_imports_fspot_db_fspot_rolls_v0_behavior_data_imports_fspot_db_
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	data_imports_fspot_db_fspot_rolls_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_rolls_v0_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_rolls_v0_behavior_real_get_table_name;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_rolls_v0_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_rolls_v0_behavior_real_list_columns;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_rolls_v0_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_rolls_v0_behavior_real_build_row;
 #line 763 "FSpotRollsTable.c"
 }
 
@@ -767,7 +767,7 @@ static void data_imports_fspot_db_fspot_rolls_v0_behavior_instance_init (DataImp
 }
 
 
-static void data_imports_fspot_db_fspot_rolls_v0_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_rolls_v0_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotRollsV0Behavior * self;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR, DataImportsFSpotDbFSpotRollsV0Behavior);
@@ -810,15 +810,15 @@ static DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls
 
 DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotRollsV5Behavior* result = NULL;
-	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp3_;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_rolls_v5_behavior_instance;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	if (_tmp0_ == NULL) {
 #line 821 "FSpotRollsTable.c"
-		DataImportsFSpotDbFSpotRollsV5Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotRollsV5Behavior* _tmp1_;
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_rolls_v5_behavior_new ();
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -842,7 +842,7 @@ DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_beh
 static gchar* data_imports_fspot_db_fspot_rolls_v5_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotRollsV5Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR, DataImportsFSpotDbFSpotRollsV5Behavior);
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -858,11 +858,11 @@ static gchar* data_imports_fspot_db_fspot_rolls_v5_behavior_real_get_table_name
 static gchar** data_imports_fspot_db_fspot_rolls_v5_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotRollsV5Behavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar** _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
 #line 99 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR, DataImportsFSpotDbFSpotRollsV5Behavior);
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -893,16 +893,16 @@ static gchar** data_imports_fspot_db_fspot_rolls_v5_behavior_real_list_columns (
 }
 
 
-static void data_imports_fspot_db_fspot_rolls_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_rolls_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotRollsV5Behavior * self;
 	DataImportsFSpotDbFSpotRollRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotRollRow* _tmp0_ = NULL;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint64 _tmp3_ = 0LL;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint64 _tmp6_ = 0LL;
+	DataImportsFSpotDbFSpotRollRow* _tmp0_;
+	sqlite3_stmt* _tmp1_;
+	gint _tmp2_;
+	gint64 _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint64 _tmp6_;
 #line 103 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR, DataImportsFSpotDbFSpotRollsV5Behavior);
 #line 103 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -955,11 +955,11 @@ static void data_imports_fspot_db_fspot_rolls_v5_behavior_data_imports_fspot_db_
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	data_imports_fspot_db_fspot_rolls_v5_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_rolls_v5_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_rolls_v5_behavior_real_get_table_name;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_rolls_v5_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_rolls_v5_behavior_real_list_columns;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_rolls_v5_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_rolls_v5_behavior_real_build_row;
 #line 964 "FSpotRollsTable.c"
 }
 
@@ -968,7 +968,7 @@ static void data_imports_fspot_db_fspot_rolls_v5_behavior_instance_init (DataImp
 }
 
 
-static void data_imports_fspot_db_fspot_rolls_v5_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_rolls_v5_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotRollsV5Behavior * self;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR, DataImportsFSpotDbFSpotRollsV5Behavior);