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

1 files changed, 255 insertions, 255 deletions

diff --git a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c
index ed13500..74516f1 100644
--- a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c
+++ b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c
@@ -1,4 +1,4 @@
-/* FSpotDatabaseBehavior.c generated by valac 0.34.7, the Vala compiler
+/* FSpotDatabaseBehavior.c generated by valac 0.36.6, the Vala compiler
  * generated from FSpotDatabaseBehavior.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -340,7 +340,7 @@ DataImportsFSpotDbFSpotBehaviorEntry* data_imports_fspot_db_fspot_behavior_entry
 DataImportsFSpotDbFSpotBehaviorEntry* data_imports_fspot_db_fspot_behavior_entry_construct (GType object_type, UtilsVersionNumber* version, DataImportsFSpotDbFSpotTableBehavior* behavior);
 UtilsVersionNumber* data_imports_fspot_db_fspot_behavior_entry_get_version (DataImportsFSpotDbFSpotBehaviorEntry* self);
 DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_behavior_entry_get_behavior (DataImportsFSpotDbFSpotBehaviorEntry* self);
-static void data_imports_fspot_db_fspot_behavior_entry_finalize (DataImportsFSpotDbFSpotBehaviorEntry* obj);
+static void data_imports_fspot_db_fspot_behavior_entry_finalize (DataImportsFSpotDbFSpotBehaviorEntry * obj);
 GType data_imports_fspot_db_fspot_database_behavior_get_type (void) G_GNUC_CONST;
 GType data_imports_fspot_db_fspot_photo_row_get_type (void) G_GNUC_CONST;
 GType data_imports_fspot_db_fspot_tag_row_get_type (void) G_GNUC_CONST;
@@ -400,7 +400,7 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photo_tags_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self);
 DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photo_versions_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self);
 DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_rolls_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self);
-static void data_imports_fspot_db_fspot_database_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_database_behavior_finalize (GObject * obj);
 
 
 static gpointer _g_object_ref0 (gpointer self) {
@@ -412,10 +412,10 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 DataImportsFSpotDbFSpotBehaviorEntry* data_imports_fspot_db_fspot_behavior_entry_construct (GType object_type, UtilsVersionNumber* version, DataImportsFSpotDbFSpotTableBehavior* behavior) {
 	DataImportsFSpotDbFSpotBehaviorEntry* self = NULL;
-	UtilsVersionNumber* _tmp0_ = NULL;
-	UtilsVersionNumber* _tmp1_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp3_ = NULL;
+	UtilsVersionNumber* _tmp0_;
+	UtilsVersionNumber* _tmp1_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp2_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp3_;
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_val_if_fail (UTILS_IS_VERSION_NUMBER (version), NULL);
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -453,8 +453,8 @@ DataImportsFSpotDbFSpotBehaviorEntry* data_imports_fspot_db_fspot_behavior_entry
 
 UtilsVersionNumber* data_imports_fspot_db_fspot_behavior_entry_get_version (DataImportsFSpotDbFSpotBehaviorEntry* self) {
 	UtilsVersionNumber* result = NULL;
-	UtilsVersionNumber* _tmp0_ = NULL;
-	UtilsVersionNumber* _tmp1_ = NULL;
+	UtilsVersionNumber* _tmp0_;
+	UtilsVersionNumber* _tmp1_;
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_BEHAVIOR_ENTRY (self), NULL);
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -471,8 +471,8 @@ UtilsVersionNumber* data_imports_fspot_db_fspot_behavior_entry_get_version (Data
 
 DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_behavior_entry_get_behavior (DataImportsFSpotDbFSpotBehaviorEntry* self) {
 	DataImportsFSpotDbFSpotTableBehavior* result = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp1_ = NULL;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp1_;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_BEHAVIOR_ENTRY (self), NULL);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -529,7 +529,7 @@ static gchar* data_imports_fspot_db_value_fspot_behavior_entry_collect_value (GV
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	if (collect_values[0].v_pointer) {
 #line 532 "FSpotDatabaseBehavior.c"
-		DataImportsFSpotDbFSpotBehaviorEntry* object;
+		DataImportsFSpotDbFSpotBehaviorEntry * object;
 		object = collect_values[0].v_pointer;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -556,7 +556,7 @@ static gchar* data_imports_fspot_db_value_fspot_behavior_entry_collect_value (GV
 
 
 static gchar* data_imports_fspot_db_value_fspot_behavior_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	DataImportsFSpotDbFSpotBehaviorEntry** object_p;
+	DataImportsFSpotDbFSpotBehaviorEntry ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	if (!object_p) {
@@ -608,7 +608,7 @@ gpointer data_imports_fspot_db_value_get_fspot_behavior_entry (const GValue* val
 
 
 void data_imports_fspot_db_value_set_fspot_behavior_entry (GValue* value, gpointer v_object) {
-	DataImportsFSpotDbFSpotBehaviorEntry* old;
+	DataImportsFSpotDbFSpotBehaviorEntry * old;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY));
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -639,7 +639,7 @@ void data_imports_fspot_db_value_set_fspot_behavior_entry (GValue* value, gpoint
 
 
 void data_imports_fspot_db_value_take_fspot_behavior_entry (GValue* value, gpointer v_object) {
-	DataImportsFSpotDbFSpotBehaviorEntry* old;
+	DataImportsFSpotDbFSpotBehaviorEntry * old;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY));
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -687,7 +687,7 @@ static void data_imports_fspot_db_fspot_behavior_entry_instance_init (DataImport
 }
 
 
-static void data_imports_fspot_db_fspot_behavior_entry_finalize (DataImportsFSpotDbFSpotBehaviorEntry* obj) {
+static void data_imports_fspot_db_fspot_behavior_entry_finalize (DataImportsFSpotDbFSpotBehaviorEntry * obj) {
 	DataImportsFSpotDbFSpotBehaviorEntry * self;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, DataImportsFSpotDbFSpotBehaviorEntry);
@@ -716,7 +716,7 @@ GType data_imports_fspot_db_fspot_behavior_entry_get_type (void) {
 
 
 gpointer data_imports_fspot_db_fspot_behavior_entry_ref (gpointer instance) {
-	DataImportsFSpotDbFSpotBehaviorEntry* self;
+	DataImportsFSpotDbFSpotBehaviorEntry * self;
 	self = instance;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -727,7 +727,7 @@ gpointer data_imports_fspot_db_fspot_behavior_entry_ref (gpointer instance) {
 
 
 void data_imports_fspot_db_fspot_behavior_entry_unref (gpointer instance) {
-	DataImportsFSpotDbFSpotBehaviorEntry* self;
+	DataImportsFSpotDbFSpotBehaviorEntry * self;
 	self = instance;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -741,166 +741,166 @@ void data_imports_fspot_db_fspot_behavior_entry_unref (gpointer instance) {
 
 
 void data_imports_fspot_db_fspot_database_behavior_create_behavior_map (void) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 	GeeList* photos_list = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	gint* _tmp2_ = NULL;
-	gint* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	UtilsVersionNumber* _tmp4_ = NULL;
-	UtilsVersionNumber* _tmp5_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp6_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp7_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp8_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp9_ = NULL;
-	gint* _tmp10_ = NULL;
-	gint* _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
-	UtilsVersionNumber* _tmp12_ = NULL;
-	UtilsVersionNumber* _tmp13_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp14_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp15_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp16_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp17_ = NULL;
-	gint* _tmp18_ = NULL;
-	gint* _tmp19_ = NULL;
-	gint _tmp19__length1 = 0;
-	UtilsVersionNumber* _tmp20_ = NULL;
-	UtilsVersionNumber* _tmp21_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp22_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp23_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp24_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp25_ = NULL;
-	gint* _tmp26_ = NULL;
-	gint* _tmp27_ = NULL;
-	gint _tmp27__length1 = 0;
-	UtilsVersionNumber* _tmp28_ = NULL;
-	UtilsVersionNumber* _tmp29_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp30_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp31_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp32_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp33_ = NULL;
-	gint* _tmp34_ = NULL;
-	gint* _tmp35_ = NULL;
-	gint _tmp35__length1 = 0;
-	UtilsVersionNumber* _tmp36_ = NULL;
-	UtilsVersionNumber* _tmp37_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp38_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp39_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp40_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp41_ = NULL;
-	gint* _tmp42_ = NULL;
-	gint* _tmp43_ = NULL;
-	gint _tmp43__length1 = 0;
-	UtilsVersionNumber* _tmp44_ = NULL;
-	UtilsVersionNumber* _tmp45_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp46_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp47_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp48_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp49_ = NULL;
-	gint* _tmp50_ = NULL;
-	gint* _tmp51_ = NULL;
-	gint _tmp51__length1 = 0;
-	UtilsVersionNumber* _tmp52_ = NULL;
-	UtilsVersionNumber* _tmp53_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp54_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp55_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp56_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp57_ = NULL;
-	GeeMap* _tmp58_ = NULL;
+	GeeArrayList* _tmp1_;
+	gint* _tmp2_;
+	gint* _tmp3_;
+	gint _tmp3__length1;
+	UtilsVersionNumber* _tmp4_;
+	UtilsVersionNumber* _tmp5_;
+	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp6_;
+	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp7_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp8_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp9_;
+	gint* _tmp10_;
+	gint* _tmp11_;
+	gint _tmp11__length1;
+	UtilsVersionNumber* _tmp12_;
+	UtilsVersionNumber* _tmp13_;
+	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp14_;
+	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp15_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp16_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp17_;
+	gint* _tmp18_;
+	gint* _tmp19_;
+	gint _tmp19__length1;
+	UtilsVersionNumber* _tmp20_;
+	UtilsVersionNumber* _tmp21_;
+	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp22_;
+	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp23_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp24_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp25_;
+	gint* _tmp26_;
+	gint* _tmp27_;
+	gint _tmp27__length1;
+	UtilsVersionNumber* _tmp28_;
+	UtilsVersionNumber* _tmp29_;
+	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp30_;
+	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp31_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp32_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp33_;
+	gint* _tmp34_;
+	gint* _tmp35_;
+	gint _tmp35__length1;
+	UtilsVersionNumber* _tmp36_;
+	UtilsVersionNumber* _tmp37_;
+	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp38_;
+	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp39_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp40_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp41_;
+	gint* _tmp42_;
+	gint* _tmp43_;
+	gint _tmp43__length1;
+	UtilsVersionNumber* _tmp44_;
+	UtilsVersionNumber* _tmp45_;
+	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp46_;
+	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp47_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp48_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp49_;
+	gint* _tmp50_;
+	gint* _tmp51_;
+	gint _tmp51__length1;
+	UtilsVersionNumber* _tmp52_;
+	UtilsVersionNumber* _tmp53_;
+	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp54_;
+	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp55_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp56_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp57_;
+	GeeMap* _tmp58_;
 	GeeList* tags_list = NULL;
-	GeeArrayList* _tmp59_ = NULL;
-	gint* _tmp60_ = NULL;
-	gint* _tmp61_ = NULL;
-	gint _tmp61__length1 = 0;
-	UtilsVersionNumber* _tmp62_ = NULL;
-	UtilsVersionNumber* _tmp63_ = NULL;
-	DataImportsFSpotDbFSpotTagsV0Behavior* _tmp64_ = NULL;
-	DataImportsFSpotDbFSpotTagsV0Behavior* _tmp65_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp66_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp67_ = NULL;
-	GeeMap* _tmp68_ = NULL;
+	GeeArrayList* _tmp59_;
+	gint* _tmp60_;
+	gint* _tmp61_;
+	gint _tmp61__length1;
+	UtilsVersionNumber* _tmp62_;
+	UtilsVersionNumber* _tmp63_;
+	DataImportsFSpotDbFSpotTagsV0Behavior* _tmp64_;
+	DataImportsFSpotDbFSpotTagsV0Behavior* _tmp65_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp66_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp67_;
+	GeeMap* _tmp68_;
 	GeeList* photo_tags_list = NULL;
-	GeeArrayList* _tmp69_ = NULL;
-	gint* _tmp70_ = NULL;
-	gint* _tmp71_ = NULL;
-	gint _tmp71__length1 = 0;
-	UtilsVersionNumber* _tmp72_ = NULL;
-	UtilsVersionNumber* _tmp73_ = NULL;
-	DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp74_ = NULL;
-	DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp75_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp76_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp77_ = NULL;
-	GeeMap* _tmp78_ = NULL;
+	GeeArrayList* _tmp69_;
+	gint* _tmp70_;
+	gint* _tmp71_;
+	gint _tmp71__length1;
+	UtilsVersionNumber* _tmp72_;
+	UtilsVersionNumber* _tmp73_;
+	DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp74_;
+	DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp75_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp76_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp77_;
+	GeeMap* _tmp78_;
 	GeeList* photo_versions_list = NULL;
-	GeeArrayList* _tmp79_ = NULL;
-	gint* _tmp80_ = NULL;
-	gint* _tmp81_ = NULL;
-	gint _tmp81__length1 = 0;
-	UtilsVersionNumber* _tmp82_ = NULL;
-	UtilsVersionNumber* _tmp83_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp84_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp85_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp86_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp87_ = NULL;
-	gint* _tmp88_ = NULL;
-	gint* _tmp89_ = NULL;
-	gint _tmp89__length1 = 0;
-	UtilsVersionNumber* _tmp90_ = NULL;
-	UtilsVersionNumber* _tmp91_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp92_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp93_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp94_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp95_ = NULL;
-	gint* _tmp96_ = NULL;
-	gint* _tmp97_ = NULL;
-	gint _tmp97__length1 = 0;
-	UtilsVersionNumber* _tmp98_ = NULL;
-	UtilsVersionNumber* _tmp99_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp100_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp101_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp102_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp103_ = NULL;
-	gint* _tmp104_ = NULL;
-	gint* _tmp105_ = NULL;
-	gint _tmp105__length1 = 0;
-	UtilsVersionNumber* _tmp106_ = NULL;
-	UtilsVersionNumber* _tmp107_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp108_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp109_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp110_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp111_ = NULL;
-	gint* _tmp112_ = NULL;
-	gint* _tmp113_ = NULL;
-	gint _tmp113__length1 = 0;
-	UtilsVersionNumber* _tmp114_ = NULL;
-	UtilsVersionNumber* _tmp115_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp116_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp117_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp118_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp119_ = NULL;
-	GeeMap* _tmp120_ = NULL;
+	GeeArrayList* _tmp79_;
+	gint* _tmp80_;
+	gint* _tmp81_;
+	gint _tmp81__length1;
+	UtilsVersionNumber* _tmp82_;
+	UtilsVersionNumber* _tmp83_;
+	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp84_;
+	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp85_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp86_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp87_;
+	gint* _tmp88_;
+	gint* _tmp89_;
+	gint _tmp89__length1;
+	UtilsVersionNumber* _tmp90_;
+	UtilsVersionNumber* _tmp91_;
+	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp92_;
+	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp93_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp94_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp95_;
+	gint* _tmp96_;
+	gint* _tmp97_;
+	gint _tmp97__length1;
+	UtilsVersionNumber* _tmp98_;
+	UtilsVersionNumber* _tmp99_;
+	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp100_;
+	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp101_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp102_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp103_;
+	gint* _tmp104_;
+	gint* _tmp105_;
+	gint _tmp105__length1;
+	UtilsVersionNumber* _tmp106_;
+	UtilsVersionNumber* _tmp107_;
+	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp108_;
+	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp109_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp110_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp111_;
+	gint* _tmp112_;
+	gint* _tmp113_;
+	gint _tmp113__length1;
+	UtilsVersionNumber* _tmp114_;
+	UtilsVersionNumber* _tmp115_;
+	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp116_;
+	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp117_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp118_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp119_;
+	GeeMap* _tmp120_;
 	GeeList* rolls_list = NULL;
-	GeeArrayList* _tmp121_ = NULL;
-	gint* _tmp122_ = NULL;
-	gint* _tmp123_ = NULL;
-	gint _tmp123__length1 = 0;
-	UtilsVersionNumber* _tmp124_ = NULL;
-	UtilsVersionNumber* _tmp125_ = NULL;
-	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp126_ = NULL;
-	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp127_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp128_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp129_ = NULL;
-	gint* _tmp130_ = NULL;
-	gint* _tmp131_ = NULL;
-	gint _tmp131__length1 = 0;
-	UtilsVersionNumber* _tmp132_ = NULL;
-	UtilsVersionNumber* _tmp133_ = NULL;
-	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp134_ = NULL;
-	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp135_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp136_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp137_ = NULL;
-	GeeMap* _tmp138_ = NULL;
+	GeeArrayList* _tmp121_;
+	gint* _tmp122_;
+	gint* _tmp123_;
+	gint _tmp123__length1;
+	UtilsVersionNumber* _tmp124_;
+	UtilsVersionNumber* _tmp125_;
+	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp126_;
+	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp127_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp128_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp129_;
+	gint* _tmp130_;
+	gint* _tmp131_;
+	gint _tmp131__length1;
+	UtilsVersionNumber* _tmp132_;
+	UtilsVersionNumber* _tmp133_;
+	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp134_;
+	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp135_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp136_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp137_;
+	GeeMap* _tmp138_;
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1445,10 +1445,10 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 	DataImportsFSpotDbFSpotTableBehavior* result = NULL;
 	DataImportsFSpotDbFSpotTableBehavior* behavior = NULL;
 	GeeList* behavior_list = NULL;
-	GeeMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
-	GeeList* _tmp3_ = NULL;
+	GeeMap* _tmp0_;
+	const gchar* _tmp1_;
+	gpointer _tmp2_;
+	GeeList* _tmp3_;
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_val_if_fail (table_name != NULL, NULL);
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1470,12 +1470,12 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 #line 1471 "FSpotDatabaseBehavior.c"
 		{
 			GeeList* _entry_list = NULL;
-			GeeList* _tmp4_ = NULL;
-			GeeList* _tmp5_ = NULL;
+			GeeList* _tmp4_;
+			GeeList* _tmp5_;
 			gint _entry_size = 0;
-			GeeList* _tmp6_ = NULL;
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
+			GeeList* _tmp6_;
+			gint _tmp7_;
+			gint _tmp8_;
 			gint _entry_index = 0;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 			_tmp4_ = behavior_list;
@@ -1496,19 +1496,19 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 			while (TRUE) {
 #line 1499 "FSpotDatabaseBehavior.c"
-				gint _tmp9_ = 0;
-				gint _tmp10_ = 0;
-				gint _tmp11_ = 0;
+				gint _tmp9_;
+				gint _tmp10_;
+				gint _tmp11_;
 				DataImportsFSpotDbFSpotBehaviorEntry* entry = NULL;
-				GeeList* _tmp12_ = NULL;
-				gint _tmp13_ = 0;
-				gpointer _tmp14_ = NULL;
-				UtilsVersionNumber* _tmp15_ = NULL;
-				DataImportsFSpotDbFSpotBehaviorEntry* _tmp16_ = NULL;
-				UtilsVersionNumber* _tmp17_ = NULL;
-				UtilsVersionNumber* _tmp18_ = NULL;
-				gint _tmp19_ = 0;
-				gboolean _tmp20_ = FALSE;
+				GeeList* _tmp12_;
+				gint _tmp13_;
+				gpointer _tmp14_;
+				UtilsVersionNumber* _tmp15_;
+				DataImportsFSpotDbFSpotBehaviorEntry* _tmp16_;
+				UtilsVersionNumber* _tmp17_;
+				UtilsVersionNumber* _tmp18_;
+				gint _tmp19_;
+				gboolean _tmp20_;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 				_tmp9_ = _entry_index;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1548,8 +1548,8 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 				if (_tmp20_) {
 #line 1551 "FSpotDatabaseBehavior.c"
-					DataImportsFSpotDbFSpotBehaviorEntry* _tmp21_ = NULL;
-					DataImportsFSpotDbFSpotTableBehavior* _tmp22_ = NULL;
+					DataImportsFSpotDbFSpotBehaviorEntry* _tmp21_;
+					DataImportsFSpotDbFSpotTableBehavior* _tmp22_;
 #line 152 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 					_tmp21_ = entry;
 #line 152 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1569,7 +1569,7 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 #line 1570 "FSpotDatabaseBehavior.c"
 		}
 	} else {
-		const gchar* _tmp23_ = NULL;
+		const gchar* _tmp23_;
 #line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp23_ = table_name;
 #line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1589,34 +1589,34 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 
 DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_behavior_construct (GType object_type, UtilsVersionNumber* version, GError** error) {
 	DataImportsFSpotDbFSpotDatabaseBehavior * self = NULL;
-	UtilsVersionNumber* _tmp0_ = NULL;
-	UtilsVersionNumber* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	UtilsVersionNumber* _tmp0_;
+	UtilsVersionNumber* _tmp1_;
+	gint _tmp2_;
 	DataImportsFSpotDbFSpotTableBehavior* photos_generic_behavior = NULL;
-	UtilsVersionNumber* _tmp8_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp9_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp10_ = NULL;
+	UtilsVersionNumber* _tmp8_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp9_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp10_;
 	DataImportsFSpotDbFSpotTableBehavior* tags_generic_behavior = NULL;
-	UtilsVersionNumber* _tmp13_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp14_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp15_ = NULL;
+	UtilsVersionNumber* _tmp13_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp14_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp15_;
 	DataImportsFSpotDbFSpotTableBehavior* photo_tags_generic_behavior = NULL;
-	UtilsVersionNumber* _tmp18_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp19_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp20_ = NULL;
+	UtilsVersionNumber* _tmp18_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp19_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp20_;
 	DataImportsFSpotDbFSpotTableBehavior* photo_versions_generic_behavior = NULL;
-	UtilsVersionNumber* _tmp23_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp24_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp25_ = NULL;
+	UtilsVersionNumber* _tmp23_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp24_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp25_;
 	DataImportsFSpotDbFSpotTableBehavior* rolls_generic_behavior = NULL;
-	UtilsVersionNumber* _tmp28_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp29_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp30_ = NULL;
+	UtilsVersionNumber* _tmp28_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp29_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp30_;
 	gboolean _tmp33_ = FALSE;
 	gboolean _tmp34_ = FALSE;
 	gboolean _tmp35_ = FALSE;
 	gboolean _tmp36_ = FALSE;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp37_ = NULL;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp37_;
 	GError * _inner_error_ = NULL;
 #line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_val_if_fail (UTILS_IS_VERSION_NUMBER (version), NULL);
@@ -1631,11 +1631,11 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 #line 160 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	if (_tmp2_ >= 0) {
 #line 1633 "FSpotDatabaseBehavior.c"
-		UtilsVersionNumber* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-		GError* _tmp7_ = NULL;
+		UtilsVersionNumber* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		GError* _tmp6_;
+		GError* _tmp7_;
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp3_ = version;
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1680,8 +1680,8 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 #line 164 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	if (_tmp10_ != NULL) {
 #line 1682 "FSpotDatabaseBehavior.c"
-		DataImportsFSpotDbFSpotTableBehavior* _tmp11_ = NULL;
-		DataImportsFSpotDbFSpotTableBehavior* _tmp12_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp11_;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp12_;
 #line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp11_ = photos_generic_behavior;
 #line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1703,8 +1703,8 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	if (_tmp15_ != NULL) {
 #line 1705 "FSpotDatabaseBehavior.c"
-		DataImportsFSpotDbFSpotTableBehavior* _tmp16_ = NULL;
-		DataImportsFSpotDbFSpotTableBehavior* _tmp17_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp16_;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp17_;
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp16_ = tags_generic_behavior;
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1726,8 +1726,8 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 #line 170 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	if (_tmp20_ != NULL) {
 #line 1728 "FSpotDatabaseBehavior.c"
-		DataImportsFSpotDbFSpotTableBehavior* _tmp21_ = NULL;
-		DataImportsFSpotDbFSpotTableBehavior* _tmp22_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp21_;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp22_;
 #line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp21_ = photo_tags_generic_behavior;
 #line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1749,8 +1749,8 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	if (_tmp25_ != NULL) {
 #line 1751 "FSpotDatabaseBehavior.c"
-		DataImportsFSpotDbFSpotTableBehavior* _tmp26_ = NULL;
-		DataImportsFSpotDbFSpotTableBehavior* _tmp27_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp26_;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp27_;
 #line 174 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp26_ = photo_versions_generic_behavior;
 #line 174 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1772,8 +1772,8 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 #line 176 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	if (_tmp30_ != NULL) {
 #line 1774 "FSpotDatabaseBehavior.c"
-		DataImportsFSpotDbFSpotTableBehavior* _tmp31_ = NULL;
-		DataImportsFSpotDbFSpotTableBehavior* _tmp32_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp31_;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp32_;
 #line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp31_ = rolls_generic_behavior;
 #line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1792,7 +1792,7 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 		_tmp36_ = TRUE;
 #line 1793 "FSpotDatabaseBehavior.c"
 	} else {
-		DataImportsFSpotDbFSpotTableBehavior* _tmp38_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp38_;
 #line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp38_ = self->priv->tags_behavior;
 #line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1805,7 +1805,7 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 		_tmp35_ = TRUE;
 #line 1806 "FSpotDatabaseBehavior.c"
 	} else {
-		DataImportsFSpotDbFSpotTableBehavior* _tmp39_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp39_;
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp39_ = self->priv->photo_tags_behavior;
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1818,7 +1818,7 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 		_tmp34_ = TRUE;
 #line 1819 "FSpotDatabaseBehavior.c"
 	} else {
-		DataImportsFSpotDbFSpotTableBehavior* _tmp40_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp40_;
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp40_ = self->priv->photo_versions_behavior;
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1831,7 +1831,7 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 		_tmp33_ = TRUE;
 #line 1832 "FSpotDatabaseBehavior.c"
 	} else {
-		DataImportsFSpotDbFSpotTableBehavior* _tmp41_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp41_;
 #line 181 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp41_ = self->priv->rolls_behavior;
 #line 181 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1841,11 +1841,11 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 #line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	if (_tmp33_) {
 #line 1843 "FSpotDatabaseBehavior.c"
-		UtilsVersionNumber* _tmp42_ = NULL;
-		gchar* _tmp43_ = NULL;
-		gchar* _tmp44_ = NULL;
-		GError* _tmp45_ = NULL;
-		GError* _tmp46_ = NULL;
+		UtilsVersionNumber* _tmp42_;
+		gchar* _tmp43_;
+		gchar* _tmp44_;
+		GError* _tmp45_;
+		GError* _tmp46_;
 #line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp42_ = version;
 #line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1924,8 +1924,8 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 
 DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photos_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self) {
 	DataImportsFSpotDbFSpotTableBehavior* result = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp1_ = NULL;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp1_;
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (self), NULL);
 #line 187 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1942,8 +1942,8 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 
 DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_tags_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self) {
 	DataImportsFSpotDbFSpotTableBehavior* result = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp1_ = NULL;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp1_;
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (self), NULL);
 #line 191 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1960,8 +1960,8 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 
 DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photo_tags_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self) {
 	DataImportsFSpotDbFSpotTableBehavior* result = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp1_ = NULL;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp1_;
 #line 194 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (self), NULL);
 #line 195 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1978,8 +1978,8 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 
 DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photo_versions_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self) {
 	DataImportsFSpotDbFSpotTableBehavior* result = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp1_ = NULL;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp1_;
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (self), NULL);
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1996,8 +1996,8 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 
 DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_rolls_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self) {
 	DataImportsFSpotDbFSpotTableBehavior* result = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp1_ = NULL;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp1_;
 #line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (self), NULL);
 #line 203 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -2013,10 +2013,10 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 
 
 static void data_imports_fspot_db_fspot_database_behavior_class_init (DataImportsFSpotDbFSpotDatabaseBehaviorClass * klass) {
-	gint* _tmp0_ = NULL;
-	gint* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	UtilsVersionNumber* _tmp2_ = NULL;
+	gint* _tmp0_;
+	gint* _tmp1_;
+	gint _tmp1__length1;
+	UtilsVersionNumber* _tmp2_;
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	data_imports_fspot_db_fspot_database_behavior_parent_class = g_type_class_peek_parent (klass);
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -2046,7 +2046,7 @@ static void data_imports_fspot_db_fspot_database_behavior_instance_init (DataImp
 }
 
 
-static void data_imports_fspot_db_fspot_database_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_database_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotDatabaseBehavior * self;
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehavior);