Merge branch 'feature/upstream' into develop

1 files changed, 16 insertions, 16 deletions

diff --git a/src/direct/DirectPhotoPage.c b/src/direct/DirectPhotoPage.c
index 07f26d9..ae2a47c 100644
--- a/src/direct/DirectPhotoPage.c
+++ b/src/direct/DirectPhotoPage.c
@@ -722,8 +722,8 @@ InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_len
 InjectionGroup* injection_group_new (const gchar* path);
 InjectionGroup* injection_group_construct (GType object_type, const gchar* path);
 void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action, const gchar* accellerator);
-static void _vala_array_add61 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add62 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add64 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add65 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
 gboolean photo_file_format_is_file_supported (GFile* file);
 #define RESOURCES_APP_TITLE "Shotwell"
@@ -846,9 +846,9 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print);
 GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t);
 static Block7Data* block7_data_ref (Block7Data* _data7_);
 static void block7_data_unref (void * _userdata_);
-static gboolean __lambda16_ (Block7Data* _data7_);
+static gboolean __lambda17_ (Block7Data* _data7_);
 void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_enable);
-static gboolean ___lambda16__gsource_func (gpointer self);
+static gboolean ___lambda17__gsource_func (gpointer self);
 static DataView* direct_photo_page_real_create_photo_view (EditingHostPage* base, DataSource* source);
 static void direct_photo_page_finalize (GObject * obj);
 GType direct_fullscreen_photo_page_get_type (void) G_GNUC_CONST;
@@ -1242,7 +1242,7 @@ static gpointer _injection_group_ref0 (gpointer self) {
 }
 
 
-static void _vala_array_add61 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add64 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if ((*length) == (*size)) {
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1259,7 +1259,7 @@ static void _vala_array_add61 (InjectionGroup** * array, int* length, int* size,
 }
 
 
-static void _vala_array_add62 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add65 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if ((*length) == (*size)) {
 #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1319,7 +1319,7 @@ static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Pa
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp4_ = _injection_group_ref0 (print_group);
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add61 (&groups, &groups_length1, &_groups_size_, _tmp4_);
+	_vala_array_add64 (&groups, &groups_length1, &_groups_size_, _tmp4_);
 #line 89 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = injection_group_new ("SetBackgroundPlaceholder");
 #line 89 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1333,7 +1333,7 @@ static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Pa
 #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp7_ = _injection_group_ref0 (bg_group);
 #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add62 (&groups, &groups_length1, &_groups_size_, _tmp7_);
+	_vala_array_add65 (&groups, &groups_length1, &_groups_size_, _tmp7_);
 #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = groups;
 #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2871,11 +2871,11 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 #line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2874 "DirectPhotoPage.c"
-			goto __catch48_g_error;
+			goto __catch52_g_error;
 		}
 	}
-	goto __finally48;
-	__catch48_g_error:
+	goto __finally52;
+	__catch52_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp11_;
@@ -2915,7 +2915,7 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 		return;
 #line 2917 "DirectPhotoPage.c"
 	}
-	__finally48:
+	__finally52:
 #line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -3666,7 +3666,7 @@ static void block7_data_unref (void * _userdata_) {
 }
 
 
-static gboolean __lambda16_ (Block7Data* _data7_) {
+static gboolean __lambda17_ (Block7Data* _data7_) {
 	DirectPhotoPage* self;
 	gboolean result = FALSE;
 	gboolean _tmp0_;
@@ -3684,9 +3684,9 @@ static gboolean __lambda16_ (Block7Data* _data7_) {
 }
 
 
-static gboolean ___lambda16__gsource_func (gpointer self) {
+static gboolean ___lambda17__gsource_func (gpointer self) {
 	gboolean result;
-	result = __lambda16_ (self);
+	result = __lambda17_ (self);
 #line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
 #line 3693 "DirectPhotoPage.c"
@@ -3709,7 +3709,7 @@ static void direct_photo_page_on_dphoto_can_rotate_changed (DirectPhotoPage* sel
 #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data7_->should_allow_rotation = _tmp0_;
 #line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda16__gsource_func, block7_data_ref (_data7_), block7_data_unref);
+	g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda17__gsource_func, block7_data_ref (_data7_), block7_data_unref);
 #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	block7_data_unref (_data7_);
 #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"