From 2492891f112caac6076ce49721d9d5d78a152c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 15:53:58 +0100 Subject: New upstream version 0.26.4 --- plugins/shotwell-data-imports/FSpotDatabase.c | 56 +++++++++++++-------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'plugins/shotwell-data-imports/FSpotDatabase.c') diff --git a/plugins/shotwell-data-imports/FSpotDatabase.c b/plugins/shotwell-data-imports/FSpotDatabase.c index 9dd325a..617edb9 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.7, the Vala compiler +/* FSpotDatabase.c generated by valac 0.36.6, the Vala compiler * generated from FSpotDatabase.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -196,7 +196,7 @@ DataImportsFSpotDbFSpotRollsTable* data_imports_fspot_db_fspot_rolls_table_const gchar* data_imports_fspot_db_fspot_meta_table_get_db_version (DataImportsFSpotDbFSpotMetaTable* self, GError** error); UtilsVersionNumber* utils_version_number_new_from_string (const gchar* str_version, const gchar* separator); UtilsVersionNumber* utils_version_number_construct_from_string (GType object_type, const gchar* str_version, const gchar* separator); -static void data_imports_fspot_db_fspot_database_finalize (GObject* obj); +static void data_imports_fspot_db_fspot_database_finalize (GObject * obj); /** @@ -212,32 +212,32 @@ void data_imports_fspot_db_init (void) { DataImportsFSpotDbFSpotDatabase* data_imports_fspot_db_fspot_database_construct (GType object_type, GFile* db_file, GError** error) { DataImportsFSpotDbFSpotDatabase * self = NULL; gchar* filename = NULL; - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; gint res = 0; sqlite3* _tmp2_ = NULL; - gint _tmp3_ = 0; - sqlite3* _tmp5_ = NULL; - DataImportsFSpotDbFSpotMetaTable* _tmp6_ = NULL; + gint _tmp3_; + sqlite3* _tmp5_; + DataImportsFSpotDbFSpotMetaTable* _tmp6_; gint64 _tmp7_ = 0LL; - DataImportsFSpotDbFSpotMetaTable* _tmp8_ = NULL; - gint64 _tmp9_ = 0LL; + DataImportsFSpotDbFSpotMetaTable* _tmp8_; + gint64 _tmp9_; UtilsVersionNumber* _tmp10_ = NULL; - UtilsVersionNumber* _tmp11_ = NULL; + UtilsVersionNumber* _tmp11_; DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior = NULL; - DataImportsFSpotDbFSpotDatabaseBehavior* _tmp12_ = NULL; - sqlite3* _tmp13_ = NULL; - DataImportsFSpotDbFSpotDatabaseBehavior* _tmp14_ = NULL; - DataImportsFSpotDbFSpotPhotosTable* _tmp15_ = NULL; - sqlite3* _tmp16_ = NULL; - DataImportsFSpotDbFSpotDatabaseBehavior* _tmp17_ = NULL; - DataImportsFSpotDbFSpotPhotoVersionsTable* _tmp18_ = NULL; - sqlite3* _tmp19_ = NULL; - DataImportsFSpotDbFSpotDatabaseBehavior* _tmp20_ = NULL; - DataImportsFSpotDbFSpotTagsTable* _tmp21_ = NULL; - sqlite3* _tmp22_ = NULL; - DataImportsFSpotDbFSpotDatabaseBehavior* _tmp23_ = NULL; - DataImportsFSpotDbFSpotRollsTable* _tmp24_ = NULL; + DataImportsFSpotDbFSpotDatabaseBehavior* _tmp12_; + sqlite3* _tmp13_; + DataImportsFSpotDbFSpotDatabaseBehavior* _tmp14_; + DataImportsFSpotDbFSpotPhotosTable* _tmp15_; + sqlite3* _tmp16_; + DataImportsFSpotDbFSpotDatabaseBehavior* _tmp17_; + DataImportsFSpotDbFSpotPhotoVersionsTable* _tmp18_; + sqlite3* _tmp19_; + DataImportsFSpotDbFSpotDatabaseBehavior* _tmp20_; + DataImportsFSpotDbFSpotTagsTable* _tmp21_; + sqlite3* _tmp22_; + DataImportsFSpotDbFSpotDatabaseBehavior* _tmp23_; + DataImportsFSpotDbFSpotRollsTable* _tmp24_; GError * _inner_error_ = NULL; #line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala" g_return_val_if_fail (G_IS_FILE (db_file), NULL); @@ -260,7 +260,7 @@ DataImportsFSpotDbFSpotDatabase* data_imports_fspot_db_fspot_database_construct #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala" if (res != SQLITE_OK) { #line 263 "FSpotDatabase.c" - GError* _tmp4_ = NULL; + GError* _tmp4_; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala" _tmp4_ = g_error_new (DATABASE_ERROR, DATABASE_ERROR_ERROR, "Unable to open F-Spot database %s: %d", filename, res); #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala" @@ -453,9 +453,9 @@ DataImportsFSpotDbFSpotDatabase* data_imports_fspot_db_fspot_database_new (GFile static UtilsVersionNumber* data_imports_fspot_db_fspot_database_get_version (DataImportsFSpotDbFSpotDatabase* self, GError** error) { UtilsVersionNumber* result = NULL; gchar* _tmp0_ = NULL; - DataImportsFSpotDbFSpotMetaTable* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - UtilsVersionNumber* _tmp3_ = NULL; + DataImportsFSpotDbFSpotMetaTable* _tmp1_; + gchar* _tmp2_; + UtilsVersionNumber* _tmp3_; GError * _inner_error_ = NULL; #line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE (self), NULL); @@ -514,7 +514,7 @@ static void data_imports_fspot_db_fspot_database_instance_init (DataImportsFSpot } -static void data_imports_fspot_db_fspot_database_finalize (GObject* obj) { +static void data_imports_fspot_db_fspot_database_finalize (GObject * obj) { DataImportsFSpotDbFSpotDatabase * self; #line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE, DataImportsFSpotDbFSpotDatabase); -- cgit v1.2.3