Merge tag 'upstream/0.26.1'

Upstream version 0.26.1

1 files changed, 50 insertions, 44 deletions

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"
 }