diff options
Diffstat (limited to 'src/Photo.c')
| -rw-r--r-- | src/Photo.c | 142 |
1 files changed, 71 insertions, 71 deletions
diff --git a/src/Photo.c b/src/Photo.c index 3509b5d..3da6c81 100644 --- a/src/Photo.c +++ b/src/Photo.c @@ -2273,18 +2273,18 @@ BackingFileState* backing_file_state_new_from_photo_row (BackingPhotoRow* photo_ BackingFileState* backing_file_state_construct_from_photo_row (GType object_type, BackingPhotoRow* photo_row, const gchar* md5); -static void _vala_array_add89 (BackingFileState** * array, +static void _vala_array_add88 (BackingFileState** * array, int* length, int* size, BackingFileState* value); gboolean photo_has_editable (Photo* self); -static void _vala_array_add90 (BackingFileState** * array, +static void _vala_array_add89 (BackingFileState** * array, int* length, int* size, BackingFileState* value); gboolean photo_is_developed (Photo* self); GeeCollection* photo_get_raw_development_photo_rows (Photo* self); -static void _vala_array_add91 (BackingFileState** * array, +static void _vala_array_add90 (BackingFileState** * array, int* length, int* size, BackingFileState* value); @@ -2391,6 +2391,10 @@ GType photo_reimport_master_state_get_type (void) G_GNUC_CONST; gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState* * reimport_state, GError** error); +static void _vala_array_add91 (gchar** * array, + int* length, + int* size, + gchar* value); static void _vala_array_add92 (gchar** * array, int* length, int* size, @@ -2411,10 +2415,6 @@ static void _vala_array_add96 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add97 (gchar** * array, - int* length, - int* size, - gchar* value); static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_new (PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, @@ -2437,11 +2437,11 @@ void photo_table_reimport (PhotoTable* self, GError** error); void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from); -static void _vala_array_add98 (gchar** * array, +static void _vala_array_add97 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add99 (gchar** * array, +static void _vala_array_add98 (gchar** * array, int* length, int* size, gchar* value); @@ -2611,6 +2611,10 @@ void photo_table_set_filepath (PhotoTable* self, void media_source_notify_master_replaced (MediaSource* self, GFile* old_file, GFile* new_file); +static void _vala_array_add99 (gchar** * array, + int* length, + int* size, + gchar* value); static void _vala_array_add100 (gchar** * array, int* length, int* size, @@ -2623,25 +2627,21 @@ static void _vala_array_add102 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add103 (gchar** * array, - int* length, - int* size, - gchar* value); void photo_set_editable_file (Photo* self, GFile* file); void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* id, const gchar* filepath, GError** error); -static void _vala_array_add104 (gchar** * array, +static void _vala_array_add103 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add105 (gchar** * array, +static void _vala_array_add104 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add106 (gchar** * array, +static void _vala_array_add105 (gchar** * array, int* length, int* size, gchar* value); @@ -3128,6 +3128,10 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, time_t timestamp, gint64 filesize, GError** error); +static void _vala_array_add106 (gchar** * array, + int* length, + int* size, + gchar* value); static void _vala_array_add107 (gchar** * array, int* length, int* size, @@ -3148,10 +3152,6 @@ static void _vala_array_add111 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add112 (gchar** * array, - int* length, - int* size, - gchar* value); void backing_photo_id_init (BackingPhotoID *self, gint64 id); const gchar* g_file_monitor_event_to_string (GFileMonitorEvent self); @@ -8432,7 +8432,7 @@ photo_redevelop_raw (Photo* self, static void -_vala_array_add89 (BackingFileState** * array, +_vala_array_add88 (BackingFileState** * array, int* length, int* size, BackingFileState* value) @@ -8454,7 +8454,7 @@ _vala_array_add89 (BackingFileState** * array, static void -_vala_array_add90 (BackingFileState** * array, +_vala_array_add89 (BackingFileState** * array, int* length, int* size, BackingFileState* value) @@ -8476,7 +8476,7 @@ _vala_array_add90 (BackingFileState** * array, static void -_vala_array_add91 (BackingFileState** * array, +_vala_array_add90 (BackingFileState** * array, int* length, int* size, BackingFileState* value) @@ -8551,7 +8551,7 @@ photo_real_get_backing_files_state (MediaSource* base, #line 940 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = backing_file_state_new_from_photo_row (_tmp4_, _tmp6_); #line 940 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add89 (&backing, &backing_length1, &_backing_size_, _tmp7_); + _vala_array_add88 (&backing, &backing_length1, &_backing_size_, _tmp7_); #line 941 "/home/jens/Source/shotwell/src/Photo.vala" if (photo_has_editable (self)) { #line 8558 "Photo.c" @@ -8568,7 +8568,7 @@ photo_real_get_backing_files_state (MediaSource* base, #line 942 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = backing_file_state_new_from_photo_row (_tmp9_, NULL); #line 942 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add90 (&backing, &backing_length1, &_backing_size_, _tmp10_); + _vala_array_add89 (&backing, &backing_length1, &_backing_size_, _tmp10_); #line 8573 "Photo.c" } #line 944 "/home/jens/Source/shotwell/src/Photo.vala" @@ -8638,7 +8638,7 @@ photo_real_get_backing_files_state (MediaSource* base, #line 949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = backing_file_state_new_from_photo_row (_tmp21_, NULL); #line 949 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add91 (&backing, &backing_length1, &_backing_size_, _tmp22_); + _vala_array_add90 (&backing, &backing_length1, &_backing_size_, _tmp22_); #line 947 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (r); #line 8645 "Photo.c" @@ -11682,7 +11682,7 @@ photo_query_backing_photo_row (Photo* self, static void -_vala_array_add92 (gchar** * array, +_vala_array_add91 (gchar** * array, int* length, int* size, gchar* value) @@ -11704,7 +11704,7 @@ _vala_array_add92 (gchar** * array, static void -_vala_array_add93 (gchar** * array, +_vala_array_add92 (gchar** * array, int* length, int* size, gchar* value) @@ -11726,7 +11726,7 @@ _vala_array_add93 (gchar** * array, static void -_vala_array_add94 (gchar** * array, +_vala_array_add93 (gchar** * array, int* length, int* size, gchar* value) @@ -11748,7 +11748,7 @@ _vala_array_add94 (gchar** * array, static void -_vala_array_add95 (gchar** * array, +_vala_array_add94 (gchar** * array, int* length, int* size, gchar* value) @@ -11770,7 +11770,7 @@ _vala_array_add95 (gchar** * array, static void -_vala_array_add96 (gchar** * array, +_vala_array_add95 (gchar** * array, int* length, int* size, gchar* value) @@ -11792,7 +11792,7 @@ _vala_array_add96 (gchar** * array, static void -_vala_array_add97 (gchar** * array, +_vala_array_add96 (gchar** * array, int* length, int* size, gchar* value) @@ -12123,7 +12123,7 @@ photo_prepare_for_reimport_master (Photo* self, #line 1462 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = g_strdup ("metadata:md5"); #line 1462 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add92 (&list, &list_length1, &_list_size_, _tmp35_); + _vala_array_add91 (&list, &list_length1, &_list_size_, _tmp35_); #line 12126 "Photo.c" } #line 1464 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12153,7 +12153,7 @@ photo_prepare_for_reimport_master (Photo* self, #line 1465 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = g_strdup ("image:orientation"); #line 1465 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add93 (&list, &list_length1, &_list_size_, _tmp42_); + _vala_array_add92 (&list, &list_length1, &_list_size_, _tmp42_); #line 1466 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = updated_row; #line 1466 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12240,7 +12240,7 @@ photo_prepare_for_reimport_master (Photo* self, #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = g_strdup ("metadata:exposure-time"); #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add94 (&list, &list_length1, &_list_size_, _tmp58_); + _vala_array_add93 (&list, &list_length1, &_list_size_, _tmp58_); #line 12243 "Photo.c" } #line 1474 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12272,7 +12272,7 @@ photo_prepare_for_reimport_master (Photo* self, #line 1475 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = g_strdup ("metadata:name"); #line 1475 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add95 (&list, &list_length1, &_list_size_, _tmp67_); + _vala_array_add94 (&list, &list_length1, &_list_size_, _tmp67_); #line 12275 "Photo.c" } #line 1477 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12304,7 +12304,7 @@ photo_prepare_for_reimport_master (Photo* self, #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76_ = g_strdup ("metadata:comment"); #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add96 (&list, &list_length1, &_list_size_, _tmp76_); + _vala_array_add95 (&list, &list_length1, &_list_size_, _tmp76_); #line 12307 "Photo.c" } #line 1480 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12328,7 +12328,7 @@ photo_prepare_for_reimport_master (Photo* self, #line 1481 "/home/jens/Source/shotwell/src/Photo.vala" _tmp82_ = g_strdup ("metadata:rating"); #line 1481 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add97 (&list, &list_length1, &_list_size_, _tmp82_); + _vala_array_add96 (&list, &list_length1, &_list_size_, _tmp82_); #line 12331 "Photo.c" } #line 1469 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12556,7 +12556,7 @@ _photo_reimport_master_state_ref0 (gpointer self) static void -_vala_array_add98 (gchar** * array, +_vala_array_add97 (gchar** * array, int* length, int* size, gchar* value) @@ -12578,7 +12578,7 @@ _vala_array_add98 (gchar** * array, static void -_vala_array_add99 (gchar** * array, +_vala_array_add98 (gchar** * array, int* length, int* size, gchar* value) @@ -12786,7 +12786,7 @@ photo_finish_reimport_master (Photo* self, #line 1529 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = g_strdup ("image:master"); #line 1529 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add98 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp23_); + _vala_array_add97 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp23_); #line 1530 "/home/jens/Source/shotwell/src/Photo.vala" if (photo_is_master_baseline (self)) { #line 12791 "Photo.c" @@ -12800,7 +12800,7 @@ photo_finish_reimport_master (Photo* self, #line 1531 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = g_strdup ("image:baseline"); #line 1531 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add99 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp25_); + _vala_array_add98 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp25_); #line 12803 "Photo.c" } } @@ -14879,10 +14879,10 @@ photo_real_get_file (MediaSource* base) static void -_vala_array_add100 (gchar** * array, - int* length, - int* size, - gchar* value) +_vala_array_add99 (gchar** * array, + int* length, + int* size, + gchar* value) { #line 1870 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { @@ -14901,7 +14901,7 @@ _vala_array_add100 (gchar** * array, static void -_vala_array_add101 (gchar** * array, +_vala_array_add100 (gchar** * array, int* length, int* size, gchar* value) @@ -14923,7 +14923,7 @@ _vala_array_add101 (gchar** * array, static void -_vala_array_add102 (gchar** * array, +_vala_array_add101 (gchar** * array, int* length, int* size, gchar* value) @@ -14945,7 +14945,7 @@ _vala_array_add102 (gchar** * array, static void -_vala_array_add103 (gchar** * array, +_vala_array_add102 (gchar** * array, int* length, int* size, gchar* value) @@ -15274,7 +15274,7 @@ photo_set_master_file (Photo* self, #line 1870 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = g_strdup ("backing:master"); #line 1870 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add100 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp38_); + _vala_array_add99 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp38_); #line 1874 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = name_changed; #line 1874 "/home/jens/Source/shotwell/src/Photo.vala" @@ -15290,7 +15290,7 @@ photo_set_master_file (Photo* self, #line 1875 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = g_strdup ("metadata:name"); #line 1875 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add101 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp41_); + _vala_array_add100 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp41_); #line 15293 "Photo.c" } #line 1877 "/home/jens/Source/shotwell/src/Photo.vala" @@ -15308,7 +15308,7 @@ photo_set_master_file (Photo* self, #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = g_strdup ("backing:source"); #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add102 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp44_); + _vala_array_add101 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp44_); #line 15311 "Photo.c" } #line 1880 "/home/jens/Source/shotwell/src/Photo.vala" @@ -15326,7 +15326,7 @@ photo_set_master_file (Photo* self, #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = g_strdup ("backing:baseline"); #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add103 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp47_); + _vala_array_add102 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp47_); #line 15329 "Photo.c" } #line 1883 "/home/jens/Source/shotwell/src/Photo.vala" @@ -15354,7 +15354,7 @@ photo_set_master_file (Photo* self, static void -_vala_array_add104 (gchar** * array, +_vala_array_add103 (gchar** * array, int* length, int* size, gchar* value) @@ -15376,7 +15376,7 @@ _vala_array_add104 (gchar** * array, static void -_vala_array_add105 (gchar** * array, +_vala_array_add104 (gchar** * array, int* length, int* size, gchar* value) @@ -15398,7 +15398,7 @@ _vala_array_add105 (gchar** * array, static void -_vala_array_add106 (gchar** * array, +_vala_array_add105 (gchar** * array, int* length, int* size, gchar* value) @@ -15719,7 +15719,7 @@ photo_set_editable_file (Photo* self, #line 1923 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = g_strdup ("backing:editable"); #line 1923 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add104 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp34_); + _vala_array_add103 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp34_); #line 1925 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = is_baseline; #line 1925 "/home/jens/Source/shotwell/src/Photo.vala" @@ -15735,7 +15735,7 @@ photo_set_editable_file (Photo* self, #line 1926 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = g_strdup ("backing:baseline"); #line 1926 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add105 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp37_); + _vala_array_add104 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp37_); #line 15738 "Photo.c" } #line 1928 "/home/jens/Source/shotwell/src/Photo.vala" @@ -15753,7 +15753,7 @@ photo_set_editable_file (Photo* self, #line 1929 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = g_strdup ("backing:source"); #line 1929 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add106 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp40_); + _vala_array_add105 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp40_); #line 15756 "Photo.c" } #line 1931 "/home/jens/Source/shotwell/src/Photo.vala" @@ -28285,7 +28285,7 @@ photo_reimport_editable (Photo* self, static void -_vala_array_add107 (gchar** * array, +_vala_array_add106 (gchar** * array, int* length, int* size, gchar* value) @@ -28307,7 +28307,7 @@ _vala_array_add107 (gchar** * array, static void -_vala_array_add108 (gchar** * array, +_vala_array_add107 (gchar** * array, int* length, int* size, gchar* value) @@ -28329,7 +28329,7 @@ _vala_array_add108 (gchar** * array, static void -_vala_array_add109 (gchar** * array, +_vala_array_add108 (gchar** * array, int* length, int* size, gchar* value) @@ -28351,7 +28351,7 @@ _vala_array_add109 (gchar** * array, static void -_vala_array_add110 (gchar** * array, +_vala_array_add109 (gchar** * array, int* length, int* size, gchar* value) @@ -28373,7 +28373,7 @@ _vala_array_add110 (gchar** * array, static void -_vala_array_add111 (gchar** * array, +_vala_array_add110 (gchar** * array, int* length, int* size, gchar* value) @@ -28395,7 +28395,7 @@ _vala_array_add111 (gchar** * array, static void -_vala_array_add112 (gchar** * array, +_vala_array_add111 (gchar** * array, int* length, int* size, gchar* value) @@ -29239,7 +29239,7 @@ photo_update_editable (Photo* self, #line 4026 "/home/jens/Source/shotwell/src/Photo.vala" _tmp99_ = g_strdup ("metadata:editable-timestamp"); #line 4026 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add107 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp99_); + _vala_array_add106 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp99_); #line 4027 "/home/jens/Source/shotwell/src/Photo.vala" _tmp100_ = alteration_list; #line 4027 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29247,7 +29247,7 @@ photo_update_editable (Photo* self, #line 4027 "/home/jens/Source/shotwell/src/Photo.vala" _tmp101_ = g_strdup ("metadata:baseline-timestamp"); #line 4027 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add108 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp101_); + _vala_array_add107 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp101_); #line 4029 "/home/jens/Source/shotwell/src/Photo.vala" if (photo_is_editable_source (self)) { #line 29250 "Photo.c" @@ -29261,7 +29261,7 @@ photo_update_editable (Photo* self, #line 4030 "/home/jens/Source/shotwell/src/Photo.vala" _tmp103_ = g_strdup ("metadata:source-timestamp"); #line 4030 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add109 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp103_); + _vala_array_add108 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp103_); #line 29262 "Photo.c" } } @@ -29293,7 +29293,7 @@ photo_update_editable (Photo* self, #line 4034 "/home/jens/Source/shotwell/src/Photo.vala" _tmp107_ = g_strdup ("image:editable"); #line 4034 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add110 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp107_); + _vala_array_add109 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp107_); #line 4035 "/home/jens/Source/shotwell/src/Photo.vala" _tmp108_ = alteration_list; #line 4035 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29301,7 +29301,7 @@ photo_update_editable (Photo* self, #line 4035 "/home/jens/Source/shotwell/src/Photo.vala" _tmp109_ = g_strdup ("image:baseline"); #line 4035 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add111 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp109_); + _vala_array_add110 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp109_); #line 4037 "/home/jens/Source/shotwell/src/Photo.vala" if (photo_is_editable_source (self)) { #line 29304 "Photo.c" @@ -29315,7 +29315,7 @@ photo_update_editable (Photo* self, #line 4038 "/home/jens/Source/shotwell/src/Photo.vala" _tmp111_ = g_strdup ("image:source"); #line 4038 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add112 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp111_); + _vala_array_add111 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp111_); #line 29316 "Photo.c" } } |