diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-06-25 21:12:13 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-06-25 21:12:13 +0200 |
| commit | 059a62ee3c820a42fbce980c3256049adecc9100 (patch) | |
| tree | e51eab94fd7d65459640ca227fb2257bb41d2acb /src/db/PhotoTable.c | |
| parent | 55778740c211992cc86ea87588ab62c6750f36d1 (diff) | |
| parent | e8f4d7a9cdd37c5a9fb3b6991a4e9173829808da (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/db/PhotoTable.c')
| -rw-r--r-- | src/db/PhotoTable.c | 7658 |
1 files changed, 3528 insertions, 4130 deletions
diff --git a/src/db/PhotoTable.c b/src/db/PhotoTable.c index 3fd09f6..a2832f0 100644 --- a/src/db/PhotoTable.c +++ b/src/db/PhotoTable.c @@ -1,4 +1,4 @@ -/* PhotoTable.c generated by valac 0.36.6, the Vala compiler +/* PhotoTable.c generated by valac 0.40.4, the Vala compiler * generated from PhotoTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include <glib.h> #include <glib-object.h> #include <string.h> @@ -285,36 +286,53 @@ GType photo_id_get_type (void) G_GNUC_CONST; PhotoID* photo_id_dup (const PhotoID* self); void photo_id_free (PhotoID* self); #define PHOTO_ID_INVALID ((gint64) -1) -void photo_id_init (PhotoID *self, gint64 id); +void photo_id_init (PhotoID *self, + gint64 id); gboolean photo_id_is_invalid (PhotoID *self); gboolean photo_id_is_valid (PhotoID *self); guint photo_id_hash (PhotoID *self); guint int64_hash (gint64* n); -gboolean photo_id_equal (void* a, void* b); +gboolean photo_id_equal (void* a, + void* b); gchar* photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id); #define PHOTO_TYPENAME "thumb" GType import_id_get_type (void) G_GNUC_CONST; ImportID* import_id_dup (const ImportID* self); void import_id_free (ImportID* self); #define IMPORT_ID_INVALID ((gint64) 0) -void import_id_init (ImportID *self, gint64 id); +void import_id_init (ImportID *self, + gint64 id); void import_id_generate (ImportID* result); gboolean import_id_is_invalid (ImportID *self); gboolean import_id_is_valid (ImportID *self); -gint import_id_compare_func (ImportID* a, ImportID* b); -gint64 import_id_comparator (void* a, void* b); +gint import_id_compare_func (ImportID* a, + ImportID* b); +gint64 import_id_comparator (void* a, + void* b); gpointer photo_row_ref (gpointer instance); void photo_row_unref (gpointer instance); -GParamSpec* param_spec_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_row (GValue* value, gpointer v_object); -void value_take_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_row (GValue* value, + gpointer v_object); +void value_take_photo_row (GValue* value, + gpointer v_object); gpointer value_get_photo_row (const GValue* value); GType photo_row_get_type (void) G_GNUC_CONST; gpointer backing_photo_row_ref (gpointer instance); void backing_photo_row_unref (gpointer instance); -GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_photo_row (GValue* value, gpointer v_object); -void value_take_backing_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_photo_row (GValue* value, + gpointer v_object); +void value_take_backing_photo_row (GValue* value, + gpointer v_object); gpointer value_get_backing_photo_row (const GValue* value); GType backing_photo_row_get_type (void) G_GNUC_CONST; GType event_id_get_type (void) G_GNUC_CONST; @@ -326,36 +344,42 @@ GType backing_photo_id_get_type (void) G_GNUC_CONST; BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self); void backing_photo_id_free (BackingPhotoID* self); GType raw_developer_get_type (void) G_GNUC_CONST; -enum { - PHOTO_ROW_DUMMY_PROPERTY -}; PhotoRow* photo_row_new (void); PhotoRow* photo_row_construct (GType object_type); BackingPhotoRow* backing_photo_row_new (void); BackingPhotoRow* backing_photo_row_construct (GType object_type); #define BACKING_PHOTO_ID_INVALID ((gint64) -1) -void backing_photo_id_init (BackingPhotoID *self, gint64 id); +void backing_photo_id_init (BackingPhotoID *self, + gint64 id); RawDeveloper* raw_developer_as_array (int* result_length1); static void photo_row_finalize (PhotoRow * obj); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType photo_table_get_type (void) G_GNUC_CONST; -enum { - PHOTO_TABLE_DUMMY_PROPERTY -}; static PhotoTable* photo_table_new (void); static PhotoTable* photo_table_construct (GType object_type); DatabaseTable* database_table_construct (GType object_type); -void database_table_fatal (const gchar* op, gint res); -void database_table_warning (const gchar* op, gint res); -void database_table_set_table_name (DatabaseTable* self, const gchar* table_name); +void database_table_fatal (const gchar* op, + gint res); +void database_table_warning (const gchar* op, + gint res); +void database_table_set_table_name (DatabaseTable* self, + const gchar* table_name); PhotoTable* photo_table_get_instance (void); -void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result); +void photo_table_add (PhotoTable* self, + PhotoRow* photo_row, + PhotoID* result); gulong now_sec (void); GType photo_file_format_get_type (void) G_GNUC_CONST; GType dimensions_get_type (void) G_GNUC_CONST; @@ -365,104 +389,249 @@ void dimensions_free (Dimensions* self); gint photo_file_format_serialize (PhotoFileFormat self); gint rating_serialize (Rating self); gchar* raw_developer_to_string (RawDeveloper self); -void event_id_init (EventID *self, gint64 id); +void event_id_init (EventID *self, + gint64 id); GQuark database_error_quark (void); -void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error); -void database_table_throw_error (const gchar* method, gint res, GError** error); -gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gint64 filesize, glong timestamp, const gchar* md5, const gchar* exif_md5, const gchar* thumbnail_md5, PhotoRow* row); -static void photo_table_validate_orientation (PhotoTable* self, PhotoRow* row); -gboolean photo_table_set_orientation (PhotoTable* self, PhotoID* photo_id, Orientation orientation); -PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id); -void dimensions_init (Dimensions *self, gint width, gint height); +void photo_table_reimport (PhotoTable* self, + PhotoRow* row, + GError** error); +void database_table_throw_error (const gchar* method, + gint res, + GError** error); +gboolean photo_table_master_exif_updated (PhotoTable* self, + PhotoID* photoID, + gint64 filesize, + glong timestamp, + const gchar* md5, + const gchar* exif_md5, + const gchar* thumbnail_md5, + PhotoRow* row); +static void photo_table_validate_orientation (PhotoTable* self, + PhotoRow* row); +gboolean photo_table_set_orientation (PhotoTable* self, + PhotoID* photo_id, + Orientation orientation); +PhotoRow* photo_table_get_row (PhotoTable* self, + PhotoID* photo_id); +void dimensions_init (Dimensions *self, + gint width, + gint height); GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans); Rating rating_unserialize (gint value); PhotoFileFormat photo_file_format_unserialize (gint value); RawDeveloper raw_developer_from_string (const gchar* value); GeeArrayList* photo_table_get_all (PhotoTable* self); -void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* new_filename, BackingPhotoID* editable_id, BackingPhotoID* develop_shotwell, BackingPhotoID* develop_camera_id, BackingPhotoID* develop_embedded_id, PhotoID* result); +void photo_table_duplicate (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_filename, + BackingPhotoID* editable_id, + BackingPhotoID* develop_shotwell, + BackingPhotoID* develop_camera_id, + BackingPhotoID* develop_embedded_id, + PhotoID* result); gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations); -gboolean photo_table_set_title (PhotoTable* self, PhotoID* photo_id, const gchar* new_title); -gboolean database_table_update_text_by_id (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text); -gboolean photo_table_set_comment (PhotoTable* self, PhotoID* photo_id, const gchar* new_comment); -void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* filepath, GError** error); -void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error); -void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t timestamp, GError** error); -void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint64 value, GError** error); -gboolean photo_table_set_exposure_time (PhotoTable* self, PhotoID* photo_id, time_t time); -gboolean database_table_update_int64_by_id (DatabaseTable* self, gint64 id, const gchar* column, gint64 value); -void photo_table_set_import_id (PhotoTable* self, PhotoID* photo_id, ImportID* import_id, GError** error); -gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file); -void photo_table_remove (PhotoTable* self, PhotoID* photo_id, GError** error); -void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error); +gboolean photo_table_set_title (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_title); +gboolean database_table_update_text_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text); +gboolean photo_table_set_comment (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_comment); +void photo_table_set_filepath (PhotoTable* self, + PhotoID* photo_id, + const gchar* filepath, + GError** error); +void database_table_update_text_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text, + GError** error); +void photo_table_update_timestamp (PhotoTable* self, + PhotoID* photo_id, + time_t timestamp, + GError** error); +void database_table_update_int64_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + gint64 value, + GError** error); +gboolean photo_table_set_exposure_time (PhotoTable* self, + PhotoID* photo_id, + time_t time); +gboolean database_table_update_int64_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + gint64 value); +void photo_table_set_import_id (PhotoTable* self, + PhotoID* photo_id, + ImportID* import_id, + GError** error); +gboolean photo_table_remove_by_file (PhotoTable* self, + GFile* file); +void photo_table_remove (PhotoTable* self, + PhotoID* photo_id, + GError** error); +void database_table_delete_by_id (DatabaseTable* self, + gint64 id, + GError** error); GeeArrayList* photo_table_get_photos (PhotoTable* self); -gboolean database_table_update_int_by_id (DatabaseTable* self, gint64 id, const gchar* column, gint value); -gboolean photo_table_replace_flags (PhotoTable* self, PhotoID* photo_id, guint64 flags); -gboolean photo_table_set_rating (PhotoTable* self, PhotoID* photo_id, Rating rating); -gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id); -GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event_id); -gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id); -gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id); -gboolean photo_table_set_event (PhotoTable* self, PhotoID* photo_id, EventID* event_id); -static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* photo_id); -gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt* * stmt); -static gboolean photo_table_set_raw_transformations (PhotoTable* self, PhotoID* photo_id, const gchar* trans); -gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_id, Orientation orientation, GeeHashMap* transformations); -gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, KeyValueMap* map); -gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, const gchar* object); -gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* photo_id); -static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format); -gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format); -PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format, int* result_length1); -static void _vala_array_add2 (PhotoID* * array, int* length, int* size, const PhotoID* value); -void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gchar* backlinks, GError** error); -void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoID* editable_id, GError** error); -void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** error); -void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboolean dirty, GError** error); -void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint value, GError** error); -void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, BackingPhotoID* backing_photo_id, GError** error); -void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, GError** error); +gboolean database_table_update_int_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + gint value); +gboolean photo_table_replace_flags (PhotoTable* self, + PhotoID* photo_id, + guint64 flags); +gboolean photo_table_set_rating (PhotoTable* self, + PhotoID* photo_id, + Rating rating); +gint photo_table_get_event_photo_count (PhotoTable* self, + EventID* event_id); +GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, + EventID* event_id); +gboolean photo_table_event_has_photos (PhotoTable* self, + EventID* event_id); +gboolean photo_table_drop_event (PhotoTable* self, + EventID* event_id); +gboolean photo_table_set_event (PhotoTable* self, + PhotoID* photo_id, + EventID* event_id); +static gchar* photo_table_get_raw_transformations (PhotoTable* self, + PhotoID* photo_id); +gboolean database_table_select_by_id (DatabaseTable* self, + gint64 id, + const gchar* columns, + sqlite3_stmt* * stmt); +static gboolean photo_table_set_raw_transformations (PhotoTable* self, + PhotoID* photo_id, + const gchar* trans); +gboolean photo_table_set_transformation_state (PhotoTable* self, + PhotoID* photo_id, + Orientation orientation, + GeeHashMap* transformations); +gboolean photo_table_set_transformation (PhotoTable* self, + PhotoID* photo_id, + KeyValueMap* map); +gboolean photo_table_remove_transformation (PhotoTable* self, + PhotoID* photo_id, + const gchar* object); +gboolean photo_table_remove_all_transformations (PhotoTable* self, + PhotoID* photo_id); +static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, + GFile* file, + const gchar* thumbnail_md5, + const gchar* md5, + PhotoFileFormat file_format); +gboolean photo_table_has_duplicate (PhotoTable* self, + GFile* file, + const gchar* thumbnail_md5, + const gchar* md5, + PhotoFileFormat file_format); +PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, + GFile* file, + const gchar* thumbnail_md5, + const gchar* md5, + PhotoFileFormat file_format, + int* result_length1); +static void _vala_array_add2 (PhotoID* * array, + int* length, + int* size, + const PhotoID* value); +void photo_table_update_backlinks (PhotoTable* self, + PhotoID* photo_id, + const gchar* backlinks, + GError** error); +void photo_table_attach_editable (PhotoTable* self, + PhotoRow* row, + BackingPhotoID* editable_id, + GError** error); +void photo_table_detach_editable (PhotoTable* self, + PhotoRow* row, + GError** error); +void photo_table_set_metadata_dirty (PhotoTable* self, + PhotoID* photo_id, + gboolean dirty, + GError** error); +void database_table_update_int_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + gint value, + GError** error); +void photo_table_update_raw_development (PhotoTable* self, + PhotoRow* row, + RawDeveloper rd, + BackingPhotoID* backing_photo_id, + GError** error); +void photo_table_remove_development (PhotoTable* self, + PhotoRow* row, + RawDeveloper rd, + GError** error); static void photo_table_finalize (DatabaseTable * obj); gboolean backing_photo_id_is_invalid (BackingPhotoID *self); gboolean backing_photo_id_is_valid (BackingPhotoID *self); -enum { - BACKING_PHOTO_ROW_DUMMY_PROPERTY -}; -gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* info); -gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info); -void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from); +gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, + GFileInfo* info); +gboolean backing_photo_row_is_touched (BackingPhotoRow* self, + GFileInfo* info); +void backing_photo_row_copy_from (BackingPhotoRow* self, + BackingPhotoRow* from); static void backing_photo_row_finalize (BackingPhotoRow * obj); GType backing_photo_table_get_type (void) G_GNUC_CONST; -enum { - BACKING_PHOTO_TABLE_DUMMY_PROPERTY -}; static BackingPhotoTable* backing_photo_table_new (void); static BackingPhotoTable* backing_photo_table_construct (GType object_type); BackingPhotoTable* backing_photo_table_get_instance (void); -void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, GError** error); -BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhotoID* id, GError** error); -void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, GError** error); -void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, gint64 filesize, GError** error); -void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backing_id, GError** error); -void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* id, const gchar* filepath, GError** error); -void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, GError** error); +void backing_photo_table_add (BackingPhotoTable* self, + BackingPhotoRow* state, + GError** error); +BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, + BackingPhotoID* id, + GError** error); +void backing_photo_table_update (BackingPhotoTable* self, + BackingPhotoRow* row, + GError** error); +void backing_photo_table_update_attributes (BackingPhotoTable* self, + BackingPhotoID* id, + time_t timestamp, + gint64 filesize, + GError** error); +void backing_photo_table_remove (BackingPhotoTable* self, + BackingPhotoID* backing_id, + GError** error); +void backing_photo_table_set_filepath (BackingPhotoTable* self, + BackingPhotoID* id, + const gchar* filepath, + GError** error); +void backing_photo_table_update_timestamp (BackingPhotoTable* self, + BackingPhotoID* id, + time_t timestamp, + GError** error); static void backing_photo_table_finalize (DatabaseTable * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - - -void photo_id_init (PhotoID *self, gint64 id) { - gint64 _tmp0_; +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); + + +void +photo_id_init (PhotoID *self, + gint64 id) +{ #line 12 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" memset (self, 0, sizeof (PhotoID)); #line 13 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = id; -#line 13 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - (*self).id = _tmp0_; -#line 462 "PhotoTable.c" + (*self).id = id; +#line 629 "PhotoTable.c" } -gboolean photo_id_is_invalid (PhotoID *self) { +gboolean +photo_id_is_invalid (PhotoID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 17 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -471,11 +640,13 @@ gboolean photo_id_is_invalid (PhotoID *self) { result = _tmp0_ == PHOTO_ID_INVALID; #line 17 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 475 "PhotoTable.c" +#line 644 "PhotoTable.c" } -gboolean photo_id_is_valid (PhotoID *self) { +gboolean +photo_id_is_valid (PhotoID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 21 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -484,49 +655,47 @@ gboolean photo_id_is_valid (PhotoID *self) { result = _tmp0_ != PHOTO_ID_INVALID; #line 21 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 488 "PhotoTable.c" +#line 659 "PhotoTable.c" } -guint photo_id_hash (PhotoID *self) { +guint +photo_id_hash (PhotoID *self) +{ guint result = 0U; gint64 _tmp0_; - guint _tmp1_; #line 25 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = (*self).id; #line 25 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = int64_hash (&_tmp0_); -#line 25 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp1_; + result = int64_hash (&_tmp0_); #line 25 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 504 "PhotoTable.c" +#line 674 "PhotoTable.c" } -gboolean photo_id_equal (void* a, void* b) { +gboolean +photo_id_equal (void* a, + void* b) +{ gboolean result = FALSE; - void* _tmp0_; + gint64 _tmp0_; gint64 _tmp1_; - void* _tmp2_; - gint64 _tmp3_; #line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = a; + _tmp0_ = (*((PhotoID*) a)).id; #line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = (*((PhotoID*) _tmp0_)).id; + _tmp1_ = (*((PhotoID*) b)).id; #line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = b; -#line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = (*((PhotoID*) _tmp2_)).id; -#line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp1_ == _tmp3_; + result = _tmp0_ == _tmp1_; #line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 526 "PhotoTable.c" +#line 693 "PhotoTable.c" } -gchar* photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id) { +gchar* +photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id) +{ gchar* result = NULL; PhotoID _tmp0_; gint64 _tmp1_; @@ -543,11 +712,13 @@ gchar* photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id) { result = _tmp2_; #line 33 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 547 "PhotoTable.c" +#line 716 "PhotoTable.c" } -PhotoID* photo_id_dup (const PhotoID* self) { +PhotoID* +photo_id_dup (const PhotoID* self) +{ PhotoID* dup; #line 7 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dup = g_new0 (PhotoID, 1); @@ -555,18 +726,22 @@ PhotoID* photo_id_dup (const PhotoID* self) { memcpy (dup, self, sizeof (PhotoID)); #line 7 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return dup; -#line 559 "PhotoTable.c" +#line 730 "PhotoTable.c" } -void photo_id_free (PhotoID* self) { +void +photo_id_free (PhotoID* self) +{ #line 7 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_free (self); -#line 566 "PhotoTable.c" +#line 739 "PhotoTable.c" } -GType photo_id_get_type (void) { +GType +photo_id_get_type (void) +{ static volatile gsize photo_id_type_id__volatile = 0; if (g_once_init_enter (&photo_id_type_id__volatile)) { GType photo_id_type_id; @@ -577,19 +752,21 @@ GType photo_id_get_type (void) { } -void import_id_init (ImportID *self, gint64 id) { - gint64 _tmp0_; +void +import_id_init (ImportID *self, + gint64 id) +{ #line 42 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" memset (self, 0, sizeof (ImportID)); #line 43 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = id; -#line 43 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - (*self).id = _tmp0_; -#line 589 "PhotoTable.c" + (*self).id = id; +#line 764 "PhotoTable.c" } -void import_id_generate (ImportID* result) { +void +import_id_generate (ImportID* result) +{ GTimeVal timestamp = {0}; gint64 id = 0LL; GTimeVal _tmp0_; @@ -611,11 +788,13 @@ void import_id_generate (ImportID* result) { *result = _tmp2_; #line 51 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 615 "PhotoTable.c" +#line 792 "PhotoTable.c" } -gboolean import_id_is_invalid (ImportID *self) { +gboolean +import_id_is_invalid (ImportID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 55 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -624,11 +803,13 @@ gboolean import_id_is_invalid (ImportID *self) { result = _tmp0_ == IMPORT_ID_INVALID; #line 55 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 628 "PhotoTable.c" +#line 807 "PhotoTable.c" } -gboolean import_id_is_valid (ImportID *self) { +gboolean +import_id_is_valid (ImportID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 59 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -637,75 +818,64 @@ gboolean import_id_is_valid (ImportID *self) { result = _tmp0_ != IMPORT_ID_INVALID; #line 59 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 641 "PhotoTable.c" +#line 822 "PhotoTable.c" } -gint import_id_compare_func (ImportID* a, ImportID* b) { +gint +import_id_compare_func (ImportID* a, + ImportID* b) +{ gint result = 0; gboolean _tmp0_ = FALSE; - ImportID* _tmp1_; - ImportID* _tmp3_; - gint64 _tmp4_; - ImportID* _tmp5_; - gint64 _tmp6_; -#line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = a; -#line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp1_ != NULL) { -#line 657 "PhotoTable.c" - ImportID* _tmp2_; + gint64 _tmp1_; + gint64 _tmp2_; #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = b; + if (a != NULL) { #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp2_ != NULL; -#line 663 "PhotoTable.c" + _tmp0_ = b != NULL; +#line 838 "PhotoTable.c" } else { #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = FALSE; -#line 667 "PhotoTable.c" +#line 842 "PhotoTable.c" } #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp0_, "a != null && b != null"); #line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = a; + _tmp1_ = (*a).id; #line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = (*_tmp3_).id; + _tmp2_ = (*b).id; #line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = b; -#line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = (*_tmp5_).id; -#line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = (gint) (_tmp4_ - _tmp6_); + result = (gint) (_tmp1_ - _tmp2_); #line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 683 "PhotoTable.c" +#line 854 "PhotoTable.c" } -gint64 import_id_comparator (void* a, void* b) { +gint64 +import_id_comparator (void* a, + void* b) +{ gint64 result = 0LL; - void* _tmp0_; + gint64 _tmp0_; gint64 _tmp1_; - void* _tmp2_; - gint64 _tmp3_; -#line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = a; -#line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = (*((ImportID*) _tmp0_)).id; #line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = b; + _tmp0_ = (*((ImportID*) a)).id; #line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = (*((ImportID*) _tmp2_)).id; + _tmp1_ = (*((ImportID*) b)).id; #line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp1_ - _tmp3_; + result = _tmp0_ - _tmp1_; #line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 705 "PhotoTable.c" +#line 873 "PhotoTable.c" } -ImportID* import_id_dup (const ImportID* self) { +ImportID* +import_id_dup (const ImportID* self) +{ ImportID* dup; #line 37 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dup = g_new0 (ImportID, 1); @@ -713,18 +883,22 @@ ImportID* import_id_dup (const ImportID* self) { memcpy (dup, self, sizeof (ImportID)); #line 37 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return dup; -#line 717 "PhotoTable.c" +#line 887 "PhotoTable.c" } -void import_id_free (ImportID* self) { +void +import_id_free (ImportID* self) +{ #line 37 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_free (self); -#line 724 "PhotoTable.c" +#line 896 "PhotoTable.c" } -GType import_id_get_type (void) { +GType +import_id_get_type (void) +{ static volatile gsize import_id_type_id__volatile = 0; if (g_once_init_enter (&import_id_type_id__volatile)) { GType import_id_type_id; @@ -735,7 +909,9 @@ GType import_id_get_type (void) { } -PhotoRow* photo_row_construct (GType object_type) { +PhotoRow* +photo_row_construct (GType object_type) +{ PhotoRow* self = NULL; BackingPhotoRow* _tmp0_; gint _tmp1_; @@ -773,7 +949,7 @@ PhotoRow* photo_row_construct (GType object_type) { _tmp3_ = (g_free (_tmp3_), NULL); #line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = raw_developer_as_array (&_tmp5_); -#line 777 "PhotoTable.c" +#line 953 "PhotoTable.c" { RawDeveloper* d_collection = NULL; gint d_collection_length1 = 0; @@ -785,11 +961,11 @@ PhotoRow* photo_row_construct (GType object_type) { d_collection_length1 = _tmp5_; #line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" for (d_it = 0; d_it < _tmp5_; d_it = d_it + 1) { -#line 789 "PhotoTable.c" +#line 965 "PhotoTable.c" RawDeveloper d = 0; #line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" d = d_collection[d_it]; -#line 793 "PhotoTable.c" +#line 969 "PhotoTable.c" { BackingPhotoID* _tmp7_; gint _tmp7__length1; @@ -808,124 +984,151 @@ PhotoRow* photo_row_construct (GType object_type) { _tmp7_[_tmp8_] = _tmp9_; #line 105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp10_ = _tmp7_[_tmp8_]; -#line 812 "PhotoTable.c" +#line 988 "PhotoTable.c" } } #line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" d_collection = (g_free (d_collection), NULL); -#line 817 "PhotoTable.c" +#line 993 "PhotoTable.c" } #line 100 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return self; -#line 821 "PhotoTable.c" +#line 997 "PhotoTable.c" } -PhotoRow* photo_row_new (void) { +PhotoRow* +photo_row_new (void) +{ #line 100 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return photo_row_construct (TYPE_PHOTO_ROW); -#line 828 "PhotoTable.c" +#line 1006 "PhotoTable.c" } -static void value_photo_row_init (GValue* value) { +static void +value_photo_row_init (GValue* value) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 835 "PhotoTable.c" +#line 1015 "PhotoTable.c" } -static void value_photo_row_free_value (GValue* value) { +static void +value_photo_row_free_value (GValue* value) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (value->data[0].v_pointer) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_row_unref (value->data[0].v_pointer); -#line 844 "PhotoTable.c" +#line 1026 "PhotoTable.c" } } -static void value_photo_row_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_photo_row_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (src_value->data[0].v_pointer) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dest_value->data[0].v_pointer = photo_row_ref (src_value->data[0].v_pointer); -#line 854 "PhotoTable.c" +#line 1039 "PhotoTable.c" } else { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dest_value->data[0].v_pointer = NULL; -#line 858 "PhotoTable.c" +#line 1043 "PhotoTable.c" } } -static gpointer value_photo_row_peek_pointer (const GValue* value) { +static gpointer +value_photo_row_peek_pointer (const GValue* value) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return value->data[0].v_pointer; -#line 866 "PhotoTable.c" +#line 1053 "PhotoTable.c" } -static gchar* value_photo_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_row_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (collect_values[0].v_pointer) { -#line 873 "PhotoTable.c" +#line 1065 "PhotoTable.c" PhotoRow * object; object = collect_values[0].v_pointer; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (object->parent_instance.g_class == NULL) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 880 "PhotoTable.c" +#line 1072 "PhotoTable.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 884 "PhotoTable.c" +#line 1076 "PhotoTable.c" } #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = photo_row_ref (object); -#line 888 "PhotoTable.c" +#line 1080 "PhotoTable.c" } else { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 892 "PhotoTable.c" +#line 1084 "PhotoTable.c" } #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 896 "PhotoTable.c" +#line 1088 "PhotoTable.c" } -static gchar* value_photo_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_row_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoRow ** object_p; object_p = collect_values[0].v_pointer; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!object_p) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 907 "PhotoTable.c" +#line 1104 "PhotoTable.c" } #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!value->data[0].v_pointer) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = NULL; -#line 913 "PhotoTable.c" +#line 1110 "PhotoTable.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = value->data[0].v_pointer; -#line 917 "PhotoTable.c" +#line 1114 "PhotoTable.c" } else { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = photo_row_ref (value->data[0].v_pointer); -#line 921 "PhotoTable.c" +#line 1118 "PhotoTable.c" } #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 925 "PhotoTable.c" +#line 1122 "PhotoTable.c" } -GParamSpec* param_spec_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecPhotoRow* spec; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PHOTO_ROW), NULL); @@ -935,20 +1138,25 @@ GParamSpec* param_spec_photo_row (const gchar* name, const gchar* nick, const gc G_PARAM_SPEC (spec)->value_type = object_type; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return G_PARAM_SPEC (spec); -#line 939 "PhotoTable.c" +#line 1142 "PhotoTable.c" } -gpointer value_get_photo_row (const GValue* value) { +gpointer +value_get_photo_row (const GValue* value) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_ROW), NULL); #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return value->data[0].v_pointer; -#line 948 "PhotoTable.c" +#line 1153 "PhotoTable.c" } -void value_set_photo_row (GValue* value, gpointer v_object) { +void +value_set_photo_row (GValue* value, + gpointer v_object) +{ PhotoRow * old; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_ROW)); @@ -964,22 +1172,25 @@ void value_set_photo_row (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_row_ref (value->data[0].v_pointer); -#line 968 "PhotoTable.c" +#line 1176 "PhotoTable.c" } else { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 972 "PhotoTable.c" +#line 1180 "PhotoTable.c" } #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (old) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_row_unref (old); -#line 978 "PhotoTable.c" +#line 1186 "PhotoTable.c" } } -void value_take_photo_row (GValue* value, gpointer v_object) { +void +value_take_photo_row (GValue* value, + gpointer v_object) +{ PhotoRow * old; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_ROW)); @@ -993,38 +1204,44 @@ void value_take_photo_row (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = v_object; -#line 997 "PhotoTable.c" +#line 1208 "PhotoTable.c" } else { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 1001 "PhotoTable.c" +#line 1212 "PhotoTable.c" } #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (old) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_row_unref (old); -#line 1007 "PhotoTable.c" +#line 1218 "PhotoTable.c" } } -static void photo_row_class_init (PhotoRowClass * klass) { +static void +photo_row_class_init (PhotoRowClass * klass) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_row_parent_class = g_type_class_peek_parent (klass); #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ((PhotoRowClass *) klass)->finalize = photo_row_finalize; -#line 1017 "PhotoTable.c" +#line 1230 "PhotoTable.c" } -static void photo_row_instance_init (PhotoRow * self) { +static void +photo_row_instance_init (PhotoRow * self) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self->ref_count = 1; -#line 1024 "PhotoTable.c" +#line 1239 "PhotoTable.c" } -static void photo_row_finalize (PhotoRow * obj) { +static void +photo_row_finalize (PhotoRow * obj) +{ PhotoRow * self; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_ROW, PhotoRow); @@ -1048,11 +1265,13 @@ static void photo_row_finalize (PhotoRow * obj) { _g_free0 (self->backlinks); #line 97 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self->development_ids = (g_free (self->development_ids), NULL); -#line 1052 "PhotoTable.c" +#line 1269 "PhotoTable.c" } -GType photo_row_get_type (void) { +GType +photo_row_get_type (void) +{ static volatile gsize photo_row_type_id__volatile = 0; if (g_once_init_enter (&photo_row_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_photo_row_init, value_photo_row_free_value, value_photo_row_copy_value, value_photo_row_peek_pointer, "p", value_photo_row_collect_value, "p", value_photo_row_lcopy_value }; @@ -1066,18 +1285,22 @@ GType photo_row_get_type (void) { } -gpointer photo_row_ref (gpointer instance) { +gpointer +photo_row_ref (gpointer instance) +{ PhotoRow * self; self = instance; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_atomic_int_inc (&self->ref_count); #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return instance; -#line 1077 "PhotoTable.c" +#line 1298 "PhotoTable.c" } -void photo_row_unref (gpointer instance) { +void +photo_row_unref (gpointer instance) +{ PhotoRow * self; self = instance; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -1086,12 +1309,14 @@ void photo_row_unref (gpointer instance) { PHOTO_ROW_GET_CLASS (self)->finalize (self); #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1090 "PhotoTable.c" +#line 1313 "PhotoTable.c" } } -static PhotoTable* photo_table_construct (GType object_type) { +static PhotoTable* +photo_table_construct (GType object_type) +{ PhotoTable* self = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -1101,44 +1326,38 @@ static PhotoTable* photo_table_construct (GType object_type) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; sqlite3_stmt* stmt2 = NULL; gint res2 = 0; - sqlite3* _tmp8_; - sqlite3_stmt* _tmp9_ = NULL; + sqlite3* _tmp7_; + sqlite3_stmt* _tmp8_ = NULL; + gint _tmp9_; gint _tmp10_; - gint _tmp11_; - sqlite3_stmt* _tmp12_; - gint _tmp13_; - gint _tmp14_; - sqlite3* _tmp16_; - sqlite3_stmt* _tmp17_ = NULL; - gint _tmp18_; + sqlite3_stmt* _tmp11_; + gint _tmp12_; + sqlite3* _tmp14_; + sqlite3_stmt* _tmp15_ = NULL; + gint _tmp16_; + gint _tmp17_; + sqlite3_stmt* _tmp18_; gint _tmp19_; - sqlite3_stmt* _tmp20_; - gint _tmp21_; - gint _tmp22_; - sqlite3* _tmp24_; - sqlite3_stmt* _tmp25_ = NULL; + sqlite3* _tmp21_; + sqlite3_stmt* _tmp22_ = NULL; + gint _tmp23_; + gint _tmp24_; + sqlite3_stmt* _tmp25_; gint _tmp26_; - gint _tmp27_; - sqlite3_stmt* _tmp28_; - gint _tmp29_; + sqlite3* _tmp28_; + sqlite3_stmt* _tmp29_ = NULL; gint _tmp30_; - sqlite3* _tmp32_; - sqlite3_stmt* _tmp33_ = NULL; - gint _tmp34_; - gint _tmp35_; - sqlite3_stmt* _tmp36_; + gint _tmp31_; + sqlite3_stmt* _tmp32_; + gint _tmp33_; + sqlite3* _tmp35_; + sqlite3_stmt* _tmp36_ = NULL; gint _tmp37_; gint _tmp38_; - sqlite3* _tmp40_; - sqlite3_stmt* _tmp41_ = NULL; - gint _tmp42_; - gint _tmp43_; - sqlite3_stmt* _tmp44_; - gint _tmp45_; - gint _tmp46_; + sqlite3_stmt* _tmp39_; + gint _tmp40_; #line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = (PhotoTable*) database_table_construct (object_type); #line 114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -1158,183 +1377,171 @@ static PhotoTable* photo_table_construct (GType object_type) { #line 147 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 147 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = sqlite3_step (_tmp4_); -#line 147 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp5_; + res = sqlite3_step (_tmp4_); #line 148 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 148 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp6_ != SQLITE_DONE) { -#line 1169 "PhotoTable.c" - gint _tmp7_; + if (_tmp5_ != SQLITE_DONE) { +#line 1386 "PhotoTable.c" + gint _tmp6_; #line 149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("create photo table", _tmp7_); -#line 1175 "PhotoTable.c" + database_table_fatal ("create photo table", _tmp6_); +#line 1392 "PhotoTable.c" } #line 153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = database_table_db; + _tmp7_ = database_table_db; #line 153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_prepare_v2 (_tmp8_, "CREATE INDEX IF NOT EXISTS PhotoEventIDIndex ON PhotoTable (event_id)", -1, &_tmp9_, NULL); + _tmp9_ = sqlite3_prepare_v2 (_tmp7_, "CREATE INDEX IF NOT EXISTS PhotoEventIDIndex ON PhotoTable (event_id)", -1, &_tmp8_, NULL); #line 153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt2); #line 153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt2 = _tmp9_; + stmt2 = _tmp8_; #line 153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res2 = _tmp10_; + res2 = _tmp9_; #line 155 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res2; + _tmp10_ = res2; #line 155 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res2 == Sqlite.OK"); -#line 157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = stmt2; + _vala_assert (_tmp10_ == SQLITE_OK, "res2 == Sqlite.OK"); #line 157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = sqlite3_step (_tmp12_); + _tmp11_ = stmt2; #line 157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res2 = _tmp13_; + res2 = sqlite3_step (_tmp11_); #line 158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = res2; + _tmp12_ = res2; #line 158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp14_ != SQLITE_DONE) { -#line 1201 "PhotoTable.c" - gint _tmp15_; + if (_tmp12_ != SQLITE_DONE) { +#line 1416 "PhotoTable.c" + gint _tmp13_; #line 159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = res2; + _tmp13_ = res2; #line 159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("create photo table", _tmp15_); -#line 1207 "PhotoTable.c" + database_table_fatal ("create photo table", _tmp13_); +#line 1422 "PhotoTable.c" } #line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = database_table_db; + _tmp14_ = database_table_db; #line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = sqlite3_prepare_v2 (_tmp16_, "DROP INDEX IF EXISTS PhotoTableMD5Format", -1, &_tmp17_, NULL); + _tmp16_ = sqlite3_prepare_v2 (_tmp14_, "DROP INDEX IF EXISTS PhotoTableMD5Format", -1, &_tmp15_, NULL); #line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt = _tmp17_; + stmt = _tmp15_; #line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp18_; + res = _tmp16_; #line 166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = res; + _tmp17_ = res; #line 166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); -#line 167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = stmt; + _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); #line 167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = sqlite3_step (_tmp20_); + _tmp18_ = stmt; #line 167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp21_; + res = sqlite3_step (_tmp18_); #line 168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = res; + _tmp19_ = res; #line 168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp22_ != SQLITE_DONE) { -#line 1233 "PhotoTable.c" - gint _tmp23_; + if (_tmp19_ != SQLITE_DONE) { +#line 1446 "PhotoTable.c" + gint _tmp20_; #line 169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = res; + _tmp20_ = res; #line 169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_warning ("Failed to drop old PhotoTable index", _tmp23_); -#line 1239 "PhotoTable.c" + database_table_warning ("Failed to drop old PhotoTable index", _tmp20_); +#line 1452 "PhotoTable.c" } #line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = database_table_db; + _tmp21_ = database_table_db; #line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = sqlite3_prepare_v2 (_tmp24_, "CREATE INDEX IF NOT EXISTS PhotoTableMD5FormatV2 on PhotoTable(md5, fi" \ -"le_format)", -1, &_tmp25_, NULL); + _tmp23_ = sqlite3_prepare_v2 (_tmp21_, "CREATE INDEX IF NOT EXISTS PhotoTableMD5FormatV2 on PhotoTable(md5, fi" \ +"le_format)", -1, &_tmp22_, NULL); #line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt = _tmp25_; + stmt = _tmp22_; #line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp26_; + res = _tmp23_; #line 173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = res; + _tmp24_ = res; #line 173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); -#line 174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = stmt; + _vala_assert (_tmp24_ == SQLITE_OK, "res == Sqlite.OK"); #line 174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = sqlite3_step (_tmp28_); + _tmp25_ = stmt; #line 174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp29_; + res = sqlite3_step (_tmp25_); #line 175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = res; + _tmp26_ = res; #line 175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp30_ != SQLITE_DONE) { -#line 1265 "PhotoTable.c" - gint _tmp31_; + if (_tmp26_ != SQLITE_DONE) { +#line 1476 "PhotoTable.c" + gint _tmp27_; #line 176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = res; + _tmp27_ = res; #line 176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_warning ("Failed to create index on md5 and file_format", _tmp31_); -#line 1271 "PhotoTable.c" + database_table_warning ("Failed to create index on md5 and file_format", _tmp27_); +#line 1482 "PhotoTable.c" } #line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = database_table_db; + _tmp28_ = database_table_db; #line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = sqlite3_prepare_v2 (_tmp32_, "CREATE INDEX IF NOT EXISTS PhotoTableThumbnailMD5Format on PhotoTable(" \ -"thumbnail_md5, file_format)", -1, &_tmp33_, NULL); + _tmp30_ = sqlite3_prepare_v2 (_tmp28_, "CREATE INDEX IF NOT EXISTS PhotoTableThumbnailMD5Format on PhotoTable(" \ +"thumbnail_md5, file_format)", -1, &_tmp29_, NULL); #line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt = _tmp33_; + stmt = _tmp29_; #line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp34_; + res = _tmp30_; #line 181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = res; + _tmp31_ = res; #line 181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp35_ == SQLITE_OK, "res == Sqlite.OK"); -#line 182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = stmt; + _vala_assert (_tmp31_ == SQLITE_OK, "res == Sqlite.OK"); #line 182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = sqlite3_step (_tmp36_); + _tmp32_ = stmt; #line 182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp37_; + res = sqlite3_step (_tmp32_); #line 183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = res; + _tmp33_ = res; #line 183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp38_ != SQLITE_DONE) { -#line 1297 "PhotoTable.c" - gint _tmp39_; + if (_tmp33_ != SQLITE_DONE) { +#line 1506 "PhotoTable.c" + gint _tmp34_; #line 184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = res; + _tmp34_ = res; #line 184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_warning ("Failed to create index on md5 and file_format", _tmp39_); -#line 1303 "PhotoTable.c" + database_table_warning ("Failed to create index on md5 and file_format", _tmp34_); +#line 1512 "PhotoTable.c" } #line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = database_table_db; + _tmp35_ = database_table_db; #line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = sqlite3_prepare_v2 (_tmp40_, "CREATE INDEX IF NOT EXISTS PhotoTableThumbnailMD5MD5 on PhotoTable(thu" \ -"mbnail_md5, md5)", -1, &_tmp41_, NULL); + _tmp37_ = sqlite3_prepare_v2 (_tmp35_, "CREATE INDEX IF NOT EXISTS PhotoTableThumbnailMD5MD5 on PhotoTable(thu" \ +"mbnail_md5, md5)", -1, &_tmp36_, NULL); #line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt = _tmp41_; + stmt = _tmp36_; #line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp42_; + res = _tmp37_; #line 189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = res; + _tmp38_ = res; #line 189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp43_ == SQLITE_OK, "res == Sqlite.OK"); -#line 190 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = stmt; + _vala_assert (_tmp38_ == SQLITE_OK, "res == Sqlite.OK"); #line 190 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = sqlite3_step (_tmp44_); + _tmp39_ = stmt; #line 190 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp45_; + res = sqlite3_step (_tmp39_); #line 191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = res; + _tmp40_ = res; #line 191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp46_ != SQLITE_DONE) { -#line 1329 "PhotoTable.c" - gint _tmp47_; + if (_tmp40_ != SQLITE_DONE) { +#line 1536 "PhotoTable.c" + gint _tmp41_; #line 192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = res; + _tmp41_ = res; #line 192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_warning ("Failed to create index on thumbnail_md5 and md5", _tmp47_); -#line 1335 "PhotoTable.c" + database_table_warning ("Failed to create index on thumbnail_md5 and md5", _tmp41_); +#line 1542 "PhotoTable.c" } #line 195 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_set_table_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), "PhotoTable"); @@ -1344,25 +1551,31 @@ static PhotoTable* photo_table_construct (GType object_type) { _sqlite3_finalize0 (stmt); #line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return self; -#line 1345 "PhotoTable.c" +#line 1552 "PhotoTable.c" } -static PhotoTable* photo_table_new (void) { +static PhotoTable* +photo_table_new (void) +{ #line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return photo_table_construct (TYPE_PHOTO_TABLE); -#line 1352 "PhotoTable.c" +#line 1561 "PhotoTable.c" } -static gpointer _database_table_ref0 (gpointer self) { +static gpointer +_database_table_ref0 (gpointer self) +{ #line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return self ? database_table_ref (self) : NULL; -#line 1359 "PhotoTable.c" +#line 1570 "PhotoTable.c" } -PhotoTable* photo_table_get_instance (void) { +PhotoTable* +photo_table_get_instance (void) +{ PhotoTable* result = NULL; PhotoTable* _tmp0_; PhotoTable* _tmp2_; @@ -1371,7 +1584,7 @@ PhotoTable* photo_table_get_instance (void) { _tmp0_ = photo_table_instance; #line 199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp0_ == NULL) { -#line 1372 "PhotoTable.c" +#line 1585 "PhotoTable.c" PhotoTable* _tmp1_; #line 200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = photo_table_new (); @@ -1379,7 +1592,7 @@ PhotoTable* photo_table_get_instance (void) { _database_table_unref0 (photo_table_instance); #line 200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_table_instance = _tmp1_; -#line 1380 "PhotoTable.c" +#line 1593 "PhotoTable.c" } #line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = photo_table_instance; @@ -1389,11 +1602,15 @@ PhotoTable* photo_table_get_instance (void) { result = _tmp3_; #line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 1390 "PhotoTable.c" +#line 1603 "PhotoTable.c" } -void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) { +void +photo_table_add (PhotoTable* self, + PhotoRow* photo_row, + PhotoID* result) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -1401,145 +1618,96 @@ void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) { gint _tmp2_; gint _tmp3_; gulong time_created = 0UL; - gulong _tmp4_; - sqlite3_stmt* _tmp5_; - PhotoRow* _tmp6_; - BackingPhotoRow* _tmp7_; - const gchar* _tmp8_; - gchar* _tmp9_; - GDestroyNotify _tmp10_; - gint _tmp11_; - gint _tmp12_; - sqlite3_stmt* _tmp13_; - PhotoRow* _tmp14_; - BackingPhotoRow* _tmp15_; - Dimensions _tmp16_; - gint _tmp17_; + sqlite3_stmt* _tmp4_; + BackingPhotoRow* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; + GDestroyNotify _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; + BackingPhotoRow* _tmp11_; + Dimensions _tmp12_; + gint _tmp13_; + gint _tmp14_; + sqlite3_stmt* _tmp15_; + BackingPhotoRow* _tmp16_; + Dimensions _tmp17_; gint _tmp18_; gint _tmp19_; sqlite3_stmt* _tmp20_; - PhotoRow* _tmp21_; - BackingPhotoRow* _tmp22_; - Dimensions _tmp23_; - gint _tmp24_; - gint _tmp25_; - gint _tmp26_; - sqlite3_stmt* _tmp27_; - PhotoRow* _tmp28_; - BackingPhotoRow* _tmp29_; - gint64 _tmp30_; - gint _tmp31_; - gint _tmp32_; - sqlite3_stmt* _tmp33_; - PhotoRow* _tmp34_; - BackingPhotoRow* _tmp35_; - time_t _tmp36_; - gint _tmp37_; + BackingPhotoRow* _tmp21_; + gint64 _tmp22_; + gint _tmp23_; + sqlite3_stmt* _tmp24_; + BackingPhotoRow* _tmp25_; + time_t _tmp26_; + gint _tmp27_; + sqlite3_stmt* _tmp28_; + time_t _tmp29_; + gint _tmp30_; + sqlite3_stmt* _tmp31_; + BackingPhotoRow* _tmp32_; + Orientation _tmp33_; + gint _tmp34_; + sqlite3_stmt* _tmp35_; + BackingPhotoRow* _tmp36_; + Orientation _tmp37_; gint _tmp38_; sqlite3_stmt* _tmp39_; - PhotoRow* _tmp40_; - time_t _tmp41_; + ImportID _tmp40_; + gint64 _tmp41_; gint _tmp42_; - gint _tmp43_; - sqlite3_stmt* _tmp44_; - PhotoRow* _tmp45_; - BackingPhotoRow* _tmp46_; - Orientation _tmp47_; - gint _tmp48_; + sqlite3_stmt* _tmp43_; + gint _tmp44_; + sqlite3_stmt* _tmp45_; + const gchar* _tmp46_; + gchar* _tmp47_; + GDestroyNotify _tmp48_; gint _tmp49_; sqlite3_stmt* _tmp50_; - PhotoRow* _tmp51_; - BackingPhotoRow* _tmp52_; - Orientation _tmp53_; + const gchar* _tmp51_; + gchar* _tmp52_; + GDestroyNotify _tmp53_; gint _tmp54_; - gint _tmp55_; - sqlite3_stmt* _tmp56_; - PhotoRow* _tmp57_; - ImportID _tmp58_; - gint64 _tmp59_; - gint _tmp60_; - gint _tmp61_; - sqlite3_stmt* _tmp62_; - gint _tmp63_; - gint _tmp64_; - sqlite3_stmt* _tmp65_; - PhotoRow* _tmp66_; - const gchar* _tmp67_; - gchar* _tmp68_; - GDestroyNotify _tmp69_; - gint _tmp70_; + sqlite3_stmt* _tmp55_; + const gchar* _tmp56_; + gchar* _tmp57_; + GDestroyNotify _tmp58_; + gint _tmp59_; + sqlite3_stmt* _tmp60_; + gulong _tmp61_; + gint _tmp62_; + sqlite3_stmt* _tmp63_; + BackingPhotoRow* _tmp64_; + PhotoFileFormat _tmp65_; + gint _tmp66_; + sqlite3_stmt* _tmp67_; + const gchar* _tmp68_; + gchar* _tmp69_; + GDestroyNotify _tmp70_; gint _tmp71_; sqlite3_stmt* _tmp72_; - PhotoRow* _tmp73_; - const gchar* _tmp74_; - gchar* _tmp75_; - GDestroyNotify _tmp76_; - gint _tmp77_; - gint _tmp78_; - sqlite3_stmt* _tmp79_; - PhotoRow* _tmp80_; - const gchar* _tmp81_; - gchar* _tmp82_; - GDestroyNotify _tmp83_; - gint _tmp84_; - gint _tmp85_; - sqlite3_stmt* _tmp86_; - gulong _tmp87_; + Rating _tmp73_; + gint _tmp74_; + sqlite3_stmt* _tmp75_; + gint _tmp76_; + sqlite3_stmt* _tmp77_; + RawDeveloper _tmp78_; + gchar* _tmp79_; + GDestroyNotify _tmp80_; + gint _tmp81_; + sqlite3_stmt* _tmp82_; + const gchar* _tmp83_; + gchar* _tmp84_; + GDestroyNotify _tmp85_; + gint _tmp86_; + sqlite3_stmt* _tmp87_; gint _tmp88_; - gint _tmp89_; - sqlite3_stmt* _tmp90_; - PhotoRow* _tmp91_; - BackingPhotoRow* _tmp92_; - PhotoFileFormat _tmp93_; - gint _tmp94_; - gint _tmp95_; - gint _tmp96_; - sqlite3_stmt* _tmp97_; - PhotoRow* _tmp98_; - const gchar* _tmp99_; - gchar* _tmp100_; - GDestroyNotify _tmp101_; - gint _tmp102_; - gint _tmp103_; - sqlite3_stmt* _tmp104_; - PhotoRow* _tmp105_; - Rating _tmp106_; - gint _tmp107_; - gint _tmp108_; - gint _tmp109_; - sqlite3_stmt* _tmp110_; - gint _tmp111_; - gint _tmp112_; - sqlite3_stmt* _tmp113_; - PhotoRow* _tmp114_; - RawDeveloper _tmp115_; - gchar* _tmp116_; - GDestroyNotify _tmp117_; - gint _tmp118_; - gint _tmp119_; - sqlite3_stmt* _tmp120_; - PhotoRow* _tmp121_; - const gchar* _tmp122_; - gchar* _tmp123_; - GDestroyNotify _tmp124_; - gint _tmp125_; - gint _tmp126_; - sqlite3_stmt* _tmp127_; - gint _tmp128_; - gint _tmp129_; - PhotoRow* _tmp133_; - sqlite3* _tmp134_; - gint64 _tmp135_; - PhotoRow* _tmp136_; - PhotoRow* _tmp137_; - BackingPhotoRow* _tmp138_; - Orientation _tmp139_; - PhotoRow* _tmp140_; - PhotoRow* _tmp141_; - gulong _tmp142_; - PhotoRow* _tmp143_; - PhotoRow* _tmp144_; - PhotoID _tmp145_; + sqlite3* _tmp92_; + BackingPhotoRow* _tmp93_; + Orientation _tmp94_; + gulong _tmp95_; + PhotoID _tmp96_; #line 207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); #line 207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -1562,415 +1730,321 @@ void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) { #line 215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); #line 217 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = now_sec (); -#line 217 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - time_created = _tmp4_; -#line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = stmt; + time_created = now_sec (); #line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = photo_row; + _tmp4_ = stmt; #line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = _tmp6_->master; + _tmp5_ = photo_row->master; #line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = _tmp7_->filepath; + _tmp6_ = _tmp5_->filepath; #line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = g_strdup (_tmp8_); + _tmp7_ = g_strdup (_tmp6_); #line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = g_free; + _tmp8_ = g_free; #line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = sqlite3_bind_text (_tmp5_, 1, _tmp9_, -1, _tmp10_); -#line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp11_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp7_, -1, _tmp8_); #line 220 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = res; + _tmp9_ = res; #line 220 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp12_ == SQLITE_OK, "res == Sqlite.OK"); -#line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = stmt; -#line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = photo_row; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = _tmp14_->master; + _tmp10_ = stmt; #line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _tmp15_->dim; + _tmp11_ = photo_row->master; #line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = _tmp16_.width; + _tmp12_ = _tmp11_->dim; #line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = sqlite3_bind_int (_tmp13_, 2, _tmp17_); + _tmp13_ = _tmp12_.width; #line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp18_; + res = sqlite3_bind_int (_tmp10_, 2, _tmp13_); #line 222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = res; + _tmp14_ = res; #line 222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp14_ == SQLITE_OK, "res == Sqlite.OK"); #line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = stmt; + _tmp15_ = stmt; #line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = photo_row; + _tmp16_ = photo_row->master; #line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = _tmp21_->master; -#line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = _tmp22_->dim; + _tmp17_ = _tmp16_->dim; #line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = _tmp23_.height; + _tmp18_ = _tmp17_.height; #line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = sqlite3_bind_int (_tmp20_, 3, _tmp24_); -#line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp25_; + res = sqlite3_bind_int (_tmp15_, 3, _tmp18_); #line 224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = res; + _tmp19_ = res; #line 224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp26_ == SQLITE_OK, "res == Sqlite.OK"); -#line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = stmt; -#line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = photo_row; + _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); #line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = _tmp28_->master; + _tmp20_ = stmt; #line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = _tmp29_->filesize; + _tmp21_ = photo_row->master; #line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = sqlite3_bind_int64 (_tmp27_, 4, _tmp30_); + _tmp22_ = _tmp21_->filesize; #line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp31_; + res = sqlite3_bind_int64 (_tmp20_, 4, _tmp22_); #line 226 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = res; + _tmp23_ = res; #line 226 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp32_ == SQLITE_OK, "res == Sqlite.OK"); -#line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = stmt; -#line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = photo_row; + _vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK"); #line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = _tmp34_->master; + _tmp24_ = stmt; #line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = _tmp35_->timestamp; + _tmp25_ = photo_row->master; #line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = sqlite3_bind_int64 (_tmp33_, 5, (gint64) _tmp36_); + _tmp26_ = _tmp25_->timestamp; #line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp37_; + res = sqlite3_bind_int64 (_tmp24_, 5, (gint64) _tmp26_); #line 228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = res; + _tmp27_ = res; #line 228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp38_ == SQLITE_OK, "res == Sqlite.OK"); -#line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = stmt; -#line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = photo_row; + _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); #line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = _tmp40_->exposure_time; + _tmp28_ = stmt; #line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = sqlite3_bind_int64 (_tmp39_, 6, (gint64) _tmp41_); + _tmp29_ = photo_row->exposure_time; #line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp42_; + res = sqlite3_bind_int64 (_tmp28_, 6, (gint64) _tmp29_); #line 230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = res; + _tmp30_ = res; #line 230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp43_ == SQLITE_OK, "res == Sqlite.OK"); -#line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = stmt; -#line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = photo_row; + _vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK"); #line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = _tmp45_->master; + _tmp31_ = stmt; #line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = _tmp46_->original_orientation; + _tmp32_ = photo_row->master; #line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = sqlite3_bind_int (_tmp44_, 7, (gint) _tmp47_); + _tmp33_ = _tmp32_->original_orientation; #line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp48_; + res = sqlite3_bind_int (_tmp31_, 7, (gint) _tmp33_); #line 232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = res; + _tmp34_ = res; #line 232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp49_ == SQLITE_OK, "res == Sqlite.OK"); -#line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = stmt; -#line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = photo_row; + _vala_assert (_tmp34_ == SQLITE_OK, "res == Sqlite.OK"); #line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = _tmp51_->master; + _tmp35_ = stmt; #line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = _tmp52_->original_orientation; + _tmp36_ = photo_row->master; #line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = sqlite3_bind_int (_tmp50_, 8, (gint) _tmp53_); + _tmp37_ = _tmp36_->original_orientation; #line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp54_; + res = sqlite3_bind_int (_tmp35_, 8, (gint) _tmp37_); #line 234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_ = res; + _tmp38_ = res; #line 234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp55_ == SQLITE_OK, "res == Sqlite.OK"); -#line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_ = stmt; -#line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_ = photo_row; + _vala_assert (_tmp38_ == SQLITE_OK, "res == Sqlite.OK"); #line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp58_ = _tmp57_->import_id; + _tmp39_ = stmt; #line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp59_ = _tmp58_.id; + _tmp40_ = photo_row->import_id; #line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp60_ = sqlite3_bind_int64 (_tmp56_, 9, _tmp59_); + _tmp41_ = _tmp40_.id; #line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp60_; + res = sqlite3_bind_int64 (_tmp39_, 9, _tmp41_); #line 236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp61_ = res; + _tmp42_ = res; #line 236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp61_ == SQLITE_OK, "res == Sqlite.OK"); -#line 237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp62_ = stmt; + _vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK"); #line 237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_ = sqlite3_bind_int64 (_tmp62_, 10, EVENT_ID_INVALID); + _tmp43_ = stmt; #line 237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp63_; + res = sqlite3_bind_int64 (_tmp43_, 10, EVENT_ID_INVALID); #line 238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp64_ = res; + _tmp44_ = res; #line 238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp64_ == SQLITE_OK, "res == Sqlite.OK"); -#line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp65_ = stmt; -#line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp66_ = photo_row; + _vala_assert (_tmp44_ == SQLITE_OK, "res == Sqlite.OK"); #line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp67_ = _tmp66_->md5; + _tmp45_ = stmt; #line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp68_ = g_strdup (_tmp67_); + _tmp46_ = photo_row->md5; #line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp69_ = g_free; + _tmp47_ = g_strdup (_tmp46_); #line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp70_ = sqlite3_bind_text (_tmp65_, 11, _tmp68_, -1, _tmp69_); + _tmp48_ = g_free; #line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp70_; + res = sqlite3_bind_text (_tmp45_, 11, _tmp47_, -1, _tmp48_); #line 240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp71_ = res; + _tmp49_ = res; #line 240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp71_ == SQLITE_OK, "res == Sqlite.OK"); -#line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp72_ = stmt; -#line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp73_ = photo_row; + _vala_assert (_tmp49_ == SQLITE_OK, "res == Sqlite.OK"); #line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp74_ = _tmp73_->thumbnail_md5; + _tmp50_ = stmt; #line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp75_ = g_strdup (_tmp74_); + _tmp51_ = photo_row->thumbnail_md5; #line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp76_ = g_free; + _tmp52_ = g_strdup (_tmp51_); #line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp77_ = sqlite3_bind_text (_tmp72_, 12, _tmp75_, -1, _tmp76_); + _tmp53_ = g_free; #line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp77_; + res = sqlite3_bind_text (_tmp50_, 12, _tmp52_, -1, _tmp53_); #line 242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp78_ = res; + _tmp54_ = res; #line 242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp78_ == SQLITE_OK, "res == Sqlite.OK"); -#line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp79_ = stmt; -#line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp80_ = photo_row; + _vala_assert (_tmp54_ == SQLITE_OK, "res == Sqlite.OK"); #line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp81_ = _tmp80_->exif_md5; + _tmp55_ = stmt; #line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp82_ = g_strdup (_tmp81_); + _tmp56_ = photo_row->exif_md5; #line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp83_ = g_free; + _tmp57_ = g_strdup (_tmp56_); #line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp84_ = sqlite3_bind_text (_tmp79_, 13, _tmp82_, -1, _tmp83_); + _tmp58_ = g_free; #line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp84_; + res = sqlite3_bind_text (_tmp55_, 13, _tmp57_, -1, _tmp58_); #line 244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp85_ = res; + _tmp59_ = res; #line 244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp85_ == SQLITE_OK, "res == Sqlite.OK"); -#line 245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp86_ = stmt; + _vala_assert (_tmp59_ == SQLITE_OK, "res == Sqlite.OK"); #line 245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp87_ = time_created; + _tmp60_ = stmt; #line 245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp88_ = sqlite3_bind_int64 (_tmp86_, 14, (gint64) _tmp87_); + _tmp61_ = time_created; #line 245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp88_; + res = sqlite3_bind_int64 (_tmp60_, 14, (gint64) _tmp61_); #line 246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp89_ = res; + _tmp62_ = res; #line 246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp89_ == SQLITE_OK, "res == Sqlite.OK"); -#line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp90_ = stmt; -#line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp91_ = photo_row; + _vala_assert (_tmp62_ == SQLITE_OK, "res == Sqlite.OK"); #line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp92_ = _tmp91_->master; + _tmp63_ = stmt; #line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp93_ = _tmp92_->file_format; + _tmp64_ = photo_row->master; #line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp94_ = photo_file_format_serialize (_tmp93_); + _tmp65_ = _tmp64_->file_format; #line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp95_ = sqlite3_bind_int (_tmp90_, 15, _tmp94_); -#line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp95_; + res = sqlite3_bind_int (_tmp63_, 15, photo_file_format_serialize (_tmp65_)); #line 248 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp96_ = res; + _tmp66_ = res; #line 248 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp96_ == SQLITE_OK, "res == Sqlite.OK"); -#line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp97_ = stmt; + _vala_assert (_tmp66_ == SQLITE_OK, "res == Sqlite.OK"); #line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp98_ = photo_row; + _tmp67_ = stmt; #line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp99_ = _tmp98_->title; + _tmp68_ = photo_row->title; #line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp100_ = g_strdup (_tmp99_); + _tmp69_ = g_strdup (_tmp68_); #line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp101_ = g_free; -#line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp102_ = sqlite3_bind_text (_tmp97_, 16, _tmp100_, -1, _tmp101_); + _tmp70_ = g_free; #line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp102_; + res = sqlite3_bind_text (_tmp67_, 16, _tmp69_, -1, _tmp70_); #line 250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp103_ = res; + _tmp71_ = res; #line 250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp103_ == SQLITE_OK, "res == Sqlite.OK"); -#line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp104_ = stmt; -#line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp105_ = photo_row; -#line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp106_ = _tmp105_->rating; + _vala_assert (_tmp71_ == SQLITE_OK, "res == Sqlite.OK"); #line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp107_ = rating_serialize (_tmp106_); + _tmp72_ = stmt; #line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp108_ = sqlite3_bind_int64 (_tmp104_, 17, (gint64) _tmp107_); + _tmp73_ = photo_row->rating; #line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp108_; + res = sqlite3_bind_int64 (_tmp72_, 17, (gint64) rating_serialize (_tmp73_)); #line 252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp109_ = res; + _tmp74_ = res; #line 252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp109_ == SQLITE_OK, "res == Sqlite.OK"); -#line 253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp110_ = stmt; + _vala_assert (_tmp74_ == SQLITE_OK, "res == Sqlite.OK"); #line 253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp111_ = sqlite3_bind_int64 (_tmp110_, 18, BACKING_PHOTO_ID_INVALID); + _tmp75_ = stmt; #line 253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp111_; + res = sqlite3_bind_int64 (_tmp75_, 18, BACKING_PHOTO_ID_INVALID); #line 254 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp112_ = res; + _tmp76_ = res; #line 254 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp112_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp76_ == SQLITE_OK, "res == Sqlite.OK"); #line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp113_ = stmt; -#line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp114_ = photo_row; -#line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp115_ = _tmp114_->developer; + _tmp77_ = stmt; #line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp116_ = raw_developer_to_string (_tmp115_); + _tmp78_ = photo_row->developer; #line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp117_ = g_free; + _tmp79_ = raw_developer_to_string (_tmp78_); #line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp118_ = sqlite3_bind_text (_tmp113_, 19, _tmp116_, -1, _tmp117_); + _tmp80_ = g_free; #line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp118_; + res = sqlite3_bind_text (_tmp77_, 19, _tmp79_, -1, _tmp80_); #line 256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp119_ = res; + _tmp81_ = res; #line 256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp119_ == SQLITE_OK, "res == Sqlite.OK"); -#line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp120_ = stmt; + _vala_assert (_tmp81_ == SQLITE_OK, "res == Sqlite.OK"); #line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp121_ = photo_row; + _tmp82_ = stmt; #line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp122_ = _tmp121_->comment; + _tmp83_ = photo_row->comment; #line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp123_ = g_strdup (_tmp122_); + _tmp84_ = g_strdup (_tmp83_); #line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp124_ = g_free; + _tmp85_ = g_free; #line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp125_ = sqlite3_bind_text (_tmp120_, 20, _tmp123_, -1, _tmp124_); -#line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp125_; + res = sqlite3_bind_text (_tmp82_, 20, _tmp84_, -1, _tmp85_); #line 258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp126_ = res; + _tmp86_ = res; #line 258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp126_ == SQLITE_OK, "res == Sqlite.OK"); -#line 260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp127_ = stmt; + _vala_assert (_tmp86_ == SQLITE_OK, "res == Sqlite.OK"); #line 260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp128_ = sqlite3_step (_tmp127_); + _tmp87_ = stmt; #line 260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp128_; + res = sqlite3_step (_tmp87_); #line 261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp129_ = res; + _tmp88_ = res; #line 261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp129_ != SQLITE_DONE) { -#line 1897 "PhotoTable.c" - gint _tmp130_; - PhotoID _tmp132_ = {0}; + if (_tmp88_ != SQLITE_DONE) { +#line 1983 "PhotoTable.c" + gint _tmp89_; + PhotoID _tmp91_ = {0}; #line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp130_ = res; + _tmp89_ = res; #line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp130_ != SQLITE_CONSTRAINT) { -#line 1904 "PhotoTable.c" - gint _tmp131_; + if (_tmp89_ != SQLITE_CONSTRAINT) { +#line 1990 "PhotoTable.c" + gint _tmp90_; #line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp131_ = res; + _tmp90_ = res; #line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("add_photo", _tmp131_); -#line 1910 "PhotoTable.c" + database_table_fatal ("add_photo", _tmp90_); +#line 1996 "PhotoTable.c" } #line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_id_init (&_tmp132_, PHOTO_ID_INVALID); + photo_id_init (&_tmp91_, PHOTO_ID_INVALID); #line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - *result = _tmp132_; + *result = _tmp91_; #line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 1920 "PhotoTable.c" +#line 2006 "PhotoTable.c" } #line 269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp133_ = photo_row; -#line 269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp134_ = database_table_db; -#line 269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp135_ = sqlite3_last_insert_rowid (_tmp134_); + _tmp92_ = database_table_db; #line 269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_id_init (&_tmp133_->photo_id, _tmp135_); + photo_id_init (&photo_row->photo_id, sqlite3_last_insert_rowid (_tmp92_)); #line 270 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp136_ = photo_row; + _tmp93_ = photo_row->master; #line 270 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp137_ = photo_row; + _tmp94_ = _tmp93_->original_orientation; #line 270 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp138_ = _tmp137_->master; -#line 270 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp139_ = _tmp138_->original_orientation; -#line 270 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp136_->orientation = _tmp139_; -#line 271 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp140_ = photo_row; + photo_row->orientation = _tmp94_; #line 271 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - event_id_init (&_tmp140_->event_id, EVENT_ID_INVALID); + event_id_init (&photo_row->event_id, EVENT_ID_INVALID); #line 272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp141_ = photo_row; + _tmp95_ = time_created; #line 272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp142_ = time_created; -#line 272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp141_->time_created = (time_t) _tmp142_; -#line 273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp143_ = photo_row; + photo_row->time_created = (time_t) _tmp95_; #line 273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp143_->flags = (guint64) 0; + photo_row->flags = (guint64) 0; #line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp144_ = photo_row; + _tmp96_ = photo_row->photo_id; #line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp145_ = _tmp144_->photo_id; -#line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - *result = _tmp145_; + *result = _tmp96_; #line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 1964 "PhotoTable.c" +#line 2034 "PhotoTable.c" } -void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) { +void +photo_table_reimport (PhotoTable* self, + PhotoRow* row, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -1978,104 +2052,71 @@ void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) { gint _tmp2_; gint _tmp3_; time_t time_reimported = 0; - gulong _tmp4_; - sqlite3_stmt* _tmp5_; - PhotoRow* _tmp6_; - BackingPhotoRow* _tmp7_; - Dimensions _tmp8_; - gint _tmp9_; - gint _tmp10_; - gint _tmp11_; - sqlite3_stmt* _tmp12_; - PhotoRow* _tmp13_; - BackingPhotoRow* _tmp14_; - Dimensions _tmp15_; - gint _tmp16_; + sqlite3_stmt* _tmp4_; + BackingPhotoRow* _tmp5_; + Dimensions _tmp6_; + gint _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + BackingPhotoRow* _tmp10_; + Dimensions _tmp11_; + gint _tmp12_; + gint _tmp13_; + sqlite3_stmt* _tmp14_; + BackingPhotoRow* _tmp15_; + gint64 _tmp16_; gint _tmp17_; - gint _tmp18_; - sqlite3_stmt* _tmp19_; - PhotoRow* _tmp20_; - BackingPhotoRow* _tmp21_; - gint64 _tmp22_; - gint _tmp23_; + sqlite3_stmt* _tmp18_; + BackingPhotoRow* _tmp19_; + time_t _tmp20_; + gint _tmp21_; + sqlite3_stmt* _tmp22_; + time_t _tmp23_; gint _tmp24_; sqlite3_stmt* _tmp25_; - PhotoRow* _tmp26_; - BackingPhotoRow* _tmp27_; - time_t _tmp28_; - gint _tmp29_; - gint _tmp30_; - sqlite3_stmt* _tmp31_; - PhotoRow* _tmp32_; - time_t _tmp33_; - gint _tmp34_; - gint _tmp35_; - sqlite3_stmt* _tmp36_; - PhotoRow* _tmp37_; - BackingPhotoRow* _tmp38_; - Orientation _tmp39_; - gint _tmp40_; - gint _tmp41_; - sqlite3_stmt* _tmp42_; - PhotoRow* _tmp43_; - BackingPhotoRow* _tmp44_; - Orientation _tmp45_; - gint _tmp46_; + BackingPhotoRow* _tmp26_; + Orientation _tmp27_; + gint _tmp28_; + sqlite3_stmt* _tmp29_; + BackingPhotoRow* _tmp30_; + Orientation _tmp31_; + gint _tmp32_; + sqlite3_stmt* _tmp33_; + const gchar* _tmp34_; + gchar* _tmp35_; + GDestroyNotify _tmp36_; + gint _tmp37_; + sqlite3_stmt* _tmp38_; + const gchar* _tmp39_; + gchar* _tmp40_; + GDestroyNotify _tmp41_; + gint _tmp42_; + sqlite3_stmt* _tmp43_; + const gchar* _tmp44_; + gchar* _tmp45_; + GDestroyNotify _tmp46_; gint _tmp47_; sqlite3_stmt* _tmp48_; - PhotoRow* _tmp49_; - const gchar* _tmp50_; - gchar* _tmp51_; - GDestroyNotify _tmp52_; - gint _tmp53_; - gint _tmp54_; - sqlite3_stmt* _tmp55_; - PhotoRow* _tmp56_; - const gchar* _tmp57_; - gchar* _tmp58_; - GDestroyNotify _tmp59_; - gint _tmp60_; - gint _tmp61_; - sqlite3_stmt* _tmp62_; - PhotoRow* _tmp63_; - const gchar* _tmp64_; - gchar* _tmp65_; - GDestroyNotify _tmp66_; - gint _tmp67_; - gint _tmp68_; - sqlite3_stmt* _tmp69_; - PhotoRow* _tmp70_; - BackingPhotoRow* _tmp71_; - PhotoFileFormat _tmp72_; - gint _tmp73_; - gint _tmp74_; - gint _tmp75_; - sqlite3_stmt* _tmp76_; - PhotoRow* _tmp77_; - const gchar* _tmp78_; - gchar* _tmp79_; - GDestroyNotify _tmp80_; - gint _tmp81_; - gint _tmp82_; - sqlite3_stmt* _tmp83_; - time_t _tmp84_; - gint _tmp85_; - gint _tmp86_; - sqlite3_stmt* _tmp87_; - PhotoRow* _tmp88_; - PhotoID _tmp89_; - gint64 _tmp90_; - gint _tmp91_; - gint _tmp92_; - sqlite3_stmt* _tmp93_; - gint _tmp94_; - gint _tmp95_; - PhotoRow* _tmp97_; - time_t _tmp98_; - PhotoRow* _tmp99_; - PhotoRow* _tmp100_; - BackingPhotoRow* _tmp101_; - Orientation _tmp102_; + BackingPhotoRow* _tmp49_; + PhotoFileFormat _tmp50_; + gint _tmp51_; + sqlite3_stmt* _tmp52_; + const gchar* _tmp53_; + gchar* _tmp54_; + GDestroyNotify _tmp55_; + gint _tmp56_; + sqlite3_stmt* _tmp57_; + time_t _tmp58_; + gint _tmp59_; + sqlite3_stmt* _tmp60_; + PhotoID _tmp61_; + gint64 _tmp62_; + gint _tmp63_; + sqlite3_stmt* _tmp64_; + gint _tmp65_; + time_t _tmp67_; + BackingPhotoRow* _tmp68_; + Orientation _tmp69_; GError * _inner_error_ = NULL; #line 283 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -2099,257 +2140,197 @@ void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) { #line 290 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); #line 292 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = now_sec (); -#line 292 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - time_reimported = (time_t) _tmp4_; -#line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = stmt; + time_reimported = (time_t) now_sec (); #line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = row; -#line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = _tmp6_->master; + _tmp4_ = stmt; #line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = _tmp7_->dim; + _tmp5_ = row->master; #line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = _tmp8_.width; + _tmp6_ = _tmp5_->dim; #line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_bind_int (_tmp5_, 1, _tmp9_); + _tmp7_ = _tmp6_.width; #line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_bind_int (_tmp4_, 1, _tmp7_); #line 295 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp8_ = res; #line 295 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = stmt; -#line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = row; + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = _tmp13_->master; + _tmp9_ = stmt; #line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = _tmp14_->dim; + _tmp10_ = row->master; #line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _tmp15_.height; + _tmp11_ = _tmp10_->dim; #line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = sqlite3_bind_int (_tmp12_, 2, _tmp16_); + _tmp12_ = _tmp11_.height; #line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp17_; + res = sqlite3_bind_int (_tmp9_, 2, _tmp12_); #line 297 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = res; + _tmp13_ = res; #line 297 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK"); -#line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = stmt; -#line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = row; + _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); #line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = _tmp20_->master; + _tmp14_ = stmt; #line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = _tmp21_->filesize; + _tmp15_ = row->master; #line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = sqlite3_bind_int64 (_tmp19_, 3, _tmp22_); + _tmp16_ = _tmp15_->filesize; #line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp23_; + res = sqlite3_bind_int64 (_tmp14_, 3, _tmp16_); #line 299 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = res; + _tmp17_ = res; #line 299 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp24_ == SQLITE_OK, "res == Sqlite.OK"); -#line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = stmt; -#line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = row; + _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); #line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = _tmp26_->master; + _tmp18_ = stmt; #line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = _tmp27_->timestamp; + _tmp19_ = row->master; #line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = sqlite3_bind_int64 (_tmp25_, 4, (gint64) _tmp28_); + _tmp20_ = _tmp19_->timestamp; #line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp29_; + res = sqlite3_bind_int64 (_tmp18_, 4, (gint64) _tmp20_); #line 301 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = res; + _tmp21_ = res; #line 301 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK"); -#line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = stmt; -#line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = row; + _vala_assert (_tmp21_ == SQLITE_OK, "res == Sqlite.OK"); #line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = _tmp32_->exposure_time; + _tmp22_ = stmt; #line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = sqlite3_bind_int64 (_tmp31_, 5, (gint64) _tmp33_); + _tmp23_ = row->exposure_time; #line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp34_; + res = sqlite3_bind_int64 (_tmp22_, 5, (gint64) _tmp23_); #line 303 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = res; + _tmp24_ = res; #line 303 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp35_ == SQLITE_OK, "res == Sqlite.OK"); -#line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = stmt; -#line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = row; + _vala_assert (_tmp24_ == SQLITE_OK, "res == Sqlite.OK"); #line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = _tmp37_->master; + _tmp25_ = stmt; #line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = _tmp38_->original_orientation; + _tmp26_ = row->master; #line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = sqlite3_bind_int (_tmp36_, 6, (gint) _tmp39_); + _tmp27_ = _tmp26_->original_orientation; #line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp40_; + res = sqlite3_bind_int (_tmp25_, 6, (gint) _tmp27_); #line 305 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = res; + _tmp28_ = res; #line 305 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp41_ == SQLITE_OK, "res == Sqlite.OK"); -#line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = stmt; + _vala_assert (_tmp28_ == SQLITE_OK, "res == Sqlite.OK"); #line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = row; + _tmp29_ = stmt; #line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = _tmp43_->master; + _tmp30_ = row->master; #line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = _tmp44_->original_orientation; + _tmp31_ = _tmp30_->original_orientation; #line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = sqlite3_bind_int (_tmp42_, 7, (gint) _tmp45_); -#line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp46_; + res = sqlite3_bind_int (_tmp29_, 7, (gint) _tmp31_); #line 307 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = res; + _tmp32_ = res; #line 307 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp47_ == SQLITE_OK, "res == Sqlite.OK"); -#line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = stmt; -#line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = row; + _vala_assert (_tmp32_ == SQLITE_OK, "res == Sqlite.OK"); #line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = _tmp49_->md5; + _tmp33_ = stmt; #line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = g_strdup (_tmp50_); + _tmp34_ = row->md5; #line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = g_free; + _tmp35_ = g_strdup (_tmp34_); #line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = sqlite3_bind_text (_tmp48_, 8, _tmp51_, -1, _tmp52_); + _tmp36_ = g_free; #line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp53_; + res = sqlite3_bind_text (_tmp33_, 8, _tmp35_, -1, _tmp36_); #line 309 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = res; + _tmp37_ = res; #line 309 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp54_ == SQLITE_OK, "res == Sqlite.OK"); -#line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_ = stmt; + _vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK"); #line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_ = row; + _tmp38_ = stmt; #line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_ = _tmp56_->exif_md5; + _tmp39_ = row->exif_md5; #line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp58_ = g_strdup (_tmp57_); + _tmp40_ = g_strdup (_tmp39_); #line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp59_ = g_free; + _tmp41_ = g_free; #line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp60_ = sqlite3_bind_text (_tmp55_, 9, _tmp58_, -1, _tmp59_); -#line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp60_; + res = sqlite3_bind_text (_tmp38_, 9, _tmp40_, -1, _tmp41_); #line 311 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp61_ = res; + _tmp42_ = res; #line 311 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp61_ == SQLITE_OK, "res == Sqlite.OK"); -#line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp62_ = stmt; -#line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_ = row; + _vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK"); #line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp64_ = _tmp63_->thumbnail_md5; + _tmp43_ = stmt; #line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp65_ = g_strdup (_tmp64_); + _tmp44_ = row->thumbnail_md5; #line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp66_ = g_free; + _tmp45_ = g_strdup (_tmp44_); #line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp67_ = sqlite3_bind_text (_tmp62_, 10, _tmp65_, -1, _tmp66_); + _tmp46_ = g_free; #line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp67_; + res = sqlite3_bind_text (_tmp43_, 10, _tmp45_, -1, _tmp46_); #line 313 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp68_ = res; + _tmp47_ = res; #line 313 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp68_ == SQLITE_OK, "res == Sqlite.OK"); -#line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp69_ = stmt; -#line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp70_ = row; -#line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp71_ = _tmp70_->master; + _vala_assert (_tmp47_ == SQLITE_OK, "res == Sqlite.OK"); #line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp72_ = _tmp71_->file_format; + _tmp48_ = stmt; #line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp73_ = photo_file_format_serialize (_tmp72_); + _tmp49_ = row->master; #line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp74_ = sqlite3_bind_int (_tmp69_, 11, _tmp73_); + _tmp50_ = _tmp49_->file_format; #line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp74_; + res = sqlite3_bind_int (_tmp48_, 11, photo_file_format_serialize (_tmp50_)); #line 315 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp75_ = res; + _tmp51_ = res; #line 315 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp75_ == SQLITE_OK, "res == Sqlite.OK"); -#line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp76_ = stmt; -#line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp77_ = row; + _vala_assert (_tmp51_ == SQLITE_OK, "res == Sqlite.OK"); #line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp78_ = _tmp77_->title; + _tmp52_ = stmt; #line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp79_ = g_strdup (_tmp78_); + _tmp53_ = row->title; #line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp80_ = g_free; + _tmp54_ = g_strdup (_tmp53_); #line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp81_ = sqlite3_bind_text (_tmp76_, 12, _tmp79_, -1, _tmp80_); + _tmp55_ = g_free; #line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp81_; + res = sqlite3_bind_text (_tmp52_, 12, _tmp54_, -1, _tmp55_); #line 317 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp82_ = res; + _tmp56_ = res; #line 317 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp82_ == SQLITE_OK, "res == Sqlite.OK"); -#line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp83_ = stmt; + _vala_assert (_tmp56_ == SQLITE_OK, "res == Sqlite.OK"); #line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp84_ = time_reimported; + _tmp57_ = stmt; #line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp85_ = sqlite3_bind_int64 (_tmp83_, 13, (gint64) _tmp84_); + _tmp58_ = time_reimported; #line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp85_; + res = sqlite3_bind_int64 (_tmp57_, 13, (gint64) _tmp58_); #line 319 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp86_ = res; + _tmp59_ = res; #line 319 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp86_ == SQLITE_OK, "res == Sqlite.OK"); -#line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp87_ = stmt; -#line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp88_ = row; + _vala_assert (_tmp59_ == SQLITE_OK, "res == Sqlite.OK"); #line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp89_ = _tmp88_->photo_id; + _tmp60_ = stmt; #line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp90_ = _tmp89_.id; + _tmp61_ = row->photo_id; #line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp91_ = sqlite3_bind_int64 (_tmp87_, 14, _tmp90_); + _tmp62_ = _tmp61_.id; #line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp91_; + res = sqlite3_bind_int64 (_tmp60_, 14, _tmp62_); #line 321 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp92_ = res; + _tmp63_ = res; #line 321 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp92_ == SQLITE_OK, "res == Sqlite.OK"); -#line 323 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp93_ = stmt; + _vala_assert (_tmp63_ == SQLITE_OK, "res == Sqlite.OK"); #line 323 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp94_ = sqlite3_step (_tmp93_); + _tmp64_ = stmt; #line 323 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp94_; + res = sqlite3_step (_tmp64_); #line 324 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp95_ = res; + _tmp65_ = res; #line 324 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp95_ != SQLITE_DONE) { -#line 2339 "PhotoTable.c" - gint _tmp96_; + if (_tmp65_ != SQLITE_DONE) { +#line 2320 "PhotoTable.c" + gint _tmp66_; #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp96_ = res; + _tmp66_ = res; #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_throw_error ("PhotoTable.reimport_master", _tmp96_, &_inner_error_); + database_table_throw_error ("PhotoTable.reimport_master", _tmp66_, &_inner_error_); #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -2360,7 +2341,7 @@ void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) { _sqlite3_finalize0 (stmt); #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 2355 "PhotoTable.c" +#line 2336 "PhotoTable.c" } else { #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -2370,33 +2351,36 @@ void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) { g_clear_error (&_inner_error_); #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 2365 "PhotoTable.c" +#line 2346 "PhotoTable.c" } } } #line 327 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp97_ = row; -#line 327 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp98_ = time_reimported; + _tmp67_ = time_reimported; #line 327 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp97_->time_reimported = _tmp98_; + row->time_reimported = _tmp67_; #line 328 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp99_ = row; + _tmp68_ = row->master; #line 328 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp100_ = row; + _tmp69_ = _tmp68_->original_orientation; #line 328 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp101_ = _tmp100_->master; -#line 328 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp102_ = _tmp101_->original_orientation; -#line 328 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp99_->orientation = _tmp102_; + row->orientation = _tmp69_; #line 283 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 2387 "PhotoTable.c" +#line 2362 "PhotoTable.c" } -gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gint64 filesize, glong timestamp, const gchar* md5, const gchar* exif_md5, const gchar* thumbnail_md5, PhotoRow* row) { +gboolean +photo_table_master_exif_updated (PhotoTable* self, + PhotoID* photoID, + gint64 filesize, + glong timestamp, + const gchar* md5, + const gchar* exif_md5, + const gchar* thumbnail_md5, + PhotoRow* row) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -2405,54 +2389,32 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - gint64 _tmp5_; - gint _tmp6_; + gint _tmp5_; + sqlite3_stmt* _tmp6_; gint _tmp7_; sqlite3_stmt* _tmp8_; - glong _tmp9_; - gint _tmp10_; + gchar* _tmp9_; + GDestroyNotify _tmp10_; gint _tmp11_; sqlite3_stmt* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - GDestroyNotify _tmp15_; - gint _tmp16_; - gint _tmp17_; - sqlite3_stmt* _tmp18_; - const gchar* _tmp19_; - gchar* _tmp20_; - GDestroyNotify _tmp21_; - gint _tmp22_; + gchar* _tmp13_; + GDestroyNotify _tmp14_; + gint _tmp15_; + sqlite3_stmt* _tmp16_; + gchar* _tmp17_; + GDestroyNotify _tmp18_; + gint _tmp19_; + sqlite3_stmt* _tmp20_; + PhotoID _tmp21_; + gint64 _tmp22_; gint _tmp23_; sqlite3_stmt* _tmp24_; - const gchar* _tmp25_; - gchar* _tmp26_; - GDestroyNotify _tmp27_; - gint _tmp28_; - gint _tmp29_; - sqlite3_stmt* _tmp30_; - PhotoID _tmp31_; - gint64 _tmp32_; - gint _tmp33_; - gint _tmp34_; - sqlite3_stmt* _tmp35_; - gint _tmp36_; - gint _tmp37_; - PhotoRow* _tmp40_; - BackingPhotoRow* _tmp41_; - gint64 _tmp42_; - PhotoRow* _tmp43_; - BackingPhotoRow* _tmp44_; - glong _tmp45_; - PhotoRow* _tmp46_; - const gchar* _tmp47_; - gchar* _tmp48_; - PhotoRow* _tmp49_; - const gchar* _tmp50_; - gchar* _tmp51_; - PhotoRow* _tmp52_; - const gchar* _tmp53_; - gchar* _tmp54_; + gint _tmp25_; + BackingPhotoRow* _tmp28_; + BackingPhotoRow* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; #line 331 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 331 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -2479,112 +2441,88 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi #line 339 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 339 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = filesize; -#line 339 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp5_); -#line 339 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp6_; + res = sqlite3_bind_int64 (_tmp4_, 1, filesize); #line 340 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = res; + _tmp5_ = res; #line 340 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); -#line 341 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = stmt; -#line 341 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = timestamp; + _vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK"); #line 341 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_bind_int64 (_tmp8_, 2, (gint64) _tmp9_); + _tmp6_ = stmt; #line 341 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_bind_int64 (_tmp6_, 2, (gint64) timestamp); #line 342 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp7_ = res; #line 342 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = stmt; -#line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = md5; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = g_strdup (_tmp13_); + _tmp8_ = stmt; #line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = g_free; + _tmp9_ = g_strdup (md5); #line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = sqlite3_bind_text (_tmp12_, 3, _tmp14_, -1, _tmp15_); + _tmp10_ = g_free; #line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp16_; + res = sqlite3_bind_text (_tmp8_, 3, _tmp9_, -1, _tmp10_); #line 344 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = res; + _tmp11_ = res; #line 344 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); -#line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = stmt; -#line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = exif_md5; + _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); #line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = g_strdup (_tmp19_); + _tmp12_ = stmt; #line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = g_free; + _tmp13_ = g_strdup (exif_md5); #line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = sqlite3_bind_text (_tmp18_, 4, _tmp20_, -1, _tmp21_); + _tmp14_ = g_free; #line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp22_; + res = sqlite3_bind_text (_tmp12_, 4, _tmp13_, -1, _tmp14_); #line 346 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = res; + _tmp15_ = res; #line 346 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK"); -#line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = stmt; -#line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = thumbnail_md5; + _vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK"); #line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = g_strdup (_tmp25_); + _tmp16_ = stmt; #line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = g_free; + _tmp17_ = g_strdup (thumbnail_md5); #line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = sqlite3_bind_text (_tmp24_, 5, _tmp26_, -1, _tmp27_); + _tmp18_ = g_free; #line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp28_; + res = sqlite3_bind_text (_tmp16_, 5, _tmp17_, -1, _tmp18_); #line 348 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = res; + _tmp19_ = res; #line 348 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp29_ == SQLITE_OK, "res == Sqlite.OK"); -#line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = stmt; + _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); #line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = *photoID; + _tmp20_ = stmt; #line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = _tmp31_.id; + _tmp21_ = *photoID; #line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = sqlite3_bind_int64 (_tmp30_, 6, _tmp32_); + _tmp22_ = _tmp21_.id; #line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp33_; + res = sqlite3_bind_int64 (_tmp20_, 6, _tmp22_); #line 350 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = res; + _tmp23_ = res; #line 350 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp34_ == SQLITE_OK, "res == Sqlite.OK"); -#line 352 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = stmt; + _vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK"); #line 352 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = sqlite3_step (_tmp35_); + _tmp24_ = stmt; #line 352 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp36_; + res = sqlite3_step (_tmp24_); #line 353 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = res; + _tmp25_ = res; #line 353 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp37_ != SQLITE_DONE) { -#line 2566 "PhotoTable.c" - gint _tmp38_; + if (_tmp25_ != SQLITE_DONE) { +#line 2504 "PhotoTable.c" + gint _tmp26_; #line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = res; + _tmp26_ = res; #line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp38_ != SQLITE_CONSTRAINT) { -#line 2572 "PhotoTable.c" - gint _tmp39_; + if (_tmp26_ != SQLITE_CONSTRAINT) { +#line 2510 "PhotoTable.c" + gint _tmp27_; #line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = res; + _tmp27_ = res; #line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("write_update_photo", _tmp39_); -#line 2578 "PhotoTable.c" + database_table_fatal ("write_update_photo", _tmp27_); +#line 2516 "PhotoTable.c" } #line 357 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; @@ -2592,114 +2530,88 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi _sqlite3_finalize0 (stmt); #line 357 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 2586 "PhotoTable.c" +#line 2524 "PhotoTable.c" } #line 360 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = row; -#line 360 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = _tmp40_->master; + _tmp28_ = row->master; #line 360 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = filesize; -#line 360 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_->filesize = _tmp42_; -#line 361 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = row; + _tmp28_->filesize = filesize; #line 361 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = _tmp43_->master; + _tmp29_ = row->master; #line 361 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = timestamp; -#line 361 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_->timestamp = (time_t) _tmp45_; + _tmp29_->timestamp = (time_t) timestamp; #line 362 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = row; + _tmp30_ = g_strdup (md5); #line 362 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = md5; + _g_free0 (row->md5); #line 362 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = g_strdup (_tmp47_); -#line 362 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp46_->md5); -#line 362 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_->md5 = _tmp48_; -#line 363 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = row; + row->md5 = _tmp30_; #line 363 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = exif_md5; + _tmp31_ = g_strdup (exif_md5); #line 363 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = g_strdup (_tmp50_); + _g_free0 (row->exif_md5); #line 363 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp49_->exif_md5); -#line 363 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_->exif_md5 = _tmp51_; -#line 364 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = row; + row->exif_md5 = _tmp31_; #line 364 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = thumbnail_md5; -#line 364 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = g_strdup (_tmp53_); + _tmp32_ = g_strdup (thumbnail_md5); #line 364 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp52_->thumbnail_md5); + _g_free0 (row->thumbnail_md5); #line 364 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_->thumbnail_md5 = _tmp54_; + row->thumbnail_md5 = _tmp32_; #line 366 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = TRUE; #line 366 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 366 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 2640 "PhotoTable.c" +#line 2558 "PhotoTable.c" } -static void photo_table_validate_orientation (PhotoTable* self, PhotoRow* row) { +static void +photo_table_validate_orientation (PhotoTable* self, + PhotoRow* row) +{ gboolean _tmp0_ = FALSE; - PhotoRow* _tmp1_; - Orientation _tmp2_; + Orientation _tmp1_; #line 377 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); #line 377 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_ROW (row)); #line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = row; -#line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = _tmp1_->orientation; + _tmp1_ = row->orientation; #line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp2_ < ORIENTATION_MIN) { + if (_tmp1_ < ORIENTATION_MIN) { #line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = TRUE; -#line 2660 "PhotoTable.c" +#line 2578 "PhotoTable.c" } else { - PhotoRow* _tmp3_; - Orientation _tmp4_; + Orientation _tmp2_; #line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = row; + _tmp2_ = row->orientation; #line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp3_->orientation; -#line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp4_ > ORIENTATION_MAX; -#line 2670 "PhotoTable.c" + _tmp0_ = _tmp2_ > ORIENTATION_MAX; +#line 2585 "PhotoTable.c" } #line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp0_) { -#line 2674 "PhotoTable.c" - PhotoRow* _tmp5_; - PhotoID _tmp6_; - PhotoRow* _tmp7_; +#line 2589 "PhotoTable.c" + PhotoID _tmp3_; #line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = row; + _tmp3_ = row->photo_id; #line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = _tmp5_->photo_id; -#line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_table_set_orientation (self, &_tmp6_, ORIENTATION_MIN); -#line 382 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = row; + photo_table_set_orientation (self, &_tmp3_, ORIENTATION_MIN); #line 382 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_->orientation = ORIENTATION_MIN; -#line 2688 "PhotoTable.c" + row->orientation = ORIENTATION_MIN; +#line 2597 "PhotoTable.c" } } -PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) { +PhotoRow* +photo_table_get_row (PhotoTable* self, + PhotoID* photo_id) +{ PhotoRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -2711,125 +2623,102 @@ PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) { PhotoID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - gint _tmp10_; + sqlite3_stmt* _tmp8_; PhotoRow* row = NULL; - PhotoRow* _tmp11_; + PhotoRow* _tmp9_; + PhotoRow* _tmp10_; + PhotoID _tmp11_; PhotoRow* _tmp12_; - PhotoID _tmp13_; - PhotoRow* _tmp14_; - BackingPhotoRow* _tmp15_; - sqlite3_stmt* _tmp16_; - const gchar* _tmp17_; - gchar* _tmp18_; - PhotoRow* _tmp19_; - BackingPhotoRow* _tmp20_; - sqlite3_stmt* _tmp21_; - gint _tmp22_; + BackingPhotoRow* _tmp13_; + sqlite3_stmt* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + PhotoRow* _tmp17_; + BackingPhotoRow* _tmp18_; + sqlite3_stmt* _tmp19_; + sqlite3_stmt* _tmp20_; + PhotoRow* _tmp21_; + BackingPhotoRow* _tmp22_; sqlite3_stmt* _tmp23_; - gint _tmp24_; - PhotoRow* _tmp25_; - BackingPhotoRow* _tmp26_; - sqlite3_stmt* _tmp27_; - gint64 _tmp28_; + PhotoRow* _tmp24_; + BackingPhotoRow* _tmp25_; + sqlite3_stmt* _tmp26_; + PhotoRow* _tmp27_; + sqlite3_stmt* _tmp28_; PhotoRow* _tmp29_; - BackingPhotoRow* _tmp30_; - sqlite3_stmt* _tmp31_; - gint64 _tmp32_; - PhotoRow* _tmp33_; - sqlite3_stmt* _tmp34_; - gint64 _tmp35_; + sqlite3_stmt* _tmp30_; + PhotoRow* _tmp31_; + BackingPhotoRow* _tmp32_; + sqlite3_stmt* _tmp33_; + PhotoRow* _tmp34_; + sqlite3_stmt* _tmp35_; PhotoRow* _tmp36_; sqlite3_stmt* _tmp37_; - gint _tmp38_; - PhotoRow* _tmp39_; - BackingPhotoRow* _tmp40_; - sqlite3_stmt* _tmp41_; - gint _tmp42_; - PhotoRow* _tmp43_; - sqlite3_stmt* _tmp44_; - gint64 _tmp45_; + PhotoRow* _tmp38_; + sqlite3_stmt* _tmp39_; + const gchar* _tmp40_; + GeeHashMap* _tmp41_; + PhotoRow* _tmp42_; + sqlite3_stmt* _tmp43_; + const gchar* _tmp44_; + gchar* _tmp45_; PhotoRow* _tmp46_; sqlite3_stmt* _tmp47_; - gint64 _tmp48_; - PhotoRow* _tmp49_; - sqlite3_stmt* _tmp50_; - const gchar* _tmp51_; - GeeHashMap* _tmp52_; - PhotoRow* _tmp53_; - sqlite3_stmt* _tmp54_; - const gchar* _tmp55_; - gchar* _tmp56_; - PhotoRow* _tmp57_; - sqlite3_stmt* _tmp58_; - const gchar* _tmp59_; - gchar* _tmp60_; - PhotoRow* _tmp61_; + const gchar* _tmp48_; + gchar* _tmp49_; + PhotoRow* _tmp50_; + sqlite3_stmt* _tmp51_; + const gchar* _tmp52_; + gchar* _tmp53_; + PhotoRow* _tmp54_; + sqlite3_stmt* _tmp55_; + PhotoRow* _tmp56_; + sqlite3_stmt* _tmp57_; + PhotoRow* _tmp58_; + sqlite3_stmt* _tmp59_; + PhotoRow* _tmp60_; + BackingPhotoRow* _tmp61_; sqlite3_stmt* _tmp62_; - const gchar* _tmp63_; - gchar* _tmp64_; - PhotoRow* _tmp65_; - sqlite3_stmt* _tmp66_; - gint64 _tmp67_; - PhotoRow* _tmp68_; - sqlite3_stmt* _tmp69_; - gint64 _tmp70_; + PhotoRow* _tmp63_; + sqlite3_stmt* _tmp64_; + const gchar* _tmp65_; + gchar* _tmp66_; + PhotoRow* _tmp67_; + sqlite3_stmt* _tmp68_; + const gchar* _tmp69_; + gchar* _tmp70_; PhotoRow* _tmp71_; sqlite3_stmt* _tmp72_; - gint _tmp73_; - Rating _tmp74_; + PhotoRow* _tmp73_; + sqlite3_stmt* _tmp74_; PhotoRow* _tmp75_; - BackingPhotoRow* _tmp76_; - sqlite3_stmt* _tmp77_; - gint _tmp78_; - PhotoFileFormat _tmp79_; - PhotoRow* _tmp80_; - sqlite3_stmt* _tmp81_; - const gchar* _tmp82_; - gchar* _tmp83_; - PhotoRow* _tmp84_; + sqlite3_stmt* _tmp76_; + RawDeveloper _tmp77_ = 0; + sqlite3_stmt* _tmp78_; + const gchar* _tmp79_; + PhotoRow* _tmp82_; + PhotoRow* _tmp83_; + BackingPhotoID* _tmp84_; + gint _tmp84__length1; sqlite3_stmt* _tmp85_; - const gchar* _tmp86_; - gchar* _tmp87_; + BackingPhotoID _tmp86_ = {0}; + BackingPhotoID _tmp87_; PhotoRow* _tmp88_; - sqlite3_stmt* _tmp89_; - gint64 _tmp90_; - PhotoRow* _tmp91_; - sqlite3_stmt* _tmp92_; - gint64 _tmp93_; - PhotoRow* _tmp94_; + BackingPhotoID* _tmp89_; + gint _tmp89__length1; + sqlite3_stmt* _tmp90_; + BackingPhotoID _tmp91_ = {0}; + BackingPhotoID _tmp92_; + PhotoRow* _tmp93_; + BackingPhotoID* _tmp94_; + gint _tmp94__length1; sqlite3_stmt* _tmp95_; - gint _tmp96_; - RawDeveloper _tmp97_ = 0; - sqlite3_stmt* _tmp98_; - const gchar* _tmp99_; - PhotoRow* _tmp103_; - PhotoRow* _tmp104_; - BackingPhotoID* _tmp105_; - gint _tmp105__length1; - sqlite3_stmt* _tmp106_; - gint64 _tmp107_; - BackingPhotoID _tmp108_ = {0}; - BackingPhotoID _tmp109_; - PhotoRow* _tmp110_; - BackingPhotoID* _tmp111_; - gint _tmp111__length1; - sqlite3_stmt* _tmp112_; - gint64 _tmp113_; - BackingPhotoID _tmp114_ = {0}; - BackingPhotoID _tmp115_; - PhotoRow* _tmp116_; - BackingPhotoID* _tmp117_; - gint _tmp117__length1; - sqlite3_stmt* _tmp118_; - gint64 _tmp119_; - BackingPhotoID _tmp120_ = {0}; - BackingPhotoID _tmp121_; - PhotoRow* _tmp122_; - sqlite3_stmt* _tmp123_; - const gchar* _tmp124_; - gchar* _tmp125_; + BackingPhotoID _tmp96_ = {0}; + BackingPhotoID _tmp97_; + PhotoRow* _tmp98_; + sqlite3_stmt* _tmp99_; + const gchar* _tmp100_; + gchar* _tmp101_; #line 386 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL); #line 386 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -2858,360 +2747,313 @@ PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) { #line 398 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = _tmp5_.id; #line 398 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 398 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 399 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 399 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); -#line 401 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 401 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); + _tmp8_ = stmt; #line 401 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp10_ != SQLITE_ROW) { + if (sqlite3_step (_tmp8_) != SQLITE_ROW) { #line 402 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = NULL; #line 402 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 402 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 2868 "PhotoTable.c" +#line 2753 "PhotoTable.c" } #line 404 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = photo_row_new (); + _tmp9_ = photo_row_new (); #line 404 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - row = _tmp11_; + row = _tmp9_; #line 405 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = row; + _tmp10_ = row; #line 405 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = *photo_id; + _tmp11_ = *photo_id; #line 405 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_->photo_id = _tmp13_; + _tmp10_->photo_id = _tmp11_; #line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = row; + _tmp12_ = row; #line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = _tmp14_->master; + _tmp13_ = _tmp12_->master; #line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = stmt; + _tmp14_ = stmt; #line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = sqlite3_column_text (_tmp16_, 0); + _tmp15_ = sqlite3_column_text (_tmp14_, 0); #line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = g_strdup (_tmp17_); + _tmp16_ = g_strdup (_tmp15_); #line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp15_->filepath); + _g_free0 (_tmp13_->filepath); #line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_->filepath = _tmp18_; + _tmp13_->filepath = _tmp16_; #line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = row; -#line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = _tmp19_->master; -#line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = stmt; + _tmp17_ = row; #line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = sqlite3_column_int (_tmp21_, 1); + _tmp18_ = _tmp17_->master; #line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = stmt; + _tmp19_ = stmt; #line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = sqlite3_column_int (_tmp23_, 2); + _tmp20_ = stmt; #line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - dimensions_init (&_tmp20_->dim, _tmp22_, _tmp24_); -#line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = row; + dimensions_init (&_tmp18_->dim, sqlite3_column_int (_tmp19_, 1), sqlite3_column_int (_tmp20_, 2)); #line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = _tmp25_->master; + _tmp21_ = row; #line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = stmt; + _tmp22_ = _tmp21_->master; #line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = sqlite3_column_int64 (_tmp27_, 3); + _tmp23_ = stmt; #line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_->filesize = _tmp28_; + _tmp22_->filesize = sqlite3_column_int64 (_tmp23_, 3); #line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = row; -#line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = _tmp29_->master; + _tmp24_ = row; #line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = stmt; + _tmp25_ = _tmp24_->master; #line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = sqlite3_column_int64 (_tmp31_, 4); + _tmp26_ = stmt; #line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_->timestamp = (time_t) _tmp32_; + _tmp25_->timestamp = (time_t) sqlite3_column_int64 (_tmp26_, 4); #line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = row; -#line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = stmt; + _tmp27_ = row; #line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = sqlite3_column_int64 (_tmp34_, 5); + _tmp28_ = stmt; #line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_->exposure_time = (time_t) _tmp35_; + _tmp27_->exposure_time = (time_t) sqlite3_column_int64 (_tmp28_, 5); #line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = row; -#line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = stmt; + _tmp29_ = row; #line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = sqlite3_column_int (_tmp37_, 6); + _tmp30_ = stmt; #line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_->orientation = (Orientation) _tmp38_; + _tmp29_->orientation = (Orientation) sqlite3_column_int (_tmp30_, 6); #line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = row; + _tmp31_ = row; #line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = _tmp39_->master; + _tmp32_ = _tmp31_->master; #line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = stmt; -#line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = sqlite3_column_int (_tmp41_, 7); + _tmp33_ = stmt; #line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_->original_orientation = (Orientation) _tmp42_; -#line 413 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = row; + _tmp32_->original_orientation = (Orientation) sqlite3_column_int (_tmp33_, 7); #line 413 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = stmt; + _tmp34_ = row; #line 413 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = sqlite3_column_int64 (_tmp44_, 8); + _tmp35_ = stmt; #line 413 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_->import_id.id = _tmp45_; -#line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = row; + _tmp34_->import_id.id = sqlite3_column_int64 (_tmp35_, 8); #line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = stmt; + _tmp36_ = row; #line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = sqlite3_column_int64 (_tmp47_, 9); + _tmp37_ = stmt; #line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_->event_id.id = _tmp48_; + _tmp36_->event_id.id = sqlite3_column_int64 (_tmp37_, 9); #line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = row; + _tmp38_ = row; #line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = stmt; + _tmp39_ = stmt; #line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = sqlite3_column_text (_tmp50_, 10); + _tmp40_ = sqlite3_column_text (_tmp39_, 10); #line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = photo_table_marshall_all_transformations (_tmp51_); + _tmp41_ = photo_table_marshall_all_transformations (_tmp40_); #line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_object_unref0 (_tmp49_->transformations); + _g_object_unref0 (_tmp38_->transformations); #line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_->transformations = _tmp52_; + _tmp38_->transformations = _tmp41_; #line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = row; + _tmp42_ = row; #line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = stmt; + _tmp43_ = stmt; #line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_ = sqlite3_column_text (_tmp54_, 11); + _tmp44_ = sqlite3_column_text (_tmp43_, 11); #line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_ = g_strdup (_tmp55_); + _tmp45_ = g_strdup (_tmp44_); #line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp53_->md5); + _g_free0 (_tmp42_->md5); #line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_->md5 = _tmp56_; + _tmp42_->md5 = _tmp45_; #line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_ = row; + _tmp46_ = row; #line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp58_ = stmt; + _tmp47_ = stmt; #line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp59_ = sqlite3_column_text (_tmp58_, 12); + _tmp48_ = sqlite3_column_text (_tmp47_, 12); #line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp60_ = g_strdup (_tmp59_); + _tmp49_ = g_strdup (_tmp48_); #line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp57_->thumbnail_md5); + _g_free0 (_tmp46_->thumbnail_md5); #line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_->thumbnail_md5 = _tmp60_; + _tmp46_->thumbnail_md5 = _tmp49_; #line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp61_ = row; + _tmp50_ = row; #line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp62_ = stmt; + _tmp51_ = stmt; #line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_ = sqlite3_column_text (_tmp62_, 13); + _tmp52_ = sqlite3_column_text (_tmp51_, 13); #line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp64_ = g_strdup (_tmp63_); + _tmp53_ = g_strdup (_tmp52_); #line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp61_->exif_md5); + _g_free0 (_tmp50_->exif_md5); #line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp61_->exif_md5 = _tmp64_; + _tmp50_->exif_md5 = _tmp53_; #line 419 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp65_ = row; + _tmp54_ = row; #line 419 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp66_ = stmt; -#line 419 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp67_ = sqlite3_column_int64 (_tmp66_, 14); + _tmp55_ = stmt; #line 419 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp65_->time_created = (time_t) _tmp67_; + _tmp54_->time_created = (time_t) sqlite3_column_int64 (_tmp55_, 14); #line 420 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp68_ = row; -#line 420 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp69_ = stmt; + _tmp56_ = row; #line 420 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp70_ = sqlite3_column_int64 (_tmp69_, 15); + _tmp57_ = stmt; #line 420 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp68_->flags = (guint64) _tmp70_; -#line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp71_ = row; -#line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp72_ = stmt; + _tmp56_->flags = (guint64) sqlite3_column_int64 (_tmp57_, 15); #line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp73_ = sqlite3_column_int (_tmp72_, 16); + _tmp58_ = row; #line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp74_ = rating_unserialize (_tmp73_); + _tmp59_ = stmt; #line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp71_->rating = _tmp74_; + _tmp58_->rating = rating_unserialize (sqlite3_column_int (_tmp59_, 16)); #line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp75_ = row; -#line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp76_ = _tmp75_->master; -#line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp77_ = stmt; + _tmp60_ = row; #line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp78_ = sqlite3_column_int (_tmp77_, 17); + _tmp61_ = _tmp60_->master; #line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp79_ = photo_file_format_unserialize (_tmp78_); + _tmp62_ = stmt; #line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp76_->file_format = _tmp79_; + _tmp61_->file_format = photo_file_format_unserialize (sqlite3_column_int (_tmp62_, 17)); #line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp80_ = row; + _tmp63_ = row; #line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp81_ = stmt; + _tmp64_ = stmt; #line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp82_ = sqlite3_column_text (_tmp81_, 18); + _tmp65_ = sqlite3_column_text (_tmp64_, 18); #line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp83_ = g_strdup (_tmp82_); + _tmp66_ = g_strdup (_tmp65_); #line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp80_->title); + _g_free0 (_tmp63_->title); #line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp80_->title = _tmp83_; + _tmp63_->title = _tmp66_; #line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp84_ = row; + _tmp67_ = row; #line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp85_ = stmt; + _tmp68_ = stmt; #line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp86_ = sqlite3_column_text (_tmp85_, 19); + _tmp69_ = sqlite3_column_text (_tmp68_, 19); #line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp87_ = g_strdup (_tmp86_); + _tmp70_ = g_strdup (_tmp69_); #line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp84_->backlinks); + _g_free0 (_tmp67_->backlinks); #line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp84_->backlinks = _tmp87_; -#line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp88_ = row; + _tmp67_->backlinks = _tmp70_; #line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp89_ = stmt; + _tmp71_ = row; #line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp90_ = sqlite3_column_int64 (_tmp89_, 20); + _tmp72_ = stmt; #line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp88_->time_reimported = (time_t) _tmp90_; -#line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp91_ = row; + _tmp71_->time_reimported = (time_t) sqlite3_column_int64 (_tmp72_, 20); #line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp92_ = stmt; + _tmp73_ = row; #line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp93_ = sqlite3_column_int64 (_tmp92_, 21); + _tmp74_ = stmt; #line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp91_->editable_id, _tmp93_); + backing_photo_id_init (&_tmp73_->editable_id, sqlite3_column_int64 (_tmp74_, 21)); #line 427 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp94_ = row; -#line 427 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp95_ = stmt; + _tmp75_ = row; #line 427 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp96_ = sqlite3_column_int (_tmp95_, 22); + _tmp76_ = stmt; #line 427 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp94_->metadata_dirty = _tmp96_ != 0; + _tmp75_->metadata_dirty = sqlite3_column_int (_tmp76_, 22) != 0; #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp98_ = stmt; + _tmp78_ = stmt; #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp99_ = sqlite3_column_text (_tmp98_, 23); + _tmp79_ = sqlite3_column_text (_tmp78_, 23); #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp99_ != NULL) { -#line 3110 "PhotoTable.c" - sqlite3_stmt* _tmp100_; - const gchar* _tmp101_; - RawDeveloper _tmp102_; + if (_tmp79_ != NULL) { +#line 2959 "PhotoTable.c" + sqlite3_stmt* _tmp80_; + const gchar* _tmp81_; #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp100_ = stmt; + _tmp80_ = stmt; #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp101_ = sqlite3_column_text (_tmp100_, 23); + _tmp81_ = sqlite3_column_text (_tmp80_, 23); #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp102_ = raw_developer_from_string (_tmp101_); -#line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp97_ = _tmp102_; -#line 3122 "PhotoTable.c" + _tmp77_ = raw_developer_from_string (_tmp81_); +#line 2968 "PhotoTable.c" } else { #line 429 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp97_ = RAW_DEVELOPER_CAMERA; -#line 3126 "PhotoTable.c" + _tmp77_ = RAW_DEVELOPER_CAMERA; +#line 2972 "PhotoTable.c" } #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp103_ = row; + _tmp82_ = row; #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp103_->developer = _tmp97_; -#line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp104_ = row; + _tmp82_->developer = _tmp77_; #line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp105_ = _tmp104_->development_ids; + _tmp83_ = row; #line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp105__length1 = _tmp104_->development_ids_length1; + _tmp84_ = _tmp83_->development_ids; #line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp106_ = stmt; + _tmp84__length1 = _tmp83_->development_ids_length1; #line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp107_ = sqlite3_column_int64 (_tmp106_, 24); + _tmp85_ = stmt; #line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp108_, _tmp107_); + backing_photo_id_init (&_tmp86_, sqlite3_column_int64 (_tmp85_, 24)); #line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp105_[RAW_DEVELOPER_SHOTWELL] = _tmp108_; + _tmp84_[RAW_DEVELOPER_SHOTWELL] = _tmp86_; #line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp109_ = _tmp105_[RAW_DEVELOPER_SHOTWELL]; + _tmp87_ = _tmp84_[RAW_DEVELOPER_SHOTWELL]; #line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp110_ = row; -#line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp111_ = _tmp110_->development_ids; + _tmp88_ = row; #line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp111__length1 = _tmp110_->development_ids_length1; + _tmp89_ = _tmp88_->development_ids; #line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp112_ = stmt; + _tmp89__length1 = _tmp88_->development_ids_length1; #line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp113_ = sqlite3_column_int64 (_tmp112_, 25); + _tmp90_ = stmt; #line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp114_, _tmp113_); + backing_photo_id_init (&_tmp91_, sqlite3_column_int64 (_tmp90_, 25)); #line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp111_[RAW_DEVELOPER_CAMERA] = _tmp114_; + _tmp89_[RAW_DEVELOPER_CAMERA] = _tmp91_; #line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp115_ = _tmp111_[RAW_DEVELOPER_CAMERA]; -#line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp116_ = row; + _tmp92_ = _tmp89_[RAW_DEVELOPER_CAMERA]; #line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp117_ = _tmp116_->development_ids; + _tmp93_ = row; #line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp117__length1 = _tmp116_->development_ids_length1; + _tmp94_ = _tmp93_->development_ids; #line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp118_ = stmt; + _tmp94__length1 = _tmp93_->development_ids_length1; #line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp119_ = sqlite3_column_int64 (_tmp118_, 26); + _tmp95_ = stmt; #line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp120_, _tmp119_); + backing_photo_id_init (&_tmp96_, sqlite3_column_int64 (_tmp95_, 26)); #line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp117_[RAW_DEVELOPER_EMBEDDED] = _tmp120_; + _tmp94_[RAW_DEVELOPER_EMBEDDED] = _tmp96_; #line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp121_ = _tmp117_[RAW_DEVELOPER_EMBEDDED]; + _tmp97_ = _tmp94_[RAW_DEVELOPER_EMBEDDED]; #line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp122_ = row; + _tmp98_ = row; #line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp123_ = stmt; + _tmp99_ = stmt; #line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp124_ = sqlite3_column_text (_tmp123_, 27); + _tmp100_ = sqlite3_column_text (_tmp99_, 27); #line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp125_ = g_strdup (_tmp124_); + _tmp101_ = g_strdup (_tmp100_); #line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp122_->comment); + _g_free0 (_tmp98_->comment); #line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp122_->comment = _tmp125_; + _tmp98_->comment = _tmp101_; #line 435 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = row; #line 435 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 435 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 3198 "PhotoTable.c" +#line 3038 "PhotoTable.c" } -GeeArrayList* photo_table_get_all (PhotoTable* self) { +GeeArrayList* +photo_table_get_all (PhotoTable* self) +{ GeeArrayList* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -3247,481 +3089,409 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) { all = _tmp4_; #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 3234 "PhotoTable.c" +#line 3076 "PhotoTable.c" sqlite3_stmt* _tmp5_; gint _tmp6_; - gint _tmp7_; PhotoRow* row = NULL; + PhotoRow* _tmp7_; PhotoRow* _tmp8_; - PhotoRow* _tmp9_; - sqlite3_stmt* _tmp10_; - gint64 _tmp11_; - PhotoRow* _tmp12_; - BackingPhotoRow* _tmp13_; - sqlite3_stmt* _tmp14_; - const gchar* _tmp15_; - gchar* _tmp16_; - PhotoRow* _tmp17_; - BackingPhotoRow* _tmp18_; - sqlite3_stmt* _tmp19_; - gint _tmp20_; + sqlite3_stmt* _tmp9_; + PhotoRow* _tmp10_; + BackingPhotoRow* _tmp11_; + sqlite3_stmt* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; + PhotoRow* _tmp15_; + BackingPhotoRow* _tmp16_; + sqlite3_stmt* _tmp17_; + sqlite3_stmt* _tmp18_; + PhotoRow* _tmp19_; + BackingPhotoRow* _tmp20_; sqlite3_stmt* _tmp21_; - gint _tmp22_; - PhotoRow* _tmp23_; - BackingPhotoRow* _tmp24_; - sqlite3_stmt* _tmp25_; - gint64 _tmp26_; + PhotoRow* _tmp22_; + BackingPhotoRow* _tmp23_; + sqlite3_stmt* _tmp24_; + PhotoRow* _tmp25_; + sqlite3_stmt* _tmp26_; PhotoRow* _tmp27_; - BackingPhotoRow* _tmp28_; - sqlite3_stmt* _tmp29_; - gint64 _tmp30_; - PhotoRow* _tmp31_; - sqlite3_stmt* _tmp32_; - gint64 _tmp33_; + sqlite3_stmt* _tmp28_; + PhotoRow* _tmp29_; + BackingPhotoRow* _tmp30_; + sqlite3_stmt* _tmp31_; + PhotoRow* _tmp32_; + sqlite3_stmt* _tmp33_; PhotoRow* _tmp34_; sqlite3_stmt* _tmp35_; - gint _tmp36_; - PhotoRow* _tmp37_; - BackingPhotoRow* _tmp38_; - sqlite3_stmt* _tmp39_; - gint _tmp40_; - PhotoRow* _tmp41_; - sqlite3_stmt* _tmp42_; - gint64 _tmp43_; + PhotoRow* _tmp36_; + sqlite3_stmt* _tmp37_; + const gchar* _tmp38_; + GeeHashMap* _tmp39_; + PhotoRow* _tmp40_; + sqlite3_stmt* _tmp41_; + const gchar* _tmp42_; + gchar* _tmp43_; PhotoRow* _tmp44_; sqlite3_stmt* _tmp45_; - gint64 _tmp46_; - PhotoRow* _tmp47_; - sqlite3_stmt* _tmp48_; - const gchar* _tmp49_; - GeeHashMap* _tmp50_; - PhotoRow* _tmp51_; - sqlite3_stmt* _tmp52_; - const gchar* _tmp53_; - gchar* _tmp54_; - PhotoRow* _tmp55_; - sqlite3_stmt* _tmp56_; - const gchar* _tmp57_; - gchar* _tmp58_; - PhotoRow* _tmp59_; + const gchar* _tmp46_; + gchar* _tmp47_; + PhotoRow* _tmp48_; + sqlite3_stmt* _tmp49_; + const gchar* _tmp50_; + gchar* _tmp51_; + PhotoRow* _tmp52_; + sqlite3_stmt* _tmp53_; + PhotoRow* _tmp54_; + sqlite3_stmt* _tmp55_; + PhotoRow* _tmp56_; + sqlite3_stmt* _tmp57_; + PhotoRow* _tmp58_; + BackingPhotoRow* _tmp59_; sqlite3_stmt* _tmp60_; - const gchar* _tmp61_; - gchar* _tmp62_; - PhotoRow* _tmp63_; - sqlite3_stmt* _tmp64_; - gint64 _tmp65_; - PhotoRow* _tmp66_; - sqlite3_stmt* _tmp67_; - gint64 _tmp68_; + PhotoRow* _tmp61_; + sqlite3_stmt* _tmp62_; + const gchar* _tmp63_; + gchar* _tmp64_; + PhotoRow* _tmp65_; + sqlite3_stmt* _tmp66_; + const gchar* _tmp67_; + gchar* _tmp68_; PhotoRow* _tmp69_; sqlite3_stmt* _tmp70_; - gint _tmp71_; - Rating _tmp72_; + PhotoRow* _tmp71_; + sqlite3_stmt* _tmp72_; PhotoRow* _tmp73_; - BackingPhotoRow* _tmp74_; - sqlite3_stmt* _tmp75_; - gint _tmp76_; - PhotoFileFormat _tmp77_; - PhotoRow* _tmp78_; - sqlite3_stmt* _tmp79_; - const gchar* _tmp80_; - gchar* _tmp81_; - PhotoRow* _tmp82_; + sqlite3_stmt* _tmp74_; + RawDeveloper _tmp75_ = 0; + sqlite3_stmt* _tmp76_; + const gchar* _tmp77_; + PhotoRow* _tmp80_; + PhotoRow* _tmp81_; + BackingPhotoID* _tmp82_; + gint _tmp82__length1; sqlite3_stmt* _tmp83_; - const gchar* _tmp84_; - gchar* _tmp85_; + BackingPhotoID _tmp84_ = {0}; + BackingPhotoID _tmp85_; PhotoRow* _tmp86_; - sqlite3_stmt* _tmp87_; - gint64 _tmp88_; - PhotoRow* _tmp89_; - sqlite3_stmt* _tmp90_; - gint64 _tmp91_; - PhotoRow* _tmp92_; + BackingPhotoID* _tmp87_; + gint _tmp87__length1; + sqlite3_stmt* _tmp88_; + BackingPhotoID _tmp89_ = {0}; + BackingPhotoID _tmp90_; + PhotoRow* _tmp91_; + BackingPhotoID* _tmp92_; + gint _tmp92__length1; sqlite3_stmt* _tmp93_; - gint _tmp94_; - RawDeveloper _tmp95_ = 0; - sqlite3_stmt* _tmp96_; - const gchar* _tmp97_; - PhotoRow* _tmp101_; + BackingPhotoID _tmp94_ = {0}; + BackingPhotoID _tmp95_; + PhotoRow* _tmp96_; + sqlite3_stmt* _tmp97_; + const gchar* _tmp98_; + gchar* _tmp99_; + PhotoRow* _tmp100_; + GeeArrayList* _tmp101_; PhotoRow* _tmp102_; - BackingPhotoID* _tmp103_; - gint _tmp103__length1; - sqlite3_stmt* _tmp104_; - gint64 _tmp105_; - BackingPhotoID _tmp106_ = {0}; - BackingPhotoID _tmp107_; - PhotoRow* _tmp108_; - BackingPhotoID* _tmp109_; - gint _tmp109__length1; - sqlite3_stmt* _tmp110_; - gint64 _tmp111_; - BackingPhotoID _tmp112_ = {0}; - BackingPhotoID _tmp113_; - PhotoRow* _tmp114_; - BackingPhotoID* _tmp115_; - gint _tmp115__length1; - sqlite3_stmt* _tmp116_; - gint64 _tmp117_; - BackingPhotoID _tmp118_ = {0}; - BackingPhotoID _tmp119_; - PhotoRow* _tmp120_; - sqlite3_stmt* _tmp121_; - const gchar* _tmp122_; - gchar* _tmp123_; - PhotoRow* _tmp124_; - GeeArrayList* _tmp125_; - PhotoRow* _tmp126_; #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = stmt; #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = sqlite3_step (_tmp5_); -#line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp6_; + res = sqlite3_step (_tmp5_); #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!(_tmp7_ == SQLITE_ROW)) { + if (!(_tmp6_ == SQLITE_ROW)) { #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 3370 "PhotoTable.c" +#line 3187 "PhotoTable.c" } #line 452 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = photo_row_new (); + _tmp7_ = photo_row_new (); #line 452 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - row = _tmp8_; + row = _tmp7_; #line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = row; + _tmp8_ = row; #line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = stmt; + _tmp9_ = stmt; #line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = sqlite3_column_int64 (_tmp10_, 0); -#line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_->photo_id.id = _tmp11_; + _tmp8_->photo_id.id = sqlite3_column_int64 (_tmp9_, 0); #line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = row; + _tmp10_ = row; #line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = _tmp12_->master; + _tmp11_ = _tmp10_->master; #line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = stmt; + _tmp12_ = stmt; #line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = sqlite3_column_text (_tmp14_, 1); + _tmp13_ = sqlite3_column_text (_tmp12_, 1); #line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = g_strdup (_tmp15_); + _tmp14_ = g_strdup (_tmp13_); #line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp13_->filepath); + _g_free0 (_tmp11_->filepath); #line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_->filepath = _tmp16_; -#line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = row; + _tmp11_->filepath = _tmp14_; #line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = _tmp17_->master; + _tmp15_ = row; #line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = stmt; + _tmp16_ = _tmp15_->master; #line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = sqlite3_column_int (_tmp19_, 2); -#line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = stmt; + _tmp17_ = stmt; #line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = sqlite3_column_int (_tmp21_, 3); + _tmp18_ = stmt; #line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - dimensions_init (&_tmp18_->dim, _tmp20_, _tmp22_); + dimensions_init (&_tmp16_->dim, sqlite3_column_int (_tmp17_, 2), sqlite3_column_int (_tmp18_, 3)); #line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = row; + _tmp19_ = row; #line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = _tmp23_->master; + _tmp20_ = _tmp19_->master; #line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = stmt; -#line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = sqlite3_column_int64 (_tmp25_, 4); + _tmp21_ = stmt; #line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_->filesize = _tmp26_; -#line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = row; + _tmp20_->filesize = sqlite3_column_int64 (_tmp21_, 4); #line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = _tmp27_->master; + _tmp22_ = row; #line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = stmt; + _tmp23_ = _tmp22_->master; #line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = sqlite3_column_int64 (_tmp29_, 5); + _tmp24_ = stmt; #line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_->timestamp = (time_t) _tmp30_; -#line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = row; + _tmp23_->timestamp = (time_t) sqlite3_column_int64 (_tmp24_, 5); #line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = stmt; + _tmp25_ = row; #line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = sqlite3_column_int64 (_tmp32_, 6); + _tmp26_ = stmt; #line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_->exposure_time = (time_t) _tmp33_; -#line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = row; + _tmp25_->exposure_time = (time_t) sqlite3_column_int64 (_tmp26_, 6); #line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = stmt; + _tmp27_ = row; #line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = sqlite3_column_int (_tmp35_, 7); + _tmp28_ = stmt; #line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_->orientation = (Orientation) _tmp36_; -#line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = row; + _tmp27_->orientation = (Orientation) sqlite3_column_int (_tmp28_, 7); #line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = _tmp37_->master; + _tmp29_ = row; #line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = stmt; + _tmp30_ = _tmp29_->master; #line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = sqlite3_column_int (_tmp39_, 8); + _tmp31_ = stmt; #line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_->original_orientation = (Orientation) _tmp40_; + _tmp30_->original_orientation = (Orientation) sqlite3_column_int (_tmp31_, 8); #line 461 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = row; + _tmp32_ = row; #line 461 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = stmt; + _tmp33_ = stmt; #line 461 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = sqlite3_column_int64 (_tmp42_, 9); -#line 461 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_->import_id.id = _tmp43_; -#line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = row; + _tmp32_->import_id.id = sqlite3_column_int64 (_tmp33_, 9); #line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = stmt; + _tmp34_ = row; #line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = sqlite3_column_int64 (_tmp45_, 10); + _tmp35_ = stmt; #line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_->event_id.id = _tmp46_; + _tmp34_->event_id.id = sqlite3_column_int64 (_tmp35_, 10); #line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = row; + _tmp36_ = row; #line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = stmt; + _tmp37_ = stmt; #line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = sqlite3_column_text (_tmp48_, 11); + _tmp38_ = sqlite3_column_text (_tmp37_, 11); #line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = photo_table_marshall_all_transformations (_tmp49_); + _tmp39_ = photo_table_marshall_all_transformations (_tmp38_); #line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_object_unref0 (_tmp47_->transformations); + _g_object_unref0 (_tmp36_->transformations); #line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_->transformations = _tmp50_; + _tmp36_->transformations = _tmp39_; #line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = row; + _tmp40_ = row; #line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = stmt; + _tmp41_ = stmt; #line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = sqlite3_column_text (_tmp52_, 12); + _tmp42_ = sqlite3_column_text (_tmp41_, 12); #line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = g_strdup (_tmp53_); + _tmp43_ = g_strdup (_tmp42_); #line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp51_->md5); + _g_free0 (_tmp40_->md5); #line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_->md5 = _tmp54_; + _tmp40_->md5 = _tmp43_; #line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_ = row; + _tmp44_ = row; #line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_ = stmt; + _tmp45_ = stmt; #line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_ = sqlite3_column_text (_tmp56_, 13); + _tmp46_ = sqlite3_column_text (_tmp45_, 13); #line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp58_ = g_strdup (_tmp57_); + _tmp47_ = g_strdup (_tmp46_); #line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp55_->thumbnail_md5); + _g_free0 (_tmp44_->thumbnail_md5); #line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_->thumbnail_md5 = _tmp58_; + _tmp44_->thumbnail_md5 = _tmp47_; #line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp59_ = row; + _tmp48_ = row; #line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp60_ = stmt; + _tmp49_ = stmt; #line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp61_ = sqlite3_column_text (_tmp60_, 14); + _tmp50_ = sqlite3_column_text (_tmp49_, 14); #line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp62_ = g_strdup (_tmp61_); + _tmp51_ = g_strdup (_tmp50_); #line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp59_->exif_md5); + _g_free0 (_tmp48_->exif_md5); #line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp59_->exif_md5 = _tmp62_; -#line 467 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_ = row; + _tmp48_->exif_md5 = _tmp51_; #line 467 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp64_ = stmt; + _tmp52_ = row; #line 467 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp65_ = sqlite3_column_int64 (_tmp64_, 15); + _tmp53_ = stmt; #line 467 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_->time_created = (time_t) _tmp65_; + _tmp52_->time_created = (time_t) sqlite3_column_int64 (_tmp53_, 15); #line 468 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp66_ = row; + _tmp54_ = row; #line 468 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp67_ = stmt; -#line 468 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp68_ = sqlite3_column_int64 (_tmp67_, 16); + _tmp55_ = stmt; #line 468 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp66_->flags = (guint64) _tmp68_; + _tmp54_->flags = (guint64) sqlite3_column_int64 (_tmp55_, 16); #line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp69_ = row; -#line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp70_ = stmt; + _tmp56_ = row; #line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp71_ = sqlite3_column_int (_tmp70_, 17); + _tmp57_ = stmt; #line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp72_ = rating_unserialize (_tmp71_); -#line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp69_->rating = _tmp72_; -#line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp73_ = row; -#line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp74_ = _tmp73_->master; + _tmp56_->rating = rating_unserialize (sqlite3_column_int (_tmp57_, 17)); #line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp75_ = stmt; + _tmp58_ = row; #line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp76_ = sqlite3_column_int (_tmp75_, 18); + _tmp59_ = _tmp58_->master; #line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp77_ = photo_file_format_unserialize (_tmp76_); + _tmp60_ = stmt; #line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp74_->file_format = _tmp77_; + _tmp59_->file_format = photo_file_format_unserialize (sqlite3_column_int (_tmp60_, 18)); #line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp78_ = row; + _tmp61_ = row; #line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp79_ = stmt; + _tmp62_ = stmt; #line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp80_ = sqlite3_column_text (_tmp79_, 19); + _tmp63_ = sqlite3_column_text (_tmp62_, 19); #line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp81_ = g_strdup (_tmp80_); + _tmp64_ = g_strdup (_tmp63_); #line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp78_->title); + _g_free0 (_tmp61_->title); #line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp78_->title = _tmp81_; + _tmp61_->title = _tmp64_; #line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp82_ = row; + _tmp65_ = row; #line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp83_ = stmt; + _tmp66_ = stmt; #line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp84_ = sqlite3_column_text (_tmp83_, 20); + _tmp67_ = sqlite3_column_text (_tmp66_, 20); #line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp85_ = g_strdup (_tmp84_); + _tmp68_ = g_strdup (_tmp67_); #line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp82_->backlinks); + _g_free0 (_tmp65_->backlinks); #line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp82_->backlinks = _tmp85_; -#line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp86_ = row; + _tmp65_->backlinks = _tmp68_; #line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp87_ = stmt; + _tmp69_ = row; #line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp88_ = sqlite3_column_int64 (_tmp87_, 21); + _tmp70_ = stmt; #line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp86_->time_reimported = (time_t) _tmp88_; -#line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp89_ = row; + _tmp69_->time_reimported = (time_t) sqlite3_column_int64 (_tmp70_, 21); #line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp90_ = stmt; + _tmp71_ = row; #line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp91_ = sqlite3_column_int64 (_tmp90_, 22); + _tmp72_ = stmt; #line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp89_->editable_id, _tmp91_); + backing_photo_id_init (&_tmp71_->editable_id, sqlite3_column_int64 (_tmp72_, 22)); #line 475 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp92_ = row; -#line 475 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp93_ = stmt; + _tmp73_ = row; #line 475 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp94_ = sqlite3_column_int (_tmp93_, 23); + _tmp74_ = stmt; #line 475 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp92_->metadata_dirty = _tmp94_ != 0; + _tmp73_->metadata_dirty = sqlite3_column_int (_tmp74_, 23) != 0; #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp96_ = stmt; + _tmp76_ = stmt; #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp97_ = sqlite3_column_text (_tmp96_, 24); + _tmp77_ = sqlite3_column_text (_tmp76_, 24); #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp97_ != NULL) { -#line 3614 "PhotoTable.c" - sqlite3_stmt* _tmp98_; - const gchar* _tmp99_; - RawDeveloper _tmp100_; + if (_tmp77_ != NULL) { +#line 3393 "PhotoTable.c" + sqlite3_stmt* _tmp78_; + const gchar* _tmp79_; #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp98_ = stmt; + _tmp78_ = stmt; #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp99_ = sqlite3_column_text (_tmp98_, 24); + _tmp79_ = sqlite3_column_text (_tmp78_, 24); #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp100_ = raw_developer_from_string (_tmp99_); -#line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp95_ = _tmp100_; -#line 3626 "PhotoTable.c" + _tmp75_ = raw_developer_from_string (_tmp79_); +#line 3402 "PhotoTable.c" } else { #line 477 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp95_ = RAW_DEVELOPER_CAMERA; -#line 3630 "PhotoTable.c" + _tmp75_ = RAW_DEVELOPER_CAMERA; +#line 3406 "PhotoTable.c" } #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp101_ = row; + _tmp80_ = row; #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp101_->developer = _tmp95_; -#line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp102_ = row; + _tmp80_->developer = _tmp75_; #line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp103_ = _tmp102_->development_ids; + _tmp81_ = row; #line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp103__length1 = _tmp102_->development_ids_length1; + _tmp82_ = _tmp81_->development_ids; #line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp104_ = stmt; + _tmp82__length1 = _tmp81_->development_ids_length1; #line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp105_ = sqlite3_column_int64 (_tmp104_, 25); + _tmp83_ = stmt; #line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp106_, _tmp105_); + backing_photo_id_init (&_tmp84_, sqlite3_column_int64 (_tmp83_, 25)); #line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp103_[RAW_DEVELOPER_SHOTWELL] = _tmp106_; + _tmp82_[RAW_DEVELOPER_SHOTWELL] = _tmp84_; #line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp107_ = _tmp103_[RAW_DEVELOPER_SHOTWELL]; + _tmp85_ = _tmp82_[RAW_DEVELOPER_SHOTWELL]; #line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp108_ = row; -#line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp109_ = _tmp108_->development_ids; + _tmp86_ = row; #line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp109__length1 = _tmp108_->development_ids_length1; + _tmp87_ = _tmp86_->development_ids; #line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp110_ = stmt; + _tmp87__length1 = _tmp86_->development_ids_length1; #line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp111_ = sqlite3_column_int64 (_tmp110_, 26); + _tmp88_ = stmt; #line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp112_, _tmp111_); + backing_photo_id_init (&_tmp89_, sqlite3_column_int64 (_tmp88_, 26)); #line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp109_[RAW_DEVELOPER_CAMERA] = _tmp112_; + _tmp87_[RAW_DEVELOPER_CAMERA] = _tmp89_; #line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp113_ = _tmp109_[RAW_DEVELOPER_CAMERA]; + _tmp90_ = _tmp87_[RAW_DEVELOPER_CAMERA]; #line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp114_ = row; + _tmp91_ = row; #line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp115_ = _tmp114_->development_ids; + _tmp92_ = _tmp91_->development_ids; #line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp115__length1 = _tmp114_->development_ids_length1; + _tmp92__length1 = _tmp91_->development_ids_length1; #line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp116_ = stmt; -#line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp117_ = sqlite3_column_int64 (_tmp116_, 27); + _tmp93_ = stmt; #line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp118_, _tmp117_); + backing_photo_id_init (&_tmp94_, sqlite3_column_int64 (_tmp93_, 27)); #line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp115_[RAW_DEVELOPER_EMBEDDED] = _tmp118_; + _tmp92_[RAW_DEVELOPER_EMBEDDED] = _tmp94_; #line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp119_ = _tmp115_[RAW_DEVELOPER_EMBEDDED]; + _tmp95_ = _tmp92_[RAW_DEVELOPER_EMBEDDED]; #line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp120_ = row; + _tmp96_ = row; #line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp121_ = stmt; + _tmp97_ = stmt; #line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp122_ = sqlite3_column_text (_tmp121_, 28); + _tmp98_ = sqlite3_column_text (_tmp97_, 28); #line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp123_ = g_strdup (_tmp122_); + _tmp99_ = g_strdup (_tmp98_); #line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp120_->comment); + _g_free0 (_tmp96_->comment); #line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp120_->comment = _tmp123_; + _tmp96_->comment = _tmp99_; #line 483 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp124_ = row; + _tmp100_ = row; #line 483 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_table_validate_orientation (self, _tmp124_); + photo_table_validate_orientation (self, _tmp100_); #line 485 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp125_ = all; + _tmp101_ = all; #line 485 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp126_ = row; + _tmp102_ = row; #line 485 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp126_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp102_); #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _photo_row_unref0 (row); -#line 3708 "PhotoTable.c" +#line 3478 "PhotoTable.c" } #line 488 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = all; @@ -3729,11 +3499,20 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) { _sqlite3_finalize0 (stmt); #line 488 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 3716 "PhotoTable.c" +#line 3486 "PhotoTable.c" } -void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* new_filename, BackingPhotoID* editable_id, BackingPhotoID* develop_shotwell, BackingPhotoID* develop_camera_id, BackingPhotoID* develop_embedded_id, PhotoID* result) { +void +photo_table_duplicate (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_filename, + BackingPhotoID* editable_id, + BackingPhotoID* develop_shotwell, + BackingPhotoID* develop_camera_id, + BackingPhotoID* develop_embedded_id, + PhotoID* result) +{ PhotoRow* original = NULL; PhotoID _tmp0_; PhotoRow* _tmp1_; @@ -3744,71 +3523,71 @@ void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* ne gint _tmp4_; gint _tmp5_; sqlite3_stmt* _tmp6_; - const gchar* _tmp7_; - gchar* _tmp8_; - GDestroyNotify _tmp9_; - gint _tmp10_; - gint _tmp11_; - sqlite3_stmt* _tmp12_; - PhotoRow* _tmp13_; - BackingPhotoRow* _tmp14_; - Dimensions _tmp15_; - gint _tmp16_; - gint _tmp17_; - gint _tmp18_; - sqlite3_stmt* _tmp19_; - PhotoRow* _tmp20_; - BackingPhotoRow* _tmp21_; - Dimensions _tmp22_; - gint _tmp23_; - gint _tmp24_; - gint _tmp25_; - sqlite3_stmt* _tmp26_; - PhotoRow* _tmp27_; - BackingPhotoRow* _tmp28_; - gint64 _tmp29_; - gint _tmp30_; + gchar* _tmp7_; + GDestroyNotify _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; + PhotoRow* _tmp11_; + BackingPhotoRow* _tmp12_; + Dimensions _tmp13_; + gint _tmp14_; + gint _tmp15_; + sqlite3_stmt* _tmp16_; + PhotoRow* _tmp17_; + BackingPhotoRow* _tmp18_; + Dimensions _tmp19_; + gint _tmp20_; + gint _tmp21_; + sqlite3_stmt* _tmp22_; + PhotoRow* _tmp23_; + BackingPhotoRow* _tmp24_; + gint64 _tmp25_; + gint _tmp26_; + sqlite3_stmt* _tmp27_; + PhotoRow* _tmp28_; + BackingPhotoRow* _tmp29_; + time_t _tmp30_; gint _tmp31_; sqlite3_stmt* _tmp32_; PhotoRow* _tmp33_; - BackingPhotoRow* _tmp34_; - time_t _tmp35_; - gint _tmp36_; - gint _tmp37_; - sqlite3_stmt* _tmp38_; - PhotoRow* _tmp39_; - time_t _tmp40_; - gint _tmp41_; - gint _tmp42_; - sqlite3_stmt* _tmp43_; - PhotoRow* _tmp44_; - Orientation _tmp45_; - gint _tmp46_; - gint _tmp47_; - sqlite3_stmt* _tmp48_; - PhotoRow* _tmp49_; - BackingPhotoRow* _tmp50_; - Orientation _tmp51_; - gint _tmp52_; - gint _tmp53_; - sqlite3_stmt* _tmp54_; - PhotoRow* _tmp55_; - ImportID _tmp56_; - gint64 _tmp57_; - gint _tmp58_; - gint _tmp59_; - sqlite3_stmt* _tmp60_; - PhotoRow* _tmp61_; - EventID _tmp62_; - gint64 _tmp63_; - gint _tmp64_; - gint _tmp65_; - sqlite3_stmt* _tmp66_; - PhotoRow* _tmp67_; - GeeHashMap* _tmp68_; - gchar* _tmp69_; - GDestroyNotify _tmp70_; - gint _tmp71_; + time_t _tmp34_; + gint _tmp35_; + sqlite3_stmt* _tmp36_; + PhotoRow* _tmp37_; + Orientation _tmp38_; + gint _tmp39_; + sqlite3_stmt* _tmp40_; + PhotoRow* _tmp41_; + BackingPhotoRow* _tmp42_; + Orientation _tmp43_; + gint _tmp44_; + sqlite3_stmt* _tmp45_; + PhotoRow* _tmp46_; + ImportID _tmp47_; + gint64 _tmp48_; + gint _tmp49_; + sqlite3_stmt* _tmp50_; + PhotoRow* _tmp51_; + EventID _tmp52_; + gint64 _tmp53_; + gint _tmp54_; + sqlite3_stmt* _tmp55_; + PhotoRow* _tmp56_; + GeeHashMap* _tmp57_; + gchar* _tmp58_; + GDestroyNotify _tmp59_; + gint _tmp60_; + sqlite3_stmt* _tmp61_; + PhotoRow* _tmp62_; + const gchar* _tmp63_; + gchar* _tmp64_; + GDestroyNotify _tmp65_; + gint _tmp66_; + sqlite3_stmt* _tmp67_; + PhotoRow* _tmp68_; + const gchar* _tmp69_; + gchar* _tmp70_; + GDestroyNotify _tmp71_; gint _tmp72_; sqlite3_stmt* _tmp73_; PhotoRow* _tmp74_; @@ -3816,90 +3595,59 @@ void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* ne gchar* _tmp76_; GDestroyNotify _tmp77_; gint _tmp78_; - gint _tmp79_; - sqlite3_stmt* _tmp80_; - PhotoRow* _tmp81_; - const gchar* _tmp82_; - gchar* _tmp83_; - GDestroyNotify _tmp84_; - gint _tmp85_; - gint _tmp86_; - sqlite3_stmt* _tmp87_; - PhotoRow* _tmp88_; - const gchar* _tmp89_; - gchar* _tmp90_; - GDestroyNotify _tmp91_; - gint _tmp92_; + sqlite3_stmt* _tmp79_; + gint _tmp80_; + sqlite3_stmt* _tmp81_; + PhotoRow* _tmp82_; + guint64 _tmp83_; + gint _tmp84_; + sqlite3_stmt* _tmp85_; + PhotoRow* _tmp86_; + Rating _tmp87_; + gint _tmp88_; + sqlite3_stmt* _tmp89_; + PhotoRow* _tmp90_; + BackingPhotoRow* _tmp91_; + PhotoFileFormat _tmp92_; gint _tmp93_; sqlite3_stmt* _tmp94_; - gulong _tmp95_; - gint _tmp96_; - gint _tmp97_; - sqlite3_stmt* _tmp98_; - PhotoRow* _tmp99_; - guint64 _tmp100_; - gint _tmp101_; - gint _tmp102_; - sqlite3_stmt* _tmp103_; - PhotoRow* _tmp104_; - Rating _tmp105_; - gint _tmp106_; - gint _tmp107_; - gint _tmp108_; - sqlite3_stmt* _tmp109_; - PhotoRow* _tmp110_; - BackingPhotoRow* _tmp111_; - PhotoFileFormat _tmp112_; + PhotoRow* _tmp95_; + const gchar* _tmp96_; + gchar* _tmp97_; + GDestroyNotify _tmp98_; + gint _tmp99_; + sqlite3_stmt* _tmp100_; + BackingPhotoID _tmp101_; + gint64 _tmp102_; + gint _tmp103_; + sqlite3_stmt* _tmp104_; + PhotoRow* _tmp105_; + RawDeveloper _tmp106_; + gchar* _tmp107_; + GDestroyNotify _tmp108_; + gint _tmp109_; + sqlite3_stmt* _tmp110_; + BackingPhotoID _tmp111_; + gint64 _tmp112_; gint _tmp113_; - gint _tmp114_; - gint _tmp115_; - sqlite3_stmt* _tmp116_; - PhotoRow* _tmp117_; - const gchar* _tmp118_; - gchar* _tmp119_; - GDestroyNotify _tmp120_; + sqlite3_stmt* _tmp114_; + BackingPhotoID _tmp115_; + gint64 _tmp116_; + gint _tmp117_; + sqlite3_stmt* _tmp118_; + BackingPhotoID _tmp119_; + gint64 _tmp120_; gint _tmp121_; - gint _tmp122_; - sqlite3_stmt* _tmp123_; - BackingPhotoID _tmp124_; - gint64 _tmp125_; - gint _tmp126_; + sqlite3_stmt* _tmp122_; + PhotoRow* _tmp123_; + const gchar* _tmp124_; + gchar* _tmp125_; + GDestroyNotify _tmp126_; gint _tmp127_; sqlite3_stmt* _tmp128_; - PhotoRow* _tmp129_; - RawDeveloper _tmp130_; - gchar* _tmp131_; - GDestroyNotify _tmp132_; - gint _tmp133_; - gint _tmp134_; - sqlite3_stmt* _tmp135_; - BackingPhotoID _tmp136_; - gint64 _tmp137_; - gint _tmp138_; - gint _tmp139_; - sqlite3_stmt* _tmp140_; - BackingPhotoID _tmp141_; - gint64 _tmp142_; - gint _tmp143_; - gint _tmp144_; - sqlite3_stmt* _tmp145_; - BackingPhotoID _tmp146_; - gint64 _tmp147_; - gint _tmp148_; - gint _tmp149_; - sqlite3_stmt* _tmp150_; - PhotoRow* _tmp151_; - const gchar* _tmp152_; - gchar* _tmp153_; - GDestroyNotify _tmp154_; - gint _tmp155_; - gint _tmp156_; - sqlite3_stmt* _tmp157_; - gint _tmp158_; - gint _tmp159_; - sqlite3* _tmp163_; - gint64 _tmp164_; - PhotoID _tmp165_ = {0}; + gint _tmp129_; + sqlite3* _tmp133_; + PhotoID _tmp134_ = {0}; #line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); #line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -3941,546 +3689,476 @@ void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* ne #line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = stmt; #line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = new_filename; -#line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = g_strdup (_tmp7_); + _tmp7_ = g_strdup (new_filename); #line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = g_free; + _tmp8_ = g_free; #line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_bind_text (_tmp6_, 1, _tmp8_, -1, _tmp9_); -#line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_bind_text (_tmp6_, 1, _tmp7_, -1, _tmp8_); #line 510 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 510 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = stmt; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = original; + _tmp10_ = stmt; #line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = _tmp13_->master; + _tmp11_ = original; #line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = _tmp14_->dim; + _tmp12_ = _tmp11_->master; #line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _tmp15_.width; + _tmp13_ = _tmp12_->dim; #line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = sqlite3_bind_int (_tmp12_, 2, _tmp16_); + _tmp14_ = _tmp13_.width; #line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp17_; + res = sqlite3_bind_int (_tmp10_, 2, _tmp14_); #line 512 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = res; + _tmp15_ = res; #line 512 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK"); #line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = stmt; -#line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = original; + _tmp16_ = stmt; #line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = _tmp20_->master; + _tmp17_ = original; #line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = _tmp21_->dim; + _tmp18_ = _tmp17_->master; #line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = _tmp22_.height; + _tmp19_ = _tmp18_->dim; #line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = sqlite3_bind_int (_tmp19_, 3, _tmp23_); + _tmp20_ = _tmp19_.height; #line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp24_; + res = sqlite3_bind_int (_tmp16_, 3, _tmp20_); #line 514 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = res; + _tmp21_ = res; #line 514 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp25_ == SQLITE_OK, "res == Sqlite.OK"); -#line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = stmt; + _vala_assert (_tmp21_ == SQLITE_OK, "res == Sqlite.OK"); #line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = original; + _tmp22_ = stmt; #line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = _tmp27_->master; + _tmp23_ = original; #line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = _tmp28_->filesize; + _tmp24_ = _tmp23_->master; #line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = sqlite3_bind_int64 (_tmp26_, 4, _tmp29_); + _tmp25_ = _tmp24_->filesize; #line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp30_; + res = sqlite3_bind_int64 (_tmp22_, 4, _tmp25_); #line 516 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = res; + _tmp26_ = res; #line 516 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp31_ == SQLITE_OK, "res == Sqlite.OK"); -#line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = stmt; + _vala_assert (_tmp26_ == SQLITE_OK, "res == Sqlite.OK"); #line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = original; + _tmp27_ = stmt; #line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = _tmp33_->master; + _tmp28_ = original; #line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = _tmp34_->timestamp; + _tmp29_ = _tmp28_->master; #line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = sqlite3_bind_int64 (_tmp32_, 5, (gint64) _tmp35_); + _tmp30_ = _tmp29_->timestamp; #line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp36_; + res = sqlite3_bind_int64 (_tmp27_, 5, (gint64) _tmp30_); #line 518 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = res; + _tmp31_ = res; #line 518 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK"); -#line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = stmt; + _vala_assert (_tmp31_ == SQLITE_OK, "res == Sqlite.OK"); #line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = original; + _tmp32_ = stmt; #line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = _tmp39_->exposure_time; + _tmp33_ = original; #line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = sqlite3_bind_int64 (_tmp38_, 6, (gint64) _tmp40_); + _tmp34_ = _tmp33_->exposure_time; #line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp41_; + res = sqlite3_bind_int64 (_tmp32_, 6, (gint64) _tmp34_); #line 520 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = res; + _tmp35_ = res; #line 520 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK"); -#line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = stmt; + _vala_assert (_tmp35_ == SQLITE_OK, "res == Sqlite.OK"); #line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = original; + _tmp36_ = stmt; #line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = _tmp44_->orientation; + _tmp37_ = original; #line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = sqlite3_bind_int (_tmp43_, 7, (gint) _tmp45_); + _tmp38_ = _tmp37_->orientation; #line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp46_; + res = sqlite3_bind_int (_tmp36_, 7, (gint) _tmp38_); #line 522 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = res; + _tmp39_ = res; #line 522 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp47_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp39_ == SQLITE_OK, "res == Sqlite.OK"); #line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = stmt; -#line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = original; + _tmp40_ = stmt; #line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = _tmp49_->master; + _tmp41_ = original; #line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = _tmp50_->original_orientation; + _tmp42_ = _tmp41_->master; #line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = sqlite3_bind_int (_tmp48_, 8, (gint) _tmp51_); + _tmp43_ = _tmp42_->original_orientation; #line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp52_; + res = sqlite3_bind_int (_tmp40_, 8, (gint) _tmp43_); #line 524 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = res; + _tmp44_ = res; #line 524 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp53_ == SQLITE_OK, "res == Sqlite.OK"); -#line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = stmt; + _vala_assert (_tmp44_ == SQLITE_OK, "res == Sqlite.OK"); #line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_ = original; + _tmp45_ = stmt; #line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_ = _tmp55_->import_id; + _tmp46_ = original; #line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_ = _tmp56_.id; + _tmp47_ = _tmp46_->import_id; #line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp58_ = sqlite3_bind_int64 (_tmp54_, 9, _tmp57_); + _tmp48_ = _tmp47_.id; #line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp58_; + res = sqlite3_bind_int64 (_tmp45_, 9, _tmp48_); #line 526 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp59_ = res; + _tmp49_ = res; #line 526 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp59_ == SQLITE_OK, "res == Sqlite.OK"); -#line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp60_ = stmt; + _vala_assert (_tmp49_ == SQLITE_OK, "res == Sqlite.OK"); #line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp61_ = original; + _tmp50_ = stmt; #line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp62_ = _tmp61_->event_id; + _tmp51_ = original; #line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_ = _tmp62_.id; + _tmp52_ = _tmp51_->event_id; #line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp64_ = sqlite3_bind_int64 (_tmp60_, 10, _tmp63_); + _tmp53_ = _tmp52_.id; #line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp64_; + res = sqlite3_bind_int64 (_tmp50_, 10, _tmp53_); #line 528 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp65_ = res; + _tmp54_ = res; #line 528 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp65_ == SQLITE_OK, "res == Sqlite.OK"); -#line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp66_ = stmt; + _vala_assert (_tmp54_ == SQLITE_OK, "res == Sqlite.OK"); #line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp67_ = original; + _tmp55_ = stmt; #line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp68_ = _tmp67_->transformations; + _tmp56_ = original; #line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp69_ = photo_table_unmarshall_all_transformations (_tmp68_); + _tmp57_ = _tmp56_->transformations; #line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp70_ = g_free; + _tmp58_ = photo_table_unmarshall_all_transformations (_tmp57_); #line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp71_ = sqlite3_bind_text (_tmp66_, 11, _tmp69_, -1, _tmp70_); + _tmp59_ = g_free; #line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp71_; + res = sqlite3_bind_text (_tmp55_, 11, _tmp58_, -1, _tmp59_); #line 530 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp72_ = res; + _tmp60_ = res; #line 530 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp72_ == SQLITE_OK, "res == Sqlite.OK"); -#line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp73_ = stmt; + _vala_assert (_tmp60_ == SQLITE_OK, "res == Sqlite.OK"); #line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp74_ = original; + _tmp61_ = stmt; #line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp75_ = _tmp74_->md5; + _tmp62_ = original; #line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp76_ = g_strdup (_tmp75_); + _tmp63_ = _tmp62_->md5; #line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp77_ = g_free; + _tmp64_ = g_strdup (_tmp63_); #line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp78_ = sqlite3_bind_text (_tmp73_, 12, _tmp76_, -1, _tmp77_); + _tmp65_ = g_free; #line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp78_; + res = sqlite3_bind_text (_tmp61_, 12, _tmp64_, -1, _tmp65_); #line 532 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp79_ = res; + _tmp66_ = res; #line 532 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp79_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp66_ == SQLITE_OK, "res == Sqlite.OK"); #line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp80_ = stmt; + _tmp67_ = stmt; #line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp81_ = original; + _tmp68_ = original; #line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp82_ = _tmp81_->thumbnail_md5; + _tmp69_ = _tmp68_->thumbnail_md5; #line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp83_ = g_strdup (_tmp82_); + _tmp70_ = g_strdup (_tmp69_); #line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp84_ = g_free; + _tmp71_ = g_free; #line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp85_ = sqlite3_bind_text (_tmp80_, 13, _tmp83_, -1, _tmp84_); -#line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp85_; + res = sqlite3_bind_text (_tmp67_, 13, _tmp70_, -1, _tmp71_); #line 534 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp86_ = res; + _tmp72_ = res; #line 534 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp86_ == SQLITE_OK, "res == Sqlite.OK"); -#line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp87_ = stmt; + _vala_assert (_tmp72_ == SQLITE_OK, "res == Sqlite.OK"); #line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp88_ = original; + _tmp73_ = stmt; #line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp89_ = _tmp88_->exif_md5; + _tmp74_ = original; #line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp90_ = g_strdup (_tmp89_); + _tmp75_ = _tmp74_->exif_md5; #line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp91_ = g_free; + _tmp76_ = g_strdup (_tmp75_); #line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp92_ = sqlite3_bind_text (_tmp87_, 14, _tmp90_, -1, _tmp91_); + _tmp77_ = g_free; #line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp92_; + res = sqlite3_bind_text (_tmp73_, 14, _tmp76_, -1, _tmp77_); #line 536 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp93_ = res; + _tmp78_ = res; #line 536 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp93_ == SQLITE_OK, "res == Sqlite.OK"); -#line 537 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp94_ = stmt; -#line 537 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp95_ = now_sec (); + _vala_assert (_tmp78_ == SQLITE_OK, "res == Sqlite.OK"); #line 537 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp96_ = sqlite3_bind_int64 (_tmp94_, 15, (gint64) _tmp95_); + _tmp79_ = stmt; #line 537 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp96_; + res = sqlite3_bind_int64 (_tmp79_, 15, (gint64) now_sec ()); #line 538 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp97_ = res; + _tmp80_ = res; #line 538 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp97_ == SQLITE_OK, "res == Sqlite.OK"); -#line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp98_ = stmt; + _vala_assert (_tmp80_ == SQLITE_OK, "res == Sqlite.OK"); #line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp99_ = original; + _tmp81_ = stmt; #line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp100_ = _tmp99_->flags; + _tmp82_ = original; #line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp101_ = sqlite3_bind_int64 (_tmp98_, 16, (gint64) _tmp100_); + _tmp83_ = _tmp82_->flags; #line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp101_; + res = sqlite3_bind_int64 (_tmp81_, 16, (gint64) _tmp83_); #line 540 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp102_ = res; + _tmp84_ = res; #line 540 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp102_ == SQLITE_OK, "res == Sqlite.OK"); -#line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp103_ = stmt; + _vala_assert (_tmp84_ == SQLITE_OK, "res == Sqlite.OK"); #line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp104_ = original; -#line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp105_ = _tmp104_->rating; + _tmp85_ = stmt; #line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp106_ = rating_serialize (_tmp105_); + _tmp86_ = original; #line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp107_ = sqlite3_bind_int64 (_tmp103_, 17, (gint64) _tmp106_); + _tmp87_ = _tmp86_->rating; #line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp107_; + res = sqlite3_bind_int64 (_tmp85_, 17, (gint64) rating_serialize (_tmp87_)); #line 542 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp108_ = res; + _tmp88_ = res; #line 542 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp108_ == SQLITE_OK, "res == Sqlite.OK"); -#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp109_ = stmt; + _vala_assert (_tmp88_ == SQLITE_OK, "res == Sqlite.OK"); #line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp110_ = original; -#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp111_ = _tmp110_->master; + _tmp89_ = stmt; #line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp112_ = _tmp111_->file_format; + _tmp90_ = original; #line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp113_ = photo_file_format_serialize (_tmp112_); + _tmp91_ = _tmp90_->master; #line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp114_ = sqlite3_bind_int (_tmp109_, 18, _tmp113_); + _tmp92_ = _tmp91_->file_format; #line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp114_; + res = sqlite3_bind_int (_tmp89_, 18, photo_file_format_serialize (_tmp92_)); #line 544 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp115_ = res; + _tmp93_ = res; #line 544 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp115_ == SQLITE_OK, "res == Sqlite.OK"); -#line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp116_ = stmt; + _vala_assert (_tmp93_ == SQLITE_OK, "res == Sqlite.OK"); #line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp117_ = original; + _tmp94_ = stmt; #line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp118_ = _tmp117_->title; + _tmp95_ = original; #line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp119_ = g_strdup (_tmp118_); + _tmp96_ = _tmp95_->title; #line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp120_ = g_free; + _tmp97_ = g_strdup (_tmp96_); #line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp121_ = sqlite3_bind_text (_tmp116_, 19, _tmp119_, -1, _tmp120_); + _tmp98_ = g_free; #line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp121_; + res = sqlite3_bind_text (_tmp94_, 19, _tmp97_, -1, _tmp98_); #line 546 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp122_ = res; + _tmp99_ = res; #line 546 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp122_ == SQLITE_OK, "res == Sqlite.OK"); -#line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp123_ = stmt; + _vala_assert (_tmp99_ == SQLITE_OK, "res == Sqlite.OK"); #line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp124_ = *editable_id; + _tmp100_ = stmt; #line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp125_ = _tmp124_.id; + _tmp101_ = *editable_id; #line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp126_ = sqlite3_bind_int64 (_tmp123_, 20, _tmp125_); + _tmp102_ = _tmp101_.id; #line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp126_; + res = sqlite3_bind_int64 (_tmp100_, 20, _tmp102_); #line 548 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp127_ = res; + _tmp103_ = res; #line 548 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp127_ == SQLITE_OK, "res == Sqlite.OK"); -#line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp128_ = stmt; + _vala_assert (_tmp103_ == SQLITE_OK, "res == Sqlite.OK"); #line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp129_ = original; + _tmp104_ = stmt; #line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp130_ = _tmp129_->developer; + _tmp105_ = original; #line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp131_ = raw_developer_to_string (_tmp130_); + _tmp106_ = _tmp105_->developer; #line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp132_ = g_free; + _tmp107_ = raw_developer_to_string (_tmp106_); #line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp133_ = sqlite3_bind_text (_tmp128_, 21, _tmp131_, -1, _tmp132_); + _tmp108_ = g_free; #line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp133_; + res = sqlite3_bind_text (_tmp104_, 21, _tmp107_, -1, _tmp108_); #line 551 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp134_ = res; + _tmp109_ = res; #line 551 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp134_ == SQLITE_OK, "res == Sqlite.OK"); -#line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp135_ = stmt; + _vala_assert (_tmp109_ == SQLITE_OK, "res == Sqlite.OK"); #line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp136_ = *develop_shotwell; + _tmp110_ = stmt; #line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp137_ = _tmp136_.id; + _tmp111_ = *develop_shotwell; #line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp138_ = sqlite3_bind_int64 (_tmp135_, 22, _tmp137_); + _tmp112_ = _tmp111_.id; #line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp138_; + res = sqlite3_bind_int64 (_tmp110_, 22, _tmp112_); #line 553 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp139_ = res; + _tmp113_ = res; #line 553 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp139_ == SQLITE_OK, "res == Sqlite.OK"); -#line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp140_ = stmt; + _vala_assert (_tmp113_ == SQLITE_OK, "res == Sqlite.OK"); #line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp141_ = *develop_camera_id; + _tmp114_ = stmt; #line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp142_ = _tmp141_.id; + _tmp115_ = *develop_camera_id; #line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp143_ = sqlite3_bind_int64 (_tmp140_, 23, _tmp142_); + _tmp116_ = _tmp115_.id; #line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp143_; + res = sqlite3_bind_int64 (_tmp114_, 23, _tmp116_); #line 555 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp144_ = res; + _tmp117_ = res; #line 555 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp144_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp117_ == SQLITE_OK, "res == Sqlite.OK"); #line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp145_ = stmt; -#line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp146_ = *develop_embedded_id; + _tmp118_ = stmt; #line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp147_ = _tmp146_.id; + _tmp119_ = *develop_embedded_id; #line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp148_ = sqlite3_bind_int64 (_tmp145_, 24, _tmp147_); + _tmp120_ = _tmp119_.id; #line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp148_; + res = sqlite3_bind_int64 (_tmp118_, 24, _tmp120_); #line 557 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp149_ = res; + _tmp121_ = res; #line 557 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp149_ == SQLITE_OK, "res == Sqlite.OK"); -#line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp150_ = stmt; + _vala_assert (_tmp121_ == SQLITE_OK, "res == Sqlite.OK"); #line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp151_ = original; + _tmp122_ = stmt; #line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp152_ = _tmp151_->comment; + _tmp123_ = original; #line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp153_ = g_strdup (_tmp152_); + _tmp124_ = _tmp123_->comment; #line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp154_ = g_free; + _tmp125_ = g_strdup (_tmp124_); #line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp155_ = sqlite3_bind_text (_tmp150_, 25, _tmp153_, -1, _tmp154_); + _tmp126_ = g_free; #line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp155_; + res = sqlite3_bind_text (_tmp122_, 25, _tmp125_, -1, _tmp126_); #line 559 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp156_ = res; + _tmp127_ = res; #line 559 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp156_ == SQLITE_OK, "res == Sqlite.OK"); -#line 561 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp157_ = stmt; + _vala_assert (_tmp127_ == SQLITE_OK, "res == Sqlite.OK"); #line 561 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp158_ = sqlite3_step (_tmp157_); + _tmp128_ = stmt; #line 561 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp158_; + res = sqlite3_step (_tmp128_); #line 562 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp159_ = res; + _tmp129_ = res; #line 562 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp159_ != SQLITE_DONE) { -#line 4333 "PhotoTable.c" - gint _tmp160_; - PhotoID _tmp162_ = {0}; + if (_tmp129_ != SQLITE_DONE) { +#line 4021 "PhotoTable.c" + gint _tmp130_; + PhotoID _tmp132_ = {0}; #line 563 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp160_ = res; + _tmp130_ = res; #line 563 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp160_ != SQLITE_CONSTRAINT) { -#line 4340 "PhotoTable.c" - gint _tmp161_; + if (_tmp130_ != SQLITE_CONSTRAINT) { +#line 4028 "PhotoTable.c" + gint _tmp131_; #line 564 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp161_ = res; + _tmp131_ = res; #line 564 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("duplicate", _tmp161_); -#line 4346 "PhotoTable.c" + database_table_fatal ("duplicate", _tmp131_); +#line 4034 "PhotoTable.c" } #line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_id_init (&_tmp162_, PHOTO_ID_INVALID); + photo_id_init (&_tmp132_, PHOTO_ID_INVALID); #line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - *result = _tmp162_; + *result = _tmp132_; #line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _photo_row_unref0 (original); #line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4358 "PhotoTable.c" +#line 4046 "PhotoTable.c" } #line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp163_ = database_table_db; -#line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp164_ = sqlite3_last_insert_rowid (_tmp163_); + _tmp133_ = database_table_db; #line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_id_init (&_tmp165_, _tmp164_); + photo_id_init (&_tmp134_, sqlite3_last_insert_rowid (_tmp133_)); #line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - *result = _tmp165_; + *result = _tmp134_; #line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _photo_row_unref0 (original); #line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4374 "PhotoTable.c" +#line 4060 "PhotoTable.c" } -gboolean photo_table_set_title (PhotoTable* self, PhotoID* photo_id, const gchar* new_title) { +gboolean +photo_table_set_title (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_title) +{ gboolean result = FALSE; const gchar* _tmp0_ = NULL; - const gchar* _tmp1_; - PhotoID _tmp3_; - gint64 _tmp4_; - gboolean _tmp5_; + PhotoID _tmp1_; + gint64 _tmp2_; #line 572 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 572 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (photo_id != NULL, FALSE); #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = new_title; -#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp1_ != NULL) { -#line 4393 "PhotoTable.c" - const gchar* _tmp2_; + if (new_title != NULL) { #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = new_title; -#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp2_; -#line 4399 "PhotoTable.c" + _tmp0_ = new_title; +#line 4081 "PhotoTable.c" } else { #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = ""; -#line 4403 "PhotoTable.c" +#line 4085 "PhotoTable.c" } #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = *photo_id; -#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp3_.id; + _tmp1_ = *photo_id; #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp4_, "title", _tmp0_); + _tmp2_ = _tmp1_.id; #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp5_; + result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "title", _tmp0_); #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4415 "PhotoTable.c" +#line 4095 "PhotoTable.c" } -gboolean photo_table_set_comment (PhotoTable* self, PhotoID* photo_id, const gchar* new_comment) { +gboolean +photo_table_set_comment (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_comment) +{ gboolean result = FALSE; const gchar* _tmp0_ = NULL; - const gchar* _tmp1_; - PhotoID _tmp3_; - gint64 _tmp4_; - gboolean _tmp5_; + PhotoID _tmp1_; + gint64 _tmp2_; #line 576 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 576 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (photo_id != NULL, FALSE); #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = new_comment; -#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp1_ != NULL) { -#line 4434 "PhotoTable.c" - const gchar* _tmp2_; + if (new_comment != NULL) { #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = new_comment; -#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp2_; -#line 4440 "PhotoTable.c" + _tmp0_ = new_comment; +#line 4116 "PhotoTable.c" } else { #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = ""; -#line 4444 "PhotoTable.c" +#line 4120 "PhotoTable.c" } #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = *photo_id; -#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp3_.id; + _tmp1_ = *photo_id; #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp4_, "comment", _tmp0_); + _tmp2_ = _tmp1_.id; #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp5_; + result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "comment", _tmp0_); #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4456 "PhotoTable.c" +#line 4130 "PhotoTable.c" } -void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* filepath, GError** error) { +void +photo_table_set_filepath (PhotoTable* self, + PhotoID* photo_id, + const gchar* filepath, + GError** error) +{ PhotoID _tmp0_; gint64 _tmp1_; - const gchar* _tmp2_; GError * _inner_error_ = NULL; #line 580 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -4493,9 +4171,7 @@ void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* #line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = filepath; -#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filename", _tmp2_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filename", filepath, &_inner_error_); #line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4504,7 +4180,7 @@ void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* g_propagate_error (error, _inner_error_); #line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4487 "PhotoTable.c" +#line 4163 "PhotoTable.c" } else { #line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4512,16 +4188,20 @@ void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* g_clear_error (&_inner_error_); #line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4495 "PhotoTable.c" +#line 4171 "PhotoTable.c" } } } -void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t timestamp, GError** error) { +void +photo_table_update_timestamp (PhotoTable* self, + PhotoID* photo_id, + time_t timestamp, + GError** error) +{ PhotoID _tmp0_; gint64 _tmp1_; - time_t _tmp2_; GError * _inner_error_ = NULL; #line 584 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -4532,9 +4212,7 @@ void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t t #line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = timestamp; -#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "timestamp", (gint64) _tmp2_, &_inner_error_); + database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "timestamp", (gint64) timestamp, &_inner_error_); #line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4543,7 +4221,7 @@ void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t t g_propagate_error (error, _inner_error_); #line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4526 "PhotoTable.c" +#line 4204 "PhotoTable.c" } else { #line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4551,18 +4229,20 @@ void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t t g_clear_error (&_inner_error_); #line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4534 "PhotoTable.c" +#line 4212 "PhotoTable.c" } } } -gboolean photo_table_set_exposure_time (PhotoTable* self, PhotoID* photo_id, time_t time) { +gboolean +photo_table_set_exposure_time (PhotoTable* self, + PhotoID* photo_id, + time_t time) +{ gboolean result = FALSE; PhotoID _tmp0_; gint64 _tmp1_; - time_t _tmp2_; - gboolean _tmp3_; #line 588 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 588 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4572,18 +4252,19 @@ gboolean photo_table_set_exposure_time (PhotoTable* self, PhotoID* photo_id, tim #line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = time; -#line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "exposure_time", (gint64) _tmp2_); -#line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp3_; + result = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "exposure_time", (gint64) time); #line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4562 "PhotoTable.c" +#line 4238 "PhotoTable.c" } -void photo_table_set_import_id (PhotoTable* self, PhotoID* photo_id, ImportID* import_id, GError** error) { +void +photo_table_set_import_id (PhotoTable* self, + PhotoID* photo_id, + ImportID* import_id, + GError** error) +{ PhotoID _tmp0_; gint64 _tmp1_; ImportID _tmp2_; @@ -4613,7 +4294,7 @@ void photo_table_set_import_id (PhotoTable* self, PhotoID* photo_id, ImportID* i g_propagate_error (error, _inner_error_); #line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4596 "PhotoTable.c" +#line 4277 "PhotoTable.c" } else { #line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4621,13 +4302,16 @@ void photo_table_set_import_id (PhotoTable* self, PhotoID* photo_id, ImportID* i g_clear_error (&_inner_error_); #line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4604 "PhotoTable.c" +#line 4285 "PhotoTable.c" } } } -gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) { +gboolean +photo_table_remove_by_file (PhotoTable* self, + GFile* file) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -4636,14 +4320,11 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) { gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - GFile* _tmp5_; - gchar* _tmp6_; - GDestroyNotify _tmp7_; - gint _tmp8_; + gchar* _tmp5_; + GDestroyNotify _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; gint _tmp9_; - sqlite3_stmt* _tmp10_; - gint _tmp11_; - gint _tmp12_; #line 596 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 596 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4665,42 +4346,36 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) { #line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = file; -#line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = g_file_get_path (_tmp5_); -#line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = g_free; + _tmp5_ = g_file_get_path (file); #line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); + _tmp6_ = g_free; #line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp8_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp5_, -1, _tmp6_); #line 602 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = res; + _tmp7_ = res; #line 602 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); -#line 604 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 604 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = sqlite3_step (_tmp10_); + _tmp8_ = stmt; #line 604 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp11_; + res = sqlite3_step (_tmp8_); #line 605 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = res; + _tmp9_ = res; #line 605 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp12_ != SQLITE_DONE) { -#line 4671 "PhotoTable.c" - gint _tmp13_; + if (_tmp9_ != SQLITE_DONE) { +#line 4346 "PhotoTable.c" + gint _tmp10_; #line 606 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = res; + _tmp10_ = res; #line 606 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_warning ("remove", _tmp13_); + database_table_warning ("remove", _tmp10_); #line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4683 "PhotoTable.c" +#line 4358 "PhotoTable.c" } #line 611 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = TRUE; @@ -4708,11 +4383,15 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) { _sqlite3_finalize0 (stmt); #line 611 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4691 "PhotoTable.c" +#line 4366 "PhotoTable.c" } -void photo_table_remove (PhotoTable* self, PhotoID* photo_id, GError** error) { +void +photo_table_remove (PhotoTable* self, + PhotoID* photo_id, + GError** error) +{ PhotoID _tmp0_; gint64 _tmp1_; GError * _inner_error_ = NULL; @@ -4734,7 +4413,7 @@ void photo_table_remove (PhotoTable* self, PhotoID* photo_id, GError** error) { g_propagate_error (error, _inner_error_); #line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4717 "PhotoTable.c" +#line 4396 "PhotoTable.c" } else { #line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4742,13 +4421,15 @@ void photo_table_remove (PhotoTable* self, PhotoID* photo_id, GError** error) { g_clear_error (&_inner_error_); #line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4725 "PhotoTable.c" +#line 4404 "PhotoTable.c" } } } -GeeArrayList* photo_table_get_photos (PhotoTable* self) { +GeeArrayList* +photo_table_get_photos (PhotoTable* self) +{ GeeArrayList* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -4778,68 +4459,62 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) { _tmp4_ = gee_array_list_new (TYPE_PHOTO_ID, (GBoxedCopyFunc) photo_id_dup, (GDestroyNotify) photo_id_free, NULL, NULL, NULL); #line 623 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_ids = _tmp4_; -#line 4761 "PhotoTable.c" +#line 4442 "PhotoTable.c" { gboolean _tmp5_ = FALSE; #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = TRUE; #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 4768 "PhotoTable.c" +#line 4449 "PhotoTable.c" sqlite3_stmt* _tmp6_; gint _tmp7_; - gint _tmp8_; - GeeArrayList* _tmp11_; - sqlite3_stmt* _tmp12_; - gint64 _tmp13_; - PhotoID _tmp14_ = {0}; + GeeArrayList* _tmp10_; + sqlite3_stmt* _tmp11_; + PhotoID _tmp12_ = {0}; #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!_tmp5_) { -#line 4778 "PhotoTable.c" +#line 4457 "PhotoTable.c" } #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = FALSE; #line 625 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = stmt; #line 625 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_step (_tmp6_); -#line 625 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_step (_tmp6_); #line 626 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 626 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp8_ == SQLITE_DONE) { + if (_tmp7_ == SQLITE_DONE) { #line 627 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 4794 "PhotoTable.c" +#line 4471 "PhotoTable.c" } else { - gint _tmp9_; + gint _tmp8_; #line 628 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = res; + _tmp8_ = res; #line 628 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp9_ != SQLITE_ROW) { -#line 4801 "PhotoTable.c" - gint _tmp10_; + if (_tmp8_ != SQLITE_ROW) { +#line 4478 "PhotoTable.c" + gint _tmp9_; #line 629 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = res; + _tmp9_ = res; #line 629 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("get_photos", _tmp10_); + database_table_fatal ("get_photos", _tmp9_); #line 631 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 4809 "PhotoTable.c" +#line 4486 "PhotoTable.c" } } #line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = photo_ids; + _tmp10_ = photo_ids; #line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = stmt; -#line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = sqlite3_column_int64 (_tmp12_, 0); + _tmp11_ = stmt; #line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_id_init (&_tmp14_, _tmp13_); + photo_id_init (&_tmp12_, sqlite3_column_int64 (_tmp11_, 0)); #line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp14_); -#line 4822 "PhotoTable.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp12_); +#line 4497 "PhotoTable.c" } } #line 637 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4848,16 +4523,18 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) { _sqlite3_finalize0 (stmt); #line 637 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4831 "PhotoTable.c" +#line 4506 "PhotoTable.c" } -gboolean photo_table_set_orientation (PhotoTable* self, PhotoID* photo_id, Orientation orientation) { +gboolean +photo_table_set_orientation (PhotoTable* self, + PhotoID* photo_id, + Orientation orientation) +{ gboolean result = FALSE; PhotoID _tmp0_; gint64 _tmp1_; - Orientation _tmp2_; - gboolean _tmp3_; #line 640 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 640 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4867,23 +4544,21 @@ gboolean photo_table_set_orientation (PhotoTable* self, PhotoID* photo_id, Orien #line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = orientation; -#line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = database_table_update_int_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "orientation", (gint) _tmp2_); -#line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp3_; + result = database_table_update_int_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "orientation", (gint) orientation); #line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4857 "PhotoTable.c" +#line 4530 "PhotoTable.c" } -gboolean photo_table_replace_flags (PhotoTable* self, PhotoID* photo_id, guint64 flags) { +gboolean +photo_table_replace_flags (PhotoTable* self, + PhotoID* photo_id, + guint64 flags) +{ gboolean result = FALSE; PhotoID _tmp0_; gint64 _tmp1_; - guint64 _tmp2_; - gboolean _tmp3_; #line 644 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 644 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4893,24 +4568,21 @@ gboolean photo_table_replace_flags (PhotoTable* self, PhotoID* photo_id, guint64 #line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = flags; -#line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "flags", (gint64) _tmp2_); -#line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp3_; + result = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "flags", (gint64) flags); #line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4883 "PhotoTable.c" +#line 4554 "PhotoTable.c" } -gboolean photo_table_set_rating (PhotoTable* self, PhotoID* photo_id, Rating rating) { +gboolean +photo_table_set_rating (PhotoTable* self, + PhotoID* photo_id, + Rating rating) +{ gboolean result = FALSE; PhotoID _tmp0_; gint64 _tmp1_; - Rating _tmp2_; - gint _tmp3_; - gboolean _tmp4_; #line 648 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 648 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4920,20 +4592,17 @@ gboolean photo_table_set_rating (PhotoTable* self, PhotoID* photo_id, Rating rat #line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = rating; -#line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = rating_serialize (_tmp2_); -#line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = database_table_update_int_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "rating", _tmp3_); -#line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp4_; + result = database_table_update_int_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "rating", rating_serialize (rating)); #line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4912 "PhotoTable.c" +#line 4578 "PhotoTable.c" } -gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) { +gint +photo_table_get_event_photo_count (PhotoTable* self, + EventID* event_id) +{ gint result = 0; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -4945,7 +4614,6 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) { EventID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; gint count = 0; #line 652 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), 0); @@ -4972,68 +4640,63 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) { #line 657 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = _tmp5_.id; #line 657 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 657 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 658 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 658 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 660 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" count = 0; -#line 4964 "PhotoTable.c" +#line 4630 "PhotoTable.c" { - gboolean _tmp9_ = FALSE; + gboolean _tmp8_ = FALSE; #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = TRUE; + _tmp8_ = TRUE; #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 4971 "PhotoTable.c" - sqlite3_stmt* _tmp10_; - gint _tmp11_; - gint _tmp12_; - gint _tmp15_; +#line 4637 "PhotoTable.c" + sqlite3_stmt* _tmp9_; + gint _tmp10_; + gint _tmp13_; #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp9_) { -#line 4978 "PhotoTable.c" + if (!_tmp8_) { +#line 4643 "PhotoTable.c" } #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = FALSE; + _tmp8_ = FALSE; #line 662 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = stmt; -#line 662 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = sqlite3_step (_tmp10_); + _tmp9_ = stmt; #line 662 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp11_; + res = sqlite3_step (_tmp9_); #line 663 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = res; + _tmp10_ = res; #line 663 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp12_ == SQLITE_DONE) { + if (_tmp10_ == SQLITE_DONE) { #line 664 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 4994 "PhotoTable.c" +#line 4657 "PhotoTable.c" } else { - gint _tmp13_; + gint _tmp11_; #line 665 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 665 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp13_ != SQLITE_ROW) { -#line 5001 "PhotoTable.c" - gint _tmp14_; + if (_tmp11_ != SQLITE_ROW) { +#line 4664 "PhotoTable.c" + gint _tmp12_; #line 666 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = res; + _tmp12_ = res; #line 666 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("get_event_photo_count", _tmp14_); + database_table_fatal ("get_event_photo_count", _tmp12_); #line 668 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 5009 "PhotoTable.c" +#line 4672 "PhotoTable.c" } } #line 671 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = count; + _tmp13_ = count; #line 671 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - count = _tmp15_ + 1; -#line 5016 "PhotoTable.c" + count = _tmp13_ + 1; +#line 4679 "PhotoTable.c" } } #line 674 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5042,11 +4705,14 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 674 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5025 "PhotoTable.c" +#line 4688 "PhotoTable.c" } -GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event_id) { +GeeArrayList* +photo_table_get_event_source_ids (PhotoTable* self, + EventID* event_id) +{ GeeArrayList* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -5058,9 +4724,8 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event EventID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; GeeArrayList* _result_ = NULL; - GeeArrayList* _tmp9_; + GeeArrayList* _tmp8_; #line 677 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL); #line 677 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5086,87 +4751,79 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event #line 682 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = _tmp5_.id; #line 682 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 682 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 683 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 683 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 685 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp8_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 685 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _result_ = _tmp9_; -#line 5080 "PhotoTable.c" + _result_ = _tmp8_; +#line 4743 "PhotoTable.c" { - gboolean _tmp10_ = FALSE; + gboolean _tmp9_ = FALSE; #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = TRUE; + _tmp9_ = TRUE; #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 5087 "PhotoTable.c" - sqlite3_stmt* _tmp11_; - gint _tmp12_; - gint _tmp13_; - GeeArrayList* _tmp16_; - sqlite3_stmt* _tmp17_; - gint64 _tmp18_; - PhotoID _tmp19_ = {0}; - gchar* _tmp20_; - gchar* _tmp21_; +#line 4750 "PhotoTable.c" + sqlite3_stmt* _tmp10_; + gint _tmp11_; + GeeArrayList* _tmp14_; + sqlite3_stmt* _tmp15_; + PhotoID _tmp16_ = {0}; + gchar* _tmp17_; + gchar* _tmp18_; #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp10_) { -#line 5099 "PhotoTable.c" + if (!_tmp9_) { +#line 4760 "PhotoTable.c" } #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = FALSE; -#line 687 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = stmt; + _tmp9_ = FALSE; #line 687 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = sqlite3_step (_tmp11_); + _tmp10_ = stmt; #line 687 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp12_; + res = sqlite3_step (_tmp10_); #line 688 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 688 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp13_ == SQLITE_DONE) { + if (_tmp11_ == SQLITE_DONE) { #line 689 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 5115 "PhotoTable.c" +#line 4774 "PhotoTable.c" } else { - gint _tmp14_; + gint _tmp12_; #line 690 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = res; + _tmp12_ = res; #line 690 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp14_ != SQLITE_ROW) { -#line 5122 "PhotoTable.c" - gint _tmp15_; + if (_tmp12_ != SQLITE_ROW) { +#line 4781 "PhotoTable.c" + gint _tmp13_; #line 691 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = res; + _tmp13_ = res; #line 691 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("get_event_source_ids", _tmp15_); + database_table_fatal ("get_event_source_ids", _tmp13_); #line 693 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 5130 "PhotoTable.c" +#line 4789 "PhotoTable.c" } } #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _result_; -#line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = stmt; + _tmp14_ = _result_; #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = sqlite3_column_int64 (_tmp17_, 0); + _tmp15_ = stmt; #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_id_init (&_tmp19_, _tmp18_); + photo_id_init (&_tmp16_, sqlite3_column_int64 (_tmp15_, 0)); #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = photo_id_upgrade_photo_id_to_source_id (&_tmp19_); + _tmp17_ = photo_id_upgrade_photo_id_to_source_id (&_tmp16_); #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = _tmp20_; + _tmp18_ = _tmp17_; #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp18_); #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp21_); -#line 5149 "PhotoTable.c" + _g_free0 (_tmp18_); +#line 4806 "PhotoTable.c" } } #line 699 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5175,11 +4832,14 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event _sqlite3_finalize0 (stmt); #line 699 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5158 "PhotoTable.c" +#line 4815 "PhotoTable.c" } -gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) { +gboolean +photo_table_event_has_photos (PhotoTable* self, + EventID* event_id) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -5191,10 +4851,8 @@ gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) { EventID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - gint _tmp10_; - gint _tmp11_; + sqlite3_stmt* _tmp8_; + gint _tmp9_; #line 702 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 702 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5220,49 +4878,45 @@ gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) { #line 707 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = _tmp5_.id; #line 707 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 707 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 708 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 708 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); -#line 710 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 710 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); + _tmp8_ = stmt; #line 710 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_step (_tmp8_); #line 711 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 711 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp11_ == SQLITE_DONE) { + if (_tmp9_ == SQLITE_DONE) { #line 712 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 712 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 712 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5226 "PhotoTable.c" +#line 4880 "PhotoTable.c" } else { - gint _tmp12_; + gint _tmp10_; #line 713 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = res; + _tmp10_ = res; #line 713 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp12_ != SQLITE_ROW) { -#line 5233 "PhotoTable.c" - gint _tmp13_; + if (_tmp10_ != SQLITE_ROW) { +#line 4887 "PhotoTable.c" + gint _tmp11_; #line 714 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 714 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("event_has_photos", _tmp13_); + database_table_fatal ("event_has_photos", _tmp11_); #line 716 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 716 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 716 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5245 "PhotoTable.c" +#line 4899 "PhotoTable.c" } } #line 719 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5271,11 +4925,14 @@ gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 719 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5254 "PhotoTable.c" +#line 4908 "PhotoTable.c" } -gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) { +gboolean +photo_table_drop_event (PhotoTable* self, + EventID* event_id) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -5285,15 +4942,12 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; - sqlite3_stmt* _tmp7_; - EventID _tmp8_; - gint64 _tmp9_; - gint _tmp10_; + sqlite3_stmt* _tmp6_; + EventID _tmp7_; + gint64 _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; gint _tmp11_; - sqlite3_stmt* _tmp12_; - gint _tmp13_; - gint _tmp14_; #line 722 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 722 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5315,50 +4969,44 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) { #line 727 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 727 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = sqlite3_bind_int64 (_tmp4_, 1, EVENT_ID_INVALID); -#line 727 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp5_; + res = sqlite3_bind_int64 (_tmp4_, 1, EVENT_ID_INVALID); #line 728 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 728 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); -#line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = stmt; + _vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK"); #line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = *event_id; + _tmp6_ = stmt; #line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = _tmp8_.id; + _tmp7_ = *event_id; #line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_bind_int64 (_tmp7_, 2, _tmp9_); + _tmp8_ = _tmp7_.id; #line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_bind_int64 (_tmp6_, 2, _tmp8_); #line 730 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 730 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 732 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = stmt; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 732 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = sqlite3_step (_tmp12_); + _tmp10_ = stmt; #line 732 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp13_; + res = sqlite3_step (_tmp10_); #line 733 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = res; + _tmp11_ = res; #line 733 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp14_ != SQLITE_DONE) { -#line 5329 "PhotoTable.c" - gint _tmp15_; + if (_tmp11_ != SQLITE_DONE) { +#line 4977 "PhotoTable.c" + gint _tmp12_; #line 734 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = res; + _tmp12_ = res; #line 734 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("drop_event", _tmp15_); + database_table_fatal ("drop_event", _tmp12_); #line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5341 "PhotoTable.c" +#line 4989 "PhotoTable.c" } #line 739 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = TRUE; @@ -5366,17 +5014,20 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 739 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5349 "PhotoTable.c" +#line 4997 "PhotoTable.c" } -gboolean photo_table_set_event (PhotoTable* self, PhotoID* photo_id, EventID* event_id) { +gboolean +photo_table_set_event (PhotoTable* self, + PhotoID* photo_id, + EventID* event_id) +{ gboolean result = FALSE; PhotoID _tmp0_; gint64 _tmp1_; EventID _tmp2_; gint64 _tmp3_; - gboolean _tmp4_; #line 742 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 742 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5392,16 +5043,17 @@ gboolean photo_table_set_event (PhotoTable* self, PhotoID* photo_id, EventID* ev #line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = _tmp2_.id; #line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "event_id", _tmp3_); -#line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp4_; + result = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "event_id", _tmp3_); #line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5380 "PhotoTable.c" +#line 5029 "PhotoTable.c" } -static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* photo_id) { +static gchar* +photo_table_get_raw_transformations (PhotoTable* self, + PhotoID* photo_id) +{ gchar* result = NULL; sqlite3_stmt* stmt = NULL; PhotoID _tmp0_; @@ -5436,7 +5088,7 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph _sqlite3_finalize0 (stmt); #line 749 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5419 "PhotoTable.c" +#line 5071 "PhotoTable.c" } #line 751 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; @@ -5452,7 +5104,7 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph if (_tmp8_ == NULL) { #line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp7_ = TRUE; -#line 5435 "PhotoTable.c" +#line 5087 "PhotoTable.c" } else { const gchar* _tmp9_; gint _tmp10_; @@ -5465,7 +5117,7 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph _tmp11_ = _tmp10_; #line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp7_ = _tmp11_ == 0; -#line 5448 "PhotoTable.c" +#line 5100 "PhotoTable.c" } #line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp7_) { @@ -5477,7 +5129,7 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph _sqlite3_finalize0 (stmt); #line 753 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5460 "PhotoTable.c" +#line 5112 "PhotoTable.c" } #line 755 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = trans; @@ -5485,16 +5137,18 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph _sqlite3_finalize0 (stmt); #line 755 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5468 "PhotoTable.c" +#line 5120 "PhotoTable.c" } -static gboolean photo_table_set_raw_transformations (PhotoTable* self, PhotoID* photo_id, const gchar* trans) { +static gboolean +photo_table_set_raw_transformations (PhotoTable* self, + PhotoID* photo_id, + const gchar* trans) +{ gboolean result = FALSE; PhotoID _tmp0_; gint64 _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_; #line 758 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 758 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5506,18 +5160,19 @@ static gboolean photo_table_set_raw_transformations (PhotoTable* self, PhotoID* #line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = trans; -#line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "transformations", _tmp2_); -#line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp3_; + result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "transformations", trans); #line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5496 "PhotoTable.c" +#line 5146 "PhotoTable.c" } -gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_id, Orientation orientation, GeeHashMap* transformations) { +gboolean +photo_table_set_transformation_state (PhotoTable* self, + PhotoID* photo_id, + Orientation orientation, + GeeHashMap* transformations) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -5526,23 +5181,17 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_ gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - Orientation _tmp5_; - gint _tmp6_; - gint _tmp7_; - sqlite3_stmt* _tmp8_; - GeeHashMap* _tmp9_; - gchar* _tmp10_; - GDestroyNotify _tmp11_; - gint _tmp12_; + gint _tmp5_; + sqlite3_stmt* _tmp6_; + gchar* _tmp7_; + GDestroyNotify _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; + PhotoID _tmp11_; + gint64 _tmp12_; gint _tmp13_; sqlite3_stmt* _tmp14_; - PhotoID _tmp15_; - gint64 _tmp16_; - gint _tmp17_; - gint _tmp18_; - sqlite3_stmt* _tmp19_; - gint _tmp20_; - gint _tmp21_; + gint _tmp15_; #line 762 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 762 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5567,68 +5216,56 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_ #line 769 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 769 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = orientation; -#line 769 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = sqlite3_bind_int (_tmp4_, 1, (gint) _tmp5_); -#line 769 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp6_; + res = sqlite3_bind_int (_tmp4_, 1, (gint) orientation); #line 770 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = res; + _tmp5_ = res; #line 770 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); -#line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = stmt; -#line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = transformations; + _vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK"); #line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = photo_table_unmarshall_all_transformations (_tmp9_); + _tmp6_ = stmt; #line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = g_free; + _tmp7_ = photo_table_unmarshall_all_transformations (transformations); #line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = sqlite3_bind_text (_tmp8_, 2, _tmp10_, -1, _tmp11_); + _tmp8_ = g_free; #line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp12_; + res = sqlite3_bind_text (_tmp6_, 2, _tmp7_, -1, _tmp8_); #line 772 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = res; + _tmp9_ = res; #line 772 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); -#line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = stmt; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = *photo_id; + _tmp10_ = stmt; #line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _tmp15_.id; + _tmp11_ = *photo_id; #line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = sqlite3_bind_int64 (_tmp14_, 3, _tmp16_); + _tmp12_ = _tmp11_.id; #line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp17_; + res = sqlite3_bind_int64 (_tmp10_, 3, _tmp12_); #line 774 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = res; + _tmp13_ = res; #line 774 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK"); -#line 776 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = stmt; + _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); #line 776 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = sqlite3_step (_tmp19_); + _tmp14_ = stmt; #line 776 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp20_; + res = sqlite3_step (_tmp14_); #line 777 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = res; + _tmp15_ = res; #line 777 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp21_ != SQLITE_DONE) { -#line 5598 "PhotoTable.c" - gint _tmp22_; + if (_tmp15_ != SQLITE_DONE) { +#line 5235 "PhotoTable.c" + gint _tmp16_; #line 778 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = res; + _tmp16_ = res; #line 778 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("set_transformation_state", _tmp22_); + database_table_fatal ("set_transformation_state", _tmp16_); #line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5610 "PhotoTable.c" +#line 5247 "PhotoTable.c" } #line 783 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = TRUE; @@ -5636,35 +5273,31 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_ _sqlite3_finalize0 (stmt); #line 783 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5618 "PhotoTable.c" +#line 5255 "PhotoTable.c" } -GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { +GeeHashMap* +photo_table_marshall_all_transformations (const gchar* trans) +{ GeeHashMap* result = NULL; gboolean _tmp0_ = FALSE; - const gchar* _tmp1_; GError * _inner_error_ = NULL; #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = trans; -#line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp1_ == NULL) { + if (trans == NULL) { #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = TRUE; -#line 5633 "PhotoTable.c" +#line 5269 "PhotoTable.c" } else { - const gchar* _tmp2_; - gint _tmp3_; - gint _tmp4_; + gint _tmp1_; + gint _tmp2_; #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = trans; + _tmp1_ = strlen (trans); #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = strlen (_tmp2_); + _tmp2_ = _tmp1_; #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp3_; -#line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp4_ == 0; -#line 5646 "PhotoTable.c" + _tmp0_ = _tmp2_ == 0; +#line 5279 "PhotoTable.c" } #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp0_) { @@ -5672,128 +5305,119 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { result = NULL; #line 788 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5654 "PhotoTable.c" +#line 5287 "PhotoTable.c" } { GKeyFile* keyfile = NULL; + GKeyFile* _tmp3_; + gboolean _tmp4_ = FALSE; GKeyFile* _tmp5_; - gboolean _tmp6_ = FALSE; - GKeyFile* _tmp7_; - const gchar* _tmp8_; - const gchar* _tmp9_; - gint _tmp10_; - gint _tmp11_; - gboolean _tmp12_; + gint _tmp6_; + gint _tmp7_; GeeHashMap* map = NULL; - GeeHashMap* _tmp13_; + GeeHashMap* _tmp8_; gchar** objects = NULL; - GKeyFile* _tmp14_; - gsize _tmp15_; - gchar** _tmp16_; + GKeyFile* _tmp9_; + gsize _tmp10_; + gchar** _tmp11_; gint objects_length1; gint _objects_size_; - gchar** _tmp17_; - gint _tmp17__length1; + gchar** _tmp12_; + gint _tmp12__length1; #line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = g_key_file_new (); + _tmp3_ = g_key_file_new (); #line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - keyfile = _tmp5_; -#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = keyfile; -#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = trans; -#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = trans; + keyfile = _tmp3_; #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = strlen (_tmp9_); + _tmp5_ = keyfile; #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = _tmp10_; + _tmp6_ = strlen (trans); #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = g_key_file_load_from_data (_tmp7_, _tmp8_, (gsize) _tmp11_, G_KEY_FILE_NONE, &_inner_error_); + _tmp7_ = _tmp6_; #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = _tmp12_; + _tmp4_ = g_key_file_load_from_data (_tmp5_, trans, (gsize) _tmp7_, G_KEY_FILE_NONE, &_inner_error_); #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 5698 "PhotoTable.c" +#line 5322 "PhotoTable.c" goto __catch17_g_error; } #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp6_) { + if (!_tmp4_) { #line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = NULL; #line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); #line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5709 "PhotoTable.c" +#line 5333 "PhotoTable.c" } #line 795 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp8_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 795 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - map = _tmp13_; + map = _tmp8_; #line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = keyfile; + _tmp9_ = keyfile; #line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = g_key_file_get_groups (_tmp14_, &_tmp15_); + _tmp11_ = g_key_file_get_groups (_tmp9_, &_tmp10_); #line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - objects = _tmp16_; + objects = _tmp11_; #line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - objects_length1 = _tmp15_; + objects_length1 = _tmp10_; #line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _objects_size_ = objects_length1; #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = objects; + _tmp12_ = objects; #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17__length1 = objects_length1; -#line 5729 "PhotoTable.c" + _tmp12__length1 = objects_length1; +#line 5353 "PhotoTable.c" { gchar** object_collection = NULL; gint object_collection_length1 = 0; gint _object_collection_size_ = 0; gint object_it = 0; #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - object_collection = _tmp17_; + object_collection = _tmp12_; #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - object_collection_length1 = _tmp17__length1; + object_collection_length1 = _tmp12__length1; #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - for (object_it = 0; object_it < _tmp17__length1; object_it = object_it + 1) { -#line 5741 "PhotoTable.c" - gchar* _tmp18_; + for (object_it = 0; object_it < _tmp12__length1; object_it = object_it + 1) { +#line 5365 "PhotoTable.c" + gchar* _tmp13_; gchar* object = NULL; #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = g_strdup (object_collection[object_it]); + _tmp13_ = g_strdup (object_collection[object_it]); #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - object = _tmp18_; -#line 5748 "PhotoTable.c" + object = _tmp13_; +#line 5372 "PhotoTable.c" { gchar** keys = NULL; - GKeyFile* _tmp19_; - const gchar* _tmp20_; - gsize _tmp21_; - gchar** _tmp22_; + GKeyFile* _tmp14_; + const gchar* _tmp15_; + gsize _tmp16_; + gchar** _tmp17_; gint keys_length1; gint _keys_size_; - gboolean _tmp23_ = FALSE; - gchar** _tmp24_; - gint _tmp24__length1; + gboolean _tmp18_ = FALSE; + gchar** _tmp19_; + gint _tmp19__length1; KeyValueMap* key_map = NULL; - const gchar* _tmp26_; - KeyValueMap* _tmp27_; - GeeHashMap* _tmp43_; - const gchar* _tmp44_; - KeyValueMap* _tmp45_; + const gchar* _tmp21_; + KeyValueMap* _tmp22_; + GeeHashMap* _tmp38_; + const gchar* _tmp39_; + KeyValueMap* _tmp40_; #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = keyfile; + _tmp14_ = keyfile; #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = object; + _tmp15_ = object; #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = g_key_file_get_keys (_tmp19_, _tmp20_, &_tmp21_, &_inner_error_); + _tmp17_ = g_key_file_get_keys (_tmp14_, _tmp15_, &_tmp16_, &_inner_error_); #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - keys = _tmp22_; + keys = _tmp17_; #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - keys_length1 = _tmp21_; + keys_length1 = _tmp16_; #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _keys_size_ = keys_length1; #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5806,114 +5430,114 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { _g_object_unref0 (map); #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 5788 "PhotoTable.c" +#line 5412 "PhotoTable.c" goto __catch17_g_error; } #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = keys; + _tmp19_ = keys; #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24__length1 = keys_length1; + _tmp19__length1 = keys_length1; #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp24_ == NULL) { + if (_tmp19_ == NULL) { #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = TRUE; -#line 5799 "PhotoTable.c" + _tmp18_ = TRUE; +#line 5423 "PhotoTable.c" } else { - gchar** _tmp25_; - gint _tmp25__length1; + gchar** _tmp20_; + gint _tmp20__length1; #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = keys; + _tmp20_ = keys; #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25__length1 = keys_length1; + _tmp20__length1 = keys_length1; #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = _tmp25__length1 == 0; -#line 5809 "PhotoTable.c" + _tmp18_ = _tmp20__length1 == 0; +#line 5433 "PhotoTable.c" } #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp23_) { + if (_tmp18_) { #line 801 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL); #line 801 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (object); #line 801 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" continue; -#line 5819 "PhotoTable.c" +#line 5443 "PhotoTable.c" } #line 803 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = object; + _tmp21_ = object; #line 803 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = key_value_map_new (_tmp26_); + _tmp22_ = key_value_map_new (_tmp21_); #line 803 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - key_map = _tmp27_; -#line 5827 "PhotoTable.c" + key_map = _tmp22_; +#line 5451 "PhotoTable.c" { gint ctr = 0; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ctr = 0; -#line 5832 "PhotoTable.c" +#line 5456 "PhotoTable.c" { - gboolean _tmp28_ = FALSE; + gboolean _tmp23_ = FALSE; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = TRUE; + _tmp23_ = TRUE; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 5839 "PhotoTable.c" - gint _tmp30_; - gchar** _tmp31_; - gint _tmp31__length1; - gchar* _tmp32_ = NULL; - GKeyFile* _tmp33_; - const gchar* _tmp34_; +#line 5463 "PhotoTable.c" + gint _tmp25_; + gchar** _tmp26_; + gint _tmp26__length1; + gchar* _tmp27_ = NULL; + GKeyFile* _tmp28_; + const gchar* _tmp29_; + gchar** _tmp30_; + gint _tmp30__length1; + gint _tmp31_; + const gchar* _tmp32_; + gchar* _tmp33_; + KeyValueMap* _tmp34_; gchar** _tmp35_; gint _tmp35__length1; gint _tmp36_; const gchar* _tmp37_; - gchar* _tmp38_; - KeyValueMap* _tmp39_; - gchar** _tmp40_; - gint _tmp40__length1; - gint _tmp41_; - const gchar* _tmp42_; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp28_) { -#line 5858 "PhotoTable.c" - gint _tmp29_; + if (!_tmp23_) { +#line 5482 "PhotoTable.c" + gint _tmp24_; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = ctr; + _tmp24_ = ctr; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - ctr = _tmp29_ + 1; -#line 5864 "PhotoTable.c" + ctr = _tmp24_ + 1; +#line 5488 "PhotoTable.c" } #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = FALSE; + _tmp23_ = FALSE; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = ctr; + _tmp25_ = ctr; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = keys; + _tmp26_ = keys; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31__length1 = keys_length1; + _tmp26__length1 = keys_length1; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!(_tmp30_ < _tmp31__length1)) { + if (!(_tmp25_ < _tmp26__length1)) { #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 5878 "PhotoTable.c" +#line 5502 "PhotoTable.c" } #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = keyfile; + _tmp28_ = keyfile; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = object; + _tmp29_ = object; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = keys; + _tmp30_ = keys; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35__length1 = keys_length1; + _tmp30__length1 = keys_length1; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = ctr; + _tmp31_ = ctr; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = _tmp35_[_tmp36_]; + _tmp32_ = _tmp30_[_tmp31_]; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = g_key_file_get_string (_tmp33_, _tmp34_, _tmp37_, &_inner_error_); + _tmp33_ = g_key_file_get_string (_tmp28_, _tmp29_, _tmp32_, &_inner_error_); #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = _tmp38_; + _tmp27_ = _tmp33_; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5928,42 +5552,42 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { _g_object_unref0 (map); #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 5910 "PhotoTable.c" +#line 5534 "PhotoTable.c" goto __catch17_g_error; } #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = key_map; + _tmp34_ = key_map; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = keys; + _tmp35_ = keys; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40__length1 = keys_length1; + _tmp35__length1 = keys_length1; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = ctr; + _tmp36_ = ctr; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = _tmp40_[_tmp41_]; + _tmp37_ = _tmp35_[_tmp36_]; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - key_value_map_set_string (_tmp39_, _tmp42_, _tmp32_); + key_value_map_set_string (_tmp34_, _tmp37_, _tmp27_); #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp32_); -#line 5927 "PhotoTable.c" + _g_free0 (_tmp27_); +#line 5551 "PhotoTable.c" } } } #line 807 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = map; + _tmp38_ = map; #line 807 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = object; + _tmp39_ = object; #line 807 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = key_map; + _tmp40_ = key_map; #line 807 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp44_, _tmp45_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp39_, _tmp40_); #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _key_value_map_unref0 (key_map); #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL); #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (object); -#line 5945 "PhotoTable.c" +#line 5569 "PhotoTable.c" } } } @@ -5975,24 +5599,24 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { _g_key_file_unref0 (keyfile); #line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5957 "PhotoTable.c" +#line 5581 "PhotoTable.c" } goto __finally17; __catch17_g_error: { GError* err = NULL; - const gchar* _tmp46_; + const gchar* _tmp41_; #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" err = _inner_error_; #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _inner_error_ = NULL; #line 812 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = err->message; + _tmp41_ = err->message; #line 812 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_error ("PhotoTable.vala:812: %s", _tmp46_); + g_error ("PhotoTable.vala:812: %s", _tmp41_); #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_error_free0 (err); -#line 5974 "PhotoTable.c" +#line 5598 "PhotoTable.c" } __finally17: #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6001,58 +5625,54 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { g_clear_error (&_inner_error_); #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 5983 "PhotoTable.c" +#line 5607 "PhotoTable.c" } -gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) { +gchar* +photo_table_unmarshall_all_transformations (GeeHashMap* transformations) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; - GeeHashMap* _tmp1_; GKeyFile* keyfile = NULL; - GKeyFile* _tmp8_; + GKeyFile* _tmp6_; gsize length = 0UL; gchar* unmarshalled = NULL; - GKeyFile* _tmp39_; - gsize _tmp40_ = 0UL; - gchar* _tmp41_; - const gchar* _tmp42_; - const gchar* _tmp43_; - gint _tmp44_; - gint _tmp45_; + GKeyFile* _tmp33_; + gsize _tmp34_ = 0UL; + gchar* _tmp35_; + const gchar* _tmp36_; + const gchar* _tmp37_; + gint _tmp38_; + gint _tmp39_; #line 816 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail ((transformations == NULL) || GEE_IS_HASH_MAP (transformations), NULL); #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = transformations; -#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp1_ == NULL) { + if (transformations == NULL) { #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = TRUE; -#line 6010 "PhotoTable.c" +#line 5633 "PhotoTable.c" } else { - GeeHashMap* _tmp2_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; GeeSet* _tmp3_; - GeeSet* _tmp4_; - GeeSet* _tmp5_; - gint _tmp6_; - gint _tmp7_; -#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = transformations; + gint _tmp4_; + gint _tmp5_; #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (transformations, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp7_ == 0; + _tmp0_ = _tmp5_ == 0; #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_object_unref0 (_tmp5_); -#line 6034 "PhotoTable.c" + _g_object_unref0 (_tmp3_); +#line 5654 "PhotoTable.c" } #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp0_) { @@ -6060,208 +5680,199 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) result = NULL; #line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6042 "PhotoTable.c" +#line 5662 "PhotoTable.c" } #line 820 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = g_key_file_new (); + _tmp6_ = g_key_file_new (); #line 820 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - keyfile = _tmp8_; -#line 6048 "PhotoTable.c" + keyfile = _tmp6_; +#line 5668 "PhotoTable.c" { GeeIterator* _object_it = NULL; - GeeHashMap* _tmp9_; - GeeSet* _tmp10_; - GeeSet* _tmp11_; - GeeSet* _tmp12_; - GeeIterator* _tmp13_; - GeeIterator* _tmp14_; + GeeSet* _tmp7_; + GeeSet* _tmp8_; + GeeSet* _tmp9_; + GeeIterator* _tmp10_; + GeeIterator* _tmp11_; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = transformations; + _tmp7_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (transformations, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp8_ = _tmp7_; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = _tmp10_; -#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = _tmp11_; + _tmp9_ = _tmp8_; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = _tmp13_; + _tmp11_ = _tmp10_; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp9_); #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _object_it = _tmp14_; + _object_it = _tmp11_; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 6075 "PhotoTable.c" - GeeIterator* _tmp15_; - gboolean _tmp16_; +#line 5692 "PhotoTable.c" + GeeIterator* _tmp12_; gchar* object = NULL; - GeeIterator* _tmp17_; - gpointer _tmp18_; + GeeIterator* _tmp13_; + gpointer _tmp14_; KeyValueMap* map = NULL; - GeeHashMap* _tmp19_; - const gchar* _tmp20_; - gpointer _tmp21_; -#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = _object_it; + const gchar* _tmp15_; + gpointer _tmp16_; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = gee_iterator_next (_tmp15_); + _tmp12_ = _object_it; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp16_) { + if (!gee_iterator_next (_tmp12_)) { #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 6093 "PhotoTable.c" +#line 5706 "PhotoTable.c" } #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = _object_it; + _tmp13_ = _object_it; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = gee_iterator_get (_tmp17_); + _tmp14_ = gee_iterator_get (_tmp13_); #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - object = (gchar*) _tmp18_; + object = (gchar*) _tmp14_; #line 823 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = transformations; + _tmp15_ = object; #line 823 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = object; + _tmp16_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (transformations, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_); #line 823 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_); -#line 823 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - map = (KeyValueMap*) _tmp21_; -#line 6109 "PhotoTable.c" + map = (KeyValueMap*) _tmp16_; +#line 5720 "PhotoTable.c" { GeeIterator* _key_it = NULL; - KeyValueMap* _tmp22_; - GeeSet* _tmp23_; - GeeSet* _tmp24_; - GeeIterator* _tmp25_; - GeeIterator* _tmp26_; + KeyValueMap* _tmp17_; + GeeSet* _tmp18_; + GeeSet* _tmp19_; + GeeIterator* _tmp20_; + GeeIterator* _tmp21_; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = map; + _tmp17_ = map; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = key_value_map_get_keys (_tmp22_); + _tmp18_ = key_value_map_get_keys (_tmp17_); #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = _tmp23_; + _tmp19_ = _tmp18_; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable)); #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = _tmp25_; + _tmp21_ = _tmp20_; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp19_); #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _key_it = _tmp26_; + _key_it = _tmp21_; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 6133 "PhotoTable.c" - GeeIterator* _tmp27_; - gboolean _tmp28_; +#line 5744 "PhotoTable.c" + GeeIterator* _tmp22_; gchar* key = NULL; - GeeIterator* _tmp29_; - gpointer _tmp30_; + GeeIterator* _tmp23_; + gpointer _tmp24_; gchar* value = NULL; - KeyValueMap* _tmp31_; + KeyValueMap* _tmp25_; + const gchar* _tmp26_; + gchar* _tmp27_; + const gchar* _tmp28_; + GKeyFile* _tmp29_; + const gchar* _tmp30_; + const gchar* _tmp31_; const gchar* _tmp32_; - gchar* _tmp33_; - const gchar* _tmp34_; - GKeyFile* _tmp35_; - const gchar* _tmp36_; - const gchar* _tmp37_; - const gchar* _tmp38_; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = _key_it; + _tmp22_ = _key_it; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = gee_iterator_next (_tmp27_); -#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp28_) { + if (!gee_iterator_next (_tmp22_)) { #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 6156 "PhotoTable.c" +#line 5764 "PhotoTable.c" } #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = _key_it; + _tmp23_ = _key_it; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = gee_iterator_get (_tmp29_); + _tmp24_ = gee_iterator_get (_tmp23_); #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - key = (gchar*) _tmp30_; + key = (gchar*) _tmp24_; #line 826 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = map; + _tmp25_ = map; #line 826 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = key; + _tmp26_ = key; #line 826 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = key_value_map_get_string (_tmp31_, _tmp32_, NULL); + _tmp27_ = key_value_map_get_string (_tmp25_, _tmp26_, NULL); #line 826 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - value = _tmp33_; + value = _tmp27_; #line 827 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = value; + _tmp28_ = value; #line 827 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp34_ != NULL, "value != null"); + _vala_assert (_tmp28_ != NULL, "value != null"); #line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = keyfile; + _tmp29_ = keyfile; #line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = object; + _tmp30_ = object; #line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = key; + _tmp31_ = key; #line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = value; + _tmp32_ = value; #line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_key_file_set_string (_tmp35_, _tmp36_, _tmp37_, _tmp38_); + g_key_file_set_string (_tmp29_, _tmp30_, _tmp31_, _tmp32_); #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (value); #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (key); -#line 6190 "PhotoTable.c" +#line 5798 "PhotoTable.c" } #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_object_unref0 (_key_it); -#line 6194 "PhotoTable.c" +#line 5802 "PhotoTable.c" } #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _key_value_map_unref0 (map); #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (object); -#line 6200 "PhotoTable.c" +#line 5808 "PhotoTable.c" } #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_object_unref0 (_object_it); -#line 6204 "PhotoTable.c" +#line 5812 "PhotoTable.c" } #line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = keyfile; + _tmp33_ = keyfile; #line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = g_key_file_to_data (_tmp39_, &_tmp40_, NULL); + _tmp35_ = g_key_file_to_data (_tmp33_, &_tmp34_, NULL); #line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - length = _tmp40_; + length = _tmp34_; #line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - unmarshalled = _tmp41_; + unmarshalled = _tmp35_; #line 835 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = unmarshalled; + _tmp36_ = unmarshalled; #line 835 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp42_ != NULL, "unmarshalled != null"); + _vala_assert (_tmp36_ != NULL, "unmarshalled != null"); #line 836 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = unmarshalled; + _tmp37_ = unmarshalled; #line 836 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = strlen (_tmp43_); + _tmp38_ = strlen (_tmp37_); #line 836 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = _tmp44_; + _tmp39_ = _tmp38_; #line 836 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp45_ > 0, "unmarshalled.length > 0"); + _vala_assert (_tmp39_ > 0, "unmarshalled.length > 0"); #line 838 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = unmarshalled; #line 838 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); #line 838 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6232 "PhotoTable.c" +#line 5840 "PhotoTable.c" } -gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, KeyValueMap* map) { +gboolean +photo_table_set_transformation (PhotoTable* self, + PhotoID* photo_id, + KeyValueMap* map) +{ gboolean result = FALSE; gchar* trans = NULL; PhotoID _tmp0_; gchar* _tmp1_; - PhotoID _tmp38_; - const gchar* _tmp39_; - gboolean _tmp40_; + PhotoID _tmp33_; + const gchar* _tmp34_; GError * _inner_error_ = NULL; #line 841 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); @@ -6275,22 +5886,21 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke _tmp1_ = photo_table_get_raw_transformations (self, &_tmp0_); #line 842 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" trans = _tmp1_; -#line 6257 "PhotoTable.c" +#line 5868 "PhotoTable.c" { GKeyFile* keyfile = NULL; GKeyFile* _tmp2_; const gchar* _tmp3_; GeeSet* keys = NULL; - KeyValueMap* _tmp11_; - GeeSet* _tmp12_; + GeeSet* _tmp10_; gsize length = 0UL; - GKeyFile* _tmp29_; - gsize _tmp30_ = 0UL; - gchar* _tmp31_; - const gchar* _tmp32_; - const gchar* _tmp33_; - gint _tmp34_; - gint _tmp35_; + GKeyFile* _tmp24_; + gsize _tmp25_ = 0UL; + gchar* _tmp26_; + const gchar* _tmp27_; + const gchar* _tmp28_; + gint _tmp29_; + gint _tmp30_; #line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = g_key_file_new (); #line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6299,14 +5909,13 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke _tmp3_ = trans; #line 846 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp3_ != NULL) { -#line 6281 "PhotoTable.c" +#line 5891 "PhotoTable.c" gboolean _tmp4_ = FALSE; GKeyFile* _tmp5_; const gchar* _tmp6_; const gchar* _tmp7_; gint _tmp8_; gint _tmp9_; - gboolean _tmp10_; #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = keyfile; #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6318,14 +5927,12 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = _tmp8_; #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = g_key_file_load_from_data (_tmp5_, _tmp6_, (gsize) _tmp9_, G_KEY_FILE_NONE, &_inner_error_); -#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp10_; + _tmp4_ = g_key_file_load_from_data (_tmp5_, _tmp6_, (gsize) _tmp9_, G_KEY_FILE_NONE, &_inner_error_); #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 6307 "PhotoTable.c" +#line 5914 "PhotoTable.c" goto __catch18_g_error; } #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6338,149 +5945,138 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke _g_free0 (trans); #line 848 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6320 "PhotoTable.c" +#line 5927 "PhotoTable.c" } } #line 851 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = map; -#line 851 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = key_value_map_get_keys (_tmp11_); + _tmp10_ = key_value_map_get_keys (map); #line 851 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - keys = _tmp12_; -#line 6329 "PhotoTable.c" + keys = _tmp10_; +#line 5934 "PhotoTable.c" { GeeIterator* _key_it = NULL; - GeeSet* _tmp13_; - GeeIterator* _tmp14_; + GeeSet* _tmp11_; + GeeIterator* _tmp12_; #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = keys; + _tmp11_ = keys; #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _key_it = _tmp14_; + _key_it = _tmp12_; #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 6342 "PhotoTable.c" - GeeIterator* _tmp15_; - gboolean _tmp16_; +#line 5947 "PhotoTable.c" + GeeIterator* _tmp13_; gchar* key = NULL; - GeeIterator* _tmp17_; - gpointer _tmp18_; + GeeIterator* _tmp14_; + gpointer _tmp15_; gchar* value = NULL; - KeyValueMap* _tmp19_; - const gchar* _tmp20_; + const gchar* _tmp16_; + gchar* _tmp17_; + const gchar* _tmp18_; + GKeyFile* _tmp19_; + gchar* _tmp20_; gchar* _tmp21_; const gchar* _tmp22_; - GKeyFile* _tmp23_; - KeyValueMap* _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; - const gchar* _tmp27_; - const gchar* _tmp28_; + const gchar* _tmp23_; #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = _key_it; + _tmp13_ = _key_it; #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = gee_iterator_next (_tmp15_); -#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp16_) { + if (!gee_iterator_next (_tmp13_)) { #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 6367 "PhotoTable.c" +#line 5967 "PhotoTable.c" } #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = _key_it; + _tmp14_ = _key_it; #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = gee_iterator_get (_tmp17_); + _tmp15_ = gee_iterator_get (_tmp14_); #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - key = (gchar*) _tmp18_; -#line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = map; + key = (gchar*) _tmp15_; #line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = key; + _tmp16_ = key; #line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = key_value_map_get_string (_tmp19_, _tmp20_, NULL); + _tmp17_ = key_value_map_get_string (map, _tmp16_, NULL); #line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - value = _tmp21_; + value = _tmp17_; #line 854 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = value; + _tmp18_ = value; #line 854 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp22_ != NULL, "value != null"); + _vala_assert (_tmp18_ != NULL, "value != null"); #line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = keyfile; + _tmp19_ = keyfile; #line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = map; + _tmp20_ = key_value_map_get_group (map); #line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = key_value_map_get_group (_tmp24_); + _tmp21_ = _tmp20_; #line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = _tmp25_; + _tmp22_ = key; #line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = key; + _tmp23_ = value; #line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = value; + g_key_file_set_string (_tmp19_, _tmp21_, _tmp22_, _tmp23_); #line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_key_file_set_string (_tmp23_, _tmp26_, _tmp27_, _tmp28_); -#line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp26_); + _g_free0 (_tmp21_); #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (value); #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (key); -#line 6407 "PhotoTable.c" +#line 6003 "PhotoTable.c" } #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_object_unref0 (_key_it); -#line 6411 "PhotoTable.c" +#line 6007 "PhotoTable.c" } #line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = keyfile; + _tmp24_ = keyfile; #line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = g_key_file_to_data (_tmp29_, &_tmp30_, NULL); + _tmp26_ = g_key_file_to_data (_tmp24_, &_tmp25_, NULL); #line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - length = _tmp30_; + length = _tmp25_; #line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); #line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - trans = _tmp31_; + trans = _tmp26_; #line 861 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = trans; + _tmp27_ = trans; #line 861 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp32_ != NULL, "trans != null"); + _vala_assert (_tmp27_ != NULL, "trans != null"); #line 862 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = trans; + _tmp28_ = trans; #line 862 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = strlen (_tmp33_); + _tmp29_ = strlen (_tmp28_); #line 862 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = _tmp34_; + _tmp30_ = _tmp29_; #line 862 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp35_ > 0, "trans.length > 0"); + _vala_assert (_tmp30_ > 0, "trans.length > 0"); #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_object_unref0 (keys); #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 6439 "PhotoTable.c" +#line 6035 "PhotoTable.c" } goto __finally18; __catch18_g_error: { GError* err = NULL; - const gchar* _tmp36_; + const gchar* _tmp31_; #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" err = _inner_error_; #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _inner_error_ = NULL; #line 864 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = err->message; + _tmp31_ = err->message; #line 864 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_error ("PhotoTable.vala:864: %s", _tmp36_); + g_error ("PhotoTable.vala:864: %s", _tmp31_); #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_error_free0 (err); -#line 6456 "PhotoTable.c" +#line 6052 "PhotoTable.c" } __finally18: #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6461 "PhotoTable.c" - gboolean _tmp37_ = FALSE; +#line 6057 "PhotoTable.c" + gboolean _tmp32_ = FALSE; #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6488,34 +6084,35 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_clear_error (&_inner_error_); #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - return _tmp37_; -#line 6471 "PhotoTable.c" + return _tmp32_; +#line 6067 "PhotoTable.c" } #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = *photo_id; -#line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = trans; + _tmp33_ = *photo_id; #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = photo_table_set_raw_transformations (self, &_tmp38_, _tmp39_); + _tmp34_ = trans; #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp40_; + result = photo_table_set_raw_transformations (self, &_tmp33_, _tmp34_); #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6485 "PhotoTable.c" +#line 6079 "PhotoTable.c" } -gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, const gchar* object) { +gboolean +photo_table_remove_transformation (PhotoTable* self, + PhotoID* photo_id, + const gchar* object) +{ gboolean result = FALSE; gchar* trans = NULL; PhotoID _tmp0_; gchar* _tmp1_; const gchar* _tmp2_; - PhotoID _tmp22_; - const gchar* _tmp23_; - gboolean _tmp24_; + PhotoID _tmp18_; + const gchar* _tmp19_; GError * _inner_error_ = NULL; #line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); @@ -6539,7 +6136,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, _g_free0 (trans); #line 873 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6521 "PhotoTable.c" +#line 6118 "PhotoTable.c" } { GKeyFile* keyfile = NULL; @@ -6550,17 +6147,13 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, const gchar* _tmp7_; gint _tmp8_; gint _tmp9_; - gboolean _tmp10_; + GKeyFile* _tmp10_; GKeyFile* _tmp11_; - const gchar* _tmp12_; - gboolean _tmp13_; - GKeyFile* _tmp14_; - const gchar* _tmp15_; gsize length = 0UL; - GKeyFile* _tmp16_; - gsize _tmp17_ = 0UL; - gchar* _tmp18_; - const gchar* _tmp19_; + GKeyFile* _tmp12_; + gsize _tmp13_ = 0UL; + gchar* _tmp14_; + const gchar* _tmp15_; #line 876 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = g_key_file_new (); #line 876 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6576,14 +6169,12 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = _tmp8_; #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = g_key_file_load_from_data (_tmp5_, _tmp6_, (gsize) _tmp9_, G_KEY_FILE_NONE, &_inner_error_); -#line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp10_; + _tmp4_ = g_key_file_load_from_data (_tmp5_, _tmp6_, (gsize) _tmp9_, G_KEY_FILE_NONE, &_inner_error_); #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 6565 "PhotoTable.c" +#line 6156 "PhotoTable.c" goto __catch19_g_error; } #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6596,16 +6187,12 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, _g_free0 (trans); #line 878 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6578 "PhotoTable.c" +#line 6169 "PhotoTable.c" } #line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = keyfile; + _tmp10_ = keyfile; #line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = object; -#line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = g_key_file_has_group (_tmp11_, _tmp12_); -#line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp13_) { + if (!g_key_file_has_group (_tmp10_, object)) { #line 881 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = TRUE; #line 881 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6614,61 +6201,59 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, _g_free0 (trans); #line 881 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6596 "PhotoTable.c" +#line 6183 "PhotoTable.c" } #line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = keyfile; -#line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = object; + _tmp11_ = keyfile; #line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_key_file_remove_group (_tmp14_, _tmp15_, &_inner_error_); + g_key_file_remove_group (_tmp11_, object, &_inner_error_); #line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 6608 "PhotoTable.c" +#line 6193 "PhotoTable.c" goto __catch19_g_error; } #line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = keyfile; + _tmp12_ = keyfile; #line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = g_key_file_to_data (_tmp16_, &_tmp17_, NULL); + _tmp14_ = g_key_file_to_data (_tmp12_, &_tmp13_, NULL); #line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - length = _tmp17_; + length = _tmp13_; #line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); #line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - trans = _tmp18_; + trans = _tmp14_; #line 887 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = trans; + _tmp15_ = trans; #line 887 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp19_ != NULL, "trans != null"); + _vala_assert (_tmp15_ != NULL, "trans != null"); #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 6627 "PhotoTable.c" +#line 6212 "PhotoTable.c" } goto __finally19; __catch19_g_error: { GError* err = NULL; - const gchar* _tmp20_; + const gchar* _tmp16_; #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" err = _inner_error_; #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _inner_error_ = NULL; #line 889 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = err->message; + _tmp16_ = err->message; #line 889 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_error ("PhotoTable.vala:889: %s", _tmp20_); + g_error ("PhotoTable.vala:889: %s", _tmp16_); #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_error_free0 (err); -#line 6644 "PhotoTable.c" +#line 6229 "PhotoTable.c" } __finally19: #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6649 "PhotoTable.c" - gboolean _tmp21_ = FALSE; +#line 6234 "PhotoTable.c" + gboolean _tmp17_ = FALSE; #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6676,26 +6261,27 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_clear_error (&_inner_error_); #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - return _tmp21_; -#line 6659 "PhotoTable.c" + return _tmp17_; +#line 6244 "PhotoTable.c" } #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = *photo_id; -#line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = trans; + _tmp18_ = *photo_id; #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = photo_table_set_raw_transformations (self, &_tmp22_, _tmp23_); + _tmp19_ = trans; #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp24_; + result = photo_table_set_raw_transformations (self, &_tmp18_, _tmp19_); #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6673 "PhotoTable.c" +#line 6256 "PhotoTable.c" } -gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* photo_id) { +gboolean +photo_table_remove_all_transformations (PhotoTable* self, + PhotoID* photo_id) +{ gboolean result = FALSE; PhotoID _tmp0_; gchar* _tmp1_; @@ -6703,7 +6289,6 @@ gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* phot gboolean _tmp3_; PhotoID _tmp4_; gint64 _tmp5_; - gboolean _tmp6_; #line 895 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 895 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6724,428 +6309,355 @@ gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* phot result = FALSE; #line 897 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6706 "PhotoTable.c" +#line 6291 "PhotoTable.c" } #line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = *photo_id; #line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = _tmp4_.id; #line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp5_, "transformations", ""); -#line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp6_; + result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp5_, "transformations", ""); #line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6718 "PhotoTable.c" +#line 6301 "PhotoTable.c" } -static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format) { +static sqlite3_stmt* +photo_table_get_duplicate_stmt (PhotoTable* self, + GFile* file, + const gchar* thumbnail_md5, + const gchar* md5, + PhotoFileFormat file_format) +{ sqlite3_stmt* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - GFile* _tmp2_; gchar* sql = NULL; - gchar* _tmp5_; + gchar* _tmp2_; gboolean first = FALSE; - GFile* _tmp6_; - gboolean _tmp9_ = FALSE; - const gchar* _tmp10_; + gboolean _tmp5_ = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp33_; - const gchar* _tmp34_; - sqlite3_stmt* _tmp35_ = NULL; - gint _tmp36_; - gint _tmp37_; + sqlite3* _tmp23_; + const gchar* _tmp24_; + sqlite3_stmt* _tmp25_ = NULL; + gint _tmp26_; + gint _tmp27_; gint col = 0; - GFile* _tmp38_; - const gchar* _tmp46_; - const gchar* _tmp54_; - gboolean _tmp62_ = FALSE; - gboolean _tmp63_ = FALSE; - const gchar* _tmp64_; + gboolean _tmp43_ = FALSE; + gboolean _tmp44_ = FALSE; #line 904 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL); #line 904 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL); #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = file; -#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp2_ != NULL) { + if (file != NULL) { #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = TRUE; -#line 6757 "PhotoTable.c" +#line 6337 "PhotoTable.c" } else { - const gchar* _tmp3_; #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = thumbnail_md5; -#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = _tmp3_ != NULL; -#line 6764 "PhotoTable.c" + _tmp1_ = thumbnail_md5 != NULL; +#line 6341 "PhotoTable.c" } #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp1_) { #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = TRUE; -#line 6770 "PhotoTable.c" +#line 6347 "PhotoTable.c" } else { - const gchar* _tmp4_; -#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = md5; #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp4_ != NULL; -#line 6777 "PhotoTable.c" + _tmp0_ = md5 != NULL; +#line 6351 "PhotoTable.c" } #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp0_, "file != null || thumbnail_md5 != null || md5 != null"); #line 908 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = g_strdup ("SELECT id FROM PhotoTable WHERE"); + _tmp2_ = g_strdup ("SELECT id FROM PhotoTable WHERE"); #line 908 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp5_; + sql = _tmp2_; #line 909 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" first = TRUE; #line 911 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = file; -#line 911 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp6_ != NULL) { -#line 6791 "PhotoTable.c" - const gchar* _tmp7_; - gchar* _tmp8_; + if (file != NULL) { +#line 6363 "PhotoTable.c" + const gchar* _tmp3_; + gchar* _tmp4_; #line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sql; + _tmp3_ = sql; #line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = g_strconcat (_tmp7_, " filename=?", NULL); + _tmp4_ = g_strconcat (_tmp3_, " filename=?", NULL); #line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp8_; + sql = _tmp4_; #line 913 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" first = FALSE; -#line 6804 "PhotoTable.c" +#line 6376 "PhotoTable.c" } #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = thumbnail_md5; -#line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp10_ != NULL) { + if (thumbnail_md5 != NULL) { #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = TRUE; -#line 6812 "PhotoTable.c" + _tmp5_ = TRUE; +#line 6382 "PhotoTable.c" } else { - const gchar* _tmp11_; -#line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = md5; #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = _tmp11_ != NULL; -#line 6819 "PhotoTable.c" + _tmp5_ = md5 != NULL; +#line 6386 "PhotoTable.c" } #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp9_) { -#line 6823 "PhotoTable.c" - gboolean _tmp12_; + if (_tmp5_) { +#line 6390 "PhotoTable.c" + gboolean _tmp6_; const gchar* _tmp17_; - const gchar* _tmp20_; - const gchar* _tmp26_; - gchar* _tmp27_; - PhotoFileFormat _tmp28_; - const gchar* _tmp31_; - gchar* _tmp32_; + gchar* _tmp18_; + const gchar* _tmp21_; + gchar* _tmp22_; #line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = first; + _tmp6_ = first; #line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp12_) { -#line 6836 "PhotoTable.c" - const gchar* _tmp13_; - gchar* _tmp14_; + if (_tmp6_) { +#line 6400 "PhotoTable.c" + const gchar* _tmp7_; + gchar* _tmp8_; #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = sql; + _tmp7_ = sql; #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = g_strconcat (_tmp13_, " ((", NULL); + _tmp8_ = g_strconcat (_tmp7_, " ((", NULL); #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp14_; -#line 6847 "PhotoTable.c" + sql = _tmp8_; +#line 6411 "PhotoTable.c" } else { - const gchar* _tmp15_; - gchar* _tmp16_; + const gchar* _tmp9_; + gchar* _tmp10_; #line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = sql; + _tmp9_ = sql; #line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = g_strconcat (_tmp15_, " OR ((", NULL); + _tmp10_ = g_strconcat (_tmp9_, " OR ((", NULL); #line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp16_; -#line 6859 "PhotoTable.c" + sql = _tmp10_; +#line 6423 "PhotoTable.c" } #line 921 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" first = FALSE; #line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = md5; -#line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp17_ != NULL) { -#line 6867 "PhotoTable.c" - const gchar* _tmp18_; - gchar* _tmp19_; + if (md5 != NULL) { +#line 6429 "PhotoTable.c" + const gchar* _tmp11_; + gchar* _tmp12_; #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = sql; + _tmp11_ = sql; #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = g_strconcat (_tmp18_, " md5=?", NULL); + _tmp12_ = g_strconcat (_tmp11_, " md5=?", NULL); #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp19_; -#line 6878 "PhotoTable.c" + sql = _tmp12_; +#line 6440 "PhotoTable.c" } #line 927 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = thumbnail_md5; -#line 927 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp20_ != NULL) { -#line 6884 "PhotoTable.c" - const gchar* _tmp21_; -#line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = md5; + if (thumbnail_md5 != NULL) { #line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp21_ == NULL) { -#line 6890 "PhotoTable.c" - const gchar* _tmp22_; - gchar* _tmp23_; + if (md5 == NULL) { +#line 6446 "PhotoTable.c" + const gchar* _tmp13_; + gchar* _tmp14_; #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = sql; + _tmp13_ = sql; #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = g_strconcat (_tmp22_, " thumbnail_md5=?", NULL); + _tmp14_ = g_strconcat (_tmp13_, " thumbnail_md5=?", NULL); #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp23_; -#line 6901 "PhotoTable.c" + sql = _tmp14_; +#line 6457 "PhotoTable.c" } else { - const gchar* _tmp24_; - gchar* _tmp25_; + const gchar* _tmp15_; + gchar* _tmp16_; #line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = sql; + _tmp15_ = sql; #line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = g_strconcat (_tmp24_, " OR (md5 IS NULL AND thumbnail_md5=?)", NULL); + _tmp16_ = g_strconcat (_tmp15_, " OR (md5 IS NULL AND thumbnail_md5=?)", NULL); #line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp25_; -#line 6913 "PhotoTable.c" + sql = _tmp16_; +#line 6469 "PhotoTable.c" } } #line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = sql; + _tmp17_ = sql; #line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = g_strconcat (_tmp26_, ")", NULL); + _tmp18_ = g_strconcat (_tmp17_, ")", NULL); #line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp27_; -#line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = file_format; + sql = _tmp18_; #line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp28_ != PHOTO_FILE_FORMAT_UNKNOWN) { -#line 6928 "PhotoTable.c" - const gchar* _tmp29_; - gchar* _tmp30_; + if (file_format != PHOTO_FILE_FORMAT_UNKNOWN) { +#line 6482 "PhotoTable.c" + const gchar* _tmp19_; + gchar* _tmp20_; #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = sql; + _tmp19_ = sql; #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = g_strconcat (_tmp29_, " AND file_format=?", NULL); + _tmp20_ = g_strconcat (_tmp19_, " AND file_format=?", NULL); #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp30_; -#line 6939 "PhotoTable.c" + sql = _tmp20_; +#line 6493 "PhotoTable.c" } #line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = sql; + _tmp21_ = sql; #line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = g_strconcat (_tmp31_, ")", NULL); + _tmp22_ = g_strconcat (_tmp21_, ")", NULL); #line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp32_; -#line 6949 "PhotoTable.c" + sql = _tmp22_; +#line 6503 "PhotoTable.c" } #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = database_table_db; + _tmp23_ = database_table_db; #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = sql; + _tmp24_ = sql; #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = sqlite3_prepare_v2 (_tmp33_, _tmp34_, -1, &_tmp35_, NULL); + _tmp26_ = sqlite3_prepare_v2 (_tmp23_, _tmp24_, -1, &_tmp25_, NULL); #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt = _tmp35_; + stmt = _tmp25_; #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp36_; + res = _tmp26_; #line 944 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = res; + _tmp27_ = res; #line 944 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); #line 946 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" col = 1; #line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = file; -#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp38_ != NULL) { -#line 6973 "PhotoTable.c" - sqlite3_stmt* _tmp39_; - gint _tmp40_; - GFile* _tmp41_; - gchar* _tmp42_; - GDestroyNotify _tmp43_; - gint _tmp44_; - gint _tmp45_; -#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = stmt; + if (file != NULL) { +#line 6525 "PhotoTable.c" + sqlite3_stmt* _tmp28_; + gint _tmp29_; + gchar* _tmp30_; + GDestroyNotify _tmp31_; + gint _tmp32_; #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = col; + _tmp28_ = stmt; #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp40_ + 1; + _tmp29_ = col; #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = file; + col = _tmp29_ + 1; #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = g_file_get_path (_tmp41_); + _tmp30_ = g_file_get_path (file); #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = g_free; + _tmp31_ = g_free; #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = sqlite3_bind_text (_tmp39_, _tmp40_, _tmp42_, -1, _tmp43_); -#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp44_; + res = sqlite3_bind_text (_tmp28_, _tmp29_, _tmp30_, -1, _tmp31_); #line 950 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = res; + _tmp32_ = res; #line 950 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp45_ == SQLITE_OK, "res == Sqlite.OK"); -#line 7001 "PhotoTable.c" + _vala_assert (_tmp32_ == SQLITE_OK, "res == Sqlite.OK"); +#line 6547 "PhotoTable.c" } #line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = thumbnail_md5; -#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp46_ != NULL) { -#line 7007 "PhotoTable.c" - sqlite3_stmt* _tmp47_; - gint _tmp48_; - const gchar* _tmp49_; - gchar* _tmp50_; - GDestroyNotify _tmp51_; - gint _tmp52_; - gint _tmp53_; -#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = stmt; -#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = col; + if (thumbnail_md5 != NULL) { +#line 6551 "PhotoTable.c" + sqlite3_stmt* _tmp33_; + gint _tmp34_; + gchar* _tmp35_; + GDestroyNotify _tmp36_; + gint _tmp37_; #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp48_ + 1; + _tmp33_ = stmt; #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = thumbnail_md5; + _tmp34_ = col; #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = g_strdup (_tmp49_); + col = _tmp34_ + 1; #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = g_free; + _tmp35_ = g_strdup (thumbnail_md5); #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = sqlite3_bind_text (_tmp47_, _tmp48_, _tmp50_, -1, _tmp51_); + _tmp36_ = g_free; #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp52_; + res = sqlite3_bind_text (_tmp33_, _tmp34_, _tmp35_, -1, _tmp36_); #line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = res; + _tmp37_ = res; #line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp53_ == SQLITE_OK, "res == Sqlite.OK"); -#line 7035 "PhotoTable.c" + _vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK"); +#line 6573 "PhotoTable.c" } #line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = md5; -#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp54_ != NULL) { -#line 7041 "PhotoTable.c" - sqlite3_stmt* _tmp55_; - gint _tmp56_; - const gchar* _tmp57_; - gchar* _tmp58_; - GDestroyNotify _tmp59_; - gint _tmp60_; - gint _tmp61_; -#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_ = stmt; -#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_ = col; + if (md5 != NULL) { +#line 6577 "PhotoTable.c" + sqlite3_stmt* _tmp38_; + gint _tmp39_; + gchar* _tmp40_; + GDestroyNotify _tmp41_; + gint _tmp42_; #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp56_ + 1; + _tmp38_ = stmt; #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_ = md5; + _tmp39_ = col; #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp58_ = g_strdup (_tmp57_); + col = _tmp39_ + 1; #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp59_ = g_free; + _tmp40_ = g_strdup (md5); #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp60_ = sqlite3_bind_text (_tmp55_, _tmp56_, _tmp58_, -1, _tmp59_); + _tmp41_ = g_free; #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp60_; + res = sqlite3_bind_text (_tmp38_, _tmp39_, _tmp40_, -1, _tmp41_); #line 960 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp61_ = res; + _tmp42_ = res; #line 960 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp61_ == SQLITE_OK, "res == Sqlite.OK"); -#line 7069 "PhotoTable.c" + _vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK"); +#line 6599 "PhotoTable.c" } #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp64_ = thumbnail_md5; -#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp64_ != NULL) { + if (thumbnail_md5 != NULL) { #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_ = TRUE; -#line 7077 "PhotoTable.c" + _tmp44_ = TRUE; +#line 6605 "PhotoTable.c" } else { - const gchar* _tmp65_; #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp65_ = md5; -#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_ = _tmp65_ != NULL; -#line 7084 "PhotoTable.c" + _tmp44_ = md5 != NULL; +#line 6609 "PhotoTable.c" } #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp63_) { -#line 7088 "PhotoTable.c" - PhotoFileFormat _tmp66_; -#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp66_ = file_format; + if (_tmp44_) { #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp62_ = _tmp66_ != PHOTO_FILE_FORMAT_UNKNOWN; -#line 7094 "PhotoTable.c" + _tmp43_ = file_format != PHOTO_FILE_FORMAT_UNKNOWN; +#line 6615 "PhotoTable.c" } else { #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp62_ = FALSE; -#line 7098 "PhotoTable.c" + _tmp43_ = FALSE; +#line 6619 "PhotoTable.c" } #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp62_) { -#line 7102 "PhotoTable.c" - sqlite3_stmt* _tmp67_; - gint _tmp68_; - PhotoFileFormat _tmp69_; - gint _tmp70_; - gint _tmp71_; - gint _tmp72_; -#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp67_ = stmt; -#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp68_ = col; -#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp68_ + 1; + if (_tmp43_) { +#line 6623 "PhotoTable.c" + sqlite3_stmt* _tmp45_; + gint _tmp46_; + gint _tmp47_; #line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp69_ = file_format; + _tmp45_ = stmt; #line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp70_ = photo_file_format_serialize (_tmp69_); + _tmp46_ = col; #line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp71_ = sqlite3_bind_int (_tmp67_, _tmp68_, _tmp70_); + col = _tmp46_ + 1; #line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp71_; + res = sqlite3_bind_int (_tmp45_, _tmp46_, photo_file_format_serialize (file_format)); #line 965 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp72_ = res; + _tmp47_ = res; #line 965 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp72_ == SQLITE_OK, "res == Sqlite.OK"); -#line 7127 "PhotoTable.c" + _vala_assert (_tmp47_ == SQLITE_OK, "res == Sqlite.OK"); +#line 6639 "PhotoTable.c" } #line 968 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = stmt; @@ -7153,242 +6665,222 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _g_free0 (sql); #line 968 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7135 "PhotoTable.c" +#line 6647 "PhotoTable.c" } -gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format) { +gboolean +photo_table_has_duplicate (PhotoTable* self, + GFile* file, + const gchar* thumbnail_md5, + const gchar* md5, + PhotoFileFormat file_format) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; - GFile* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - PhotoFileFormat _tmp3_; - sqlite3_stmt* _tmp4_; + sqlite3_stmt* _tmp0_; gint res = 0; - sqlite3_stmt* _tmp5_; - gint _tmp6_; - gint _tmp7_; + sqlite3_stmt* _tmp1_; + gint _tmp2_; #line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE); #line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = file; -#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = thumbnail_md5; -#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = md5; -#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = file_format; + _tmp0_ = photo_table_get_duplicate_stmt (self, file, thumbnail_md5, md5, file_format); #line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = photo_table_get_duplicate_stmt (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_); -#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt = _tmp4_; -#line 973 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = stmt; + stmt = _tmp0_; #line 973 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = sqlite3_step (_tmp5_); + _tmp1_ = stmt; #line 973 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp6_; + res = sqlite3_step (_tmp1_); #line 975 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = res; + _tmp2_ = res; #line 975 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp7_ == SQLITE_DONE) { + if (_tmp2_ == SQLITE_DONE) { #line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7183 "PhotoTable.c" +#line 6686 "PhotoTable.c" } else { - gint _tmp8_; + gint _tmp3_; #line 978 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp3_ = res; #line 978 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp8_ == SQLITE_ROW) { + if (_tmp3_ == SQLITE_ROW) { #line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = TRUE; #line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7196 "PhotoTable.c" +#line 6699 "PhotoTable.c" } else { - gint _tmp9_; + gint _tmp4_; #line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = res; + _tmp4_ = res; #line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("has_duplicate", _tmp9_); + database_table_fatal ("has_duplicate", _tmp4_); #line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7209 "PhotoTable.c" +#line 6712 "PhotoTable.c" } } #line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 7214 "PhotoTable.c" +#line 6717 "PhotoTable.c" } -static void _vala_array_add2 (PhotoID* * array, int* length, int* size, const PhotoID* value) { +static void +_vala_array_add2 (PhotoID* * array, + int* length, + int* size, + const PhotoID* value) +{ #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if ((*length) == (*size)) { #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *size = (*size) ? (2 * (*size)) : 4; #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *array = g_renew (PhotoID, *array, *size); -#line 7225 "PhotoTable.c" +#line 6733 "PhotoTable.c" } #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" (*array)[(*length)++] = *value; -#line 7229 "PhotoTable.c" +#line 6737 "PhotoTable.c" } -PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format, int* result_length1) { +PhotoID* +photo_table_get_duplicate_ids (PhotoTable* self, + GFile* file, + const gchar* thumbnail_md5, + const gchar* md5, + PhotoFileFormat file_format, + int* result_length1) +{ PhotoID* result = NULL; sqlite3_stmt* stmt = NULL; - GFile* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - PhotoFileFormat _tmp3_; - sqlite3_stmt* _tmp4_; + sqlite3_stmt* _tmp0_; PhotoID* ids = NULL; - PhotoID* _tmp5_; + PhotoID* _tmp1_; gint ids_length1; gint _ids_size_; gint res = 0; - sqlite3_stmt* _tmp6_; - gint _tmp7_; - PhotoID* _tmp15_; - gint _tmp15__length1; + sqlite3_stmt* _tmp2_; + PhotoID* _tmp8_; + gint _tmp8__length1; #line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL); #line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL); #line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = file; -#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = thumbnail_md5; -#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = md5; -#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = file_format; + _tmp0_ = photo_table_get_duplicate_stmt (self, file, thumbnail_md5, md5, file_format); #line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = photo_table_get_duplicate_stmt (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_); -#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt = _tmp4_; + stmt = _tmp0_; #line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = g_new0 (PhotoID, 0); + _tmp1_ = g_new0 (PhotoID, 0); #line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - ids = _tmp5_; + ids = _tmp1_; #line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ids_length1 = 0; #line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _ids_size_ = ids_length1; #line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = stmt; -#line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_step (_tmp6_); + _tmp2_ = stmt; #line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_step (_tmp2_); #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 7282 "PhotoTable.c" - gint _tmp8_; - PhotoID* _tmp9_; - gint _tmp9__length1; - sqlite3_stmt* _tmp10_; - gint64 _tmp11_; - PhotoID _tmp12_ = {0}; - sqlite3_stmt* _tmp13_; - gint _tmp14_; +#line 6782 "PhotoTable.c" + gint _tmp3_; + PhotoID* _tmp4_; + gint _tmp4__length1; + sqlite3_stmt* _tmp5_; + PhotoID _tmp6_ = {0}; + sqlite3_stmt* _tmp7_; #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp3_ = res; #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!(_tmp8_ == SQLITE_ROW)) { + if (!(_tmp3_ == SQLITE_ROW)) { #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 7297 "PhotoTable.c" +#line 6795 "PhotoTable.c" } #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = ids; + _tmp4_ = ids; #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9__length1 = ids_length1; + _tmp4__length1 = ids_length1; #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = stmt; -#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = sqlite3_column_int64 (_tmp10_, 0); + _tmp5_ = stmt; #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_id_init (&_tmp12_, _tmp11_); + photo_id_init (&_tmp6_, sqlite3_column_int64 (_tmp5_, 0)); #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_array_add2 (&ids, &ids_length1, &_ids_size_, &_tmp12_); + _vala_array_add2 (&ids, &ids_length1, &_ids_size_, &_tmp6_); #line 997 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = stmt; + _tmp7_ = stmt; #line 997 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = sqlite3_step (_tmp13_); -#line 997 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp14_; -#line 7317 "PhotoTable.c" + res = sqlite3_step (_tmp7_); +#line 6811 "PhotoTable.c" } #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = ids; + _tmp8_ = ids; #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15__length1 = ids_length1; + _tmp8__length1 = ids_length1; #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (result_length1) { #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - *result_length1 = _tmp15__length1; -#line 7327 "PhotoTable.c" + *result_length1 = _tmp8__length1; +#line 6821 "PhotoTable.c" } #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp15_; + result = _tmp8_; #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7335 "PhotoTable.c" +#line 6829 "PhotoTable.c" } -void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gchar* backlinks, GError** error) { +void +photo_table_update_backlinks (PhotoTable* self, + PhotoID* photo_id, + const gchar* backlinks, + GError** error) +{ const gchar* _tmp0_ = NULL; - const gchar* _tmp1_; - PhotoID _tmp3_; - gint64 _tmp4_; + PhotoID _tmp1_; + gint64 _tmp2_; GError * _inner_error_ = NULL; #line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); #line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (photo_id != NULL); #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = backlinks; -#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp1_ != NULL) { -#line 7353 "PhotoTable.c" - const gchar* _tmp2_; + if (backlinks != NULL) { #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = backlinks; -#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp2_; -#line 7359 "PhotoTable.c" + _tmp0_ = backlinks; +#line 6851 "PhotoTable.c" } else { #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = ""; -#line 7363 "PhotoTable.c" +#line 6855 "PhotoTable.c" } #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = *photo_id; + _tmp1_ = *photo_id; #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp3_.id; + _tmp2_ = _tmp1_.id; #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp4_, "backlinks", _tmp0_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "backlinks", _tmp0_, &_inner_error_); #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7397,7 +6889,7 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc g_propagate_error (error, _inner_error_); #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7379 "PhotoTable.c" +#line 6871 "PhotoTable.c" } else { #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7405,20 +6897,23 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc g_clear_error (&_inner_error_); #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7387 "PhotoTable.c" +#line 6879 "PhotoTable.c" } } } -void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoID* editable_id, GError** error) { - PhotoRow* _tmp0_; - PhotoID _tmp1_; - gint64 _tmp2_; - BackingPhotoID _tmp3_; - gint64 _tmp4_; - PhotoRow* _tmp5_; - BackingPhotoID _tmp6_; +void +photo_table_attach_editable (PhotoTable* self, + PhotoRow* row, + BackingPhotoID* editable_id, + GError** error) +{ + PhotoID _tmp0_; + gint64 _tmp1_; + BackingPhotoID _tmp2_; + gint64 _tmp3_; + BackingPhotoID _tmp4_; GError * _inner_error_ = NULL; #line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -7427,17 +6922,15 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI #line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (editable_id != NULL); #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = row; -#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = _tmp0_->photo_id; + _tmp0_ = row->photo_id; #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = _tmp1_.id; + _tmp1_ = _tmp0_.id; #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = *editable_id; + _tmp2_ = *editable_id; #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp3_.id; + _tmp3_ = _tmp2_.id; #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "editable_id", _tmp4_, &_inner_error_); + database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "editable_id", _tmp3_, &_inner_error_); #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7446,7 +6939,7 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI g_propagate_error (error, _inner_error_); #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7428 "PhotoTable.c" +#line 6921 "PhotoTable.c" } else { #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7454,37 +6947,35 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI g_clear_error (&_inner_error_); #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7436 "PhotoTable.c" +#line 6929 "PhotoTable.c" } } #line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = row; -#line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = *editable_id; + _tmp4_ = *editable_id; #line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_->editable_id = _tmp6_; -#line 7445 "PhotoTable.c" + row->editable_id = _tmp4_; +#line 6936 "PhotoTable.c" } -void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** error) { - PhotoRow* _tmp0_; - PhotoID _tmp1_; - gint64 _tmp2_; - PhotoRow* _tmp3_; +void +photo_table_detach_editable (PhotoTable* self, + PhotoRow* row, + GError** error) +{ + PhotoID _tmp0_; + gint64 _tmp1_; GError * _inner_error_ = NULL; #line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); #line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_ROW (row)); #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = row; -#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = _tmp0_->photo_id; + _tmp0_ = row->photo_id; #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = _tmp1_.id; + _tmp1_ = _tmp0_.id; #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "editable_id", BACKING_PHOTO_ID_INVALID, &_inner_error_); + database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "editable_id", BACKING_PHOTO_ID_INVALID, &_inner_error_); #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7493,7 +6984,7 @@ void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** erro g_propagate_error (error, _inner_error_); #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7475 "PhotoTable.c" +#line 6966 "PhotoTable.c" } else { #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7501,45 +6992,45 @@ void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** erro g_clear_error (&_inner_error_); #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7483 "PhotoTable.c" +#line 6974 "PhotoTable.c" } } #line 1016 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = row; -#line 1016 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp3_->editable_id, BACKING_PHOTO_ID_INVALID); -#line 7490 "PhotoTable.c" + backing_photo_id_init (&row->editable_id, BACKING_PHOTO_ID_INVALID); +#line 6979 "PhotoTable.c" } -void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboolean dirty, GError** error) { +void +photo_table_set_metadata_dirty (PhotoTable* self, + PhotoID* photo_id, + gboolean dirty, + GError** error) +{ gint _tmp0_ = 0; - gboolean _tmp1_; - PhotoID _tmp2_; - gint64 _tmp3_; + PhotoID _tmp1_; + gint64 _tmp2_; GError * _inner_error_ = NULL; #line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); #line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (photo_id != NULL); #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = dirty; -#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp1_) { + if (dirty) { #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = 1; -#line 7510 "PhotoTable.c" +#line 7001 "PhotoTable.c" } else { #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = 0; -#line 7514 "PhotoTable.c" +#line 7005 "PhotoTable.c" } #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = *photo_id; + _tmp1_ = *photo_id; #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = _tmp2_.id; + _tmp2_ = _tmp1_.id; #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_update_int_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp3_, "metadata_dirty", _tmp0_, &_inner_error_); + database_table_update_int_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "metadata_dirty", _tmp0_, &_inner_error_); #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7548,7 +7039,7 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole g_propagate_error (error, _inner_error_); #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7530 "PhotoTable.c" +#line 7021 "PhotoTable.c" } else { #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7556,29 +7047,31 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole g_clear_error (&_inner_error_); #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7538 "PhotoTable.c" +#line 7029 "PhotoTable.c" } } } -void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, BackingPhotoID* backing_photo_id, GError** error) { +void +photo_table_update_raw_development (PhotoTable* self, + PhotoRow* row, + RawDeveloper rd, + BackingPhotoID* backing_photo_id, + GError** error) +{ gchar* col = NULL; - RawDeveloper _tmp0_; - PhotoRow* _tmp4_; - BackingPhotoID* _tmp5_; - gint _tmp5__length1; - RawDeveloper _tmp6_; - BackingPhotoID _tmp7_; - BackingPhotoID _tmp8_; - PhotoRow* _tmp9_; - PhotoID _tmp10_; - gint64 _tmp11_; - const gchar* _tmp12_; - BackingPhotoID _tmp13_; - gint64 _tmp14_; - BackingPhotoID _tmp15_; - gint64 _tmp16_; + BackingPhotoID* _tmp3_; + gint _tmp3__length1; + BackingPhotoID _tmp4_; + BackingPhotoID _tmp5_; + PhotoID _tmp6_; + gint64 _tmp7_; + const gchar* _tmp8_; + BackingPhotoID _tmp9_; + gint64 _tmp10_; + BackingPhotoID _tmp11_; + gint64 _tmp12_; GError * _inner_error_ = NULL; #line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -7587,89 +7080,81 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev #line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (backing_photo_id != NULL); #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = rd; -#line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - switch (_tmp0_) { + switch (rd) { #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" case RAW_DEVELOPER_SHOTWELL: -#line 7574 "PhotoTable.c" +#line 7065 "PhotoTable.c" { - gchar* _tmp1_; + gchar* _tmp0_; #line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = g_strdup ("develop_shotwell_id"); + _tmp0_ = g_strdup ("develop_shotwell_id"); #line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); #line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp1_; + col = _tmp0_; #line 1030 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 7585 "PhotoTable.c" +#line 7076 "PhotoTable.c" } #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" case RAW_DEVELOPER_CAMERA: -#line 7589 "PhotoTable.c" +#line 7080 "PhotoTable.c" { - gchar* _tmp2_; + gchar* _tmp1_; #line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = g_strdup ("develop_camera_id"); + _tmp1_ = g_strdup ("develop_camera_id"); #line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); #line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp2_; + col = _tmp1_; #line 1034 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 7600 "PhotoTable.c" +#line 7091 "PhotoTable.c" } #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" case RAW_DEVELOPER_EMBEDDED: -#line 7604 "PhotoTable.c" +#line 7095 "PhotoTable.c" { - gchar* _tmp3_; + gchar* _tmp2_; #line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = g_strdup ("develop_embedded_id"); + _tmp2_ = g_strdup ("develop_embedded_id"); #line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); #line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp3_; + col = _tmp2_; #line 1038 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 7615 "PhotoTable.c" +#line 7106 "PhotoTable.c" } default: { #line 1041 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_assert_not_reached (); -#line 7621 "PhotoTable.c" +#line 7112 "PhotoTable.c" } } #line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = row; + _tmp3_ = row->development_ids; #line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = _tmp4_->development_ids; + _tmp3__length1 = row->development_ids_length1; #line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5__length1 = _tmp4_->development_ids_length1; + _tmp4_ = *backing_photo_id; #line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = rd; + _tmp3_[rd] = _tmp4_; #line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = *backing_photo_id; -#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_[_tmp6_] = _tmp7_; -#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = _tmp5_[_tmp6_]; + _tmp5_ = _tmp3_[rd]; #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = row; + _tmp6_ = row->photo_id; #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = _tmp9_->photo_id; + _tmp7_ = _tmp6_.id; #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = _tmp10_.id; + _tmp8_ = col; #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = col; + _tmp9_ = *backing_photo_id; #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = *backing_photo_id; + _tmp10_ = _tmp9_.id; #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = _tmp13_.id; -#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp11_, _tmp12_, _tmp14_, &_inner_error_); + database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp7_, _tmp8_, _tmp10_, &_inner_error_); #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7680,7 +7165,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev _g_free0 (col); #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7662 "PhotoTable.c" +#line 7147 "PhotoTable.c" } else { #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); @@ -7690,38 +7175,32 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev g_clear_error (&_inner_error_); #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7672 "PhotoTable.c" +#line 7157 "PhotoTable.c" } } #line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = *backing_photo_id; + _tmp11_ = *backing_photo_id; #line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _tmp15_.id; + _tmp12_ = _tmp11_.id; #line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp16_ != BACKING_PHOTO_ID_INVALID) { -#line 7681 "PhotoTable.c" - PhotoRow* _tmp17_; - PhotoID _tmp18_; - gint64 _tmp19_; - RawDeveloper _tmp20_; - gchar* _tmp21_; - gchar* _tmp22_; -#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = row; -#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = _tmp17_->photo_id; + if (_tmp12_ != BACKING_PHOTO_ID_INVALID) { +#line 7166 "PhotoTable.c" + PhotoID _tmp13_; + gint64 _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = _tmp18_.id; + _tmp13_ = row->photo_id; #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = rd; + _tmp14_ = _tmp13_.id; #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = raw_developer_to_string (_tmp20_); + _tmp15_ = raw_developer_to_string (rd); #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = _tmp21_; + _tmp16_ = _tmp15_; #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp19_, "developer", _tmp22_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp14_, "developer", _tmp16_, &_inner_error_); #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp16_); #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7732,7 +7211,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev _g_free0 (col); #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7714 "PhotoTable.c" +#line 7193 "PhotoTable.c" } else { #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); @@ -7742,33 +7221,32 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev g_clear_error (&_inner_error_); #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7724 "PhotoTable.c" +#line 7203 "PhotoTable.c" } } } #line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); -#line 7730 "PhotoTable.c" +#line 7209 "PhotoTable.c" } -void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, GError** error) { - PhotoRow* _tmp0_; - RawDeveloper _tmp1_; - BackingPhotoID _tmp2_ = {0}; +void +photo_table_remove_development (PhotoTable* self, + PhotoRow* row, + RawDeveloper rd, + GError** error) +{ + BackingPhotoID _tmp0_ = {0}; GError * _inner_error_ = NULL; #line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); #line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_ROW (row)); #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = row; -#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = rd; + backing_photo_id_init (&_tmp0_, BACKING_PHOTO_ID_INVALID); #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp2_, BACKING_PHOTO_ID_INVALID); -#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_table_update_raw_development (self, _tmp0_, _tmp1_, &_tmp2_, &_inner_error_); + photo_table_update_raw_development (self, row, rd, &_tmp0_, &_inner_error_); #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7777,7 +7255,7 @@ void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDevelop g_propagate_error (error, _inner_error_); #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7759 "PhotoTable.c" +#line 7237 "PhotoTable.c" } else { #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7785,36 +7263,44 @@ void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDevelop g_clear_error (&_inner_error_); #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7767 "PhotoTable.c" +#line 7245 "PhotoTable.c" } } } -static void photo_table_class_init (PhotoTableClass * klass) { +static void +photo_table_class_init (PhotoTableClass * klass) +{ #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_table_parent_class = g_type_class_peek_parent (klass); #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ((DatabaseTableClass *) klass)->finalize = photo_table_finalize; -#line 7778 "PhotoTable.c" +#line 7258 "PhotoTable.c" } -static void photo_table_instance_init (PhotoTable * self) { +static void +photo_table_instance_init (PhotoTable * self) +{ } -static void photo_table_finalize (DatabaseTable * obj) { +static void +photo_table_finalize (DatabaseTable * obj) +{ PhotoTable * self; #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_TABLE, PhotoTable); #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" DATABASE_TABLE_CLASS (photo_table_parent_class)->finalize (obj); -#line 7792 "PhotoTable.c" +#line 7276 "PhotoTable.c" } -GType photo_table_get_type (void) { +GType +photo_table_get_type (void) +{ static volatile gsize photo_table_type_id__volatile = 0; if (g_once_init_enter (&photo_table_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoTable), 0, (GInstanceInitFunc) photo_table_instance_init, NULL }; @@ -7826,19 +7312,21 @@ GType photo_table_get_type (void) { } -void backing_photo_id_init (BackingPhotoID *self, gint64 id) { - gint64 _tmp0_; +void +backing_photo_id_init (BackingPhotoID *self, + gint64 id) +{ #line 1072 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" memset (self, 0, sizeof (BackingPhotoID)); #line 1073 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = id; -#line 1073 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - (*self).id = _tmp0_; -#line 7816 "PhotoTable.c" + (*self).id = id; +#line 7302 "PhotoTable.c" } -gboolean backing_photo_id_is_invalid (BackingPhotoID *self) { +gboolean +backing_photo_id_is_invalid (BackingPhotoID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7847,11 +7335,13 @@ gboolean backing_photo_id_is_invalid (BackingPhotoID *self) { result = _tmp0_ == BACKING_PHOTO_ID_INVALID; #line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7829 "PhotoTable.c" +#line 7317 "PhotoTable.c" } -gboolean backing_photo_id_is_valid (BackingPhotoID *self) { +gboolean +backing_photo_id_is_valid (BackingPhotoID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 1081 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7860,11 +7350,13 @@ gboolean backing_photo_id_is_valid (BackingPhotoID *self) { result = _tmp0_ != BACKING_PHOTO_ID_INVALID; #line 1081 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7842 "PhotoTable.c" +#line 7332 "PhotoTable.c" } -BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self) { +BackingPhotoID* +backing_photo_id_dup (const BackingPhotoID* self) +{ BackingPhotoID* dup; #line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dup = g_new0 (BackingPhotoID, 1); @@ -7872,18 +7364,22 @@ BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self) { memcpy (dup, self, sizeof (BackingPhotoID)); #line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return dup; -#line 7854 "PhotoTable.c" +#line 7346 "PhotoTable.c" } -void backing_photo_id_free (BackingPhotoID* self) { +void +backing_photo_id_free (BackingPhotoID* self) +{ #line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_free (self); -#line 7861 "PhotoTable.c" +#line 7355 "PhotoTable.c" } -GType backing_photo_id_get_type (void) { +GType +backing_photo_id_get_type (void) +{ static volatile gsize backing_photo_id_type_id__volatile = 0; if (g_once_init_enter (&backing_photo_id_type_id__volatile)) { GType backing_photo_id_type_id; @@ -7894,15 +7390,15 @@ GType backing_photo_id_get_type (void) { } -gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* info) { +gboolean +backing_photo_row_matches_file_info (BackingPhotoRow* self, + GFileInfo* info) +{ gboolean result = FALSE; gint64 _tmp0_; - GFileInfo* _tmp1_; - gint64 _tmp2_; - time_t _tmp3_; - GFileInfo* _tmp4_; - GTimeVal _tmp5_ = {0}; - glong _tmp6_; + time_t _tmp1_; + GTimeVal _tmp2_ = {0}; + glong _tmp3_; #line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_BACKING_PHOTO_ROW (self), FALSE); #line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7910,42 +7406,36 @@ gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* #line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = self->filesize; #line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = info; -#line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = g_file_info_get_size (_tmp1_); -#line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp0_ != _tmp2_) { + if (_tmp0_ != g_file_info_get_size (info)) { #line 1097 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 1097 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7901 "PhotoTable.c" +#line 7393 "PhotoTable.c" } #line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = self->timestamp; -#line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = info; + _tmp1_ = self->timestamp; #line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_file_info_get_modification_time (_tmp4_, &_tmp5_); + g_file_info_get_modification_time (info, &_tmp2_); #line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = _tmp5_.tv_sec; + _tmp3_ = _tmp2_.tv_sec; #line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp3_ == ((time_t) _tmp6_); + result = _tmp1_ == ((time_t) _tmp3_); #line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7915 "PhotoTable.c" +#line 7405 "PhotoTable.c" } -gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info) { +gboolean +backing_photo_row_is_touched (BackingPhotoRow* self, + GFileInfo* info) +{ gboolean result = FALSE; gint64 _tmp0_; - GFileInfo* _tmp1_; - gint64 _tmp2_; - time_t _tmp3_; - GFileInfo* _tmp4_; - GTimeVal _tmp5_ = {0}; - glong _tmp6_; + time_t _tmp1_; + GTimeVal _tmp2_ = {0}; + glong _tmp3_; #line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_BACKING_PHOTO_ROW (self), FALSE); #line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7953,226 +7443,228 @@ gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info) { #line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = self->filesize; #line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = info; -#line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = g_file_info_get_size (_tmp1_); -#line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp0_ != _tmp2_) { + if (_tmp0_ != g_file_info_get_size (info)) { #line 1104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 1104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7944 "PhotoTable.c" +#line 7430 "PhotoTable.c" } #line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = self->timestamp; -#line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = info; + _tmp1_ = self->timestamp; #line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_file_info_get_modification_time (_tmp4_, &_tmp5_); + g_file_info_get_modification_time (info, &_tmp2_); #line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = _tmp5_.tv_sec; + _tmp3_ = _tmp2_.tv_sec; #line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp3_ != ((time_t) _tmp6_); + result = _tmp1_ != ((time_t) _tmp3_); #line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7958 "PhotoTable.c" +#line 7442 "PhotoTable.c" } -void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from) { - BackingPhotoRow* _tmp0_; - BackingPhotoID _tmp1_; - BackingPhotoRow* _tmp2_; - time_t _tmp3_; - BackingPhotoRow* _tmp4_; - const gchar* _tmp5_; - gchar* _tmp6_; - BackingPhotoRow* _tmp7_; - gint64 _tmp8_; - BackingPhotoRow* _tmp9_; - time_t _tmp10_; - BackingPhotoRow* _tmp11_; - PhotoFileFormat _tmp12_; - BackingPhotoRow* _tmp13_; - Dimensions _tmp14_; - BackingPhotoRow* _tmp15_; - Orientation _tmp16_; +void +backing_photo_row_copy_from (BackingPhotoRow* self, + BackingPhotoRow* from) +{ + BackingPhotoID _tmp0_; + time_t _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; + gint64 _tmp4_; + time_t _tmp5_; + PhotoFileFormat _tmp6_; + Dimensions _tmp7_; + Orientation _tmp8_; #line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_ROW (self)); #line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_ROW (from)); #line 1111 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = from; + _tmp0_ = from->id; #line 1111 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = _tmp0_->id; -#line 1111 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->id = _tmp1_; -#line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = from; + self->id = _tmp0_; #line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = _tmp2_->time_created; + _tmp1_ = from->time_created; #line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->time_created = _tmp3_; -#line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = from; + self->time_created = _tmp1_; #line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = _tmp4_->filepath; + _tmp2_ = from->filepath; #line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = g_strdup (_tmp5_); + _tmp3_ = g_strdup (_tmp2_); #line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (self->filepath); #line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->filepath = _tmp6_; -#line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = from; + self->filepath = _tmp3_; #line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = _tmp7_->filesize; + _tmp4_ = from->filesize; #line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->filesize = _tmp8_; + self->filesize = _tmp4_; #line 1115 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = from; + _tmp5_ = from->timestamp; #line 1115 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = _tmp9_->timestamp; -#line 1115 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->timestamp = _tmp10_; -#line 1116 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = from; + self->timestamp = _tmp5_; #line 1116 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = _tmp11_->file_format; + _tmp6_ = from->file_format; #line 1116 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->file_format = _tmp12_; + self->file_format = _tmp6_; #line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = from; + _tmp7_ = from->dim; #line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = _tmp13_->dim; -#line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->dim = _tmp14_; -#line 1118 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = from; + self->dim = _tmp7_; #line 1118 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _tmp15_->original_orientation; + _tmp8_ = from->original_orientation; #line 1118 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->original_orientation = _tmp16_; -#line 8036 "PhotoTable.c" + self->original_orientation = _tmp8_; +#line 7499 "PhotoTable.c" } -BackingPhotoRow* backing_photo_row_construct (GType object_type) { +BackingPhotoRow* +backing_photo_row_construct (GType object_type) +{ BackingPhotoRow* self = NULL; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = (BackingPhotoRow*) g_type_create_instance (object_type); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return self; -#line 8046 "PhotoTable.c" +#line 7511 "PhotoTable.c" } -BackingPhotoRow* backing_photo_row_new (void) { +BackingPhotoRow* +backing_photo_row_new (void) +{ #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return backing_photo_row_construct (TYPE_BACKING_PHOTO_ROW); -#line 8053 "PhotoTable.c" +#line 7520 "PhotoTable.c" } -static void value_backing_photo_row_init (GValue* value) { +static void +value_backing_photo_row_init (GValue* value) +{ #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 8060 "PhotoTable.c" +#line 7529 "PhotoTable.c" } -static void value_backing_photo_row_free_value (GValue* value) { +static void +value_backing_photo_row_free_value (GValue* value) +{ #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (value->data[0].v_pointer) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_unref (value->data[0].v_pointer); -#line 8069 "PhotoTable.c" +#line 7540 "PhotoTable.c" } } -static void value_backing_photo_row_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_backing_photo_row_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (src_value->data[0].v_pointer) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dest_value->data[0].v_pointer = backing_photo_row_ref (src_value->data[0].v_pointer); -#line 8079 "PhotoTable.c" +#line 7553 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dest_value->data[0].v_pointer = NULL; -#line 8083 "PhotoTable.c" +#line 7557 "PhotoTable.c" } } -static gpointer value_backing_photo_row_peek_pointer (const GValue* value) { +static gpointer +value_backing_photo_row_peek_pointer (const GValue* value) +{ #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return value->data[0].v_pointer; -#line 8091 "PhotoTable.c" +#line 7567 "PhotoTable.c" } -static gchar* value_backing_photo_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_backing_photo_row_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (collect_values[0].v_pointer) { -#line 8098 "PhotoTable.c" +#line 7579 "PhotoTable.c" BackingPhotoRow * object; object = collect_values[0].v_pointer; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (object->parent_instance.g_class == NULL) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8105 "PhotoTable.c" +#line 7586 "PhotoTable.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8109 "PhotoTable.c" +#line 7590 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = backing_photo_row_ref (object); -#line 8113 "PhotoTable.c" +#line 7594 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 8117 "PhotoTable.c" +#line 7598 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 8121 "PhotoTable.c" +#line 7602 "PhotoTable.c" } -static gchar* value_backing_photo_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_backing_photo_row_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ BackingPhotoRow ** object_p; object_p = collect_values[0].v_pointer; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!object_p) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 8132 "PhotoTable.c" +#line 7618 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!value->data[0].v_pointer) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = NULL; -#line 8138 "PhotoTable.c" +#line 7624 "PhotoTable.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = value->data[0].v_pointer; -#line 8142 "PhotoTable.c" +#line 7628 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = backing_photo_row_ref (value->data[0].v_pointer); -#line 8146 "PhotoTable.c" +#line 7632 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 8150 "PhotoTable.c" +#line 7636 "PhotoTable.c" } -GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_backing_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecBackingPhotoRow* spec; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_BACKING_PHOTO_ROW), NULL); @@ -8182,20 +7674,25 @@ GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return G_PARAM_SPEC (spec); -#line 8164 "PhotoTable.c" +#line 7656 "PhotoTable.c" } -gpointer value_get_backing_photo_row (const GValue* value) { +gpointer +value_get_backing_photo_row (const GValue* value) +{ #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW), NULL); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return value->data[0].v_pointer; -#line 8173 "PhotoTable.c" +#line 7667 "PhotoTable.c" } -void value_set_backing_photo_row (GValue* value, gpointer v_object) { +void +value_set_backing_photo_row (GValue* value, + gpointer v_object) +{ BackingPhotoRow * old; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW)); @@ -8211,22 +7708,25 @@ void value_set_backing_photo_row (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_ref (value->data[0].v_pointer); -#line 8193 "PhotoTable.c" +#line 7690 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 8197 "PhotoTable.c" +#line 7694 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (old) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_unref (old); -#line 8203 "PhotoTable.c" +#line 7700 "PhotoTable.c" } } -void value_take_backing_photo_row (GValue* value, gpointer v_object) { +void +value_take_backing_photo_row (GValue* value, + gpointer v_object) +{ BackingPhotoRow * old; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW)); @@ -8240,40 +7740,46 @@ void value_take_backing_photo_row (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = v_object; -#line 8222 "PhotoTable.c" +#line 7722 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 8226 "PhotoTable.c" +#line 7726 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (old) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_unref (old); -#line 8232 "PhotoTable.c" +#line 7732 "PhotoTable.c" } } -static void backing_photo_row_class_init (BackingPhotoRowClass * klass) { +static void +backing_photo_row_class_init (BackingPhotoRowClass * klass) +{ #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_parent_class = g_type_class_peek_parent (klass); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ((BackingPhotoRowClass *) klass)->finalize = backing_photo_row_finalize; -#line 8242 "PhotoTable.c" +#line 7744 "PhotoTable.c" } -static void backing_photo_row_instance_init (BackingPhotoRow * self) { +static void +backing_photo_row_instance_init (BackingPhotoRow * self) +{ #line 1088 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self->filepath = NULL; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self->ref_count = 1; -#line 8251 "PhotoTable.c" +#line 7755 "PhotoTable.c" } -static void backing_photo_row_finalize (BackingPhotoRow * obj) { +static void +backing_photo_row_finalize (BackingPhotoRow * obj) +{ BackingPhotoRow * self; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_PHOTO_ROW, BackingPhotoRow); @@ -8281,11 +7787,13 @@ static void backing_photo_row_finalize (BackingPhotoRow * obj) { g_signal_handlers_destroy (self); #line 1088 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (self->filepath); -#line 8263 "PhotoTable.c" +#line 7769 "PhotoTable.c" } -GType backing_photo_row_get_type (void) { +GType +backing_photo_row_get_type (void) +{ static volatile gsize backing_photo_row_type_id__volatile = 0; if (g_once_init_enter (&backing_photo_row_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_backing_photo_row_init, value_backing_photo_row_free_value, value_backing_photo_row_copy_value, value_backing_photo_row_peek_pointer, "p", value_backing_photo_row_collect_value, "p", value_backing_photo_row_lcopy_value }; @@ -8299,18 +7807,22 @@ GType backing_photo_row_get_type (void) { } -gpointer backing_photo_row_ref (gpointer instance) { +gpointer +backing_photo_row_ref (gpointer instance) +{ BackingPhotoRow * self; self = instance; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_atomic_int_inc (&self->ref_count); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return instance; -#line 8288 "PhotoTable.c" +#line 7798 "PhotoTable.c" } -void backing_photo_row_unref (gpointer instance) { +void +backing_photo_row_unref (gpointer instance) +{ BackingPhotoRow * self; self = instance; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -8319,12 +7831,14 @@ void backing_photo_row_unref (gpointer instance) { BACKING_PHOTO_ROW_GET_CLASS (self)->finalize (self); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_type_free_instance ((GTypeInstance *) self); -#line 8301 "PhotoTable.c" +#line 7813 "PhotoTable.c" } } -static BackingPhotoTable* backing_photo_table_construct (GType object_type) { +static BackingPhotoTable* +backing_photo_table_construct (GType object_type) +{ BackingPhotoTable* self = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -8334,7 +7848,6 @@ static BackingPhotoTable* backing_photo_table_construct (GType object_type) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = (BackingPhotoTable*) database_table_construct (object_type); #line 1126 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -8356,37 +7869,39 @@ static BackingPhotoTable* backing_photo_table_construct (GType object_type) { #line 1144 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 1144 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = sqlite3_step (_tmp4_); -#line 1144 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp5_; + res = sqlite3_step (_tmp4_); #line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp6_ != SQLITE_DONE) { -#line 8345 "PhotoTable.c" - gint _tmp7_; + if (_tmp5_ != SQLITE_DONE) { +#line 7856 "PhotoTable.c" + gint _tmp6_; #line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("create PhotoBackingTable", _tmp7_); -#line 8351 "PhotoTable.c" + database_table_fatal ("create PhotoBackingTable", _tmp6_); +#line 7862 "PhotoTable.c" } #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return self; -#line 8357 "PhotoTable.c" +#line 7868 "PhotoTable.c" } -static BackingPhotoTable* backing_photo_table_new (void) { +static BackingPhotoTable* +backing_photo_table_new (void) +{ #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return backing_photo_table_construct (TYPE_BACKING_PHOTO_TABLE); -#line 8364 "PhotoTable.c" +#line 7877 "PhotoTable.c" } -BackingPhotoTable* backing_photo_table_get_instance (void) { +BackingPhotoTable* +backing_photo_table_get_instance (void) +{ BackingPhotoTable* result = NULL; BackingPhotoTable* _tmp0_; BackingPhotoTable* _tmp2_; @@ -8395,7 +7910,7 @@ BackingPhotoTable* backing_photo_table_get_instance (void) { _tmp0_ = backing_photo_table_instance; #line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp0_ == NULL) { -#line 8377 "PhotoTable.c" +#line 7892 "PhotoTable.c" BackingPhotoTable* _tmp1_; #line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = backing_photo_table_new (); @@ -8403,7 +7918,7 @@ BackingPhotoTable* backing_photo_table_get_instance (void) { _database_table_unref0 (backing_photo_table_instance); #line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_table_instance = _tmp1_; -#line 8385 "PhotoTable.c" +#line 7900 "PhotoTable.c" } #line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = backing_photo_table_instance; @@ -8413,11 +7928,15 @@ BackingPhotoTable* backing_photo_table_get_instance (void) { result = _tmp3_; #line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 8395 "PhotoTable.c" +#line 7910 "PhotoTable.c" } -void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, GError** error) { +void +backing_photo_table_add (BackingPhotoTable* self, + BackingPhotoRow* state, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -8425,59 +7944,38 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G gint _tmp2_; gint _tmp3_; time_t time_created = 0; - gulong _tmp4_; - sqlite3_stmt* _tmp5_; - BackingPhotoRow* _tmp6_; - const gchar* _tmp7_; - gchar* _tmp8_; - GDestroyNotify _tmp9_; - gint _tmp10_; + sqlite3_stmt* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; + GDestroyNotify _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + time_t _tmp10_; gint _tmp11_; sqlite3_stmt* _tmp12_; - BackingPhotoRow* _tmp13_; - time_t _tmp14_; - gint _tmp15_; - gint _tmp16_; - sqlite3_stmt* _tmp17_; - BackingPhotoRow* _tmp18_; - gint64 _tmp19_; - gint _tmp20_; + gint64 _tmp13_; + gint _tmp14_; + sqlite3_stmt* _tmp15_; + Dimensions _tmp16_; + gint _tmp17_; + gint _tmp18_; + sqlite3_stmt* _tmp19_; + Dimensions _tmp20_; gint _tmp21_; - sqlite3_stmt* _tmp22_; - BackingPhotoRow* _tmp23_; - Dimensions _tmp24_; + gint _tmp22_; + sqlite3_stmt* _tmp23_; + Orientation _tmp24_; gint _tmp25_; - gint _tmp26_; - gint _tmp27_; - sqlite3_stmt* _tmp28_; - BackingPhotoRow* _tmp29_; - Dimensions _tmp30_; + sqlite3_stmt* _tmp26_; + PhotoFileFormat _tmp27_; + gint _tmp28_; + sqlite3_stmt* _tmp29_; + time_t _tmp30_; gint _tmp31_; - gint _tmp32_; + sqlite3_stmt* _tmp32_; gint _tmp33_; - sqlite3_stmt* _tmp34_; - BackingPhotoRow* _tmp35_; - Orientation _tmp36_; - gint _tmp37_; - gint _tmp38_; - sqlite3_stmt* _tmp39_; - BackingPhotoRow* _tmp40_; - PhotoFileFormat _tmp41_; - gint _tmp42_; - gint _tmp43_; - gint _tmp44_; - sqlite3_stmt* _tmp45_; - time_t _tmp46_; - gint _tmp47_; - gint _tmp48_; - sqlite3_stmt* _tmp49_; - gint _tmp50_; - gint _tmp51_; - BackingPhotoRow* _tmp53_; - sqlite3* _tmp54_; - gint64 _tmp55_; - BackingPhotoRow* _tmp56_; - time_t _tmp57_; + sqlite3* _tmp35_; + time_t _tmp36_; GError * _inner_error_ = NULL; #line 1156 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); @@ -8498,145 +7996,109 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G #line 1163 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); #line 1165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = now_sec (); -#line 1165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - time_created = (time_t) _tmp4_; + time_created = (time_t) now_sec (); #line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = stmt; -#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = state; -#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = _tmp6_->filepath; + _tmp4_ = stmt; #line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = g_strdup (_tmp7_); + _tmp5_ = state->filepath; #line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = g_free; + _tmp6_ = g_strdup (_tmp5_); #line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_bind_text (_tmp5_, 1, _tmp8_, -1, _tmp9_); + _tmp7_ = g_free; #line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); #line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp8_ = res; #line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = stmt; -#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = state; + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = _tmp13_->timestamp; + _tmp9_ = stmt; #line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = sqlite3_bind_int64 (_tmp12_, 2, (gint64) _tmp14_); + _tmp10_ = state->timestamp; #line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp15_; + res = sqlite3_bind_int64 (_tmp9_, 2, (gint64) _tmp10_); #line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = res; + _tmp11_ = res; #line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp16_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = stmt; -#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = state; + _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); #line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = _tmp18_->filesize; + _tmp12_ = stmt; #line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = sqlite3_bind_int64 (_tmp17_, 3, _tmp19_); + _tmp13_ = state->filesize; #line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp20_; + res = sqlite3_bind_int64 (_tmp12_, 3, _tmp13_); #line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = res; + _tmp14_ = res; #line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp21_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp14_ == SQLITE_OK, "res == Sqlite.OK"); #line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = stmt; + _tmp15_ = stmt; #line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = state; + _tmp16_ = state->dim; #line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = _tmp23_->dim; -#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = _tmp24_.width; -#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = sqlite3_bind_int (_tmp22_, 4, _tmp25_); + _tmp17_ = _tmp16_.width; #line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp26_; + res = sqlite3_bind_int (_tmp15_, 4, _tmp17_); #line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = res; + _tmp18_ = res; #line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = stmt; -#line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = state; + _vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK"); #line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = _tmp29_->dim; + _tmp19_ = stmt; #line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = _tmp30_.height; + _tmp20_ = state->dim; #line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = sqlite3_bind_int (_tmp28_, 5, _tmp31_); + _tmp21_ = _tmp20_.height; #line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp32_; + res = sqlite3_bind_int (_tmp19_, 5, _tmp21_); #line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = res; + _tmp22_ = res; #line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp33_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp22_ == SQLITE_OK, "res == Sqlite.OK"); #line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = stmt; -#line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = state; -#line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = _tmp35_->original_orientation; + _tmp23_ = stmt; #line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = sqlite3_bind_int (_tmp34_, 6, (gint) _tmp36_); + _tmp24_ = state->original_orientation; #line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp37_; + res = sqlite3_bind_int (_tmp23_, 6, (gint) _tmp24_); #line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = res; + _tmp25_ = res; #line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp38_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = stmt; -#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = state; -#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = _tmp40_->file_format; + _vala_assert (_tmp25_ == SQLITE_OK, "res == Sqlite.OK"); #line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = photo_file_format_serialize (_tmp41_); + _tmp26_ = stmt; #line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = sqlite3_bind_int (_tmp39_, 7, _tmp42_); + _tmp27_ = state->file_format; #line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp43_; + res = sqlite3_bind_int (_tmp26_, 7, photo_file_format_serialize (_tmp27_)); #line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = res; + _tmp28_ = res; #line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp44_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp28_ == SQLITE_OK, "res == Sqlite.OK"); #line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = stmt; -#line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = time_created; + _tmp29_ = stmt; #line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = sqlite3_bind_int64 (_tmp45_, 8, (gint64) _tmp46_); + _tmp30_ = time_created; #line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp47_; + res = sqlite3_bind_int64 (_tmp29_, 8, (gint64) _tmp30_); #line 1182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = res; + _tmp31_ = res; #line 1182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp48_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = stmt; + _vala_assert (_tmp31_ == SQLITE_OK, "res == Sqlite.OK"); #line 1184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = sqlite3_step (_tmp49_); + _tmp32_ = stmt; #line 1184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp50_; + res = sqlite3_step (_tmp32_); #line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = res; + _tmp33_ = res; #line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp51_ != SQLITE_DONE) { -#line 8613 "PhotoTable.c" - gint _tmp52_; + if (_tmp33_ != SQLITE_DONE) { +#line 8075 "PhotoTable.c" + gint _tmp34_; #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = res; + _tmp34_ = res; #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_throw_error ("PhotoBackingTable.add", _tmp52_, &_inner_error_); + database_table_throw_error ("PhotoBackingTable.add", _tmp34_, &_inner_error_); #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -8647,7 +8109,7 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G _sqlite3_finalize0 (stmt); #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 8629 "PhotoTable.c" +#line 8091 "PhotoTable.c" } else { #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -8657,31 +8119,29 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G g_clear_error (&_inner_error_); #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 8639 "PhotoTable.c" +#line 8101 "PhotoTable.c" } } } #line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = state; + _tmp35_ = database_table_db; #line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = database_table_db; -#line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_ = sqlite3_last_insert_rowid (_tmp54_); -#line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp53_->id, _tmp55_); + backing_photo_id_init (&state->id, sqlite3_last_insert_rowid (_tmp35_)); #line 1189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_ = state; + _tmp36_ = time_created; #line 1189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_ = time_created; -#line 1189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_->time_created = _tmp57_; + state->time_created = _tmp36_; #line 1156 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 8659 "PhotoTable.c" +#line 8115 "PhotoTable.c" } -BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhotoID* id, GError** error) { +BackingPhotoRow* +backing_photo_table_fetch (BackingPhotoTable* self, + BackingPhotoID* id, + GError** error) +{ BackingPhotoRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -8693,39 +8153,29 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot BackingPhotoID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - gint _tmp10_; - gint _tmp11_; + sqlite3_stmt* _tmp8_; + gint _tmp9_; BackingPhotoRow* row = NULL; - BackingPhotoRow* _tmp14_; + BackingPhotoRow* _tmp12_; + BackingPhotoRow* _tmp13_; + BackingPhotoID _tmp14_; BackingPhotoRow* _tmp15_; - BackingPhotoID _tmp16_; - BackingPhotoRow* _tmp17_; - sqlite3_stmt* _tmp18_; - const gchar* _tmp19_; - gchar* _tmp20_; + sqlite3_stmt* _tmp16_; + const gchar* _tmp17_; + gchar* _tmp18_; + BackingPhotoRow* _tmp19_; + sqlite3_stmt* _tmp20_; BackingPhotoRow* _tmp21_; sqlite3_stmt* _tmp22_; - gint64 _tmp23_; - BackingPhotoRow* _tmp24_; + BackingPhotoRow* _tmp23_; + sqlite3_stmt* _tmp24_; sqlite3_stmt* _tmp25_; - gint64 _tmp26_; - BackingPhotoRow* _tmp27_; - sqlite3_stmt* _tmp28_; - gint _tmp29_; - sqlite3_stmt* _tmp30_; - gint _tmp31_; - BackingPhotoRow* _tmp32_; - sqlite3_stmt* _tmp33_; - gint _tmp34_; - BackingPhotoRow* _tmp35_; - sqlite3_stmt* _tmp36_; - gint _tmp37_; - PhotoFileFormat _tmp38_; - BackingPhotoRow* _tmp39_; - sqlite3_stmt* _tmp40_; - gint64 _tmp41_; + BackingPhotoRow* _tmp26_; + sqlite3_stmt* _tmp27_; + BackingPhotoRow* _tmp28_; + sqlite3_stmt* _tmp29_; + BackingPhotoRow* _tmp30_; + sqlite3_stmt* _tmp31_; GError * _inner_error_ = NULL; #line 1192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_BACKING_PHOTO_TABLE (self), NULL); @@ -8753,42 +8203,38 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot #line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = _tmp5_.id; #line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 1200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 1200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); + _tmp8_ = stmt; #line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_step (_tmp8_); #line 1203 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 1203 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp11_ == SQLITE_DONE) { + if (_tmp9_ == SQLITE_DONE) { #line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = NULL; #line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 8757 "PhotoTable.c" +#line 8203 "PhotoTable.c" } else { - gint _tmp12_; + gint _tmp10_; #line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = res; + _tmp10_ = res; #line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp12_ != SQLITE_ROW) { -#line 8764 "PhotoTable.c" - gint _tmp13_; + if (_tmp10_ != SQLITE_ROW) { +#line 8210 "PhotoTable.c" + gint _tmp11_; #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_throw_error ("BackingPhotoTable.fetch_for_photo", _tmp13_, &_inner_error_); + database_table_throw_error ("BackingPhotoTable.fetch_for_photo", _tmp11_, &_inner_error_); #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -8799,7 +8245,7 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot _sqlite3_finalize0 (stmt); #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 8780 "PhotoTable.c" +#line 8226 "PhotoTable.c" } else { #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -8809,98 +8255,86 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot g_clear_error (&_inner_error_); #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 8790 "PhotoTable.c" +#line 8236 "PhotoTable.c" } } } } #line 1208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = backing_photo_row_new (); + _tmp12_ = backing_photo_row_new (); #line 1208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - row = _tmp14_; + row = _tmp12_; #line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = row; + _tmp13_ = row; #line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = *id; + _tmp14_ = *id; #line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_->id = _tmp16_; + _tmp13_->id = _tmp14_; #line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = row; + _tmp15_ = row; #line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = stmt; + _tmp16_ = stmt; #line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = sqlite3_column_text (_tmp18_, 0); + _tmp17_ = sqlite3_column_text (_tmp16_, 0); #line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = g_strdup (_tmp19_); + _tmp18_ = g_strdup (_tmp17_); #line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp17_->filepath); + _g_free0 (_tmp15_->filepath); #line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_->filepath = _tmp20_; -#line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = row; + _tmp15_->filepath = _tmp18_; #line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = stmt; + _tmp19_ = row; #line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = sqlite3_column_int64 (_tmp22_, 1); + _tmp20_ = stmt; #line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_->timestamp = (time_t) _tmp23_; -#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = row; + _tmp19_->timestamp = (time_t) sqlite3_column_int64 (_tmp20_, 1); #line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = stmt; + _tmp21_ = row; #line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = sqlite3_column_int64 (_tmp25_, 2); + _tmp22_ = stmt; #line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_->filesize = _tmp26_; + _tmp21_->filesize = sqlite3_column_int64 (_tmp22_, 2); #line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = row; -#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = stmt; -#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = sqlite3_column_int (_tmp28_, 3); + _tmp23_ = row; #line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = stmt; + _tmp24_ = stmt; #line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = sqlite3_column_int (_tmp30_, 4); + _tmp25_ = stmt; #line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - dimensions_init (&_tmp27_->dim, _tmp29_, _tmp31_); + dimensions_init (&_tmp23_->dim, sqlite3_column_int (_tmp24_, 3), sqlite3_column_int (_tmp25_, 4)); #line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = row; -#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = stmt; + _tmp26_ = row; #line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = sqlite3_column_int (_tmp33_, 5); + _tmp27_ = stmt; #line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_->original_orientation = (Orientation) _tmp34_; -#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = row; -#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = stmt; + _tmp26_->original_orientation = (Orientation) sqlite3_column_int (_tmp27_, 5); #line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = sqlite3_column_int (_tmp36_, 6); + _tmp28_ = row; #line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = photo_file_format_unserialize (_tmp37_); + _tmp29_ = stmt; #line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_->file_format = _tmp38_; + _tmp28_->file_format = photo_file_format_unserialize (sqlite3_column_int (_tmp29_, 6)); #line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = row; + _tmp30_ = row; #line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = stmt; -#line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = sqlite3_column_int64 (_tmp40_, 7); + _tmp31_ = stmt; #line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_->time_created = (time_t) _tmp41_; + _tmp30_->time_created = (time_t) sqlite3_column_int64 (_tmp31_, 7); #line 1218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = row; #line 1218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 1218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 8877 "PhotoTable.c" +#line 8307 "PhotoTable.c" } -void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, GError** error) { +void +backing_photo_table_update (BackingPhotoTable* self, + BackingPhotoRow* row, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -8908,47 +8342,31 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - BackingPhotoRow* _tmp5_; - time_t _tmp6_; - gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - BackingPhotoRow* _tmp10_; - gint64 _tmp11_; + time_t _tmp5_; + gint _tmp6_; + sqlite3_stmt* _tmp7_; + gint64 _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; + Dimensions _tmp11_; gint _tmp12_; gint _tmp13_; sqlite3_stmt* _tmp14_; - BackingPhotoRow* _tmp15_; - Dimensions _tmp16_; + Dimensions _tmp15_; + gint _tmp16_; gint _tmp17_; - gint _tmp18_; - gint _tmp19_; - sqlite3_stmt* _tmp20_; - BackingPhotoRow* _tmp21_; - Dimensions _tmp22_; + sqlite3_stmt* _tmp18_; + Orientation _tmp19_; + gint _tmp20_; + sqlite3_stmt* _tmp21_; + PhotoFileFormat _tmp22_; gint _tmp23_; - gint _tmp24_; - gint _tmp25_; - sqlite3_stmt* _tmp26_; - BackingPhotoRow* _tmp27_; - Orientation _tmp28_; + sqlite3_stmt* _tmp24_; + BackingPhotoID _tmp25_; + gint64 _tmp26_; + gint _tmp27_; + sqlite3_stmt* _tmp28_; gint _tmp29_; - gint _tmp30_; - sqlite3_stmt* _tmp31_; - BackingPhotoRow* _tmp32_; - PhotoFileFormat _tmp33_; - gint _tmp34_; - gint _tmp35_; - gint _tmp36_; - sqlite3_stmt* _tmp37_; - BackingPhotoRow* _tmp38_; - BackingPhotoID _tmp39_; - gint64 _tmp40_; - gint _tmp41_; - gint _tmp42_; - sqlite3_stmt* _tmp43_; - gint _tmp44_; - gint _tmp45_; GError * _inner_error_ = NULL; #line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); @@ -8971,125 +8389,93 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, #line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = row; + _tmp5_ = row->timestamp; #line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = _tmp5_->timestamp; -#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, (gint64) _tmp6_); -#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, (gint64) _tmp5_); #line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp6_ = res; #line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = stmt; -#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = row; + _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); #line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = _tmp10_->filesize; + _tmp7_ = stmt; #line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = sqlite3_bind_int64 (_tmp9_, 2, _tmp11_); + _tmp8_ = row->filesize; #line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp12_; + res = sqlite3_bind_int64 (_tmp7_, 2, _tmp8_); #line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = res; + _tmp9_ = res; #line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = stmt; -#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = row; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _tmp15_->dim; + _tmp10_ = stmt; #line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = _tmp16_.width; + _tmp11_ = row->dim; #line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = sqlite3_bind_int (_tmp14_, 3, _tmp17_); + _tmp12_ = _tmp11_.width; #line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp18_; + res = sqlite3_bind_int (_tmp10_, 3, _tmp12_); #line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = res; + _tmp13_ = res; #line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = stmt; -#line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = row; + _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); #line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = _tmp21_->dim; + _tmp14_ = stmt; #line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = _tmp22_.height; + _tmp15_ = row->dim; #line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = sqlite3_bind_int (_tmp20_, 4, _tmp23_); + _tmp16_ = _tmp15_.height; #line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp24_; + res = sqlite3_bind_int (_tmp14_, 4, _tmp16_); #line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = res; + _tmp17_ = res; #line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp25_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = stmt; -#line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = row; + _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); #line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = _tmp27_->original_orientation; + _tmp18_ = stmt; #line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = sqlite3_bind_int (_tmp26_, 5, (gint) _tmp28_); + _tmp19_ = row->original_orientation; #line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp29_; + res = sqlite3_bind_int (_tmp18_, 5, (gint) _tmp19_); #line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = res; + _tmp20_ = res; #line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = stmt; -#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = row; -#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = _tmp32_->file_format; + _vala_assert (_tmp20_ == SQLITE_OK, "res == Sqlite.OK"); #line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = photo_file_format_serialize (_tmp33_); + _tmp21_ = stmt; #line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = sqlite3_bind_int (_tmp31_, 6, _tmp34_); + _tmp22_ = row->file_format; #line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp35_; + res = sqlite3_bind_int (_tmp21_, 6, photo_file_format_serialize (_tmp22_)); #line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = res; + _tmp23_ = res; #line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp36_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = stmt; -#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = row; + _vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK"); #line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = _tmp38_->id; + _tmp24_ = stmt; #line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = _tmp39_.id; + _tmp25_ = row->id; #line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = sqlite3_bind_int64 (_tmp37_, 7, _tmp40_); + _tmp26_ = _tmp25_.id; #line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp41_; + res = sqlite3_bind_int64 (_tmp24_, 7, _tmp26_); #line 1243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = res; + _tmp27_ = res; #line 1243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = stmt; + _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); #line 1245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = sqlite3_step (_tmp43_); + _tmp28_ = stmt; #line 1245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp44_; + res = sqlite3_step (_tmp28_); #line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = res; + _tmp29_ = res; #line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp45_ != SQLITE_DONE) { -#line 9065 "PhotoTable.c" - gint _tmp46_; + if (_tmp29_ != SQLITE_DONE) { +#line 8451 "PhotoTable.c" + gint _tmp30_; #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = res; + _tmp30_ = res; #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_throw_error ("BackingPhotoTable.update", _tmp46_, &_inner_error_); + database_table_throw_error ("BackingPhotoTable.update", _tmp30_, &_inner_error_); #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -9100,7 +8486,7 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, _sqlite3_finalize0 (stmt); #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9081 "PhotoTable.c" +#line 8467 "PhotoTable.c" } else { #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -9110,17 +8496,23 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, g_clear_error (&_inner_error_); #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9091 "PhotoTable.c" +#line 8477 "PhotoTable.c" } } } #line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 9097 "PhotoTable.c" +#line 8483 "PhotoTable.c" } -void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, gint64 filesize, GError** error) { +void +backing_photo_table_update_attributes (BackingPhotoTable* self, + BackingPhotoID* id, + time_t timestamp, + gint64 filesize, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -9128,21 +8520,15 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - time_t _tmp5_; - gint _tmp6_; + gint _tmp5_; + sqlite3_stmt* _tmp6_; gint _tmp7_; sqlite3_stmt* _tmp8_; - gint64 _tmp9_; - gint _tmp10_; + BackingPhotoID _tmp9_; + gint64 _tmp10_; gint _tmp11_; sqlite3_stmt* _tmp12_; - BackingPhotoID _tmp13_; - gint64 _tmp14_; - gint _tmp15_; - gint _tmp16_; - sqlite3_stmt* _tmp17_; - gint _tmp18_; - gint _tmp19_; + gint _tmp13_; GError * _inner_error_ = NULL; #line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); @@ -9165,57 +8551,45 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot #line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = timestamp; -#line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = sqlite3_bind_int64 (_tmp4_, 1, (gint64) _tmp5_); -#line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp6_; + res = sqlite3_bind_int64 (_tmp4_, 1, (gint64) timestamp); #line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = res; + _tmp5_ = res; #line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = stmt; -#line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = filesize; + _vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK"); #line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_bind_int64 (_tmp8_, 2, _tmp9_); + _tmp6_ = stmt; #line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_bind_int64 (_tmp6_, 2, filesize); #line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp7_ = res; #line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = *id; + _tmp8_ = stmt; #line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = _tmp13_.id; + _tmp9_ = *id; #line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = sqlite3_bind_int64 (_tmp12_, 3, _tmp14_); + _tmp10_ = _tmp9_.id; #line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp15_; + res = sqlite3_bind_int64 (_tmp8_, 3, _tmp10_); #line 1261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = res; + _tmp11_ = res; #line 1261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp16_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = stmt; + _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); #line 1263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = sqlite3_step (_tmp17_); + _tmp12_ = stmt; #line 1263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp18_; + res = sqlite3_step (_tmp12_); #line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = res; + _tmp13_ = res; #line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp19_ != SQLITE_DONE) { -#line 9191 "PhotoTable.c" - gint _tmp20_; + if (_tmp13_ != SQLITE_DONE) { +#line 8565 "PhotoTable.c" + gint _tmp14_; #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = res; + _tmp14_ = res; #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_throw_error ("BackingPhotoTable.update_attributes", _tmp20_, &_inner_error_); + database_table_throw_error ("BackingPhotoTable.update_attributes", _tmp14_, &_inner_error_); #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -9226,7 +8600,7 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot _sqlite3_finalize0 (stmt); #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9207 "PhotoTable.c" +#line 8581 "PhotoTable.c" } else { #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -9236,17 +8610,21 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot g_clear_error (&_inner_error_); #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9217 "PhotoTable.c" +#line 8591 "PhotoTable.c" } } } #line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 9223 "PhotoTable.c" +#line 8597 "PhotoTable.c" } -void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backing_id, GError** error) { +void +backing_photo_table_remove (BackingPhotoTable* self, + BackingPhotoID* backing_id, + GError** error) +{ BackingPhotoID _tmp0_; gint64 _tmp1_; GError * _inner_error_ = NULL; @@ -9268,7 +8646,7 @@ void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backin g_propagate_error (error, _inner_error_); #line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9249 "PhotoTable.c" +#line 8627 "PhotoTable.c" } else { #line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -9276,16 +8654,20 @@ void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backin g_clear_error (&_inner_error_); #line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9257 "PhotoTable.c" +#line 8635 "PhotoTable.c" } } } -void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* id, const gchar* filepath, GError** error) { +void +backing_photo_table_set_filepath (BackingPhotoTable* self, + BackingPhotoID* id, + const gchar* filepath, + GError** error) +{ BackingPhotoID _tmp0_; gint64 _tmp1_; - const gchar* _tmp2_; GError * _inner_error_ = NULL; #line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); @@ -9298,9 +8680,7 @@ void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = filepath; -#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filepath", _tmp2_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filepath", filepath, &_inner_error_); #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -9309,7 +8689,7 @@ void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* g_propagate_error (error, _inner_error_); #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9290 "PhotoTable.c" +#line 8670 "PhotoTable.c" } else { #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -9317,16 +8697,20 @@ void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* g_clear_error (&_inner_error_); #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9298 "PhotoTable.c" +#line 8678 "PhotoTable.c" } } } -void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, GError** error) { +void +backing_photo_table_update_timestamp (BackingPhotoTable* self, + BackingPhotoID* id, + time_t timestamp, + GError** error) +{ BackingPhotoID _tmp0_; gint64 _tmp1_; - time_t _tmp2_; GError * _inner_error_ = NULL; #line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); @@ -9337,9 +8721,7 @@ void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhoto #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = timestamp; -#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "timestamp", (gint64) _tmp2_, &_inner_error_); + database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "timestamp", (gint64) timestamp, &_inner_error_); #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -9348,7 +8730,7 @@ void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhoto g_propagate_error (error, _inner_error_); #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9329 "PhotoTable.c" +#line 8711 "PhotoTable.c" } else { #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -9356,36 +8738,44 @@ void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhoto g_clear_error (&_inner_error_); #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9337 "PhotoTable.c" +#line 8719 "PhotoTable.c" } } } -static void backing_photo_table_class_init (BackingPhotoTableClass * klass) { +static void +backing_photo_table_class_init (BackingPhotoTableClass * klass) +{ #line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_table_parent_class = g_type_class_peek_parent (klass); #line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ((DatabaseTableClass *) klass)->finalize = backing_photo_table_finalize; -#line 9348 "PhotoTable.c" +#line 8732 "PhotoTable.c" } -static void backing_photo_table_instance_init (BackingPhotoTable * self) { +static void +backing_photo_table_instance_init (BackingPhotoTable * self) +{ } -static void backing_photo_table_finalize (DatabaseTable * obj) { +static void +backing_photo_table_finalize (DatabaseTable * obj) +{ BackingPhotoTable * self; #line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_PHOTO_TABLE, BackingPhotoTable); #line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" DATABASE_TABLE_CLASS (backing_photo_table_parent_class)->finalize (obj); -#line 9362 "PhotoTable.c" +#line 8750 "PhotoTable.c" } -GType backing_photo_table_get_type (void) { +GType +backing_photo_table_get_type (void) +{ static volatile gsize backing_photo_table_type_id__volatile = 0; if (g_once_init_enter (&backing_photo_table_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (BackingPhotoTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) backing_photo_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (BackingPhotoTable), 0, (GInstanceInitFunc) backing_photo_table_instance_init, NULL }; @@ -9397,7 +8787,11 @@ GType backing_photo_table_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -9409,7 +8803,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } |