Merge branch 'release/debian/0.28.4-1'debian/0.28.4-1

1 files changed, 34 insertions, 34 deletions

diff --git a/src/Printing.c b/src/Printing.c
index 2e017b8..47e9298 100644
--- a/src/Printing.c
+++ b/src/Printing.c
@@ -708,6 +708,10 @@ GType progress_dialog_get_type (void) G_GNUC_CONST;
 #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,
@@ -764,10 +768,6 @@ 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);
@@ -5500,7 +5500,7 @@ print_manager_new (void)
 
 
 static void
-_vala_array_add113 (StandardPrintSize** * array,
+_vala_array_add112 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5522,7 +5522,7 @@ _vala_array_add113 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add114 (StandardPrintSize** * array,
+_vala_array_add113 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5544,7 +5544,7 @@ _vala_array_add114 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add115 (StandardPrintSize** * array,
+_vala_array_add114 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5566,7 +5566,7 @@ _vala_array_add115 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add116 (StandardPrintSize** * array,
+_vala_array_add115 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5588,7 +5588,7 @@ _vala_array_add116 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add117 (StandardPrintSize** * array,
+_vala_array_add116 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5610,7 +5610,7 @@ _vala_array_add117 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add118 (StandardPrintSize** * array,
+_vala_array_add117 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5632,7 +5632,7 @@ _vala_array_add118 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add119 (StandardPrintSize** * array,
+_vala_array_add118 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5654,7 +5654,7 @@ _vala_array_add119 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add120 (StandardPrintSize** * array,
+_vala_array_add119 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5676,7 +5676,7 @@ _vala_array_add120 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add121 (StandardPrintSize** * array,
+_vala_array_add120 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5698,7 +5698,7 @@ _vala_array_add121 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add122 (StandardPrintSize** * array,
+_vala_array_add121 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5720,7 +5720,7 @@ _vala_array_add122 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add123 (StandardPrintSize** * array,
+_vala_array_add122 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5742,7 +5742,7 @@ _vala_array_add123 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add124 (StandardPrintSize** * array,
+_vala_array_add123 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5764,7 +5764,7 @@ _vala_array_add124 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add125 (StandardPrintSize** * array,
+_vala_array_add124 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5786,7 +5786,7 @@ _vala_array_add125 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add126 (StandardPrintSize** * array,
+_vala_array_add125 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5808,7 +5808,7 @@ _vala_array_add126 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add127 (StandardPrintSize** * array,
+_vala_array_add126 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5946,7 +5946,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #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_add113 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp5_);
+		_vala_array_add112 (&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"
@@ -5958,7 +5958,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #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_add114 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp9_);
+		_vala_array_add113 (&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"
@@ -5970,7 +5970,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #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_add115 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp13_);
+		_vala_array_add114 (&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"
@@ -5982,7 +5982,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #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_add116 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp17_);
+		_vala_array_add115 (&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"
@@ -5994,7 +5994,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #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_add117 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp21_);
+		_vala_array_add116 (&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"
@@ -6006,7 +6006,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #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_add118 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp25_);
+		_vala_array_add117 (&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"
@@ -6018,7 +6018,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #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_add119 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp29_);
+		_vala_array_add118 (&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"
@@ -6030,7 +6030,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #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_add120 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp33_);
+		_vala_array_add119 (&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"
@@ -6042,7 +6042,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #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_add121 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp37_);
+		_vala_array_add120 (&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"
@@ -6054,7 +6054,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #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_add122 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp41_);
+		_vala_array_add121 (&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"
@@ -6066,7 +6066,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #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_add123 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp45_);
+		_vala_array_add122 (&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"
@@ -6078,7 +6078,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #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_add124 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp49_);
+		_vala_array_add123 (&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"
@@ -6090,7 +6090,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #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_add125 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp53_);
+		_vala_array_add124 (&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"
@@ -6102,7 +6102,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #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_add126 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp57_);
+		_vala_array_add125 (&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"
@@ -6114,7 +6114,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #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_add127 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp61_);
+		_vala_array_add126 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp61_);
 #line 6118 "Printing.c"
 	}
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"