From 49120f48474fc8fdc2448c75d961bc238213cfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 14:34:32 +0200 Subject: New upstream version 0.28.2 --- src/PhotoMonitor.c | 86 +++++++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'src/PhotoMonitor.c') diff --git a/src/PhotoMonitor.c b/src/PhotoMonitor.c index f9c7e9f..82de1d6 100644 --- a/src/PhotoMonitor.c +++ b/src/PhotoMonitor.c @@ -724,10 +724,10 @@ void photo_monitor_update_raw_development_file (PhotoMonitor* self, LibraryPhoto static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* base, Monitorable* monitorable, int* result_length1); gboolean photo_has_editable (Photo* self); GFile* photo_get_editable_file (Photo* self); -static void _vala_array_add131 (GFile** * array, int* length, int* size, GFile* value); -GeeCollection* photo_get_raw_developer_files (Photo* self); static void _vala_array_add132 (GFile** * array, int* length, int* size, GFile* value); -static GFile** _vala_array_dup31 (GFile** self, int length); +GeeCollection* photo_get_raw_developer_files (Photo* self); +static void _vala_array_add133 (GFile** * array, int* length, int* size, GFile* value); +static GFile** _vala_array_dup26 (GFile** self, int length); static void photo_monitor_real_update_backing_file_info (MediaMonitor* base, Monitorable* monitorable, GFile* file, GFileInfo* info); GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorable); static void photo_monitor_check_for_master_changes (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info); @@ -755,7 +755,7 @@ void photo_monitor_update_editable_file_info_altered (PhotoMonitor* self, Librar void photo_monitor_update_editable_file_alterations_completed (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info); void photo_monitor_update_reimport_editable (PhotoMonitor* self, LibraryPhoto* photo); GType raw_developer_get_type (void) G_GNUC_CONST; -void photo_set_raw_developer (Photo* self, RawDeveloper d); +void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify); GeeCollection* photo_get_raw_development_photo_rows (Photo* self); GType backing_photo_id_get_type (void) G_GNUC_CONST; BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self); @@ -2618,7 +2618,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit } -static void _vala_array_add131 (GFile** * array, int* length, int* size, GFile* value) { +static void _vala_array_add132 (GFile** * array, int* length, int* size, GFile* value) { #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if ((*length) == (*size)) { #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2635,7 +2635,7 @@ static void _vala_array_add131 (GFile** * array, int* length, int* size, GFile* } -static void _vala_array_add132 (GFile** * array, int* length, int* size, GFile* value) { +static void _vala_array_add133 (GFile** * array, int* length, int* size, GFile* value) { #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if ((*length) == (*size)) { #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2652,7 +2652,7 @@ static void _vala_array_add132 (GFile** * array, int* length, int* size, GFile* } -static GFile** _vala_array_dup31 (GFile** self, int length) { +static GFile** _vala_array_dup26 (GFile** self, int length) { GFile** result; int i; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2736,7 +2736,7 @@ static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* ba #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp7_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PHOTO, Photo)); #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_array_add131 (&files, &files_length1, &_files_size_, _tmp7_); + _vala_array_add132 (&files, &files_length1, &_files_size_, _tmp7_); #line 2739 "PhotoMonitor.c" } #line 370 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2797,7 +2797,7 @@ static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* ba #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp19_ = _g_object_ref0 (_tmp18_); #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_array_add132 (&files, &files_length1, &_files_size_, _tmp19_); + _vala_array_add133 (&files, &files_length1, &_files_size_, _tmp19_); #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (f); #line 2802 "PhotoMonitor.c" @@ -2837,7 +2837,7 @@ static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* ba #line 2836 "PhotoMonitor.c" } #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = (_tmp20_ != NULL) ? _vala_array_dup31 (_tmp20_, _tmp20__length1) : ((gpointer) _tmp20_); + _tmp23_ = (_tmp20_ != NULL) ? _vala_array_dup26 (_tmp20_, _tmp20__length1) : ((gpointer) _tmp20_); #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp23__length1 = _tmp20__length1; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -3291,7 +3291,7 @@ static void photo_monitor_check_for_raw_development_changes (PhotoMonitor* self, #line 442 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp1_ = photo; #line 442 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_set_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO, Photo), RAW_DEVELOPER_SHOTWELL); + photo_set_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO, Photo), RAW_DEVELOPER_SHOTWELL, TRUE); #line 444 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; #line 3296 "PhotoMonitor.c" @@ -6616,7 +6616,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio #line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 6617 "PhotoMonitor.c" - goto __catch586_database_error; + goto __catch595_database_error; } #line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (reimport_raw_developments); @@ -6641,8 +6641,8 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio #line 6640 "PhotoMonitor.c" } } - goto __finally586; - __catch586_database_error: + goto __finally595; + __catch595_database_error: { GError* err = NULL; GError* _tmp97_; @@ -6658,7 +6658,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio _g_error_free0 (err); #line 6658 "PhotoMonitor.c" } - __finally586: + __finally595: #line 996 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 996 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -6718,7 +6718,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio #line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 6719 "PhotoMonitor.c" - goto __catch587_database_error; + goto __catch596_database_error; } #line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (reimport_raw_developments); @@ -6743,8 +6743,8 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio #line 6742 "PhotoMonitor.c" } } - goto __finally587; - __catch587_database_error: + goto __finally596; + __catch596_database_error: { GError* err = NULL; GError* _tmp105_; @@ -6760,7 +6760,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio _g_error_free0 (err); #line 6760 "PhotoMonitor.c" } - __finally587: + __finally596: #line 1006 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1006 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -7437,7 +7437,7 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 7437 "PhotoMonitor.c" - goto __catch588_database_error; + goto __catch597_database_error; } #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); @@ -7450,8 +7450,8 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo #line 7448 "PhotoMonitor.c" } } - goto __finally588; - __catch588_database_error: + goto __finally597; + __catch597_database_error: { GError* err = NULL; GError* _tmp26_; @@ -7467,7 +7467,7 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo _g_error_free0 (err); #line 7466 "PhotoMonitor.c" } - __finally588: + __finally597: #line 1084 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1084 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -7650,7 +7650,7 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 7650 "PhotoMonitor.c" - goto __catch589_database_error; + goto __catch598_database_error; } #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); @@ -7663,8 +7663,8 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background #line 7661 "PhotoMonitor.c" } } - goto __finally589; - __catch589_database_error: + goto __finally598; + __catch598_database_error: { GError* err = NULL; GError* _tmp20_; @@ -7680,7 +7680,7 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background _g_error_free0 (err); #line 7679 "PhotoMonitor.c" } - __finally589: + __finally598: #line 1115 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1115 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -7844,7 +7844,7 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 7844 "PhotoMonitor.c" - goto __catch590_database_error; + goto __catch599_database_error; } #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); @@ -7857,8 +7857,8 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac #line 7855 "PhotoMonitor.c" } } - goto __finally590; - __catch590_database_error: + goto __finally599; + __catch599_database_error: { GError* err = NULL; GError* _tmp20_; @@ -7874,7 +7874,7 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac _g_error_free0 (err); #line 7873 "PhotoMonitor.c" } - __finally590: + __finally599: #line 1142 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1142 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -8030,14 +8030,14 @@ static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base) #line 176 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 8030 "PhotoMonitor.c" - goto __catch591_g_error; + goto __catch600_g_error; } #line 176 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->mark_online = _tmp0_; #line 8035 "PhotoMonitor.c" } - goto __finally591; - __catch591_g_error: + goto __finally600; + __catch600_g_error: { GError* err = NULL; GError* _tmp4_; @@ -8058,7 +8058,7 @@ static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base) _g_error_free0 (err); #line 8057 "PhotoMonitor.c" } - __finally591: + __finally600: #line 175 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 175 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -8208,14 +8208,14 @@ static void photo_monitor_reimport_editable_job_real_execute (BackgroundJob* bas #line 198 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 8208 "PhotoMonitor.c" - goto __catch592_g_error; + goto __catch601_g_error; } #line 198 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->success = _tmp0_; #line 8213 "PhotoMonitor.c" } - goto __finally592; - __catch592_g_error: + goto __finally601; + __catch601_g_error: { GError* err = NULL; GError* _tmp4_; @@ -8236,7 +8236,7 @@ static void photo_monitor_reimport_editable_job_real_execute (BackgroundJob* bas _g_error_free0 (err); #line 8235 "PhotoMonitor.c" } - __finally592: + __finally601: #line 197 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 197 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -8386,14 +8386,14 @@ static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJ #line 220 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 8386 "PhotoMonitor.c" - goto __catch593_g_error; + goto __catch602_g_error; } #line 220 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->success = _tmp0_; #line 8391 "PhotoMonitor.c" } - goto __finally593; - __catch593_g_error: + goto __finally602; + __catch602_g_error: { GError* err = NULL; GError* _tmp4_; @@ -8414,7 +8414,7 @@ static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJ _g_error_free0 (err); #line 8413 "PhotoMonitor.c" } - __finally593: + __finally602: #line 219 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 219 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" -- cgit v1.2.3