From 9e7cd144725a270e0460b21747619f447ca87684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 14 Apr 2017 18:51:46 +0200 Subject: New upstream version 0.26.1 --- plugins/shotwell-data-imports/FSpotDatabase.c | 2 +- .../shotwell-data-imports/FSpotDatabaseBehavior.c | 14 ++-- plugins/shotwell-data-imports/FSpotDatabaseTable.c | 94 ++++++++++++---------- plugins/shotwell-data-imports/FSpotImporter.c | 14 ++-- plugins/shotwell-data-imports/FSpotMetaTable.c | 59 +++++++------- .../shotwell-data-imports/FSpotPhotoTagsTable.c | 4 +- .../FSpotPhotoVersionsTable.c | 6 +- plugins/shotwell-data-imports/FSpotPhotosTable.c | 6 +- plugins/shotwell-data-imports/FSpotRollsTable.c | 4 +- plugins/shotwell-data-imports/FSpotTableBehavior.c | 2 +- plugins/shotwell-data-imports/FSpotTagsTable.c | 6 +- plugins/shotwell-data-imports/SqliteSupport.c | 2 +- plugins/shotwell-data-imports/VersionNumber.c | 2 +- .../shotwell-data-imports/shotwell-data-imports.c | 2 +- 14 files changed, 113 insertions(+), 104 deletions(-) (limited to 'plugins/shotwell-data-imports') diff --git a/plugins/shotwell-data-imports/FSpotDatabase.c b/plugins/shotwell-data-imports/FSpotDatabase.c index bc423d1..9dd325a 100644 --- a/plugins/shotwell-data-imports/FSpotDatabase.c +++ b/plugins/shotwell-data-imports/FSpotDatabase.c @@ -1,4 +1,4 @@ -/* FSpotDatabase.c generated by valac 0.34.4, the Vala compiler +/* FSpotDatabase.c generated by valac 0.34.7, the Vala compiler * generated from FSpotDatabase.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. 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" diff --git a/plugins/shotwell-data-imports/FSpotDatabaseTable.c b/plugins/shotwell-data-imports/FSpotDatabaseTable.c index ffbd887..1583846 100644 --- a/plugins/shotwell-data-imports/FSpotDatabaseTable.c +++ b/plugins/shotwell-data-imports/FSpotDatabaseTable.c @@ -1,4 +1,4 @@ -/* FSpotDatabaseTable.c generated by valac 0.34.4, the Vala compiler +/* FSpotDatabaseTable.c generated by valac 0.34.7, the Vala compiler * generated from FSpotDatabaseTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -752,10 +752,10 @@ gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFS sqlite3_stmt* _tmp6_ = NULL; gint _tmp7_ = 0; gint _tmp8_ = 0; - sqlite3_stmt* _tmp13_ = NULL; - gint _tmp14_ = 0; - gboolean _tmp15_ = FALSE; + sqlite3_stmt* _tmp15_ = NULL; gint _tmp16_ = 0; + gboolean _tmp17_ = FALSE; + gint _tmp18_ = 0; GError * _inner_error_ = NULL; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE (self), 0); @@ -808,6 +808,8 @@ gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFS if (G_UNLIKELY (_inner_error_ != NULL)) { #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { +#line 812 "FSpotDatabaseTable.c" + gint _tmp13_ = 0; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" g_propagate_error (error, _inner_error_); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" @@ -815,9 +817,10 @@ gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFS #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" _g_free0 (column_list); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - return 0; -#line 820 "FSpotDatabaseTable.c" + return _tmp13_; +#line 822 "FSpotDatabaseTable.c" } else { + gint _tmp14_ = 0; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" _g_free0 (sql); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" @@ -827,59 +830,61 @@ gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFS #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" g_clear_error (&_inner_error_); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - return 0; -#line 832 "FSpotDatabaseTable.c" + return _tmp14_; +#line 835 "FSpotDatabaseTable.c" } } } #line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _tmp13_ = _vala_stmt; + _tmp15_ = _vala_stmt; #line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _tmp14_ = sqlite3_step (_tmp13_); + _tmp16_ = sqlite3_step (_tmp15_); #line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - res = _tmp14_; + res = _tmp16_; #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _tmp16_ = res; + _tmp18_ = res; #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - if (_tmp16_ != SQLITE_ROW) { -#line 846 "FSpotDatabaseTable.c" - gint _tmp17_ = 0; + if (_tmp18_ != SQLITE_ROW) { +#line 849 "FSpotDatabaseTable.c" + gint _tmp19_ = 0; #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _tmp17_ = res; + _tmp19_ = res; #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _tmp15_ = _tmp17_ != SQLITE_DONE; -#line 852 "FSpotDatabaseTable.c" + _tmp17_ = _tmp19_ != SQLITE_DONE; +#line 855 "FSpotDatabaseTable.c" } else { #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _tmp15_ = FALSE; -#line 856 "FSpotDatabaseTable.c" + _tmp17_ = FALSE; +#line 859 "FSpotDatabaseTable.c" } #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - if (_tmp15_) { -#line 860 "FSpotDatabaseTable.c" - const gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gint _tmp22_ = 0; + if (_tmp17_) { +#line 863 "FSpotDatabaseTable.c" + const gchar* _tmp20_ = NULL; + const gchar* _tmp21_ = NULL; + gchar* _tmp22_ = NULL; + gchar* _tmp23_ = NULL; + gint _tmp24_ = 0; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable)->table_name; + _tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable)->table_name; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _tmp19_ = column_list; + _tmp21_ = column_list; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _tmp20_ = g_strdup_printf ("select_all %s %s", _tmp18_, _tmp19_); + _tmp22_ = g_strdup_printf ("select_all %s %s", _tmp20_, _tmp21_); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _tmp21_ = _tmp20_; + _tmp23_ = _tmp22_; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _tmp22_ = res; + _tmp24_ = res; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - importable_database_table_throw_error (_tmp21_, _tmp22_, &_inner_error_); + importable_database_table_throw_error (_tmp23_, _tmp24_, &_inner_error_); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _g_free0 (_tmp21_); + _g_free0 (_tmp23_); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { +#line 887 "FSpotDatabaseTable.c" + gint _tmp25_ = 0; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" g_propagate_error (error, _inner_error_); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" @@ -887,9 +892,10 @@ gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFS #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" _g_free0 (column_list); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - return 0; -#line 892 "FSpotDatabaseTable.c" + return _tmp25_; +#line 897 "FSpotDatabaseTable.c" } else { + gint _tmp26_ = 0; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" _g_free0 (sql); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" @@ -899,8 +905,8 @@ gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFS #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" g_clear_error (&_inner_error_); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - return 0; -#line 904 "FSpotDatabaseTable.c" + return _tmp26_; +#line 910 "FSpotDatabaseTable.c" } } } @@ -914,15 +920,15 @@ gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFS if (stmt) { #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" *stmt = _vala_stmt; -#line 918 "FSpotDatabaseTable.c" +#line 924 "FSpotDatabaseTable.c" } else { #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" _sqlite3_finalize0 (_vala_stmt); -#line 922 "FSpotDatabaseTable.c" +#line 928 "FSpotDatabaseTable.c" } #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" return result; -#line 926 "FSpotDatabaseTable.c" +#line 932 "FSpotDatabaseTable.c" } @@ -933,14 +939,14 @@ static void data_imports_fspot_db_fspot_database_table_class_init (DataImportsFS ((ImportableDatabaseTableClass *) klass)->finalize = data_imports_fspot_db_fspot_database_table_finalize; #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" g_type_class_add_private (klass, sizeof (DataImportsFSpotDbFSpotDatabaseTablePrivate)); -#line 937 "FSpotDatabaseTable.c" +#line 943 "FSpotDatabaseTable.c" } static void data_imports_fspot_db_fspot_database_table_instance_init (DataImportsFSpotDbFSpotDatabaseTable * self) { #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" self->priv = DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE_GET_PRIVATE (self); -#line 944 "FSpotDatabaseTable.c" +#line 950 "FSpotDatabaseTable.c" } @@ -952,7 +958,7 @@ static void data_imports_fspot_db_fspot_database_table_finalize (ImportableDatab _g_object_unref0 (self->behavior); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" IMPORTABLE_DATABASE_TABLE_CLASS (data_imports_fspot_db_fspot_database_table_parent_class)->finalize (obj); -#line 956 "FSpotDatabaseTable.c" +#line 962 "FSpotDatabaseTable.c" } diff --git a/plugins/shotwell-data-imports/FSpotImporter.c b/plugins/shotwell-data-imports/FSpotImporter.c index 8dc1559..c0fc03a 100644 --- a/plugins/shotwell-data-imports/FSpotImporter.c +++ b/plugins/shotwell-data-imports/FSpotImporter.c @@ -1,4 +1,4 @@ -/* FSpotImporter.c generated by valac 0.34.4, the Vala compiler +/* FSpotImporter.c generated by valac 0.34.7, the Vala compiler * generated from FSpotImporter.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -2860,7 +2860,7 @@ DataImportsFSpotFSpotTagsCache* data_imports_fspot_fspot_tags_cache_construct (G #line 288 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self->priv->tags_table = _tmp1_; #line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp2_ = gee_hash_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp2_ = gee_hash_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (self->priv->tags_map); #line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -4033,7 +4033,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa #line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp36_ = all_photos; #line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp38_ = _tmp37_; #line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -4045,7 +4045,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa #line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp39_ = all_photos; #line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp40_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp40_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp41_ = _tmp40_; #line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -4070,7 +4070,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp44_ = _photo_row_list; #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp45_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp45_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp46_ = _tmp45_; #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -4206,7 +4206,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp61_ = _tag_row_list; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp62_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp62_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp63_ = _tmp62_; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -4618,7 +4618,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp105_ = _photo_version_row_list; #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp106_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp106_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp107_ = _tmp106_; #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" diff --git a/plugins/shotwell-data-imports/FSpotMetaTable.c b/plugins/shotwell-data-imports/FSpotMetaTable.c index 3be8630..55e20af 100644 --- a/plugins/shotwell-data-imports/FSpotMetaTable.c +++ b/plugins/shotwell-data-imports/FSpotMetaTable.c @@ -1,4 +1,4 @@ -/* FSpotMetaTable.c generated by valac 0.34.4, the Vala compiler +/* FSpotMetaTable.c generated by valac 0.34.7, the Vala compiler * generated from FSpotMetaTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -273,7 +273,7 @@ DataImportsFSpotDbFSpotMetaTable* data_imports_fspot_db_fspot_meta_table_constru #line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _tmp0_ = db; #line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" - self = (DataImportsFSpotDbFSpotMetaTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_ROW, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp0_); + self = (DataImportsFSpotDbFSpotMetaTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _tmp1_ = data_imports_fspot_db_fspot_meta_behavior_get_instance (); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" @@ -1142,34 +1142,37 @@ gint64 data_imports_fspot_db_fspot_meta_table_get_hidden_tag_id (DataImportsFSpo if (G_UNLIKELY (_inner_error_ != NULL)) { #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { +#line 1146 "FSpotMetaTable.c" + gint64 _tmp1_ = 0LL; #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" g_propagate_error (error, _inner_error_); #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" - return 0LL; -#line 1150 "FSpotMetaTable.c" + return _tmp1_; +#line 1152 "FSpotMetaTable.c" } else { + gint64 _tmp2_ = 0LL; #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" g_clear_error (&_inner_error_); #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" - return 0LL; -#line 1158 "FSpotMetaTable.c" + return _tmp2_; +#line 1161 "FSpotMetaTable.c" } } #line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" if (id_str != NULL) { -#line 1163 "FSpotMetaTable.c" - gint64 _tmp1_ = 0LL; +#line 1166 "FSpotMetaTable.c" + gint64 _tmp3_ = 0LL; #line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" - _tmp1_ = int64_parse (id_str); + _tmp3_ = int64_parse (id_str); #line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" - result = _tmp1_; + result = _tmp3_; #line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _g_free0 (id_str); #line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return result; -#line 1173 "FSpotMetaTable.c" +#line 1176 "FSpotMetaTable.c" } else { #line 78 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" result = (gint64) -1; @@ -1177,18 +1180,18 @@ gint64 data_imports_fspot_db_fspot_meta_table_get_hidden_tag_id (DataImportsFSpo _g_free0 (id_str); #line 78 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return result; -#line 1181 "FSpotMetaTable.c" +#line 1184 "FSpotMetaTable.c" } #line 73 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _g_free0 (id_str); -#line 1185 "FSpotMetaTable.c" +#line 1188 "FSpotMetaTable.c" } static void data_imports_fspot_db_fspot_meta_table_class_init (DataImportsFSpotDbFSpotMetaTableClass * klass) { #line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" data_imports_fspot_db_fspot_meta_table_parent_class = g_type_class_peek_parent (klass); -#line 1192 "FSpotMetaTable.c" +#line 1195 "FSpotMetaTable.c" } @@ -1228,21 +1231,21 @@ static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_beh self = (DataImportsFSpotDbFSpotMetaBehavior*) g_object_new (object_type, NULL); #line 88 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return self; -#line 1232 "FSpotMetaTable.c" +#line 1235 "FSpotMetaTable.c" } static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_new (void) { #line 88 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return data_imports_fspot_db_fspot_meta_behavior_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR); -#line 1239 "FSpotMetaTable.c" +#line 1242 "FSpotMetaTable.c" } static gpointer _g_object_ref0 (gpointer self) { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return self ? g_object_ref (self) : NULL; -#line 1246 "FSpotMetaTable.c" +#line 1249 "FSpotMetaTable.c" } @@ -1255,7 +1258,7 @@ DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_g _tmp0_ = data_imports_fspot_db_fspot_meta_behavior_instance; #line 92 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" if (_tmp0_ == NULL) { -#line 1259 "FSpotMetaTable.c" +#line 1262 "FSpotMetaTable.c" DataImportsFSpotDbFSpotMetaBehavior* _tmp1_ = NULL; #line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _tmp1_ = data_imports_fspot_db_fspot_meta_behavior_new (); @@ -1263,7 +1266,7 @@ DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_g _g_object_unref0 (data_imports_fspot_db_fspot_meta_behavior_instance); #line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" data_imports_fspot_db_fspot_meta_behavior_instance = _tmp1_; -#line 1267 "FSpotMetaTable.c" +#line 1270 "FSpotMetaTable.c" } #line 94 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _tmp2_ = data_imports_fspot_db_fspot_meta_behavior_instance; @@ -1273,7 +1276,7 @@ DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_g result = _tmp3_; #line 94 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return result; -#line 1277 "FSpotMetaTable.c" +#line 1280 "FSpotMetaTable.c" } @@ -1289,7 +1292,7 @@ static gchar* data_imports_fspot_db_fspot_meta_behavior_real_get_table_name (Dat result = _tmp0_; #line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return result; -#line 1293 "FSpotMetaTable.c" +#line 1296 "FSpotMetaTable.c" } @@ -1321,13 +1324,13 @@ static gchar** data_imports_fspot_db_fspot_meta_behavior_real_list_columns (Data if (result_length1) { #line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" *result_length1 = _tmp3__length1; -#line 1325 "FSpotMetaTable.c" +#line 1328 "FSpotMetaTable.c" } #line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" result = _tmp3_; #line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return result; -#line 1331 "FSpotMetaTable.c" +#line 1334 "FSpotMetaTable.c" } @@ -1381,11 +1384,11 @@ static void data_imports_fspot_db_fspot_meta_behavior_real_build_row (DataImport if (row) { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" *row = _vala_row; -#line 1385 "FSpotMetaTable.c" +#line 1388 "FSpotMetaTable.c" } else { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _g_object_unref0 (_vala_row); -#line 1389 "FSpotMetaTable.c" +#line 1392 "FSpotMetaTable.c" } } @@ -1395,7 +1398,7 @@ static void data_imports_fspot_db_fspot_meta_behavior_class_init (DataImportsFSp data_imports_fspot_db_fspot_meta_behavior_parent_class = g_type_class_peek_parent (klass); #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_meta_behavior_finalize; -#line 1399 "FSpotMetaTable.c" +#line 1402 "FSpotMetaTable.c" } @@ -1408,7 +1411,7 @@ static void data_imports_fspot_db_fspot_meta_behavior_data_imports_fspot_db_fspo iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_meta_behavior_real_list_columns; #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_meta_behavior_real_build_row; -#line 1412 "FSpotMetaTable.c" +#line 1415 "FSpotMetaTable.c" } @@ -1422,7 +1425,7 @@ static void data_imports_fspot_db_fspot_meta_behavior_finalize (GObject* obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR, DataImportsFSpotDbFSpotMetaBehavior); #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" G_OBJECT_CLASS (data_imports_fspot_db_fspot_meta_behavior_parent_class)->finalize (obj); -#line 1426 "FSpotMetaTable.c" +#line 1429 "FSpotMetaTable.c" } diff --git a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c index 615eb70..b1e6274 100644 --- a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c +++ b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c @@ -1,4 +1,4 @@ -/* FSpotPhotoTagsTable.c generated by valac 0.34.4, the Vala compiler +/* FSpotPhotoTagsTable.c generated by valac 0.34.7, the Vala compiler * generated from FSpotPhotoTagsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -263,7 +263,7 @@ DataImportsFSpotDbFSpotPhotoTagsTable* data_imports_fspot_db_fspot_photo_tags_ta #line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" _tmp0_ = db; #line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" - self = (DataImportsFSpotDbFSpotPhotoTagsTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp0_); + self = (DataImportsFSpotDbFSpotPhotoTagsTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_); #line 25 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" _tmp1_ = db_behavior; #line 25 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" diff --git a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c index 8a40c4b..267d1f1 100644 --- a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c +++ b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c @@ -1,4 +1,4 @@ -/* FSpotPhotoVersionsTable.c generated by valac 0.34.4, the Vala compiler +/* FSpotPhotoVersionsTable.c generated by valac 0.34.7, the Vala compiler * generated from FSpotPhotoVersionsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -434,7 +434,7 @@ DataImportsFSpotDbFSpotPhotoVersionsTable* data_imports_fspot_db_fspot_photo_ver #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp0_ = db; #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" - self = (DataImportsFSpotDbFSpotPhotoVersionsTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp0_); + self = (DataImportsFSpotDbFSpotPhotoVersionsTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_); #line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp1_ = db_behavior; #line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -485,7 +485,7 @@ GeeArrayList* data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id ( #line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_TABLE (self), NULL); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" - _tmp0_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" rows = _tmp0_; #line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" diff --git a/plugins/shotwell-data-imports/FSpotPhotosTable.c b/plugins/shotwell-data-imports/FSpotPhotosTable.c index 364919f..af8cc0a 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.4, the Vala compiler +/* FSpotPhotosTable.c generated by valac 0.34.7, the Vala compiler * generated from FSpotPhotosTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -507,7 +507,7 @@ DataImportsFSpotDbFSpotPhotosTable* data_imports_fspot_db_fspot_photos_table_con #line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp0_ = db; #line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - self = (DataImportsFSpotDbFSpotPhotosTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp0_); + self = (DataImportsFSpotDbFSpotPhotosTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_); #line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp1_ = db_behavior; #line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -543,7 +543,7 @@ GeeArrayList* data_imports_fspot_db_fspot_photos_table_get_all (DataImportsFSpot #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); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - _tmp0_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" all = _tmp0_; #line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" diff --git a/plugins/shotwell-data-imports/FSpotRollsTable.c b/plugins/shotwell-data-imports/FSpotRollsTable.c index d183ce0..f232dd9 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.4, the Vala compiler +/* FSpotRollsTable.c generated by valac 0.34.7, the Vala compiler * generated from FSpotRollsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -316,7 +316,7 @@ DataImportsFSpotDbFSpotRollsTable* data_imports_fspot_db_fspot_rolls_table_const #line 25 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" _tmp0_ = db; #line 25 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" - self = (DataImportsFSpotDbFSpotRollsTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp0_); + self = (DataImportsFSpotDbFSpotRollsTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_); #line 26 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" _tmp1_ = db_behavior; #line 26 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" diff --git a/plugins/shotwell-data-imports/FSpotTableBehavior.c b/plugins/shotwell-data-imports/FSpotTableBehavior.c index 3da1646..e3d5c7d 100644 --- a/plugins/shotwell-data-imports/FSpotTableBehavior.c +++ b/plugins/shotwell-data-imports/FSpotTableBehavior.c @@ -1,4 +1,4 @@ -/* FSpotTableBehavior.c generated by valac 0.34.4, the Vala compiler +/* FSpotTableBehavior.c generated by valac 0.34.7, the Vala compiler * generated from FSpotTableBehavior.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotTagsTable.c b/plugins/shotwell-data-imports/FSpotTagsTable.c index 291f238..95f6432 100644 --- a/plugins/shotwell-data-imports/FSpotTagsTable.c +++ b/plugins/shotwell-data-imports/FSpotTagsTable.c @@ -1,4 +1,4 @@ -/* FSpotTagsTable.c generated by valac 0.34.4, the Vala compiler +/* FSpotTagsTable.c generated by valac 0.34.7, the Vala compiler * generated from FSpotTagsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -319,7 +319,7 @@ DataImportsFSpotDbFSpotTagsTable* data_imports_fspot_db_fspot_tags_table_constru #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" _tmp0_ = db; #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" - self = (DataImportsFSpotDbFSpotTagsTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp0_); + self = (DataImportsFSpotDbFSpotTagsTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_); #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" _tmp1_ = db_behavior; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" @@ -557,7 +557,7 @@ GeeArrayList* data_imports_fspot_db_fspot_tags_table_get_by_photo_id (DataImport #line 63 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAGS_TABLE (self), NULL); #line 64 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" - _tmp0_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 64 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" rows = _tmp0_; #line 68 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" diff --git a/plugins/shotwell-data-imports/SqliteSupport.c b/plugins/shotwell-data-imports/SqliteSupport.c index 0dad7df..c02a5e6 100644 --- a/plugins/shotwell-data-imports/SqliteSupport.c +++ b/plugins/shotwell-data-imports/SqliteSupport.c @@ -1,4 +1,4 @@ -/* SqliteSupport.c generated by valac 0.34.4, the Vala compiler +/* SqliteSupport.c generated by valac 0.34.7, the Vala compiler * generated from SqliteSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/VersionNumber.c b/plugins/shotwell-data-imports/VersionNumber.c index 93ab197..7d21a8d 100644 --- a/plugins/shotwell-data-imports/VersionNumber.c +++ b/plugins/shotwell-data-imports/VersionNumber.c @@ -1,4 +1,4 @@ -/* VersionNumber.c generated by valac 0.34.4, the Vala compiler +/* VersionNumber.c generated by valac 0.34.7, the Vala compiler * generated from VersionNumber.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/shotwell-data-imports.c b/plugins/shotwell-data-imports/shotwell-data-imports.c index df48222..31600b3 100644 --- a/plugins/shotwell-data-imports/shotwell-data-imports.c +++ b/plugins/shotwell-data-imports/shotwell-data-imports.c @@ -1,4 +1,4 @@ -/* shotwell-data-imports.c generated by valac 0.34.4, the Vala compiler +/* shotwell-data-imports.c generated by valac 0.34.7, the Vala compiler * generated from shotwell-data-imports.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. -- cgit v1.2.3