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

1 files changed, 81 insertions, 81 deletions

diff --git a/src/db/VersionTable.c b/src/db/VersionTable.c
index e678847..4505a6f 100644
--- a/src/db/VersionTable.c
+++ b/src/db/VersionTable.c
@@ -1,4 +1,4 @@
-/* VersionTable.c generated by valac 0.34.7, the Vala compiler
+/* VersionTable.c generated by valac 0.36.6, the Vala compiler
  * generated from VersionTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -87,23 +87,23 @@ DatabaseTable* database_table_construct (GType object_type);
 void database_table_fatal (const gchar* op, gint res);
 void database_table_set_table_name (DatabaseTable* self, const gchar* table_name);
 VersionTable* version_table_get_instance (void);
-gint version_table_get_version (VersionTable* self, gchar** app_version);
+gint version_table_get_version (VersionTable* self, gchar* * app_version);
 void version_table_set_version (VersionTable* self, gint version, const gchar* app_version, const gchar* user_data);
 void version_table_update_version (VersionTable* self, gint version, const gchar* app_version);
-static void version_table_finalize (DatabaseTable* obj);
+static void version_table_finalize (DatabaseTable * obj);
 
 
 static VersionTable* version_table_construct (GType object_type) {
 	VersionTable* self = NULL;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
 #line 10 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 	self = (VersionTable*) database_table_construct (object_type);
 #line 12 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
@@ -131,7 +131,7 @@ static VersionTable* version_table_construct (GType object_type) {
 #line 21 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 	if (_tmp6_ != SQLITE_DONE) {
 #line 134 "VersionTable.c"
-		gint _tmp7_ = 0;
+		gint _tmp7_;
 #line 22 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 		_tmp7_ = res;
 #line 22 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
@@ -164,15 +164,15 @@ static gpointer _database_table_ref0 (gpointer self) {
 
 VersionTable* version_table_get_instance (void) {
 	VersionTable* result = NULL;
-	VersionTable* _tmp0_ = NULL;
-	VersionTable* _tmp2_ = NULL;
-	VersionTable* _tmp3_ = NULL;
+	VersionTable* _tmp0_;
+	VersionTable* _tmp2_;
+	VersionTable* _tmp3_;
 #line 28 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 	_tmp0_ = version_table_instance;
 #line 28 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 	if (_tmp0_ == NULL) {
 #line 175 "VersionTable.c"
-		VersionTable* _tmp1_ = NULL;
+		VersionTable* _tmp1_;
 #line 29 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 		_tmp1_ = version_table_new ();
 #line 29 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
@@ -193,23 +193,23 @@ VersionTable* version_table_get_instance (void) {
 }
 
 
-gint version_table_get_version (VersionTable* self, gchar** app_version) {
+gint version_table_get_version (VersionTable* self, gchar* * app_version) {
 	gchar* _vala_app_version = NULL;
 	gint result = 0;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	sqlite3_stmt* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	sqlite3_stmt* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	sqlite3_stmt* _tmp9_;
+	const gchar* _tmp10_;
+	gchar* _tmp11_;
+	sqlite3_stmt* _tmp12_;
+	gint _tmp13_;
 #line 34 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 	g_return_val_if_fail (IS_VERSION_TABLE (self), 0);
 #line 36 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
@@ -238,13 +238,13 @@ gint version_table_get_version (VersionTable* self, gchar** app_version) {
 #line 41 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 	if (_tmp6_ != SQLITE_ROW) {
 #line 240 "VersionTable.c"
-		gint _tmp7_ = 0;
+		gint _tmp7_;
 #line 42 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 		_tmp7_ = res;
 #line 42 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 		if (_tmp7_ != SQLITE_DONE) {
 #line 246 "VersionTable.c"
-			gint _tmp8_ = 0;
+			gint _tmp8_;
 #line 43 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 			_tmp8_ = res;
 #line 43 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
@@ -311,27 +311,27 @@ void version_table_set_version (VersionTable* self, gint version, const gchar* a
 	sqlite3_stmt* stmt = NULL;
 	gchar* bitbucket = NULL;
 	gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	gint _tmp1_;
 	gint res = 0;
-	sqlite3_stmt* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	sqlite3_stmt* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	GDestroyNotify _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	sqlite3_stmt* _tmp20_ = NULL;
-	const gchar* _tmp21_ = NULL;
-	gchar* _tmp22_ = NULL;
-	GDestroyNotify _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	gint _tmp25_ = 0;
-	sqlite3_stmt* _tmp26_ = NULL;
-	gint _tmp27_ = 0;
-	gint _tmp28_ = 0;
+	sqlite3_stmt* _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
+	sqlite3_stmt* _tmp14_;
+	const gchar* _tmp15_;
+	gchar* _tmp16_;
+	GDestroyNotify _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
+	sqlite3_stmt* _tmp20_;
+	const gchar* _tmp21_;
+	gchar* _tmp22_;
+	GDestroyNotify _tmp23_;
+	gint _tmp24_;
+	gint _tmp25_;
+	sqlite3_stmt* _tmp26_;
+	gint _tmp27_;
+	gint _tmp28_;
 #line 55 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 	g_return_if_fail (IS_VERSION_TABLE (self));
 #line 55 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
@@ -346,10 +346,10 @@ void version_table_set_version (VersionTable* self, gint version, const gchar* a
 	if (_tmp1_ != -1) {
 #line 347 "VersionTable.c"
 		gint res = 0;
-		sqlite3* _tmp2_ = NULL;
+		sqlite3* _tmp2_;
 		sqlite3_stmt* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
+		gint _tmp4_;
+		gint _tmp5_;
 #line 61 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 		_tmp2_ = database_table_db;
 #line 61 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
@@ -367,10 +367,10 @@ void version_table_set_version (VersionTable* self, gint version, const gchar* a
 #line 367 "VersionTable.c"
 	} else {
 		gint res = 0;
-		sqlite3* _tmp6_ = NULL;
+		sqlite3* _tmp6_;
 		sqlite3_stmt* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
+		gint _tmp8_;
+		gint _tmp9_;
 #line 66 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 		_tmp6_ = database_table_db;
 #line 66 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
@@ -443,12 +443,12 @@ void version_table_set_version (VersionTable* self, gint version, const gchar* a
 #line 79 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 	if (_tmp28_ != SQLITE_DONE) {
 #line 444 "VersionTable.c"
-		gint _tmp29_ = 0;
-		const gchar* _tmp30_ = NULL;
-		const gchar* _tmp31_ = NULL;
-		gchar* _tmp32_ = NULL;
-		gchar* _tmp33_ = NULL;
-		gint _tmp34_ = 0;
+		gint _tmp29_;
+		const gchar* _tmp30_;
+		const gchar* _tmp31_;
+		gchar* _tmp32_;
+		gchar* _tmp33_;
+		gint _tmp34_;
 #line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 		_tmp29_ = version;
 #line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
@@ -478,23 +478,23 @@ void version_table_set_version (VersionTable* self, gint version, const gchar* a
 void version_table_update_version (VersionTable* self, gint version, const gchar* app_version) {
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	sqlite3_stmt* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	GDestroyNotify _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	sqlite3_stmt* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
+	gint _tmp2_;
+	gint _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	sqlite3_stmt* _tmp8_;
+	const gchar* _tmp9_;
+	gchar* _tmp10_;
+	GDestroyNotify _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
+	sqlite3_stmt* _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
 #line 83 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 	g_return_if_fail (IS_VERSION_TABLE (self));
 #line 83 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
@@ -552,10 +552,10 @@ void version_table_update_version (VersionTable* self, gint version, const gchar
 #line 94 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 	if (_tmp16_ != SQLITE_DONE) {
 #line 553 "VersionTable.c"
-		gint _tmp17_ = 0;
-		gchar* _tmp18_ = NULL;
-		gchar* _tmp19_ = NULL;
-		gint _tmp20_ = 0;
+		gint _tmp17_;
+		gchar* _tmp18_;
+		gchar* _tmp19_;
+		gint _tmp20_;
 #line 95 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 		_tmp17_ = version;
 #line 95 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
@@ -589,7 +589,7 @@ static void version_table_instance_init (VersionTable * self) {
 }
 
 
-static void version_table_finalize (DatabaseTable* obj) {
+static void version_table_finalize (DatabaseTable * obj) {
 	VersionTable * self;
 #line 7 "/home/jens/Source/shotwell/src/db/VersionTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VERSION_TABLE, VersionTable);