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

1 files changed, 29 insertions, 29 deletions

diff --git a/plugins/shotwell-data-imports/SqliteSupport.c b/plugins/shotwell-data-imports/SqliteSupport.c
index c02a5e6..eb9eec2 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.7, the Vala compiler
+/* SqliteSupport.c generated by valac 0.36.6, the Vala compiler
  * generated from SqliteSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -72,7 +72,7 @@ enum  {
 void importable_database_table_set_table_name (ImportableDatabaseTable* self, const gchar* table_name);
 void importable_database_table_throw_error (const gchar* method, gint res, GError** error);
 ImportableDatabaseTable* importable_database_table_construct (GType object_type);
-static void importable_database_table_finalize (ImportableDatabaseTable* obj);
+static void importable_database_table_finalize (ImportableDatabaseTable * obj);
 
 
 GQuark database_error_quark (void) {
@@ -81,8 +81,8 @@ GQuark database_error_quark (void) {
 
 
 void importable_database_table_set_table_name (ImportableDatabaseTable* self, const gchar* table_name) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 	g_return_if_fail (IS_IMPORTABLE_DATABASE_TABLE (self));
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
@@ -101,12 +101,12 @@ void importable_database_table_set_table_name (ImportableDatabaseTable* self, co
 
 void importable_database_table_throw_error (const gchar* method, gint res, GError** error) {
 	gchar* msg = NULL;
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	sqlite3* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
+	const gchar* _tmp0_;
+	gint _tmp1_;
+	sqlite3* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	gint _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 	g_return_if_fail (method != NULL);
@@ -162,8 +162,8 @@ void importable_database_table_throw_error (const gchar* method, gint res, GErro
 		case SQLITE_NOTADB:
 #line 164 "SqliteSupport.c"
 		{
-			const gchar* _tmp6_ = NULL;
-			GError* _tmp7_ = NULL;
+			const gchar* _tmp6_;
+			GError* _tmp7_;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 			_tmp6_ = msg;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
@@ -195,8 +195,8 @@ void importable_database_table_throw_error (const gchar* method, gint res, GErro
 		case SQLITE_NOMEM:
 #line 197 "SqliteSupport.c"
 		{
-			const gchar* _tmp8_ = NULL;
-			GError* _tmp9_ = NULL;
+			const gchar* _tmp8_;
+			GError* _tmp9_;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 			_tmp8_ = msg;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
@@ -232,8 +232,8 @@ void importable_database_table_throw_error (const gchar* method, gint res, GErro
 		case SQLITE_INTERRUPT:
 #line 234 "SqliteSupport.c"
 		{
-			const gchar* _tmp10_ = NULL;
-			GError* _tmp11_ = NULL;
+			const gchar* _tmp10_;
+			GError* _tmp11_;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 			_tmp10_ = msg;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
@@ -273,8 +273,8 @@ void importable_database_table_throw_error (const gchar* method, gint res, GErro
 		case SQLITE_RANGE:
 #line 275 "SqliteSupport.c"
 		{
-			const gchar* _tmp12_ = NULL;
-			GError* _tmp13_ = NULL;
+			const gchar* _tmp12_;
+			GError* _tmp13_;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 			_tmp12_ = msg;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
@@ -308,8 +308,8 @@ void importable_database_table_throw_error (const gchar* method, gint res, GErro
 		case SQLITE_MISMATCH:
 #line 310 "SqliteSupport.c"
 		{
-			const gchar* _tmp14_ = NULL;
-			GError* _tmp15_ = NULL;
+			const gchar* _tmp14_;
+			GError* _tmp15_;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 			_tmp14_ = msg;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
@@ -346,8 +346,8 @@ void importable_database_table_throw_error (const gchar* method, gint res, GErro
 		case SQLITE_MISUSE:
 #line 348 "SqliteSupport.c"
 		{
-			const gchar* _tmp16_ = NULL;
-			GError* _tmp17_ = NULL;
+			const gchar* _tmp16_;
+			GError* _tmp17_;
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 			_tmp16_ = msg;
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
@@ -434,7 +434,7 @@ static gchar* value_importable_database_table_collect_value (GValue* value, guin
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 	if (collect_values[0].v_pointer) {
 #line 437 "SqliteSupport.c"
-		ImportableDatabaseTable* object;
+		ImportableDatabaseTable * object;
 		object = collect_values[0].v_pointer;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -461,7 +461,7 @@ static gchar* value_importable_database_table_collect_value (GValue* value, guin
 
 
 static gchar* value_importable_database_table_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	ImportableDatabaseTable** object_p;
+	ImportableDatabaseTable ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 	if (!object_p) {
@@ -513,7 +513,7 @@ gpointer value_get_importable_database_table (const GValue* value) {
 
 
 void value_set_importable_database_table (GValue* value, gpointer v_object) {
-	ImportableDatabaseTable* old;
+	ImportableDatabaseTable * old;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORTABLE_DATABASE_TABLE));
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
@@ -544,7 +544,7 @@ void value_set_importable_database_table (GValue* value, gpointer v_object) {
 
 
 void value_take_importable_database_table (GValue* value, gpointer v_object) {
-	ImportableDatabaseTable* old;
+	ImportableDatabaseTable * old;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORTABLE_DATABASE_TABLE));
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
@@ -590,7 +590,7 @@ static void importable_database_table_instance_init (ImportableDatabaseTable * s
 }
 
 
-static void importable_database_table_finalize (ImportableDatabaseTable* obj) {
+static void importable_database_table_finalize (ImportableDatabaseTable * obj) {
 	ImportableDatabaseTable * self;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable);
@@ -617,7 +617,7 @@ GType importable_database_table_get_type (void) {
 
 
 gpointer importable_database_table_ref (gpointer instance) {
-	ImportableDatabaseTable* self;
+	ImportableDatabaseTable * self;
 	self = instance;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -628,7 +628,7 @@ gpointer importable_database_table_ref (gpointer instance) {
 
 
 void importable_database_table_unref (gpointer instance) {
-	ImportableDatabaseTable* self;
+	ImportableDatabaseTable * self;
 	self = instance;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {