Update upstream source from tag 'upstream/0.28.2'

Update to upstream version '0.28.2'
with Debian dir 811236a8e9a1308bf427065dcb6270419ff4f965

1 files changed, 40 insertions, 40 deletions

diff --git a/src/Printing.c b/src/Printing.c
index 42a3024..bb93377 100644
--- a/src/Printing.c
+++ b/src/Printing.c
@@ -603,7 +603,6 @@ enum  {
 #define PRINT_MANAGER_IMAGE_DISTANCE 0.24
 static PrintManager* print_manager_new (void);
 static PrintManager* print_manager_construct (GType object_type);
-static void _vala_array_add112 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
 static void _vala_array_add113 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
 static void _vala_array_add114 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
 static void _vala_array_add115 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
@@ -618,6 +617,7 @@ static void _vala_array_add123 (StandardPrintSize** * array, int* length, int* s
 static void _vala_array_add124 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
 static void _vala_array_add125 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
 static void _vala_array_add126 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add127 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
 void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print);
 gchar* data_object_get_name (DataObject* self);
 static void print_manager_on_begin_print (PrintManager* self, GtkPrintOperation* emitting_object, GtkPrintContext* job_context);
@@ -5300,7 +5300,7 @@ static PrintManager* print_manager_new (void) {
 }
 
 
-static void _vala_array_add112 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add113 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 792 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 792 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5317,7 +5317,7 @@ static void _vala_array_add112 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add113 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add114 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5334,7 +5334,7 @@ static void _vala_array_add113 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add114 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add115 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5351,7 +5351,7 @@ static void _vala_array_add114 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add115 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add116 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5368,7 +5368,7 @@ static void _vala_array_add115 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add116 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add117 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5385,7 +5385,7 @@ static void _vala_array_add116 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add117 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add118 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5402,7 +5402,7 @@ static void _vala_array_add117 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add118 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add119 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5419,7 +5419,7 @@ static void _vala_array_add118 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add119 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add120 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5436,7 +5436,7 @@ static void _vala_array_add119 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add120 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add121 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5453,7 +5453,7 @@ static void _vala_array_add120 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add121 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add122 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5470,7 +5470,7 @@ static void _vala_array_add121 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add122 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add123 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5487,7 +5487,7 @@ static void _vala_array_add122 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add123 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add124 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5504,7 +5504,7 @@ static void _vala_array_add123 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add124 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add125 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5521,7 +5521,7 @@ static void _vala_array_add124 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add125 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add126 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5538,7 +5538,7 @@ static void _vala_array_add125 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add126 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add127 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5669,7 +5669,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 792 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = standard_print_size_new (_ ("Wallet (2 × 3 in.)"), &_tmp3_, &_tmp4_);
 #line 792 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add112 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp5_);
+		_vala_array_add113 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp5_);
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = self->priv->standard_sizes;
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5681,7 +5681,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp9_ = standard_print_size_new (_ ("Notecard (3 × 5 in.)"), &_tmp7_, &_tmp8_);
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add113 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp9_);
+		_vala_array_add114 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp9_);
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp10_ = self->priv->standard_sizes;
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5693,7 +5693,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp13_ = standard_print_size_new (_ ("4 × 6 in."), &_tmp11_, &_tmp12_);
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add114 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp13_);
+		_vala_array_add115 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp13_);
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp14_ = self->priv->standard_sizes;
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5705,7 +5705,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp17_ = standard_print_size_new (_ ("5 × 7 in."), &_tmp15_, &_tmp16_);
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add115 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp17_);
+		_vala_array_add116 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp17_);
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp18_ = self->priv->standard_sizes;
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5717,7 +5717,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp21_ = standard_print_size_new (_ ("8 × 10 in."), &_tmp19_, &_tmp20_);
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add116 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp21_);
+		_vala_array_add117 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp21_);
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp22_ = self->priv->standard_sizes;
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5729,7 +5729,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp25_ = standard_print_size_new (_ ("11 × 14 in."), &_tmp23_, &_tmp24_);
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add117 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp25_);
+		_vala_array_add118 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp25_);
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp26_ = self->priv->standard_sizes;
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5741,7 +5741,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp29_ = standard_print_size_new (_ ("16 × 20 in."), &_tmp27_, &_tmp28_);
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add118 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp29_);
+		_vala_array_add119 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp29_);
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp30_ = self->priv->standard_sizes;
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5753,7 +5753,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp33_ = standard_print_size_new ("-", &_tmp31_, &_tmp32_);
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add119 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp33_);
+		_vala_array_add120 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp33_);
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp34_ = self->priv->standard_sizes;
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5765,7 +5765,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp37_ = standard_print_size_new (_ ("Metric Wallet (9 × 13 cm)"), &_tmp35_, &_tmp36_);
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add120 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp37_);
+		_vala_array_add121 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp37_);
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp38_ = self->priv->standard_sizes;
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5777,7 +5777,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp41_ = standard_print_size_new (_ ("Postcard (10 × 15 cm)"), &_tmp39_, &_tmp40_);
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add121 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp41_);
+		_vala_array_add122 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp41_);
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp42_ = self->priv->standard_sizes;
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5789,7 +5789,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp45_ = standard_print_size_new (_ ("13 × 18 cm"), &_tmp43_, &_tmp44_);
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add122 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp45_);
+		_vala_array_add123 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp45_);
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp46_ = self->priv->standard_sizes;
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5801,7 +5801,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp49_ = standard_print_size_new (_ ("18 × 24 cm"), &_tmp47_, &_tmp48_);
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add123 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp49_);
+		_vala_array_add124 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp49_);
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp50_ = self->priv->standard_sizes;
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5813,7 +5813,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp53_ = standard_print_size_new (_ ("20 × 30 cm"), &_tmp51_, &_tmp52_);
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add124 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp53_);
+		_vala_array_add125 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp53_);
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp54_ = self->priv->standard_sizes;
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5825,7 +5825,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp57_ = standard_print_size_new (_ ("24 × 40 cm"), &_tmp55_, &_tmp56_);
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add125 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp57_);
+		_vala_array_add126 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp57_);
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp58_ = self->priv->standard_sizes;
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5837,7 +5837,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp61_ = standard_print_size_new (_ ("30 × 40 cm"), &_tmp59_, &_tmp60_);
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add126 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp61_);
+		_vala_array_add127 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp61_);
 #line 5841 "Printing.c"
 	}
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6048,7 +6048,7 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 #line 868 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6050 "Printing.c"
-			goto __catch469_g_error;
+			goto __catch478_g_error;
 		}
 #line 870 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_result_ == GTK_PRINT_OPERATION_RESULT_APPLY) {
@@ -6066,8 +6066,8 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 #line 6066 "Printing.c"
 		}
 	}
-	goto __finally469;
-	__catch469_g_error:
+	goto __finally478;
+	__catch478_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp20_;
@@ -6093,7 +6093,7 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 		_g_error_free0 (e);
 #line 6094 "Printing.c"
 	}
-	__finally469:
+	__finally478:
 #line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 867 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -7598,7 +7598,7 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 #line 1064 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7600 "Printing.c"
-				goto __catch470_g_error;
+				goto __catch479_g_error;
 			}
 #line 1065 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp52_ = photo_pixbuf;
@@ -7725,7 +7725,7 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 #line 1079 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7727 "Printing.c"
-				goto __catch470_g_error;
+				goto __catch479_g_error;
 			}
 #line 1080 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp85_ = photo_pixbuf;
@@ -7751,8 +7751,8 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 		cairo_paint (_tmp89_);
 #line 7752 "Printing.c"
 	}
-	goto __finally470;
-	__catch470_g_error:
+	goto __finally479;
+	__catch479_g_error:
 	{
 		GError* e = NULL;
 		PrintJob* _tmp90_;
@@ -7784,7 +7784,7 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 		_g_error_free0 (e);
 #line 7785 "Printing.c"
 	}
-	__finally470:
+	__finally479:
 #line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1061 "/home/jens/Source/shotwell/src/Printing.vala"