diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2018-07-20 23:24:50 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2018-07-20 23:24:50 +0200 |
| commit | 871b797a84db1fd625fe13991d4da2bb25adc1d2 (patch) | |
| tree | 95dd14c2998d80bbea4c33d207a0a1fca8184635 /src/PhotoMonitor.c | |
| parent | 313caf3932fab12b6cbf9c4f11cd80c8f25c92cf (diff) | |
| parent | a099c47b6645d9642e49144d83b26e609fa5ec2f (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/PhotoMonitor.c')
| -rw-r--r-- | src/PhotoMonitor.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/PhotoMonitor.c b/src/PhotoMonitor.c index c87391c..158acec 100644 --- a/src/PhotoMonitor.c +++ b/src/PhotoMonitor.c @@ -805,12 +805,12 @@ static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* ba int* result_length1); gboolean photo_has_editable (Photo* self); GFile* photo_get_editable_file (Photo* self); -static void _vala_array_add132 (GFile** * array, +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_add133 (GFile** * array, +static void _vala_array_add132 (GFile** * array, int* length, int* size, GFile* value); @@ -2853,7 +2853,7 @@ photo_monitor_real_candidates_for_unknown_file (MediaMonitor* base, static void -_vala_array_add132 (GFile** * array, +_vala_array_add131 (GFile** * array, int* length, int* size, GFile* value) @@ -2875,7 +2875,7 @@ _vala_array_add132 (GFile** * array, static void -_vala_array_add133 (GFile** * array, +_vala_array_add132 (GFile** * array, int* length, int* size, GFile* value) @@ -2981,7 +2981,7 @@ photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* base, #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp5_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO, Photo)); #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_array_add132 (&files, &files_length1, &_files_size_, _tmp5_); + _vala_array_add131 (&files, &files_length1, &_files_size_, _tmp5_); #line 2984 "PhotoMonitor.c" } #line 370 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -3039,7 +3039,7 @@ photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* base, #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp16_ = _g_object_ref0 (_tmp15_); #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_array_add133 (&files, &files_length1, &_files_size_, _tmp16_); + _vala_array_add132 (&files, &files_length1, &_files_size_, _tmp16_); #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (f); #line 3044 "PhotoMonitor.c" |