summaryrefslogtreecommitdiff
path: root/src/autosave-manager.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-08-19 16:46:00 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-08-19 16:46:00 +0200
commit3a5d7105589e39b43fe5e9256e8137d7e783141d (patch)
tree6a0c9fda7110bbee1213b0d347e11c84a8266875 /src/autosave-manager.c
parentf1a6c049e615f5739183d2558df9db5bca43cd68 (diff)
parent05e2631353c9f9522564ca06efc8fc5ba3a863cb (diff)
Merge tag 'upstream/3.17.90'
Upstream version 3.17.90
Diffstat (limited to 'src/autosave-manager.c')
-rw-r--r--src/autosave-manager.c64
1 files changed, 32 insertions, 32 deletions
diff --git a/src/autosave-manager.c b/src/autosave-manager.c
index e4b37a9..58a0392 100644
--- a/src/autosave-manager.c
+++ b/src/autosave-manager.c
@@ -277,11 +277,11 @@ void autosave_manager_load (AutosaveManager* self) {
#line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 280 "autosave-manager.c"
- goto __catch27_g_error;
+ goto __catch29_g_error;
}
}
- goto __finally27;
- __catch27_g_error:
+ goto __finally29;
+ __catch29_g_error:
{
GError* e = NULL;
GError* _tmp6_ = NULL;
@@ -313,7 +313,7 @@ void autosave_manager_load (AutosaveManager* self) {
return;
#line 314 "autosave-manager.c"
}
- __finally27:
+ __finally29:
#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -721,11 +721,11 @@ void autosave_manager_load (AutosaveManager* self) {
#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 723 "autosave-manager.c"
- goto __catch28_g_error;
+ goto __catch30_g_error;
}
}
- goto __finally28;
- __catch28_g_error:
+ goto __finally30;
+ __catch30_g_error:
{
GError* e = NULL;
#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -756,7 +756,7 @@ void autosave_manager_load (AutosaveManager* self) {
continue;
#line 757 "autosave-manager.c"
}
- __finally28:
+ __finally30:
#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -914,7 +914,7 @@ static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file,
#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 916 "autosave-manager.c"
- goto __catch29_g_error;
+ goto __catch31_g_error;
}
#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
_tmp5_ = _tmp0_;
@@ -928,8 +928,8 @@ static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file,
return result;
#line 929 "autosave-manager.c"
}
- goto __finally29;
- __catch29_g_error:
+ goto __finally31;
+ __catch31_g_error:
{
GError* e = NULL;
const gchar* _tmp6_ = NULL;
@@ -950,7 +950,7 @@ static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file,
return result;
#line 951 "autosave-manager.c"
}
- __finally29:
+ __finally31:
#line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
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);
#line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -992,7 +992,7 @@ static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file,
#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 994 "autosave-manager.c"
- goto __catch30_g_error;
+ goto __catch32_g_error;
}
#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
result = _tmp0_;
@@ -1000,8 +1000,8 @@ static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file,
return result;
#line 1001 "autosave-manager.c"
}
- goto __finally30;
- __catch30_g_error:
+ goto __finally32;
+ __catch32_g_error:
{
GError* e = NULL;
gint _tmp5_ = 0;
@@ -1019,7 +1019,7 @@ static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file,
return result;
#line 1020 "autosave-manager.c"
}
- __finally30:
+ __finally32:
#line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
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);
#line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -1061,7 +1061,7 @@ static gboolean autosave_manager_get_boolean (AutosaveManager* self, GKeyFile* f
#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1063 "autosave-manager.c"
- goto __catch31_g_error;
+ goto __catch33_g_error;
}
#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
result = _tmp0_;
@@ -1069,8 +1069,8 @@ static gboolean autosave_manager_get_boolean (AutosaveManager* self, GKeyFile* f
return result;
#line 1070 "autosave-manager.c"
}
- goto __finally31;
- __catch31_g_error:
+ goto __finally33;
+ __catch33_g_error:
{
GError* e = NULL;
gboolean _tmp5_ = FALSE;
@@ -1088,7 +1088,7 @@ static gboolean autosave_manager_get_boolean (AutosaveManager* self, GKeyFile* f
return result;
#line 1089 "autosave-manager.c"
}
- __finally31:
+ __finally33:
#line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
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);
#line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -1136,7 +1136,7 @@ void autosave_manager_cleanup (AutosaveManager* self) {
#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1138 "autosave-manager.c"
- goto __catch32_g_error;
+ goto __catch34_g_error;
}
#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
_tmp5_ = _tmp2_;
@@ -1150,8 +1150,8 @@ void autosave_manager_cleanup (AutosaveManager* self) {
_g_dir_close0 (_tmp2_);
#line 1151 "autosave-manager.c"
}
- goto __finally32;
- __catch32_g_error:
+ goto __finally34;
+ __catch34_g_error:
{
GError* e = NULL;
GError* _tmp6_ = NULL;
@@ -1174,7 +1174,7 @@ void autosave_manager_cleanup (AutosaveManager* self) {
return;
#line 1175 "autosave-manager.c"
}
- __finally32:
+ __finally34:
#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -1990,11 +1990,11 @@ static void autosave_manager_real_save (AutosaveManager* self) {
#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1992 "autosave-manager.c"
- goto __catch33_g_error;
+ goto __catch35_g_error;
}
}
- goto __finally33;
- __catch33_g_error:
+ goto __finally35;
+ __catch35_g_error:
{
GError* e = NULL;
GError* _tmp116_ = NULL;
@@ -2013,7 +2013,7 @@ static void autosave_manager_real_save (AutosaveManager* self) {
_g_error_free0 (e);
#line 2014 "autosave-manager.c"
}
- __finally33:
+ __finally35:
#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -2102,11 +2102,11 @@ static void autosave_manager_save_pixels (AutosaveManager* self, Page* page) {
#line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2104 "autosave-manager.c"
- goto __catch34_g_error;
+ goto __catch36_g_error;
}
}
- goto __finally34;
- __catch34_g_error:
+ goto __finally36;
+ __catch36_g_error:
{
GError* e = NULL;
GError* _tmp14_ = NULL;
@@ -2125,7 +2125,7 @@ static void autosave_manager_save_pixels (AutosaveManager* self, Page* page) {
_g_error_free0 (e);
#line 2126 "autosave-manager.c"
}
- __finally34:
+ __finally36:
#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"