Imported Upstream version 3.15.4upstream/3.15.4

1 files changed, 26 insertions, 24 deletions

diff --git a/src/autosave-manager.c b/src/autosave-manager.c
index de3f9ca..180f22a 100644
--- a/src/autosave-manager.c
+++ b/src/autosave-manager.c
@@ -1,4 +1,4 @@
-/* autosave-manager.c generated by valac 0.24.0, the Vala compiler
+/* autosave-manager.c generated by valac 0.26.1, the Vala compiler
  * generated from autosave-manager.vala, do not modify */
 
 /*
@@ -150,9 +150,9 @@ void autosave_manager_on_page_removed (AutosaveManager* self, Page* page);
 static void autosave_manager_save_pixels (AutosaveManager* self, Page* page);
 static void autosave_manager_save (AutosaveManager* self, gboolean do_timeout);
 void autosave_manager_on_cleared (AutosaveManager* self);
-static gboolean ___lambda3_ (AutosaveManager* self);
+static gboolean ___lambda4_ (AutosaveManager* self);
 static void autosave_manager_real_save (AutosaveManager* self);
-static gboolean ____lambda3__gsource_func (gpointer self);
+static gboolean ____lambda4__gsource_func (gpointer self);
 guint book_get_n_pages (Book* self);
 Page* book_get_page (Book* self, gint page_number);
 gboolean page_get_has_data (Page* self);
@@ -275,7 +275,7 @@ void autosave_manager_load (AutosaveManager* self) {
 #line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_key_file_load_from_file (_tmp4_, _tmp5_, G_KEY_FILE_NONE, &_inner_error_);
 #line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_inner_error_ != NULL) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 280 "autosave-manager.c"
 			goto __catch27_g_error;
 		}
@@ -315,7 +315,7 @@ void autosave_manager_load (AutosaveManager* self) {
 	}
 	__finally27:
 #line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_key_file_unref0 (file);
 #line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -719,7 +719,7 @@ void autosave_manager_load (AutosaveManager* self) {
 #line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_pixels_size_ = pixels_length1;
 #line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						if (_inner_error_ != NULL) {
+						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 723 "autosave-manager.c"
 							goto __catch28_g_error;
 						}
@@ -758,7 +758,7 @@ void autosave_manager_load (AutosaveManager* self) {
 					}
 					__finally28:
 #line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					if (_inner_error_ != NULL) {
+					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_object_unref0 (f);
 #line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -912,7 +912,7 @@ static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file,
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp0_ = _tmp4_;
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_inner_error_ != NULL) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 916 "autosave-manager.c"
 			goto __catch29_g_error;
 		}
@@ -990,7 +990,7 @@ static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file,
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp0_ = _tmp4_;
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_inner_error_ != NULL) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 994 "autosave-manager.c"
 			goto __catch30_g_error;
 		}
@@ -1059,7 +1059,7 @@ static gboolean autosave_manager_get_boolean (AutosaveManager* self, GKeyFile* f
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp0_ = _tmp4_;
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_inner_error_ != NULL) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1063 "autosave-manager.c"
 			goto __catch31_g_error;
 		}
@@ -1134,7 +1134,7 @@ void autosave_manager_cleanup (AutosaveManager* self) {
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp2_ = _tmp4_;
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_inner_error_ != NULL) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1138 "autosave-manager.c"
 			goto __catch32_g_error;
 		}
@@ -1176,7 +1176,7 @@ void autosave_manager_cleanup (AutosaveManager* self) {
 	}
 	__finally32:
 #line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_dir_close0 (dir);
 #line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -1377,7 +1377,7 @@ void autosave_manager_on_cleared (AutosaveManager* self) {
 }
 
 
-static gboolean ___lambda3_ (AutosaveManager* self) {
+static gboolean ___lambda4_ (AutosaveManager* self) {
 	gboolean result = FALSE;
 #line 270 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_real_save (self);
@@ -1391,9 +1391,9 @@ static gboolean ___lambda3_ (AutosaveManager* self) {
 }
 
 
-static gboolean ____lambda3__gsource_func (gpointer self) {
+static gboolean ____lambda4__gsource_func (gpointer self) {
 	gboolean result;
-	result = ___lambda3_ ((AutosaveManager*) self);
+	result = ___lambda4_ ((AutosaveManager*) self);
 #line 268 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return result;
 #line 1399 "autosave-manager.c"
@@ -1450,7 +1450,7 @@ static void autosave_manager_save (AutosaveManager* self, gboolean do_timeout) {
 #line 1450 "autosave-manager.c"
 		guint _tmp6_ = 0U;
 #line 268 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp6_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ____lambda3__gsource_func, autosave_manager_ref (self), autosave_manager_unref);
+		_tmp6_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ____lambda4__gsource_func, autosave_manager_ref (self), autosave_manager_unref);
 #line 268 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		self->priv->update_timeout = _tmp6_;
 #line 1456 "autosave-manager.c"
@@ -1988,7 +1988,7 @@ static void autosave_manager_real_save (AutosaveManager* self) {
 #line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_free0 (_tmp115_);
 #line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_inner_error_ != NULL) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1992 "autosave-manager.c"
 			goto __catch33_g_error;
 		}
@@ -2015,7 +2015,7 @@ static void autosave_manager_real_save (AutosaveManager* self) {
 	}
 	__finally33:
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_free0 (page_names);
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -2100,7 +2100,7 @@ static void autosave_manager_save_pixels (AutosaveManager* self, Page* page) {
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_file_replace_contents (file, _tmp13_, (gsize) _tmp12_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, NULL, &_inner_error_);
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_inner_error_ != NULL) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2104 "autosave-manager.c"
 			goto __catch34_g_error;
 		}
@@ -2127,7 +2127,7 @@ static void autosave_manager_save_pixels (AutosaveManager* self, Page* page) {
 	}
 	__finally34:
 #line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_object_unref0 (file);
 #line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -2599,7 +2599,7 @@ static void autosave_manager_class_init (AutosaveManagerClass * klass) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_parent_class = g_type_class_peek_parent (klass);
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	AUTOSAVE_MANAGER_CLASS (klass)->finalize = autosave_manager_finalize;
+	((AutosaveManagerClass *) klass)->finalize = autosave_manager_finalize;
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_type_class_add_private (klass, sizeof (AutosaveManagerPrivate));
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -2641,11 +2641,13 @@ static void autosave_manager_finalize (AutosaveManager* obj) {
 	AutosaveManager * self;
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_AUTOSAVE_MANAGER, AutosaveManager);
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_handlers_destroy (self);
 #line 21 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_hash_table_unref0 (self->priv->page_filenames);
 #line 23 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_book_unref0 (self->priv->book_);
-#line 2648 "autosave-manager.c"
+#line 2650 "autosave-manager.c"
 }
 
 
@@ -2670,7 +2672,7 @@ gpointer autosave_manager_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return instance;
-#line 2673 "autosave-manager.c"
+#line 2675 "autosave-manager.c"
 }
 
 
@@ -2683,7 +2685,7 @@ void autosave_manager_unref (gpointer instance) {
 		AUTOSAVE_MANAGER_GET_CLASS (self)->finalize (self);
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2686 "autosave-manager.c"
+#line 2688 "autosave-manager.c"
 	}
 }