Update upstream source from tag 'upstream/0.28.4'

Update to upstream version '0.28.4'
with Debian dir 6b82ec3fb97aab0b3e4bb752f68e0be9dfaea63e

1 files changed, 16 insertions, 16 deletions

diff --git a/src/CollectionPage.c b/src/CollectionPage.c
index 6086969..9c194d3 100644
--- a/src/CollectionPage.c
+++ b/src/CollectionPage.c
@@ -1256,6 +1256,10 @@ static InjectionGroup** collection_page_real_init_collect_injection_groups (Page
                                                                      int* result_length1);
 InjectionGroup** page_init_collect_injection_groups (Page* self,
                                                      int* result_length1);
+static void _vala_array_add79 (InjectionGroup** * array,
+                        int* length,
+                        int* size,
+                        InjectionGroup* value);
 static void _vala_array_add80 (InjectionGroup** * array,
                         int* length,
                         int* size,
@@ -1276,10 +1280,6 @@ static void _vala_array_add84 (InjectionGroup** * array,
                         int* length,
                         int* size,
                         InjectionGroup* value);
-static void _vala_array_add85 (InjectionGroup** * array,
-                        int* length,
-                        int* size,
-                        InjectionGroup* value);
 static gboolean collection_page_selection_has_video (CollectionPage* self);
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
@@ -2369,7 +2369,7 @@ collection_page_real_remove_actions (Page* base,
 
 
 static void
-_vala_array_add80 (InjectionGroup** * array,
+_vala_array_add79 (InjectionGroup** * array,
                    int* length,
                    int* size,
                    InjectionGroup* value)
@@ -2391,7 +2391,7 @@ _vala_array_add80 (InjectionGroup** * array,
 
 
 static void
-_vala_array_add81 (InjectionGroup** * array,
+_vala_array_add80 (InjectionGroup** * array,
                    int* length,
                    int* size,
                    InjectionGroup* value)
@@ -2413,7 +2413,7 @@ _vala_array_add81 (InjectionGroup** * array,
 
 
 static void
-_vala_array_add82 (InjectionGroup** * array,
+_vala_array_add81 (InjectionGroup** * array,
                    int* length,
                    int* size,
                    InjectionGroup* value)
@@ -2435,7 +2435,7 @@ _vala_array_add82 (InjectionGroup** * array,
 
 
 static void
-_vala_array_add83 (InjectionGroup** * array,
+_vala_array_add82 (InjectionGroup** * array,
                    int* length,
                    int* size,
                    InjectionGroup* value)
@@ -2457,7 +2457,7 @@ _vala_array_add83 (InjectionGroup** * array,
 
 
 static void
-_vala_array_add84 (InjectionGroup** * array,
+_vala_array_add83 (InjectionGroup** * array,
                    int* length,
                    int* size,
                    InjectionGroup* value)
@@ -2479,7 +2479,7 @@ _vala_array_add84 (InjectionGroup** * array,
 
 
 static void
-_vala_array_add85 (InjectionGroup** * array,
+_vala_array_add84 (InjectionGroup** * array,
                    int* length,
                    int* size,
                    InjectionGroup* value)
@@ -2548,7 +2548,7 @@ collection_page_real_init_collect_injection_groups (Page* base,
 #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = collection_page_create_file_menu_injectables ();
 #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add80 (&groups, &groups_length1, &_groups_size_, _tmp3_);
+	_vala_array_add79 (&groups, &groups_length1, &_groups_size_, _tmp3_);
 #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = groups;
 #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2556,7 +2556,7 @@ collection_page_real_init_collect_injection_groups (Page* base,
 #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = collection_page_create_edit_menu_injectables ();
 #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add81 (&groups, &groups_length1, &_groups_size_, _tmp5_);
+	_vala_array_add80 (&groups, &groups_length1, &_groups_size_, _tmp5_);
 #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = groups;
 #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2564,7 +2564,7 @@ collection_page_real_init_collect_injection_groups (Page* base,
 #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = collection_page_create_view_menu_fullscreen_injectables ();
 #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add82 (&groups, &groups_length1, &_groups_size_, _tmp7_);
+	_vala_array_add81 (&groups, &groups_length1, &_groups_size_, _tmp7_);
 #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = groups;
 #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2572,7 +2572,7 @@ collection_page_real_init_collect_injection_groups (Page* base,
 #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = collection_page_create_photos_menu_edits_injectables ();
 #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add83 (&groups, &groups_length1, &_groups_size_, _tmp9_);
+	_vala_array_add82 (&groups, &groups_length1, &_groups_size_, _tmp9_);
 #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = groups;
 #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2580,7 +2580,7 @@ collection_page_real_init_collect_injection_groups (Page* base,
 #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = collection_page_create_photos_menu_date_injectables ();
 #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add84 (&groups, &groups_length1, &_groups_size_, _tmp11_);
+	_vala_array_add83 (&groups, &groups_length1, &_groups_size_, _tmp11_);
 #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = groups;
 #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2588,7 +2588,7 @@ collection_page_real_init_collect_injection_groups (Page* base,
 #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = collection_page_create_photos_menu_externals_injectables ();
 #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add85 (&groups, &groups_length1, &_groups_size_, _tmp13_);
+	_vala_array_add84 (&groups, &groups_length1, &_groups_size_, _tmp13_);
 #line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = groups;
 #line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"