Imported Upstream version 3.1.90upstream/3.1.90

1 files changed, 28 insertions, 28 deletions

diff --git a/src/ui.c b/src/ui.c
index 121d780..93a4506 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1191,11 +1191,11 @@ static gboolean simple_scan_save_document (SimpleScan* self, gboolean force_choo
 	{
 		book_save (self->priv->book, format, file, &_inner_error_);
 		if (_inner_error_ != NULL) {
-			goto __catch10_g_error;
+			goto __catch11_g_error;
 		}
 	}
-	goto __finally10;
-	__catch10_g_error:
+	goto __finally11;
+	__catch11_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp16_ = NULL;
@@ -1212,7 +1212,7 @@ static gboolean simple_scan_save_document (SimpleScan* self, gboolean force_choo
 		_g_free0 (uri);
 		return result;
 	}
-	__finally10:
+	__finally11:
 	if (_inner_error_ != NULL) {
 		_g_free0 (format);
 		_g_free0 (uri_lower);
@@ -1769,12 +1769,12 @@ static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar*
 		path = _tmp1_;
 		fd = _tmp2_;
 		if (_inner_error_ != NULL) {
-			goto __catch11_g_error;
+			goto __catch12_g_error;
 		}
 		close (fd);
 	}
-	goto __finally11;
-	__catch11_g_error:
+	goto __finally12;
+	__catch12_g_error:
 	{
 		GError* e = NULL;
 		e = _inner_error_;
@@ -1786,7 +1786,7 @@ static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar*
 		_g_free0 (filename);
 		return result;
 	}
-	__finally11:
+	__finally12:
 	if (_inner_error_ != NULL) {
 		_g_free0 (path);
 		_g_free0 (filename);
@@ -1820,11 +1820,11 @@ static void simple_scan_show_page_cb (SimpleScan* self, BookView* view, Page* pa
 	{
 		page_save (page, "tiff", file, &_inner_error_);
 		if (_inner_error_ != NULL) {
-			goto __catch12_g_error;
+			goto __catch13_g_error;
 		}
 	}
-	goto __finally12;
-	__catch12_g_error:
+	goto __finally13;
+	__catch13_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp2_ = NULL;
@@ -1837,7 +1837,7 @@ static void simple_scan_show_page_cb (SimpleScan* self, BookView* view, Page* pa
 		_g_free0 (path);
 		return;
 	}
-	__finally12:
+	__finally13:
 	if (_inner_error_ != NULL) {
 		_g_object_unref0 (file);
 		_g_free0 (path);
@@ -1857,11 +1857,11 @@ static void simple_scan_show_page_cb (SimpleScan* self, BookView* view, Page* pa
 		gtk_show_uri (_tmp3_, _tmp5_, _tmp6_, &_inner_error_);
 		_g_free0 (_tmp5_);
 		if (_inner_error_ != NULL) {
-			goto __catch13_g_error;
+			goto __catch14_g_error;
 		}
 	}
-	goto __finally13;
-	__catch13_g_error:
+	goto __finally14;
+	__catch14_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp7_ = NULL;
@@ -1871,7 +1871,7 @@ static void simple_scan_show_page_cb (SimpleScan* self, BookView* view, Page* pa
 		simple_scan_show_error_dialog (self, _tmp7_, e->message);
 		_g_error_free0 (e);
 	}
-	__finally13:
+	__finally14:
 	if (_inner_error_ != NULL) {
 		_g_object_unref0 (file);
 		_g_free0 (path);
@@ -2266,11 +2266,11 @@ void G_MODULE_EXPORT print_button_clicked_cb (GtkWidget* widget, SimpleScan* sel
 	{
 		gtk_print_operation_run (print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, self->priv->window, &_inner_error_);
 		if (_inner_error_ != NULL) {
-			goto __catch14_g_error;
+			goto __catch15_g_error;
 		}
 	}
-	goto __finally14;
-	__catch14_g_error:
+	goto __finally15;
+	__catch15_g_error:
 	{
 		GError* e = NULL;
 		e = _inner_error_;
@@ -2278,7 +2278,7 @@ void G_MODULE_EXPORT print_button_clicked_cb (GtkWidget* widget, SimpleScan* sel
 		g_warning ("ui.vala:1044: Error printing: %s", e->message);
 		_g_error_free0 (e);
 	}
-	__finally14:
+	__finally15:
 	if (_inner_error_ != NULL) {
 		_g_object_unref0 (print);
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2300,11 +2300,11 @@ void G_MODULE_EXPORT help_contents_menuitem_activate_cb (GtkWidget* widget, Simp
 		_tmp1_ = gtk_get_current_event_time ();
 		gtk_show_uri (_tmp0_, "ghelp:simple-scan", _tmp1_, &_inner_error_);
 		if (_inner_error_ != NULL) {
-			goto __catch15_g_error;
+			goto __catch16_g_error;
 		}
 	}
-	goto __finally15;
-	__catch15_g_error:
+	goto __finally16;
+	__catch16_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp2_ = NULL;
@@ -2314,7 +2314,7 @@ void G_MODULE_EXPORT help_contents_menuitem_activate_cb (GtkWidget* widget, Simp
 		simple_scan_show_error_dialog (self, _tmp2_, e->message);
 		_g_error_free0 (e);
 	}
-	__finally15:
+	__finally16:
 	if (_inner_error_ != NULL) {
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 		g_clear_error (&_inner_error_);
@@ -2820,11 +2820,11 @@ static void simple_scan_load (SimpleScan* self) {
 	{
 		gtk_builder_add_from_file (self->priv->builder, filename, &_inner_error_);
 		if (_inner_error_ != NULL) {
-			goto __catch16_g_error;
+			goto __catch17_g_error;
 		}
 	}
-	goto __finally16;
-	__catch16_g_error:
+	goto __finally17;
+	__catch17_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp3_ = NULL;
@@ -2838,7 +2838,7 @@ static void simple_scan_load (SimpleScan* self) {
 		exit (EXIT_FAILURE);
 		_g_error_free0 (e);
 	}
-	__finally16:
+	__finally17:
 	if (_inner_error_ != NULL) {
 		_g_free0 (filename);
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);