Merge tag 'upstream/0.26.1'

Upstream version 0.26.1

1 files changed, 7 insertions, 7 deletions

diff --git a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c
index eee5e75..ed13500 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.4, the Vala compiler
+/* FSpotDatabaseBehavior.c generated by valac 0.34.7, the Vala compiler
  * generated from FSpotDatabaseBehavior.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -902,13 +902,13 @@ void data_imports_fspot_db_fspot_database_behavior_create_behavior_map (void) {
 	DataImportsFSpotDbFSpotBehaviorEntry* _tmp137_ = NULL;
 	GeeMap* _tmp138_ = NULL;
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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"
 	_g_object_unref0 (data_imports_fspot_db_fspot_database_behavior_behavior_map);
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	data_imports_fspot_db_fspot_database_behavior_behavior_map = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap);
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp1_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL);
+	_tmp1_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, (GDestroyNotify) data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL);
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	photos_list = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_LIST, GeeList);
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1126,7 +1126,7 @@ void data_imports_fspot_db_fspot_database_behavior_create_behavior_map (void) {
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	gee_map_set (_tmp58_, DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_TABLE_TABLE_NAME, photos_list);
 #line 88 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp59_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL);
+	_tmp59_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, (GDestroyNotify) data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL);
 #line 88 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	tags_list = G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_LIST, GeeList);
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1164,7 +1164,7 @@ void data_imports_fspot_db_fspot_database_behavior_create_behavior_map (void) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	gee_map_set (_tmp68_, DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_TABLE_NAME, tags_list);
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp69_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL);
+	_tmp69_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, (GDestroyNotify) data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL);
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	photo_tags_list = G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_LIST, GeeList);
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1202,7 +1202,7 @@ void data_imports_fspot_db_fspot_database_behavior_create_behavior_map (void) {
 #line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	gee_map_set (_tmp78_, DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAGS_TABLE_TABLE_NAME, photo_tags_list);
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp79_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL);
+	_tmp79_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, (GDestroyNotify) data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL);
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	photo_versions_list = G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, GEE_TYPE_LIST, GeeList);
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1360,7 +1360,7 @@ void data_imports_fspot_db_fspot_database_behavior_create_behavior_map (void) {
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	gee_map_set (_tmp120_, DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_TABLE_TABLE_NAME, photo_versions_list);
 #line 132 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp121_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL);
+	_tmp121_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, (GDestroyNotify) data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL);
 #line 132 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	rolls_list = G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, GEE_TYPE_LIST, GeeList);
 #line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"