diff options
Diffstat (limited to 'src/Tombstone.c')
| -rw-r--r-- | src/Tombstone.c | 2189 |
1 files changed, 1178 insertions, 1011 deletions
diff --git a/src/Tombstone.c b/src/Tombstone.c index 7c57055..4f221d3 100644 --- a/src/Tombstone.c +++ b/src/Tombstone.c @@ -1,4 +1,4 @@ -/* Tombstone.c generated by valac 0.36.6, the Vala compiler +/* Tombstone.c generated by valac 0.40.4, the Vala compiler * generated from Tombstone.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 <stdlib.h> @@ -202,6 +203,11 @@ typedef struct _TombstonePrivate TombstonePrivate; typedef struct _TombstoneRow TombstoneRow; typedef struct _TombstoneRowClass TombstoneRowClass; +enum { + TOMBSTONE_0_PROPERTY, + TOMBSTONE_NUM_PROPERTIES +}; +static GParamSpec* tombstone_properties[TOMBSTONE_NUM_PROPERTIES]; #define TOMBSTONE_TYPE_REASON (tombstone_reason_get_type ()) #define _tombstone_row_unref0(var) ((var == NULL) ? NULL : (var = (tombstone_row_unref (var), NULL))) @@ -381,45 +387,39 @@ struct _TombstoneSourceCollectionAsyncScanData { GeeIterator* _tmp3_; GeeIterator* _tmp4_; GeeIterator* _tmp5_; - gboolean _tmp6_; DataObject* object; - GeeIterator* _tmp7_; - gpointer _tmp8_; + GeeIterator* _tmp6_; + gpointer _tmp7_; Tombstone* tombstone; - DataObject* _tmp9_; - Tombstone* _tmp10_; + DataObject* _tmp8_; + Tombstone* _tmp9_; GFile* file; - Tombstone* _tmp11_; - GFile* _tmp12_; + Tombstone* _tmp10_; + GFile* _tmp11_; GFileInfo* info; - DirectoryMonitor* _tmp13_; - DirectoryMonitor* _tmp14_; - GFile* _tmp15_; - GFileInfo* _tmp16_; + GFile* _tmp12_; + GFileInfo* _tmp13_; + GFileInfo* _tmp14_; + GFileInfo* _tmp15_; + GFile* _tmp16_; GFileInfo* _tmp17_; GFileInfo* _tmp18_; - GFile* _tmp19_; - GCancellable* _tmp20_; - GFileInfo* _tmp21_; - GFileInfo* _tmp22_; GError* err; - GError* _tmp23_; + GError* _tmp19_; + GError* _tmp20_; + GFile* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; GError* _tmp24_; - GFile* _tmp25_; - gchar* _tmp26_; - gchar* _tmp27_; - GError* _tmp28_; - const gchar* _tmp29_; - GFileInfo* _tmp30_; + const gchar* _tmp25_; + GFileInfo* _tmp26_; + Marker* _tmp27_; + Tombstone* _tmp28_; + Marker* _tmp29_; + Marker* _tmp30_; Marker* _tmp31_; - Tombstone* _tmp32_; - Marker* _tmp33_; - gint _tmp34_; - Marker* _tmp35_; - gint _tmp36_; - Marker* _tmp37_; GError* err2; - GError* _tmp38_; + GError* _tmp32_; GError * _inner_error_; }; @@ -541,17 +541,29 @@ TombstoneSourceCollection* tombstone_global = NULL; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; GType marker_get_type (void) G_GNUC_CONST; @@ -559,47 +571,78 @@ GType source_collection_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType tombstone_source_collection_get_type (void) G_GNUC_CONST; GType tombstone_get_type (void) G_GNUC_CONST; #define TOMBSTONE_SOURCE_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TOMBSTONE_SOURCE_COLLECTION, TombstoneSourceCollectionPrivate)) -enum { - TOMBSTONE_SOURCE_COLLECTION_DUMMY_PROPERTY -}; guint file_hash (GFile* file); -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self); -gboolean file_equal (GFile* a, GFile* b); -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); +static guint _file_hash_gee_hash_data_func (gconstpointer v, + gpointer self); +gboolean file_equal (GFile* a, + GFile* b); +static gboolean _file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self); TombstoneSourceCollection* tombstone_source_collection_new (void); TombstoneSourceCollection* tombstone_source_collection_construct (GType object_type); static gint64 tombstone_source_collection_get_tombstone_id (DataSource* source); -static gint64 _tombstone_source_collection_get_tombstone_id_get_source_database_key (DataSource* source, gpointer self); -DatabaseSourceCollection* database_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target); -static gboolean tombstone_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source); +static gint64 _tombstone_source_collection_get_tombstone_id_get_source_database_key (DataSource* source, + gpointer self); +DatabaseSourceCollection* database_source_collection_construct (GType object_type, + const gchar* name, + GetSourceDatabaseKey source_key_func, + void* source_key_func_target); +static gboolean tombstone_source_collection_real_holds_type_of_source (SourceCollection* base, + DataSource* source); GType tombstone_id_get_type (void) G_GNUC_CONST; TombstoneID* tombstone_id_dup (const TombstoneID* self); void tombstone_id_free (TombstoneID* self); -void tombstone_get_tombstone_id (Tombstone* self, TombstoneID* result); -static void tombstone_source_collection_real_notify_contents_altered (DataCollection* base, GeeIterable* added, GeeIterable* removed); +void tombstone_get_tombstone_id (Tombstone* self, + TombstoneID* result); +static void tombstone_source_collection_real_notify_contents_altered (DataCollection* base, + GeeIterable* added, + GeeIterable* removed); GFile* tombstone_get_file (Tombstone* self); -void data_collection_notify_contents_altered (DataCollection* self, GeeIterable* added, GeeIterable* removed); -static void tombstone_source_collection_real_notify_items_altered (DataCollection* base, GeeMap* items); -gboolean alteration_has_subject (Alteration* self, const gchar* subject); -GeeCollection* alteration_get_details (Alteration* self, const gchar* subject); -Tombstone* tombstone_source_collection_locate (TombstoneSourceCollection* self, GFile* file); -gboolean tombstone_source_collection_matches (TombstoneSourceCollection* self, GFile* file); -void tombstone_source_collection_resurrect (TombstoneSourceCollection* self, Tombstone* tombstone); +void data_collection_notify_contents_altered (DataCollection* self, + GeeIterable* added, + GeeIterable* removed); +static void tombstone_source_collection_real_notify_items_altered (DataCollection* base, + GeeMap* items); +gboolean alteration_has_subject (Alteration* self, + const gchar* subject); +GeeCollection* alteration_get_details (Alteration* self, + const gchar* subject); +Tombstone* tombstone_source_collection_locate (TombstoneSourceCollection* self, + GFile* file); +gboolean tombstone_source_collection_matches (TombstoneSourceCollection* self, + GFile* file); +void tombstone_source_collection_resurrect (TombstoneSourceCollection* self, + Tombstone* tombstone); GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; -gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed); -Marker* data_collection_mark (DataCollection* self, DataObject* object); -void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self, GeeCollection* tombstones); -Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects); +gint source_collection_destroy_marked (SourceCollection* self, + Marker* marker, + gboolean delete_backing, + ProgressMonitor monitor, + void* monitor_target, + GeeList* not_removed); +Marker* data_collection_mark (DataCollection* self, + DataObject* object); +void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self, + GeeCollection* tombstones); +Marker* data_collection_mark_many (DataCollection* self, + GeeCollection* objects); void data_collection_freeze_notifications (DataCollection* self); void database_table_begin_transaction (void); GQuark database_error_quark (void); @@ -607,90 +650,155 @@ void database_table_commit_transaction (GError** error); void app_window_database_error (GError* err); void data_collection_thaw_notifications (DataCollection* self); GType directory_monitor_get_type (void) G_GNUC_CONST; -void tombstone_source_collection_launch_scan (TombstoneSourceCollection* self, DirectoryMonitor* monitor, GCancellable* cancellable); -static void tombstone_source_collection_async_scan (TombstoneSourceCollection* self, DirectoryMonitor* monitor, GCancellable* cancellable, GAsyncReadyCallback _callback_, gpointer _user_data_); -static void tombstone_source_collection_async_scan_finish (TombstoneSourceCollection* self, GAsyncResult* _res_); +void tombstone_source_collection_launch_scan (TombstoneSourceCollection* self, + DirectoryMonitor* monitor, + GCancellable* cancellable); +static void tombstone_source_collection_async_scan (TombstoneSourceCollection* self, + DirectoryMonitor* monitor, + GCancellable* cancellable, + GAsyncReadyCallback _callback_, + gpointer _user_data_); +static void tombstone_source_collection_async_scan_finish (TombstoneSourceCollection* self, + GAsyncResult* _res_); static void tombstone_source_collection_async_scan_data_free (gpointer _data); -static void tombstone_source_collection_async_scan_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data); +static void tombstone_source_collection_async_scan_async_ready_wrapper (GObject *source_object, + GAsyncResult *res, + void *user_data); static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollectionAsyncScanData* _data_); Marker* data_collection_start_marking (DataCollection* self); GeeCollection* data_collection_get_all (DataCollection* self); -GFileInfo* directory_monitor_get_file_info (DirectoryMonitor* self, GFile* file); -static void tombstone_source_collection_async_scan_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); -void marker_mark (Marker* self, DataObject* object); +GFileInfo* directory_monitor_get_file_info (DirectoryMonitor* self, + GFile* file); +static void tombstone_source_collection_async_scan_ready (GObject* source_object, + GAsyncResult* _res_, + gpointer _user_data_); +void marker_mark (Marker* self, + DataObject* object); static gboolean _tombstone_source_collection_async_scan_co_gsource_func (gpointer self); gint marker_get_count (Marker* self); static void tombstone_source_collection_finalize (DataCollection * obj); gpointer tombstoned_file_ref (gpointer instance); void tombstoned_file_unref (gpointer instance); -GParamSpec* param_spec_tombstoned_file (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_tombstoned_file (GValue* value, gpointer v_object); -void value_take_tombstoned_file (GValue* value, gpointer v_object); +GParamSpec* param_spec_tombstoned_file (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_tombstoned_file (GValue* value, + gpointer v_object); +void value_take_tombstoned_file (GValue* value, + gpointer v_object); gpointer value_get_tombstoned_file (const GValue* value); GType tombstoned_file_get_type (void) G_GNUC_CONST; -enum { - TOMBSTONED_FILE_DUMMY_PROPERTY -}; -TombstonedFile* tombstoned_file_new (GFile* file, gint64 filesize, const gchar* md5); -TombstonedFile* tombstoned_file_construct (GType object_type, GFile* file, gint64 filesize, const gchar* md5); +TombstonedFile* tombstoned_file_new (GFile* file, + gint64 filesize, + const gchar* md5); +TombstonedFile* tombstoned_file_construct (GType object_type, + GFile* file, + gint64 filesize, + const gchar* md5); static void tombstoned_file_finalize (TombstonedFile * obj); gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; gpointer source_snapshot_ref (gpointer instance); void source_snapshot_unref (gpointer instance); -GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_snapshot (GValue* value, gpointer v_object); -void value_take_source_snapshot (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_snapshot (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_snapshot (GValue* value, + gpointer v_object); +void value_take_source_snapshot (GValue* value, + gpointer v_object); gpointer value_get_source_snapshot (const GValue* value); GType source_snapshot_get_type (void) G_GNUC_CONST; gpointer tombstone_row_ref (gpointer instance); void tombstone_row_unref (gpointer instance); -GParamSpec* param_spec_tombstone_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_tombstone_row (GValue* value, gpointer v_object); -void value_take_tombstone_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_tombstone_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_tombstone_row (GValue* value, + gpointer v_object); +void value_take_tombstone_row (GValue* value, + gpointer v_object); gpointer value_get_tombstone_row (const GValue* value); GType tombstone_row_get_type (void) G_GNUC_CONST; #define TOMBSTONE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TOMBSTONE, TombstonePrivate)) -enum { - TOMBSTONE_DUMMY_PROPERTY -}; GType tombstone_reason_get_type (void) G_GNUC_CONST; gint tombstone_reason_serialize (TombstoneReason self); TombstoneReason tombstone_reason_unserialize (gint value); static Tombstone* tombstone_new (TombstoneRow* row); -static Tombstone* tombstone_construct (GType object_type, TombstoneRow* row); +static Tombstone* tombstone_construct (GType object_type, + TombstoneRow* row); #define DATA_OBJECT_INVALID_OBJECT_ID ((gint64) -1) -DataSource* data_source_construct (GType object_type, gint64 object_id); +DataSource* data_source_construct (GType object_type, + gint64 object_id); void tombstone_init (void); 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 tombstone_table_get_type (void) G_GNUC_CONST; TombstoneTable* tombstone_table_get_instance (void); -TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, int* result_length1, GError** error); -GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target); +TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, + int* result_length1, + GError** error); +GeeCollection* data_collection_add_many (DataCollection* self, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target); void tombstone_terminate (void); -void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reason, GError** error); +void tombstone_entomb_many_sources (GeeCollection* sources, + TombstoneReason reason, + GError** error); gpointer backing_file_state_ref (gpointer instance); void backing_file_state_unref (gpointer instance); -GParamSpec* param_spec_backing_file_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_file_state (GValue* value, gpointer v_object); -void value_take_backing_file_state (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_file_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_file_state (GValue* value, + gpointer v_object); +void value_take_backing_file_state (GValue* value, + gpointer v_object); gpointer value_get_backing_file_state (const GValue* value); GType backing_file_state_get_type (void) G_GNUC_CONST; -BackingFileState** media_source_get_backing_files_state (MediaSource* self, int* result_length1); +BackingFileState** media_source_get_backing_files_state (MediaSource* self, + int* result_length1); GFile* backing_file_state_get_file (BackingFileState* self); -void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason, GError** error); -TombstoneRow* tombstone_table_add (TombstoneTable* self, const gchar* filepath, gint64 filesize, const gchar* md5, TombstoneReason reason, GError** error); +void tombstone_entomb_many_files (GeeCollection* files, + TombstoneReason reason, + GError** error); +TombstoneRow* tombstone_table_add (TombstoneTable* self, + const gchar* filepath, + gint64 filesize, + const gchar* md5, + TombstoneReason reason, + GError** error); static gchar* tombstone_real_get_typename (DataSource* base); static gint64 tombstone_real_get_instance_id (DataSource* base); static gchar* tombstone_real_get_name (DataObject* base); @@ -699,116 +807,148 @@ gchar* data_object_get_name (DataObject* self); gchar* tombstone_get_md5 (Tombstone* self); gboolean is_string_empty (const gchar* s); TombstoneReason tombstone_get_reason (Tombstone* self); -void tombstone_move (Tombstone* self, GFile* file); -void tombstone_table_update_file (TombstoneTable* self, TombstoneID* tombstone_id, const gchar* filepath, GError** error); -void data_object_notify_altered (DataObject* self, Alteration* alteration); -Alteration* alteration_new (const gchar* subject, const gchar* detail); -Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail); -gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const gchar* md5); +void tombstone_move (Tombstone* self, + GFile* file); +void tombstone_table_update_file (TombstoneTable* self, + TombstoneID* tombstone_id, + const gchar* filepath, + GError** error); +void data_object_notify_altered (DataObject* self, + Alteration* alteration); +Alteration* alteration_new (const gchar* subject, + const gchar* detail); +Alteration* alteration_construct (GType object_type, + const gchar* subject, + const gchar* detail); +gboolean tombstone_matches (Tombstone* self, + GFile* file, + gint64 filesize, + const gchar* md5); static void tombstone_real_destroy (DataSource* base); -void tombstone_table_remove (TombstoneTable* self, TombstoneID* tombstone_id, GError** error); +void tombstone_table_remove (TombstoneTable* self, + TombstoneID* tombstone_id, + GError** error); void data_source_destroy (DataSource* self); static void tombstone_finalize (GObject * 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); - - -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) { +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); + + +static guint +_file_hash_gee_hash_data_func (gconstpointer v, + gpointer self) +{ guint result; result = file_hash ((GFile*) v); #line 8 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 722 "Tombstone.c" +#line 850 "Tombstone.c" } -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gboolean +_file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gboolean result; result = file_equal ((GFile*) a, (GFile*) b); #line 8 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 731 "Tombstone.c" +#line 863 "Tombstone.c" } -static gint64 _tombstone_source_collection_get_tombstone_id_get_source_database_key (DataSource* source, gpointer self) { +static gint64 +_tombstone_source_collection_get_tombstone_id_get_source_database_key (DataSource* source, + gpointer self) +{ gint64 result; result = tombstone_source_collection_get_tombstone_id (source); #line 12 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 740 "Tombstone.c" +#line 875 "Tombstone.c" } -TombstoneSourceCollection* tombstone_source_collection_construct (GType object_type) { +TombstoneSourceCollection* +tombstone_source_collection_construct (GType object_type) +{ TombstoneSourceCollection* self = NULL; #line 12 "/home/jens/Source/shotwell/src/Tombstone.vala" self = (TombstoneSourceCollection*) database_source_collection_construct (object_type, "Tombstones", _tombstone_source_collection_get_tombstone_id_get_source_database_key, NULL); #line 11 "/home/jens/Source/shotwell/src/Tombstone.vala" return self; -#line 750 "Tombstone.c" +#line 887 "Tombstone.c" } -TombstoneSourceCollection* tombstone_source_collection_new (void) { +TombstoneSourceCollection* +tombstone_source_collection_new (void) +{ #line 11 "/home/jens/Source/shotwell/src/Tombstone.vala" return tombstone_source_collection_construct (TYPE_TOMBSTONE_SOURCE_COLLECTION); -#line 757 "Tombstone.c" +#line 896 "Tombstone.c" } -static gboolean tombstone_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) { +static gboolean +tombstone_source_collection_real_holds_type_of_source (SourceCollection* base, + DataSource* source) +{ TombstoneSourceCollection * self; gboolean result = FALSE; - DataSource* _tmp0_; #line 15 "/home/jens/Source/shotwell/src/Tombstone.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE_SOURCE_COLLECTION, TombstoneSourceCollection); #line 15 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 16 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = source; -#line 16 "/home/jens/Source/shotwell/src/Tombstone.vala" - result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_TOMBSTONE); + result = G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_TOMBSTONE); #line 16 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 775 "Tombstone.c" +#line 914 "Tombstone.c" } -static gint64 tombstone_source_collection_get_tombstone_id (DataSource* source) { +static gint64 +tombstone_source_collection_get_tombstone_id (DataSource* source) +{ gint64 result = 0LL; - DataSource* _tmp0_; - TombstoneID _tmp1_ = {0}; - gint64 _tmp2_; + TombstoneID _tmp0_ = {0}; + gint64 _tmp1_; #line 19 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL); #line 20 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = source; -#line 20 "/home/jens/Source/shotwell/src/Tombstone.vala" - tombstone_get_tombstone_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_TOMBSTONE, Tombstone), &_tmp1_); + tombstone_get_tombstone_id (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_TOMBSTONE, Tombstone), &_tmp0_); #line 20 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp2_ = _tmp1_.id; + _tmp1_ = _tmp0_.id; #line 20 "/home/jens/Source/shotwell/src/Tombstone.vala" - result = _tmp2_; + result = _tmp1_; #line 20 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 796 "Tombstone.c" +#line 934 "Tombstone.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 27 "/home/jens/Source/shotwell/src/Tombstone.vala" return self ? g_object_ref (self) : NULL; -#line 803 "Tombstone.c" +#line 943 "Tombstone.c" } -static void tombstone_source_collection_real_notify_contents_altered (DataCollection* base, GeeIterable* added, GeeIterable* removed) { +static void +tombstone_source_collection_real_notify_contents_altered (DataCollection* base, + GeeIterable* added, + GeeIterable* removed) +{ TombstoneSourceCollection * self; - GeeIterable* _tmp0_; - GeeIterable* _tmp14_; - GeeIterable* _tmp36_; - GeeIterable* _tmp37_; #line 23 "/home/jens/Source/shotwell/src/Tombstone.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE_SOURCE_COLLECTION, TombstoneSourceCollection); #line 23 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -816,399 +956,364 @@ static void tombstone_source_collection_real_notify_contents_altered (DataCollec #line 23 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed)); #line 25 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = added; -#line 25 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_tmp0_ != NULL) { -#line 823 "Tombstone.c" + if (added != NULL) { +#line 961 "Tombstone.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_; - GeeIterator* _tmp2_; + GeeIterator* _tmp0_; #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp1_ = added; + _tmp0_ = gee_iterable_iterator (added); #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp2_ = gee_iterable_iterator (_tmp1_); -#line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" - _object_it = _tmp2_; + _object_it = _tmp0_; #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" while (TRUE) { -#line 836 "Tombstone.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 971 "Tombstone.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp2_; + gpointer _tmp3_; Tombstone* tombstone = NULL; - DataObject* _tmp7_; - Tombstone* _tmp8_; - GeeHashMap* _tmp9_; + DataObject* _tmp4_; + Tombstone* _tmp5_; + GeeHashMap* _tmp6_; + Tombstone* _tmp7_; + GFile* _tmp8_; + GFile* _tmp9_; Tombstone* _tmp10_; - GFile* _tmp11_; - GFile* _tmp12_; - Tombstone* _tmp13_; -#line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp3_ = _object_it; #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp1_ = _object_it; #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp1_)) { #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" break; -#line 858 "Tombstone.c" +#line 990 "Tombstone.c" } #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp5_ = _object_it; + _tmp2_ = _object_it; #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" - object = (DataObject*) _tmp6_; + object = (DataObject*) _tmp3_; #line 27 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp7_ = object; + _tmp4_ = object; #line 27 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_TOMBSTONE, Tombstone)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_TOMBSTONE, Tombstone)); #line 27 "/home/jens/Source/shotwell/src/Tombstone.vala" - tombstone = _tmp8_; + tombstone = _tmp5_; #line 29 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp9_ = self->priv->file_map; + _tmp6_ = self->priv->file_map; #line 29 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp10_ = tombstone; + _tmp7_ = tombstone; #line 29 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp11_ = tombstone_get_file (_tmp10_); + _tmp8_ = tombstone_get_file (_tmp7_); #line 29 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp12_ = _tmp11_; + _tmp9_ = _tmp8_; #line 29 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp13_ = tombstone; + _tmp10_ = tombstone; #line 29 "/home/jens/Source/shotwell/src/Tombstone.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_, _tmp13_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, _tmp10_); #line 29 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp9_); #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (tombstone); #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (object); -#line 890 "Tombstone.c" +#line 1022 "Tombstone.c" } #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_object_it); -#line 894 "Tombstone.c" +#line 1026 "Tombstone.c" } } #line 33 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp14_ = removed; -#line 33 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_tmp14_ != NULL) { -#line 901 "Tombstone.c" + if (removed != NULL) { +#line 1031 "Tombstone.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp15_; - GeeIterator* _tmp16_; + GeeIterator* _tmp11_; #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp15_ = removed; + _tmp11_ = gee_iterable_iterator (removed); #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp16_ = gee_iterable_iterator (_tmp15_); -#line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" - _object_it = _tmp16_; + _object_it = _tmp11_; #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" while (TRUE) { -#line 914 "Tombstone.c" - GeeIterator* _tmp17_; - gboolean _tmp18_; +#line 1041 "Tombstone.c" + GeeIterator* _tmp12_; DataObject* object = NULL; - GeeIterator* _tmp19_; - gpointer _tmp20_; + GeeIterator* _tmp13_; + gpointer _tmp14_; Tombstone* tombstone = NULL; - DataObject* _tmp21_; - Tombstone* _tmp22_; - GeeHashMap* _tmp23_; - Tombstone* _tmp24_; - GFile* _tmp25_; - GFile* _tmp26_; - gboolean _tmp27_; - gboolean _tmp28_; + DataObject* _tmp15_; + Tombstone* _tmp16_; + GeeHashMap* _tmp17_; + Tombstone* _tmp18_; + GFile* _tmp19_; + GFile* _tmp20_; + gboolean _tmp21_; #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp17_ = _object_it; + _tmp12_ = _object_it; #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp18_ = gee_iterator_next (_tmp17_); -#line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (!_tmp18_) { + if (!gee_iterator_next (_tmp12_)) { #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" break; -#line 937 "Tombstone.c" +#line 1060 "Tombstone.c" } #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp19_ = _object_it; + _tmp13_ = _object_it; #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp20_ = gee_iterator_get (_tmp19_); + _tmp14_ = gee_iterator_get (_tmp13_); #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" - object = (DataObject*) _tmp20_; + object = (DataObject*) _tmp14_; #line 35 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp21_ = object; + _tmp15_ = object; #line 35 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_TOMBSTONE, Tombstone)); + _tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_TOMBSTONE, Tombstone)); #line 35 "/home/jens/Source/shotwell/src/Tombstone.vala" - tombstone = _tmp22_; -#line 38 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp23_ = self->priv->file_map; + tombstone = _tmp16_; #line 38 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp24_ = tombstone; + _tmp17_ = self->priv->file_map; #line 38 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp25_ = tombstone_get_file (_tmp24_); + _tmp18_ = tombstone; #line 38 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp26_ = _tmp25_; + _tmp19_ = tombstone_get_file (_tmp18_); #line 38 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp27_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp26_); + _tmp20_ = _tmp19_; #line 38 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp28_ = _tmp27_; + _tmp21_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_); #line 38 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_tmp26_); + _g_object_unref0 (_tmp20_); #line 38 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_tmp28_) { -#line 967 "Tombstone.c" + if (_tmp21_) { +#line 1088 "Tombstone.c" gboolean is_removed = FALSE; - GeeHashMap* _tmp29_; - Tombstone* _tmp30_; - GFile* _tmp31_; - GFile* _tmp32_; - gboolean _tmp33_; - gboolean _tmp34_; - gboolean _tmp35_; + GeeHashMap* _tmp22_; + Tombstone* _tmp23_; + GFile* _tmp24_; + GFile* _tmp25_; + gboolean _tmp26_; + gboolean _tmp27_; + gboolean _tmp28_; #line 40 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp29_ = self->priv->file_map; + _tmp22_ = self->priv->file_map; #line 40 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp30_ = tombstone; + _tmp23_ = tombstone; #line 40 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp31_ = tombstone_get_file (_tmp30_); + _tmp24_ = tombstone_get_file (_tmp23_); #line 40 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp32_ = _tmp31_; + _tmp25_ = _tmp24_; #line 40 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp33_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp32_, NULL); + _tmp26_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp25_, NULL); #line 40 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp34_ = _tmp33_; + _tmp27_ = _tmp26_; #line 40 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_tmp32_); + _g_object_unref0 (_tmp25_); #line 40 "/home/jens/Source/shotwell/src/Tombstone.vala" - is_removed = _tmp34_; + is_removed = _tmp27_; #line 41 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp35_ = is_removed; + _tmp28_ = is_removed; #line 41 "/home/jens/Source/shotwell/src/Tombstone.vala" - _vala_assert (_tmp35_, "is_removed"); -#line 996 "Tombstone.c" + _vala_assert (_tmp28_, "is_removed"); +#line 1117 "Tombstone.c" } #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (tombstone); #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (object); -#line 1002 "Tombstone.c" +#line 1123 "Tombstone.c" } #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_object_it); -#line 1006 "Tombstone.c" +#line 1127 "Tombstone.c" } } #line 49 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp36_ = added; -#line 49 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp37_ = removed; -#line 49 "/home/jens/Source/shotwell/src/Tombstone.vala" - DATA_COLLECTION_CLASS (tombstone_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp36_, _tmp37_); -#line 1015 "Tombstone.c" + DATA_COLLECTION_CLASS (tombstone_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), added, removed); +#line 1132 "Tombstone.c" } -static void tombstone_source_collection_real_notify_items_altered (DataCollection* base, GeeMap* items) { +static void +tombstone_source_collection_real_notify_items_altered (DataCollection* base, + GeeMap* items) +{ TombstoneSourceCollection * self; #line 52 "/home/jens/Source/shotwell/src/Tombstone.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE_SOURCE_COLLECTION, TombstoneSourceCollection); #line 52 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (GEE_IS_MAP (items)); -#line 1025 "Tombstone.c" +#line 1145 "Tombstone.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; GeeSet* _tmp2_; - GeeSet* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = items; + _tmp0_ = gee_map_get_keys (items); #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp1_ = gee_map_get_keys (_tmp0_); + _tmp1_ = _tmp0_; #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp2_ = _tmp1_; #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp3_ = _tmp2_; -#line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - _object_it = _tmp5_; + _object_it = _tmp4_; #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" while (TRUE) { -#line 1052 "Tombstone.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 1169 "Tombstone.c" + GeeIterator* _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp6_; + gpointer _tmp7_; Alteration* alteration = NULL; - GeeMap* _tmp10_; - DataObject* _tmp11_; - gpointer _tmp12_; - Alteration* _tmp13_; - gboolean _tmp14_; + DataObject* _tmp8_; + gpointer _tmp9_; + Alteration* _tmp10_; Tombstone* tombstone = NULL; - DataObject* _tmp15_; - Tombstone* _tmp16_; -#line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp6_ = _object_it; + DataObject* _tmp11_; + Tombstone* _tmp12_; #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _object_it; #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" break; -#line 1075 "Tombstone.c" +#line 1187 "Tombstone.c" } #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp8_ = _object_it; + _tmp6_ = _object_it; #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - object = (DataObject*) _tmp9_; -#line 54 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp10_ = items; + object = (DataObject*) _tmp7_; #line 54 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp11_ = object; + _tmp8_ = object; #line 54 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp12_ = gee_map_get (_tmp10_, _tmp11_); + _tmp9_ = gee_map_get (items, _tmp8_); #line 54 "/home/jens/Source/shotwell/src/Tombstone.vala" - alteration = (Alteration*) _tmp12_; + alteration = (Alteration*) _tmp9_; #line 55 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp13_ = alteration; + _tmp10_ = alteration; #line 55 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp14_ = alteration_has_subject (_tmp13_, "file"); -#line 55 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (!_tmp14_) { + if (!alteration_has_subject (_tmp10_, "file")) { #line 56 "/home/jens/Source/shotwell/src/Tombstone.vala" _alteration_unref0 (alteration); #line 56 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (object); #line 56 "/home/jens/Source/shotwell/src/Tombstone.vala" continue; -#line 1103 "Tombstone.c" +#line 1211 "Tombstone.c" } #line 58 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp15_ = object; + _tmp11_ = object; #line 58 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_TOMBSTONE, Tombstone)); + _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_TOMBSTONE, Tombstone)); #line 58 "/home/jens/Source/shotwell/src/Tombstone.vala" - tombstone = _tmp16_; -#line 1111 "Tombstone.c" + tombstone = _tmp12_; +#line 1219 "Tombstone.c" { GeeIterator* _detail_it = NULL; - Alteration* _tmp17_; - GeeCollection* _tmp18_; - GeeCollection* _tmp19_; - GeeIterator* _tmp20_; - GeeIterator* _tmp21_; + Alteration* _tmp13_; + GeeCollection* _tmp14_; + GeeCollection* _tmp15_; + GeeIterator* _tmp16_; + GeeIterator* _tmp17_; #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp17_ = alteration; + _tmp13_ = alteration; #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp18_ = alteration_get_details (_tmp17_, "file"); + _tmp14_ = alteration_get_details (_tmp13_, "file"); #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp19_ = _tmp18_; + _tmp15_ = _tmp14_; #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp16_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ITERABLE, GeeIterable)); #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp21_ = _tmp20_; + _tmp17_ = _tmp16_; #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_tmp19_); + _g_object_unref0 (_tmp15_); #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - _detail_it = _tmp21_; + _detail_it = _tmp17_; #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" while (TRUE) { -#line 1135 "Tombstone.c" - GeeIterator* _tmp22_; - gboolean _tmp23_; +#line 1243 "Tombstone.c" + GeeIterator* _tmp18_; gchar* detail = NULL; - GeeIterator* _tmp24_; - gpointer _tmp25_; + GeeIterator* _tmp19_; + gpointer _tmp20_; GFile* old_file = NULL; - const gchar* _tmp26_; - GFile* _tmp27_; + const gchar* _tmp21_; + GFile* _tmp22_; gboolean removed = FALSE; - GeeHashMap* _tmp28_; + GeeHashMap* _tmp23_; + GFile* _tmp24_; + gboolean _tmp25_; + gboolean _tmp26_; + GeeHashMap* _tmp27_; + Tombstone* _tmp28_; GFile* _tmp29_; - gboolean _tmp30_; - gboolean _tmp31_; - GeeHashMap* _tmp32_; - Tombstone* _tmp33_; - GFile* _tmp34_; - GFile* _tmp35_; - Tombstone* _tmp36_; -#line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp22_ = _detail_it; + GFile* _tmp30_; + Tombstone* _tmp31_; #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp23_ = gee_iterator_next (_tmp22_); + _tmp18_ = _detail_it; #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (!_tmp23_) { + if (!gee_iterator_next (_tmp18_)) { #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" break; -#line 1162 "Tombstone.c" +#line 1267 "Tombstone.c" } #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp24_ = _detail_it; + _tmp19_ = _detail_it; #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp25_ = gee_iterator_get (_tmp24_); + _tmp20_ = gee_iterator_get (_tmp19_); #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - detail = (gchar*) _tmp25_; + detail = (gchar*) _tmp20_; #line 61 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp26_ = detail; + _tmp21_ = detail; #line 61 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp27_ = g_file_new_for_path (_tmp26_); + _tmp22_ = g_file_new_for_path (_tmp21_); #line 61 "/home/jens/Source/shotwell/src/Tombstone.vala" - old_file = _tmp27_; + old_file = _tmp22_; #line 63 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp28_ = self->priv->file_map; + _tmp23_ = self->priv->file_map; #line 63 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp29_ = old_file; + _tmp24_ = old_file; #line 63 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp30_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp29_, NULL); + _tmp25_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_, NULL); #line 63 "/home/jens/Source/shotwell/src/Tombstone.vala" - removed = _tmp30_; + removed = _tmp25_; #line 64 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp31_ = removed; + _tmp26_ = removed; #line 64 "/home/jens/Source/shotwell/src/Tombstone.vala" - _vala_assert (_tmp31_, "removed"); + _vala_assert (_tmp26_, "removed"); #line 66 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp32_ = self->priv->file_map; + _tmp27_ = self->priv->file_map; #line 66 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp33_ = tombstone; + _tmp28_ = tombstone; #line 66 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp34_ = tombstone_get_file (_tmp33_); + _tmp29_ = tombstone_get_file (_tmp28_); #line 66 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp35_ = _tmp34_; + _tmp30_ = _tmp29_; #line 66 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp36_ = tombstone; + _tmp31_ = tombstone; #line 66 "/home/jens/Source/shotwell/src/Tombstone.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp35_, _tmp36_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp30_, _tmp31_); #line 66 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_tmp35_); + _g_object_unref0 (_tmp30_); #line 68 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (old_file); #line 68 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_free0 (detail); #line 68 "/home/jens/Source/shotwell/src/Tombstone.vala" break; -#line 1208 "Tombstone.c" +#line 1313 "Tombstone.c" } #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_detail_it); -#line 1212 "Tombstone.c" +#line 1317 "Tombstone.c" } #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (tombstone); @@ -1216,20 +1321,22 @@ static void tombstone_source_collection_real_notify_items_altered (DataCollectio _alteration_unref0 (alteration); #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (object); -#line 1220 "Tombstone.c" +#line 1325 "Tombstone.c" } #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_object_it); -#line 1224 "Tombstone.c" +#line 1329 "Tombstone.c" } } -Tombstone* tombstone_source_collection_locate (TombstoneSourceCollection* self, GFile* file) { +Tombstone* +tombstone_source_collection_locate (TombstoneSourceCollection* self, + GFile* file) +{ Tombstone* result = NULL; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 73 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_val_if_fail (IS_TOMBSTONE_SOURCE_COLLECTION (self), NULL); #line 73 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1237,22 +1344,21 @@ Tombstone* tombstone_source_collection_locate (TombstoneSourceCollection* self, #line 74 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp0_ = self->priv->file_map; #line 74 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp1_ = file; -#line 74 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 74 "/home/jens/Source/shotwell/src/Tombstone.vala" - result = (Tombstone*) _tmp2_; + result = (Tombstone*) _tmp1_; #line 74 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 1248 "Tombstone.c" +#line 1353 "Tombstone.c" } -gboolean tombstone_source_collection_matches (TombstoneSourceCollection* self, GFile* file) { +gboolean +tombstone_source_collection_matches (TombstoneSourceCollection* self, + GFile* file) +{ gboolean result = FALSE; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gboolean _tmp2_; #line 77 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_val_if_fail (IS_TOMBSTONE_SOURCE_COLLECTION (self), FALSE); #line 77 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1260,61 +1366,57 @@ gboolean tombstone_source_collection_matches (TombstoneSourceCollection* self, G #line 78 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp0_ = self->priv->file_map; #line 78 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp1_ = file; -#line 78 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 78 "/home/jens/Source/shotwell/src/Tombstone.vala" - result = _tmp2_; + result = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 78 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 1271 "Tombstone.c" +#line 1373 "Tombstone.c" } -void tombstone_source_collection_resurrect (TombstoneSourceCollection* self, Tombstone* tombstone) { - Tombstone* _tmp0_; +void +tombstone_source_collection_resurrect (TombstoneSourceCollection* self, + Tombstone* tombstone) +{ + Marker* _tmp0_; Marker* _tmp1_; - Marker* _tmp2_; #line 81 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (IS_TOMBSTONE_SOURCE_COLLECTION (self)); #line 81 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (IS_TOMBSTONE (tombstone)); #line 82 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = tombstone; -#line 82 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp1_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (tombstone, TYPE_DATA_OBJECT, DataObject)); #line 82 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 82 "/home/jens/Source/shotwell/src/Tombstone.vala" - source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp2_, FALSE, NULL, NULL, NULL); + source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp1_, FALSE, NULL, NULL, NULL); #line 82 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_tmp2_); -#line 1293 "Tombstone.c" + _g_object_unref0 (_tmp1_); +#line 1395 "Tombstone.c" } -void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self, GeeCollection* tombstones) { +void +tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self, + GeeCollection* tombstones) +{ Marker* marker = NULL; - GeeCollection* _tmp0_; - Marker* _tmp1_; + Marker* _tmp0_; GError * _inner_error_ = NULL; #line 85 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (IS_TOMBSTONE_SOURCE_COLLECTION (self)); #line 85 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (GEE_IS_COLLECTION (tombstones)); #line 86 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = tombstones; -#line 86 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp1_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp0_); + _tmp0_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), tombstones); #line 86 "/home/jens/Source/shotwell/src/Tombstone.vala" - marker = _tmp1_; + marker = _tmp0_; #line 88 "/home/jens/Source/shotwell/src/Tombstone.vala" data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 89 "/home/jens/Source/shotwell/src/Tombstone.vala" database_table_begin_transaction (); #line 91 "/home/jens/Source/shotwell/src/Tombstone.vala" source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), marker, FALSE, NULL, NULL, NULL); -#line 1318 "Tombstone.c" +#line 1420 "Tombstone.c" { #line 94 "/home/jens/Source/shotwell/src/Tombstone.vala" database_table_commit_transaction (&_inner_error_); @@ -1322,8 +1424,8 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self if (G_UNLIKELY (_inner_error_ != NULL)) { #line 94 "/home/jens/Source/shotwell/src/Tombstone.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1326 "Tombstone.c" - goto __catch548_database_error; +#line 1428 "Tombstone.c" + goto __catch557_database_error; } #line 94 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (marker); @@ -1333,27 +1435,27 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self g_clear_error (&_inner_error_); #line 94 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 1337 "Tombstone.c" +#line 1439 "Tombstone.c" } } - goto __finally548; - __catch548_database_error: + goto __finally557; + __catch557_database_error: { GError* err = NULL; - GError* _tmp2_; + GError* _tmp1_; #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala" err = _inner_error_; #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala" _inner_error_ = NULL; #line 96 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp2_ = err; + _tmp1_ = err; #line 96 "/home/jens/Source/shotwell/src/Tombstone.vala" - app_window_database_error (_tmp2_); + app_window_database_error (_tmp1_); #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_error_free0 (err); -#line 1355 "Tombstone.c" +#line 1457 "Tombstone.c" } - __finally548: + __finally557: #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1364,19 +1466,21 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self g_clear_error (&_inner_error_); #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 1368 "Tombstone.c" +#line 1470 "Tombstone.c" } #line 99 "/home/jens/Source/shotwell/src/Tombstone.vala" data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 85 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (marker); -#line 1374 "Tombstone.c" +#line 1476 "Tombstone.c" } -void tombstone_source_collection_launch_scan (TombstoneSourceCollection* self, DirectoryMonitor* monitor, GCancellable* cancellable) { - DirectoryMonitor* _tmp0_; - GCancellable* _tmp1_; +void +tombstone_source_collection_launch_scan (TombstoneSourceCollection* self, + DirectoryMonitor* monitor, + GCancellable* cancellable) +{ #line 108 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (IS_TOMBSTONE_SOURCE_COLLECTION (self)); #line 108 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1384,16 +1488,14 @@ void tombstone_source_collection_launch_scan (TombstoneSourceCollection* self, D #line 108 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable)); #line 109 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = monitor; -#line 109 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp1_ = cancellable; -#line 109 "/home/jens/Source/shotwell/src/Tombstone.vala" - tombstone_source_collection_async_scan (self, _tmp0_, _tmp1_, NULL, NULL); -#line 1393 "Tombstone.c" + tombstone_source_collection_async_scan (self, monitor, cancellable, NULL, NULL); +#line 1493 "Tombstone.c" } -static void tombstone_source_collection_async_scan_data_free (gpointer _data) { +static void +tombstone_source_collection_async_scan_data_free (gpointer _data) +{ TombstoneSourceCollectionAsyncScanData* _data_; _data_ = _data; #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1404,11 +1506,15 @@ static void tombstone_source_collection_async_scan_data_free (gpointer _data) { _data_collection_unref0 (_data_->self); #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" g_slice_free (TombstoneSourceCollectionAsyncScanData, _data_); -#line 1408 "Tombstone.c" +#line 1510 "Tombstone.c" } -static void tombstone_source_collection_async_scan_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) { +static void +tombstone_source_collection_async_scan_async_ready_wrapper (GObject *source_object, + GAsyncResult *res, + void *user_data) +{ TombstoneSourceCollectionAsyncScanData* _task_data_; #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" _task_data_ = g_task_get_task_data (G_TASK (res)); @@ -1416,28 +1522,34 @@ static void tombstone_source_collection_async_scan_async_ready_wrapper (GObject if (_task_data_->_callback_ != NULL) { #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" _task_data_->_callback_ (source_object, res, user_data); -#line 1420 "Tombstone.c" +#line 1526 "Tombstone.c" } #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" _task_data_->_task_complete_ = TRUE; -#line 1424 "Tombstone.c" +#line 1530 "Tombstone.c" } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" return self ? data_collection_ref (self) : NULL; -#line 1431 "Tombstone.c" +#line 1539 "Tombstone.c" } -static void tombstone_source_collection_async_scan (TombstoneSourceCollection* self, DirectoryMonitor* monitor, GCancellable* cancellable, GAsyncReadyCallback _callback_, gpointer _user_data_) { +static void +tombstone_source_collection_async_scan (TombstoneSourceCollection* self, + DirectoryMonitor* monitor, + GCancellable* cancellable, + GAsyncReadyCallback _callback_, + gpointer _user_data_) +{ TombstoneSourceCollectionAsyncScanData* _data_; TombstoneSourceCollection* _tmp0_; DirectoryMonitor* _tmp1_; - DirectoryMonitor* _tmp2_; - GCancellable* _tmp3_; - GCancellable* _tmp4_; + GCancellable* _tmp2_; #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_ = g_slice_new0 (TombstoneSourceCollectionAsyncScanData); #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1448,7 +1560,7 @@ static void tombstone_source_collection_async_scan (TombstoneSourceCollection* s if (_callback_ == NULL) { #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->_task_complete_ = TRUE; -#line 1452 "Tombstone.c" +#line 1564 "Tombstone.c" } #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" g_task_set_task_data (_data_->_async_result, _data_, tombstone_source_collection_async_scan_data_free); @@ -1457,28 +1569,27 @@ static void tombstone_source_collection_async_scan (TombstoneSourceCollection* s #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->self = _tmp0_; #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp1_ = monitor; -#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (monitor); #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_data_->monitor); #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->monitor = _tmp2_; + _data_->monitor = _tmp1_; #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp3_ = cancellable; -#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp2_ = _g_object_ref0 (cancellable); #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_data_->cancellable); #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->cancellable = _tmp4_; + _data_->cancellable = _tmp2_; #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" tombstone_source_collection_async_scan_co (_data_); -#line 1478 "Tombstone.c" +#line 1586 "Tombstone.c" } -static void tombstone_source_collection_async_scan_finish (TombstoneSourceCollection* self, GAsyncResult* _res_) { +static void +tombstone_source_collection_async_scan_finish (TombstoneSourceCollection* self, + GAsyncResult* _res_) +{ TombstoneSourceCollectionAsyncScanData* _data_; #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_ = g_task_propagate_pointer (G_TASK (_res_), NULL); @@ -1486,12 +1597,16 @@ static void tombstone_source_collection_async_scan_finish (TombstoneSourceCollec if (NULL == _data_) { #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 1490 "Tombstone.c" +#line 1601 "Tombstone.c" } } -static void tombstone_source_collection_async_scan_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { +static void +tombstone_source_collection_async_scan_ready (GObject* source_object, + GAsyncResult* _res_, + gpointer _user_data_) +{ TombstoneSourceCollectionAsyncScanData* _data_; #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_ = _user_data_; @@ -1503,45 +1618,49 @@ static void tombstone_source_collection_async_scan_ready (GObject* source_object _data_->_task_complete_ = TRUE; #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" tombstone_source_collection_async_scan_co (_data_); -#line 1507 "Tombstone.c" +#line 1622 "Tombstone.c" } -static gboolean _tombstone_source_collection_async_scan_co_gsource_func (gpointer self) { +static gboolean +_tombstone_source_collection_async_scan_co_gsource_func (gpointer self) +{ gboolean result; result = tombstone_source_collection_async_scan_co (self); #line 145 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 1516 "Tombstone.c" +#line 1633 "Tombstone.c" } -static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollectionAsyncScanData* _data_) { +static gboolean +tombstone_source_collection_async_scan_co (TombstoneSourceCollectionAsyncScanData* _data_) +{ #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala" switch (_data_->_state_) { #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala" case 0: -#line 1525 "Tombstone.c" +#line 1644 "Tombstone.c" goto _state_0; #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala" case 1: -#line 1529 "Tombstone.c" +#line 1648 "Tombstone.c" goto _state_1; #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala" case 2: -#line 1533 "Tombstone.c" +#line 1652 "Tombstone.c" goto _state_2; default: #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala" g_assert_not_reached (); -#line 1538 "Tombstone.c" +#line 1657 "Tombstone.c" } _state_0: #line 114 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->_tmp0_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_DATA_COLLECTION, DataCollection)); #line 114 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->marker = _data_->_tmp0_; -#line 1545 "Tombstone.c" +#line 1664 "Tombstone.c" { #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->_tmp1_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_DATA_COLLECTION, DataCollection)); @@ -1560,99 +1679,91 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->_tmp5_ = _data_->_object_it; #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp6_ = gee_iterator_next (_data_->_tmp5_); -#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (!_data_->_tmp6_) { + if (!gee_iterator_next (_data_->_tmp5_)) { #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala" break; -#line 1569 "Tombstone.c" +#line 1686 "Tombstone.c" } #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp7_ = _data_->_object_it; + _data_->_tmp6_ = _data_->_object_it; #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp8_ = gee_iterator_get (_data_->_tmp7_); + _data_->_tmp7_ = gee_iterator_get (_data_->_tmp6_); #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->object = (DataObject*) _data_->_tmp8_; + _data_->object = (DataObject*) _data_->_tmp7_; #line 116 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp9_ = _data_->object; + _data_->_tmp8_ = _data_->object; #line 116 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp9_, TYPE_TOMBSTONE, Tombstone)); + _data_->_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp8_, TYPE_TOMBSTONE, Tombstone)); #line 116 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->tombstone = _data_->_tmp10_; + _data_->tombstone = _data_->_tmp9_; #line 117 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp11_ = _data_->tombstone; + _data_->_tmp10_ = _data_->tombstone; #line 117 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp12_ = tombstone_get_file (_data_->_tmp11_); + _data_->_tmp11_ = tombstone_get_file (_data_->_tmp10_); #line 117 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->file = _data_->_tmp12_; + _data_->file = _data_->_tmp11_; #line 119 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->info = NULL; #line 120 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp13_ = _data_->monitor; -#line 120 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_data_->_tmp13_ != NULL) { -#line 121 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp14_ = _data_->monitor; + if (_data_->monitor != NULL) { #line 121 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp15_ = _data_->file; + _data_->_tmp12_ = _data_->file; #line 121 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp16_ = directory_monitor_get_file_info (_data_->_tmp14_, _data_->_tmp15_); + _data_->_tmp13_ = directory_monitor_get_file_info (_data_->monitor, _data_->_tmp12_); #line 121 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_data_->info); #line 121 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->info = _data_->_tmp16_; -#line 1605 "Tombstone.c" + _data_->info = _data_->_tmp13_; +#line 1718 "Tombstone.c" } #line 125 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp17_ = _data_->info; + _data_->_tmp14_ = _data_->info; #line 125 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_data_->_tmp17_ == NULL) { -#line 1611 "Tombstone.c" + if (_data_->_tmp14_ == NULL) { +#line 1724 "Tombstone.c" { #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp19_ = _data_->file; -#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp20_ = _data_->cancellable; + _data_->_tmp16_ = _data_->file; #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->_state_ = 1; #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" - g_file_query_info_async (_data_->_tmp19_, G_FILE_ATTRIBUTE_STANDARD_NAME, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, G_PRIORITY_LOW, _data_->_tmp20_, tombstone_source_collection_async_scan_ready, _data_); + g_file_query_info_async (_data_->_tmp16_, G_FILE_ATTRIBUTE_STANDARD_NAME, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, G_PRIORITY_LOW, _data_->cancellable, tombstone_source_collection_async_scan_ready, _data_); #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" return FALSE; -#line 1623 "Tombstone.c" +#line 1734 "Tombstone.c" _state_1: #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp21_ = g_file_query_info_finish (_data_->_tmp19_, _data_->_res_, &_data_->_inner_error_); + _data_->_tmp17_ = g_file_query_info_finish (_data_->_tmp16_, _data_->_res_, &_data_->_inner_error_); #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp18_ = _data_->_tmp21_; + _data_->_tmp15_ = _data_->_tmp17_; #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 1631 "Tombstone.c" - goto __catch549_g_error; +#line 1742 "Tombstone.c" + goto __catch558_g_error; } #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp22_ = _data_->_tmp18_; + _data_->_tmp18_ = _data_->_tmp15_; #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp18_ = NULL; + _data_->_tmp15_ = NULL; #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_data_->info); #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->info = _data_->_tmp22_; + _data_->info = _data_->_tmp18_; #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_data_->_tmp18_); -#line 1644 "Tombstone.c" + _g_object_unref0 (_data_->_tmp15_); +#line 1755 "Tombstone.c" } - goto __finally549; - __catch549_g_error: + goto __finally558; + __catch558_g_error: { #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->err = _data_->_inner_error_; #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->_inner_error_ = NULL; #line 131 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp23_ = _data_->err; + _data_->_tmp19_ = _data_->err; #line 131 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (g_error_matches (_data_->_tmp23_, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { + if (g_error_matches (_data_->_tmp19_, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { #line 132 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_error_free0 (_data_->err); #line 132 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1665,34 +1776,34 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec _g_object_unref0 (_data_->object); #line 132 "/home/jens/Source/shotwell/src/Tombstone.vala" break; -#line 1669 "Tombstone.c" +#line 1780 "Tombstone.c" } #line 134 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp24_ = _data_->err; + _data_->_tmp20_ = _data_->err; #line 134 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (!g_error_matches (_data_->_tmp24_, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) { + if (!g_error_matches (_data_->_tmp20_, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) { #line 135 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp25_ = _data_->file; + _data_->_tmp21_ = _data_->file; #line 135 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp26_ = g_file_get_path (_data_->_tmp25_); + _data_->_tmp22_ = g_file_get_path (_data_->_tmp21_); #line 135 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp27_ = _data_->_tmp26_; + _data_->_tmp23_ = _data_->_tmp22_; #line 135 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp28_ = _data_->err; + _data_->_tmp24_ = _data_->err; #line 135 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp29_ = _data_->_tmp28_->message; + _data_->_tmp25_ = _data_->_tmp24_->message; #line 135 "/home/jens/Source/shotwell/src/Tombstone.vala" g_warning ("Tombstone.vala:135: Unable to check for existence of tombstoned file %" \ -"s: %s", _data_->_tmp27_, _data_->_tmp29_); +"s: %s", _data_->_tmp23_, _data_->_tmp25_); #line 135 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_free0 (_data_->_tmp27_); -#line 1689 "Tombstone.c" + _g_free0 (_data_->_tmp23_); +#line 1800 "Tombstone.c" } #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_error_free0 (_data_->err); -#line 1693 "Tombstone.c" +#line 1804 "Tombstone.c" } - __finally549: + __finally558: #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1715,20 +1826,20 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec g_object_unref (_data_->_async_result); #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala" return FALSE; -#line 1718 "Tombstone.c" +#line 1829 "Tombstone.c" } } #line 142 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp30_ = _data_->info; + _data_->_tmp26_ = _data_->info; #line 142 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_data_->_tmp30_ == NULL) { + if (_data_->_tmp26_ == NULL) { #line 143 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp31_ = _data_->marker; + _data_->_tmp27_ = _data_->marker; #line 143 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp32_ = _data_->tombstone; + _data_->_tmp28_ = _data_->tombstone; #line 143 "/home/jens/Source/shotwell/src/Tombstone.vala" - marker_mark (_data_->_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp32_, TYPE_DATA_OBJECT, DataObject)); -#line 1731 "Tombstone.c" + marker_mark (_data_->_tmp27_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp28_, TYPE_DATA_OBJECT, DataObject)); +#line 1842 "Tombstone.c" } #line 145 "/home/jens/Source/shotwell/src/Tombstone.vala" g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _tombstone_source_collection_async_scan_co_gsource_func, _data_, NULL); @@ -1736,7 +1847,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec _data_->_state_ = 2; #line 146 "/home/jens/Source/shotwell/src/Tombstone.vala" return FALSE; -#line 1739 "Tombstone.c" +#line 1850 "Tombstone.c" _state_2: ; #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1747,31 +1858,27 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec _g_object_unref0 (_data_->tombstone); #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_data_->object); -#line 1750 "Tombstone.c" +#line 1861 "Tombstone.c" } #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_data_->_object_it); -#line 1754 "Tombstone.c" +#line 1865 "Tombstone.c" } #line 149 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp33_ = _data_->marker; -#line 149 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp34_ = marker_get_count (_data_->_tmp33_); + _data_->_tmp29_ = _data_->marker; #line 149 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_data_->_tmp34_ > 0) { + if (marker_get_count (_data_->_tmp29_) > 0) { #line 150 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp35_ = _data_->marker; + _data_->_tmp30_ = _data_->marker; #line 150 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp36_ = marker_get_count (_data_->_tmp35_); -#line 150 "/home/jens/Source/shotwell/src/Tombstone.vala" - g_debug ("Tombstone.vala:150: Resurrecting %d tombstones with no backing file", _data_->_tmp36_); + g_debug ("Tombstone.vala:150: Resurrecting %d tombstones with no backing file", marker_get_count (_data_->_tmp30_)); #line 151 "/home/jens/Source/shotwell/src/Tombstone.vala" database_table_begin_transaction (); #line 152 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp37_ = _data_->marker; + _data_->_tmp31_ = _data_->marker; #line 152 "/home/jens/Source/shotwell/src/Tombstone.vala" - source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_SOURCE_COLLECTION, SourceCollection), _data_->_tmp37_, FALSE, NULL, NULL, NULL); -#line 1774 "Tombstone.c" + source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_SOURCE_COLLECTION, SourceCollection), _data_->_tmp31_, FALSE, NULL, NULL, NULL); +#line 1881 "Tombstone.c" { #line 154 "/home/jens/Source/shotwell/src/Tombstone.vala" database_table_commit_transaction (&_data_->_inner_error_); @@ -1779,8 +1886,8 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 154 "/home/jens/Source/shotwell/src/Tombstone.vala" if (_data_->_inner_error_->domain == DATABASE_ERROR) { -#line 1782 "Tombstone.c" - goto __catch550_database_error; +#line 1889 "Tombstone.c" + goto __catch559_database_error; } #line 154 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_data_->marker); @@ -1792,25 +1899,25 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec g_object_unref (_data_->_async_result); #line 154 "/home/jens/Source/shotwell/src/Tombstone.vala" return FALSE; -#line 1795 "Tombstone.c" +#line 1902 "Tombstone.c" } } - goto __finally550; - __catch550_database_error: + goto __finally559; + __catch559_database_error: { #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->err2 = _data_->_inner_error_; #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->_inner_error_ = NULL; #line 156 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp38_ = _data_->err2; + _data_->_tmp32_ = _data_->err2; #line 156 "/home/jens/Source/shotwell/src/Tombstone.vala" - app_window_database_error (_data_->_tmp38_); + app_window_database_error (_data_->_tmp32_); #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_error_free0 (_data_->err2); -#line 1811 "Tombstone.c" +#line 1918 "Tombstone.c" } - __finally550: + __finally559: #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1823,7 +1930,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec g_object_unref (_data_->_async_result); #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala" return FALSE; -#line 1826 "Tombstone.c" +#line 1933 "Tombstone.c" } } #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1836,18 +1943,20 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec while (_data_->_task_complete_ != TRUE) { #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala" g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); -#line 1839 "Tombstone.c" +#line 1946 "Tombstone.c" } } #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala" g_object_unref (_data_->_async_result); #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala" return FALSE; -#line 1846 "Tombstone.c" +#line 1953 "Tombstone.c" } -static void tombstone_source_collection_class_init (TombstoneSourceCollectionClass * klass) { +static void +tombstone_source_collection_class_init (TombstoneSourceCollectionClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" tombstone_source_collection_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1860,11 +1969,13 @@ static void tombstone_source_collection_class_init (TombstoneSourceCollectionCla ((DataCollectionClass *) klass)->notify_contents_altered = (void (*) (DataCollection *, GeeIterable*, GeeIterable*)) tombstone_source_collection_real_notify_contents_altered; #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" ((DataCollectionClass *) klass)->notify_items_altered = (void (*) (DataCollection *, GeeMap*)) tombstone_source_collection_real_notify_items_altered; -#line 1863 "Tombstone.c" +#line 1972 "Tombstone.c" } -static void tombstone_source_collection_instance_init (TombstoneSourceCollection * self) { +static void +tombstone_source_collection_instance_init (TombstoneSourceCollection * self) +{ GeeHashMap* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" self->priv = TOMBSTONE_SOURCE_COLLECTION_GET_PRIVATE (self); @@ -1872,11 +1983,13 @@ static void tombstone_source_collection_instance_init (TombstoneSourceCollection _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 8 "/home/jens/Source/shotwell/src/Tombstone.vala" self->priv->file_map = _tmp0_; -#line 1875 "Tombstone.c" +#line 1986 "Tombstone.c" } -static void tombstone_source_collection_finalize (DataCollection * obj) { +static void +tombstone_source_collection_finalize (DataCollection * obj) +{ TombstoneSourceCollection * self; #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TOMBSTONE_SOURCE_COLLECTION, TombstoneSourceCollection); @@ -1884,11 +1997,13 @@ static void tombstone_source_collection_finalize (DataCollection * obj) { _g_object_unref0 (self->priv->file_map); #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" DATA_COLLECTION_CLASS (tombstone_source_collection_parent_class)->finalize (obj); -#line 1887 "Tombstone.c" +#line 2000 "Tombstone.c" } -GType tombstone_source_collection_get_type (void) { +GType +tombstone_source_collection_get_type (void) +{ static volatile gsize tombstone_source_collection_type_id__volatile = 0; if (g_once_init_enter (&tombstone_source_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TombstoneSourceCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tombstone_source_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TombstoneSourceCollection), 0, (GInstanceInitFunc) tombstone_source_collection_instance_init, NULL }; @@ -1900,148 +2015,173 @@ GType tombstone_source_collection_get_type (void) { } -TombstonedFile* tombstoned_file_construct (GType object_type, GFile* file, gint64 filesize, const gchar* md5) { +TombstonedFile* +tombstoned_file_construct (GType object_type, + GFile* file, + gint64 filesize, + const gchar* md5) +{ TombstonedFile* self = NULL; GFile* _tmp0_; - GFile* _tmp1_; - gint64 _tmp2_; - const gchar* _tmp3_; - gchar* _tmp4_; + gchar* _tmp1_; #line 167 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 167 "/home/jens/Source/shotwell/src/Tombstone.vala" self = (TombstonedFile*) g_type_create_instance (object_type); #line 168 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = file; -#line 168 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (file); #line 168 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (self->file); #line 168 "/home/jens/Source/shotwell/src/Tombstone.vala" - self->file = _tmp1_; -#line 169 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp2_ = filesize; + self->file = _tmp0_; #line 169 "/home/jens/Source/shotwell/src/Tombstone.vala" - self->filesize = _tmp2_; -#line 170 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp3_ = md5; + self->filesize = filesize; #line 170 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp4_ = g_strdup (_tmp3_); + _tmp1_ = g_strdup (md5); #line 170 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_free0 (self->md5); #line 170 "/home/jens/Source/shotwell/src/Tombstone.vala" - self->md5 = _tmp4_; + self->md5 = _tmp1_; #line 167 "/home/jens/Source/shotwell/src/Tombstone.vala" return self; -#line 1936 "Tombstone.c" +#line 2047 "Tombstone.c" } -TombstonedFile* tombstoned_file_new (GFile* file, gint64 filesize, const gchar* md5) { +TombstonedFile* +tombstoned_file_new (GFile* file, + gint64 filesize, + const gchar* md5) +{ #line 167 "/home/jens/Source/shotwell/src/Tombstone.vala" return tombstoned_file_construct (TYPE_TOMBSTONED_FILE, file, filesize, md5); -#line 1943 "Tombstone.c" +#line 2058 "Tombstone.c" } -static void value_tombstoned_file_init (GValue* value) { +static void +value_tombstoned_file_init (GValue* value) +{ #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" value->data[0].v_pointer = NULL; -#line 1950 "Tombstone.c" +#line 2067 "Tombstone.c" } -static void value_tombstoned_file_free_value (GValue* value) { +static void +value_tombstoned_file_free_value (GValue* value) +{ #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" if (value->data[0].v_pointer) { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" tombstoned_file_unref (value->data[0].v_pointer); -#line 1959 "Tombstone.c" +#line 2078 "Tombstone.c" } } -static void value_tombstoned_file_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_tombstoned_file_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" if (src_value->data[0].v_pointer) { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" dest_value->data[0].v_pointer = tombstoned_file_ref (src_value->data[0].v_pointer); -#line 1969 "Tombstone.c" +#line 2091 "Tombstone.c" } else { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" dest_value->data[0].v_pointer = NULL; -#line 1973 "Tombstone.c" +#line 2095 "Tombstone.c" } } -static gpointer value_tombstoned_file_peek_pointer (const GValue* value) { +static gpointer +value_tombstoned_file_peek_pointer (const GValue* value) +{ #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" return value->data[0].v_pointer; -#line 1981 "Tombstone.c" +#line 2105 "Tombstone.c" } -static gchar* value_tombstoned_file_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_tombstoned_file_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" if (collect_values[0].v_pointer) { -#line 1988 "Tombstone.c" +#line 2117 "Tombstone.c" TombstonedFile * object; object = collect_values[0].v_pointer; #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" if (object->parent_instance.g_class == NULL) { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1995 "Tombstone.c" +#line 2124 "Tombstone.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 162 "/home/jens/Source/shotwell/src/Tombstone.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 1999 "Tombstone.c" +#line 2128 "Tombstone.c" } #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" value->data[0].v_pointer = tombstoned_file_ref (object); -#line 2003 "Tombstone.c" +#line 2132 "Tombstone.c" } else { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" value->data[0].v_pointer = NULL; -#line 2007 "Tombstone.c" +#line 2136 "Tombstone.c" } #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" return NULL; -#line 2011 "Tombstone.c" +#line 2140 "Tombstone.c" } -static gchar* value_tombstoned_file_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_tombstoned_file_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ TombstonedFile ** object_p; object_p = collect_values[0].v_pointer; #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" if (!object_p) { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2022 "Tombstone.c" +#line 2156 "Tombstone.c" } #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" if (!value->data[0].v_pointer) { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" *object_p = NULL; -#line 2028 "Tombstone.c" +#line 2162 "Tombstone.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" *object_p = value->data[0].v_pointer; -#line 2032 "Tombstone.c" +#line 2166 "Tombstone.c" } else { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" *object_p = tombstoned_file_ref (value->data[0].v_pointer); -#line 2036 "Tombstone.c" +#line 2170 "Tombstone.c" } #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" return NULL; -#line 2040 "Tombstone.c" +#line 2174 "Tombstone.c" } -GParamSpec* param_spec_tombstoned_file (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_tombstoned_file (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecTombstonedFile* spec; #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_TOMBSTONED_FILE), NULL); @@ -2051,20 +2191,25 @@ GParamSpec* param_spec_tombstoned_file (const gchar* name, const gchar* nick, co G_PARAM_SPEC (spec)->value_type = object_type; #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" return G_PARAM_SPEC (spec); -#line 2054 "Tombstone.c" +#line 2194 "Tombstone.c" } -gpointer value_get_tombstoned_file (const GValue* value) { +gpointer +value_get_tombstoned_file (const GValue* value) +{ #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONED_FILE), NULL); #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" return value->data[0].v_pointer; -#line 2063 "Tombstone.c" +#line 2205 "Tombstone.c" } -void value_set_tombstoned_file (GValue* value, gpointer v_object) { +void +value_set_tombstoned_file (GValue* value, + gpointer v_object) +{ TombstonedFile * old; #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONED_FILE)); @@ -2080,22 +2225,25 @@ void value_set_tombstoned_file (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" tombstoned_file_ref (value->data[0].v_pointer); -#line 2083 "Tombstone.c" +#line 2228 "Tombstone.c" } else { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" value->data[0].v_pointer = NULL; -#line 2087 "Tombstone.c" +#line 2232 "Tombstone.c" } #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" if (old) { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" tombstoned_file_unref (old); -#line 2093 "Tombstone.c" +#line 2238 "Tombstone.c" } } -void value_take_tombstoned_file (GValue* value, gpointer v_object) { +void +value_take_tombstoned_file (GValue* value, + gpointer v_object) +{ TombstonedFile * old; #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONED_FILE)); @@ -2109,38 +2257,44 @@ void value_take_tombstoned_file (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" value->data[0].v_pointer = v_object; -#line 2112 "Tombstone.c" +#line 2260 "Tombstone.c" } else { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" value->data[0].v_pointer = NULL; -#line 2116 "Tombstone.c" +#line 2264 "Tombstone.c" } #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" if (old) { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" tombstoned_file_unref (old); -#line 2122 "Tombstone.c" +#line 2270 "Tombstone.c" } } -static void tombstoned_file_class_init (TombstonedFileClass * klass) { +static void +tombstoned_file_class_init (TombstonedFileClass * klass) +{ #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" tombstoned_file_parent_class = g_type_class_peek_parent (klass); #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" ((TombstonedFileClass *) klass)->finalize = tombstoned_file_finalize; -#line 2132 "Tombstone.c" +#line 2282 "Tombstone.c" } -static void tombstoned_file_instance_init (TombstonedFile * self) { +static void +tombstoned_file_instance_init (TombstonedFile * self) +{ #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" self->ref_count = 1; -#line 2139 "Tombstone.c" +#line 2291 "Tombstone.c" } -static void tombstoned_file_finalize (TombstonedFile * obj) { +static void +tombstoned_file_finalize (TombstonedFile * obj) +{ TombstonedFile * self; #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TOMBSTONED_FILE, TombstonedFile); @@ -2150,11 +2304,13 @@ static void tombstoned_file_finalize (TombstonedFile * obj) { _g_object_unref0 (self->file); #line 165 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_free0 (self->md5); -#line 2153 "Tombstone.c" +#line 2307 "Tombstone.c" } -GType tombstoned_file_get_type (void) { +GType +tombstoned_file_get_type (void) +{ static volatile gsize tombstoned_file_type_id__volatile = 0; if (g_once_init_enter (&tombstoned_file_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_tombstoned_file_init, value_tombstoned_file_free_value, value_tombstoned_file_copy_value, value_tombstoned_file_peek_pointer, "p", value_tombstoned_file_collect_value, "p", value_tombstoned_file_lcopy_value }; @@ -2168,18 +2324,22 @@ GType tombstoned_file_get_type (void) { } -gpointer tombstoned_file_ref (gpointer instance) { +gpointer +tombstoned_file_ref (gpointer instance) +{ TombstonedFile * self; self = instance; #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" g_atomic_int_inc (&self->ref_count); #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" return instance; -#line 2178 "Tombstone.c" +#line 2336 "Tombstone.c" } -void tombstoned_file_unref (gpointer instance) { +void +tombstoned_file_unref (gpointer instance) +{ TombstonedFile * self; self = instance; #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -2188,54 +2348,57 @@ void tombstoned_file_unref (gpointer instance) { TOMBSTONED_FILE_GET_CLASS (self)->finalize (self); #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2191 "Tombstone.c" +#line 2351 "Tombstone.c" } } -gint tombstone_reason_serialize (TombstoneReason self) { +gint +tombstone_reason_serialize (TombstoneReason self) +{ gint result = 0; #line 181 "/home/jens/Source/shotwell/src/Tombstone.vala" result = (gint) self; #line 181 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 2202 "Tombstone.c" +#line 2364 "Tombstone.c" } -TombstoneReason tombstone_reason_unserialize (gint value) { +TombstoneReason +tombstone_reason_unserialize (gint value) +{ TombstoneReason result = 0; - gint _tmp0_; -#line 185 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = value; #line 185 "/home/jens/Source/shotwell/src/Tombstone.vala" - switch ((TombstoneReason) _tmp0_) { + switch ((TombstoneReason) value) { #line 185 "/home/jens/Source/shotwell/src/Tombstone.vala" case TOMBSTONE_REASON_AUTO_DETECTED_DUPLICATE: -#line 2215 "Tombstone.c" +#line 2376 "Tombstone.c" { #line 187 "/home/jens/Source/shotwell/src/Tombstone.vala" result = TOMBSTONE_REASON_AUTO_DETECTED_DUPLICATE; #line 187 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 2221 "Tombstone.c" +#line 2382 "Tombstone.c" } default: #line 185 "/home/jens/Source/shotwell/src/Tombstone.vala" case TOMBSTONE_REASON_REMOVED_BY_USER: -#line 2226 "Tombstone.c" +#line 2387 "Tombstone.c" { #line 192 "/home/jens/Source/shotwell/src/Tombstone.vala" result = TOMBSTONE_REASON_REMOVED_BY_USER; #line 192 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 2232 "Tombstone.c" +#line 2393 "Tombstone.c" } } } -GType tombstone_reason_get_type (void) { +GType +tombstone_reason_get_type (void) +{ static volatile gsize tombstone_reason_type_id__volatile = 0; if (g_once_init_enter (&tombstone_reason_type_id__volatile)) { static const GEnumValue values[] = {{TOMBSTONE_REASON_REMOVED_BY_USER, "TOMBSTONE_REASON_REMOVED_BY_USER", "removed-by-user"}, {TOMBSTONE_REASON_AUTO_DETECTED_DUPLICATE, "TOMBSTONE_REASON_AUTO_DETECTED_DUPLICATE", "auto-detected-duplicate"}, {0, NULL, NULL}}; @@ -2247,43 +2410,49 @@ GType tombstone_reason_get_type (void) { } -static gpointer _tombstone_row_ref0 (gpointer self) { +static gpointer +_tombstone_row_ref0 (gpointer self) +{ #line 203 "/home/jens/Source/shotwell/src/Tombstone.vala" return self ? tombstone_row_ref (self) : NULL; -#line 2253 "Tombstone.c" +#line 2418 "Tombstone.c" } -static Tombstone* tombstone_construct (GType object_type, TombstoneRow* row) { +static Tombstone* +tombstone_construct (GType object_type, + TombstoneRow* row) +{ Tombstone * self = NULL; TombstoneRow* _tmp0_; - TombstoneRow* _tmp1_; #line 202 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_val_if_fail (IS_TOMBSTONE_ROW (row), NULL); #line 202 "/home/jens/Source/shotwell/src/Tombstone.vala" self = (Tombstone*) data_source_construct (object_type, DATA_OBJECT_INVALID_OBJECT_ID); #line 203 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = row; -#line 203 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp1_ = _tombstone_row_ref0 (_tmp0_); + _tmp0_ = _tombstone_row_ref0 (row); #line 203 "/home/jens/Source/shotwell/src/Tombstone.vala" _tombstone_row_unref0 (self->priv->row); #line 203 "/home/jens/Source/shotwell/src/Tombstone.vala" - self->priv->row = _tmp1_; + self->priv->row = _tmp0_; #line 202 "/home/jens/Source/shotwell/src/Tombstone.vala" return self; -#line 2275 "Tombstone.c" +#line 2440 "Tombstone.c" } -static Tombstone* tombstone_new (TombstoneRow* row) { +static Tombstone* +tombstone_new (TombstoneRow* row) +{ #line 202 "/home/jens/Source/shotwell/src/Tombstone.vala" return tombstone_construct (TYPE_TOMBSTONE, row); -#line 2282 "Tombstone.c" +#line 2449 "Tombstone.c" } -void tombstone_init (void) { +void +tombstone_init (void) +{ TombstoneSourceCollection* _tmp0_; TombstoneRow** rows = NULL; gint rows_length1; @@ -2303,7 +2472,7 @@ void tombstone_init (void) { rows_length1 = 0; #line 209 "/home/jens/Source/shotwell/src/Tombstone.vala" _rows_size_ = rows_length1; -#line 2306 "Tombstone.c" +#line 2475 "Tombstone.c" { TombstoneRow** _tmp1_ = NULL; TombstoneTable* _tmp2_; @@ -2338,8 +2507,8 @@ void tombstone_init (void) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 2341 "Tombstone.c" - goto __catch551_database_error; +#line 2510 "Tombstone.c" + goto __catch560_database_error; } #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala" rows = (_vala_array_free (rows, rows_length1, (GDestroyNotify) tombstone_row_unref), NULL); @@ -2349,7 +2518,7 @@ void tombstone_init (void) { g_clear_error (&_inner_error_); #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 2352 "Tombstone.c" +#line 2521 "Tombstone.c" } #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp7_ = _tmp1_; @@ -2369,10 +2538,10 @@ void tombstone_init (void) { _rows_size_ = rows_length1; #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp1_ = (_vala_array_free (_tmp1_, _tmp1__length1, (GDestroyNotify) tombstone_row_unref), NULL); -#line 2372 "Tombstone.c" +#line 2541 "Tombstone.c" } - goto __finally551; - __catch551_database_error: + goto __finally560; + __catch560_database_error: { GError* err = NULL; GError* _tmp8_; @@ -2386,9 +2555,9 @@ void tombstone_init (void) { app_window_database_error (_tmp8_); #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_error_free0 (err); -#line 2389 "Tombstone.c" +#line 2558 "Tombstone.c" } - __finally551: + __finally560: #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -2399,7 +2568,7 @@ void tombstone_init (void) { g_clear_error (&_inner_error_); #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 2402 "Tombstone.c" +#line 2571 "Tombstone.c" } #line 216 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp9_ = rows; @@ -2407,7 +2576,7 @@ void tombstone_init (void) { _tmp9__length1 = rows_length1; #line 216 "/home/jens/Source/shotwell/src/Tombstone.vala" if (_tmp9_ != NULL) { -#line 2410 "Tombstone.c" +#line 2579 "Tombstone.c" GeeArrayList* tombstones = NULL; GeeArrayList* _tmp10_; TombstoneRow** _tmp11_; @@ -2424,7 +2593,7 @@ void tombstone_init (void) { _tmp11_ = rows; #line 218 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp11__length1 = rows_length1; -#line 2427 "Tombstone.c" +#line 2596 "Tombstone.c" { TombstoneRow** row_collection = NULL; gint row_collection_length1 = 0; @@ -2436,14 +2605,14 @@ void tombstone_init (void) { row_collection_length1 = _tmp11__length1; #line 218 "/home/jens/Source/shotwell/src/Tombstone.vala" for (row_it = 0; row_it < _tmp11__length1; row_it = row_it + 1) { -#line 2439 "Tombstone.c" +#line 2608 "Tombstone.c" TombstoneRow* _tmp12_; TombstoneRow* row = NULL; #line 218 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp12_ = _tombstone_row_ref0 (row_collection[row_it]); #line 218 "/home/jens/Source/shotwell/src/Tombstone.vala" row = _tmp12_; -#line 2446 "Tombstone.c" +#line 2615 "Tombstone.c" { GeeArrayList* _tmp13_; TombstoneRow* _tmp14_; @@ -2463,7 +2632,7 @@ void tombstone_init (void) { _g_object_unref0 (_tmp16_); #line 218 "/home/jens/Source/shotwell/src/Tombstone.vala" _tombstone_row_unref0 (row); -#line 2466 "Tombstone.c" +#line 2635 "Tombstone.c" } } } @@ -2479,30 +2648,37 @@ void tombstone_init (void) { _g_object_unref0 (_tmp20_); #line 216 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (tombstones); -#line 2482 "Tombstone.c" +#line 2651 "Tombstone.c" } #line 206 "/home/jens/Source/shotwell/src/Tombstone.vala" rows = (_vala_array_free (rows, rows_length1, (GDestroyNotify) tombstone_row_unref), NULL); -#line 2486 "Tombstone.c" +#line 2655 "Tombstone.c" } -void tombstone_terminate (void) { +void +tombstone_terminate (void) +{ } -static gpointer _backing_file_state_ref0 (gpointer self) { +static gpointer +_backing_file_state_ref0 (gpointer self) +{ #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala" return self ? backing_file_state_ref (self) : NULL; -#line 2497 "Tombstone.c" +#line 2670 "Tombstone.c" } -void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reason, GError** error) { +void +tombstone_entomb_many_sources (GeeCollection* sources, + TombstoneReason reason, + GError** error) +{ GeeCollection* files = NULL; GeeArrayList* _tmp0_; - GeeCollection* _tmp21_; - TombstoneReason _tmp22_; + GeeCollection* _tmp19_; GError * _inner_error_ = NULL; #line 228 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); @@ -2510,128 +2686,120 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas _tmp0_ = gee_array_list_new (TYPE_TOMBSTONED_FILE, (GBoxedCopyFunc) tombstoned_file_ref, (GDestroyNotify) tombstoned_file_unref, NULL, NULL, NULL); #line 230 "/home/jens/Source/shotwell/src/Tombstone.vala" files = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); -#line 2513 "Tombstone.c" +#line 2689 "Tombstone.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; -#line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp1_ = sources; + GeeIterator* _tmp1_; #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" - _source_it = _tmp2_; + _source_it = _tmp1_; #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" while (TRUE) { -#line 2526 "Tombstone.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 2699 "Tombstone.c" + GeeIterator* _tmp2_; MediaSource* source = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - MediaSource* _tmp7_; - gint _tmp8_; - BackingFileState** _tmp9_; -#line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp3_ = _source_it; + GeeIterator* _tmp3_; + gpointer _tmp4_; + MediaSource* _tmp5_; + gint _tmp6_; + BackingFileState** _tmp7_; #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _source_it; #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" break; -#line 2543 "Tombstone.c" +#line 2713 "Tombstone.c" } #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp5_ = _source_it; + _tmp3_ = _source_it; #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" - source = (MediaSource*) _tmp6_; + source = (MediaSource*) _tmp4_; #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp7_ = source; + _tmp5_ = source; #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp9_ = media_source_get_backing_files_state (_tmp7_, &_tmp8_); -#line 2555 "Tombstone.c" + _tmp7_ = media_source_get_backing_files_state (_tmp5_, &_tmp6_); +#line 2725 "Tombstone.c" { BackingFileState** state_collection = NULL; gint state_collection_length1 = 0; gint _state_collection_size_ = 0; gint state_it = 0; #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala" - state_collection = _tmp9_; + state_collection = _tmp7_; #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala" - state_collection_length1 = _tmp8_; + state_collection_length1 = _tmp6_; #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala" - for (state_it = 0; state_it < _tmp8_; state_it = state_it + 1) { -#line 2567 "Tombstone.c" - BackingFileState* _tmp10_; + for (state_it = 0; state_it < _tmp6_; state_it = state_it + 1) { +#line 2737 "Tombstone.c" + BackingFileState* _tmp8_; BackingFileState* state = NULL; #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp10_ = _backing_file_state_ref0 (state_collection[state_it]); + _tmp8_ = _backing_file_state_ref0 (state_collection[state_it]); #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala" - state = _tmp10_; -#line 2574 "Tombstone.c" + state = _tmp8_; +#line 2744 "Tombstone.c" { - GeeCollection* _tmp11_; - BackingFileState* _tmp12_; - GFile* _tmp13_; - GFile* _tmp14_; + GeeCollection* _tmp9_; + BackingFileState* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; + BackingFileState* _tmp13_; + gint64 _tmp14_; BackingFileState* _tmp15_; - gint64 _tmp16_; - BackingFileState* _tmp17_; - const gchar* _tmp18_; - TombstonedFile* _tmp19_; - TombstonedFile* _tmp20_; + const gchar* _tmp16_; + TombstonedFile* _tmp17_; + TombstonedFile* _tmp18_; #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp11_ = files; + _tmp9_ = files; #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp12_ = state; + _tmp10_ = state; #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp13_ = backing_file_state_get_file (_tmp12_); + _tmp11_ = backing_file_state_get_file (_tmp10_); #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp15_ = state; + _tmp13_ = state; #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp16_ = _tmp15_->filesize; + _tmp14_ = _tmp13_->filesize; #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp17_ = state; + _tmp15_ = state; #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp18_ = _tmp17_->md5; + _tmp16_ = _tmp15_->md5; #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp19_ = tombstoned_file_new (_tmp14_, _tmp16_, _tmp18_); + _tmp17_ = tombstoned_file_new (_tmp12_, _tmp14_, _tmp16_); #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp20_ = _tmp19_; + _tmp18_ = _tmp17_; #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - gee_collection_add (_tmp11_, _tmp20_); + gee_collection_add (_tmp9_, _tmp18_); #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tombstoned_file_unref0 (_tmp20_); + _tombstoned_file_unref0 (_tmp18_); #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp12_); #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala" _backing_file_state_unref0 (state); -#line 2614 "Tombstone.c" +#line 2784 "Tombstone.c" } } #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala" state_collection = (_vala_array_free (state_collection, state_collection_length1, (GDestroyNotify) backing_file_state_unref), NULL); -#line 2619 "Tombstone.c" +#line 2789 "Tombstone.c" } #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (source); -#line 2623 "Tombstone.c" +#line 2793 "Tombstone.c" } #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_source_it); -#line 2627 "Tombstone.c" +#line 2797 "Tombstone.c" } #line 236 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp21_ = files; + _tmp19_ = files; #line 236 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp22_ = reason; -#line 236 "/home/jens/Source/shotwell/src/Tombstone.vala" - tombstone_entomb_many_files (_tmp21_, _tmp22_, &_inner_error_); + tombstone_entomb_many_files (_tmp19_, reason, &_inner_error_); #line 236 "/home/jens/Source/shotwell/src/Tombstone.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 236 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -2642,7 +2810,7 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas _g_object_unref0 (files); #line 236 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 2645 "Tombstone.c" +#line 2813 "Tombstone.c" } else { #line 236 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (files); @@ -2652,27 +2820,31 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas g_clear_error (&_inner_error_); #line 236 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 2655 "Tombstone.c" +#line 2823 "Tombstone.c" } } #line 228 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (files); -#line 2660 "Tombstone.c" +#line 2828 "Tombstone.c" } -void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason, GError** error) { +void +tombstone_entomb_many_files (GeeCollection* files, + TombstoneReason reason, + GError** error) +{ Marker* to_destroy = NULL; TombstoneSourceCollection* _tmp0_; Marker* _tmp1_; - TombstoneSourceCollection* _tmp15_; - Marker* _tmp16_; + TombstoneSourceCollection* _tmp13_; + Marker* _tmp14_; GeeArrayList* tombstones = NULL; - GeeArrayList* _tmp17_; - TombstoneSourceCollection* _tmp41_; - GeeArrayList* _tmp42_; - GeeCollection* _tmp43_; - GeeCollection* _tmp44_; + GeeArrayList* _tmp15_; + TombstoneSourceCollection* _tmp36_; + GeeArrayList* _tmp37_; + GeeCollection* _tmp38_; + GeeCollection* _tmp39_; GError * _inner_error_ = NULL; #line 239 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (GEE_IS_COLLECTION (files)); @@ -2682,176 +2854,161 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason, _tmp1_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); #line 242 "/home/jens/Source/shotwell/src/Tombstone.vala" to_destroy = _tmp1_; -#line 2685 "Tombstone.c" +#line 2857 "Tombstone.c" { GeeIterator* _file_it = NULL; - GeeCollection* _tmp2_; - GeeIterator* _tmp3_; + GeeIterator* _tmp2_; #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp2_ = files; + _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (files, GEE_TYPE_ITERABLE, GeeIterable)); #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" - _file_it = _tmp3_; + _file_it = _tmp2_; #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" while (TRUE) { -#line 2698 "Tombstone.c" - GeeIterator* _tmp4_; - gboolean _tmp5_; +#line 2867 "Tombstone.c" + GeeIterator* _tmp3_; TombstonedFile* file = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; + GeeIterator* _tmp4_; + gpointer _tmp5_; Tombstone* tombstone = NULL; - TombstoneSourceCollection* _tmp8_; - TombstonedFile* _tmp9_; - GFile* _tmp10_; - Tombstone* _tmp11_; - Tombstone* _tmp12_; + TombstoneSourceCollection* _tmp6_; + TombstonedFile* _tmp7_; + GFile* _tmp8_; + Tombstone* _tmp9_; + Tombstone* _tmp10_; #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp4_ = _file_it; + _tmp3_ = _file_it; #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp3_)) { #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" break; -#line 2718 "Tombstone.c" +#line 2884 "Tombstone.c" } #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp6_ = _file_it; + _tmp4_ = _file_it; #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" - file = (TombstonedFile*) _tmp7_; + file = (TombstonedFile*) _tmp5_; #line 244 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp8_ = tombstone_global; + _tmp6_ = tombstone_global; #line 244 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp9_ = file; + _tmp7_ = file; #line 244 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp10_ = _tmp9_->file; + _tmp8_ = _tmp7_->file; #line 244 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp11_ = tombstone_source_collection_locate (_tmp8_, _tmp10_); + _tmp9_ = tombstone_source_collection_locate (_tmp6_, _tmp8_); #line 244 "/home/jens/Source/shotwell/src/Tombstone.vala" - tombstone = _tmp11_; + tombstone = _tmp9_; #line 245 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp12_ = tombstone; + _tmp10_ = tombstone; #line 245 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_tmp12_ != NULL) { -#line 2740 "Tombstone.c" - Marker* _tmp13_; - Tombstone* _tmp14_; + if (_tmp10_ != NULL) { +#line 2906 "Tombstone.c" + Marker* _tmp11_; + Tombstone* _tmp12_; #line 246 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp13_ = to_destroy; + _tmp11_ = to_destroy; #line 246 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp14_ = tombstone; + _tmp12_ = tombstone; #line 246 "/home/jens/Source/shotwell/src/Tombstone.vala" - marker_mark (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)); -#line 2749 "Tombstone.c" + marker_mark (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject)); +#line 2915 "Tombstone.c" } #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (tombstone); #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" _tombstoned_file_unref0 (file); -#line 2755 "Tombstone.c" +#line 2921 "Tombstone.c" } #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_file_it); -#line 2759 "Tombstone.c" +#line 2925 "Tombstone.c" } #line 249 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp15_ = tombstone_global; + _tmp13_ = tombstone_global; #line 249 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp16_ = to_destroy; + _tmp14_ = to_destroy; #line 249 "/home/jens/Source/shotwell/src/Tombstone.vala" - source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp16_, FALSE, NULL, NULL, NULL); + source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp14_, FALSE, NULL, NULL, NULL); #line 251 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp17_ = gee_array_list_new (TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp15_ = gee_array_list_new (TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 251 "/home/jens/Source/shotwell/src/Tombstone.vala" - tombstones = _tmp17_; -#line 2771 "Tombstone.c" + tombstones = _tmp15_; +#line 2937 "Tombstone.c" { GeeIterator* _file_it = NULL; - GeeCollection* _tmp18_; - GeeIterator* _tmp19_; -#line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp18_ = files; + GeeIterator* _tmp16_; #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp19_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp16_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (files, GEE_TYPE_ITERABLE, GeeIterable)); #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" - _file_it = _tmp19_; + _file_it = _tmp16_; #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" while (TRUE) { -#line 2784 "Tombstone.c" - GeeIterator* _tmp20_; - gboolean _tmp21_; +#line 2947 "Tombstone.c" + GeeIterator* _tmp17_; TombstonedFile* file = NULL; - GeeIterator* _tmp22_; - gpointer _tmp23_; - TombstoneRow* _tmp24_ = NULL; - TombstoneTable* _tmp25_; - TombstoneTable* _tmp26_; + GeeIterator* _tmp18_; + gpointer _tmp19_; + TombstoneRow* _tmp20_ = NULL; + TombstoneTable* _tmp21_; + TombstoneTable* _tmp22_; + TombstonedFile* _tmp23_; + GFile* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; TombstonedFile* _tmp27_; - GFile* _tmp28_; - gchar* _tmp29_; - gchar* _tmp30_; - TombstonedFile* _tmp31_; - gint64 _tmp32_; - TombstonedFile* _tmp33_; - const gchar* _tmp34_; - TombstoneReason _tmp35_; - TombstoneRow* _tmp36_; - TombstoneRow* _tmp37_; - GeeArrayList* _tmp38_; - Tombstone* _tmp39_; - Tombstone* _tmp40_; + gint64 _tmp28_; + TombstonedFile* _tmp29_; + const gchar* _tmp30_; + TombstoneRow* _tmp31_; + TombstoneRow* _tmp32_; + GeeArrayList* _tmp33_; + Tombstone* _tmp34_; + Tombstone* _tmp35_; #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp20_ = _file_it; + _tmp17_ = _file_it; #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp21_ = gee_iterator_next (_tmp20_); -#line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (!_tmp21_) { + if (!gee_iterator_next (_tmp17_)) { #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" break; -#line 2815 "Tombstone.c" +#line 2974 "Tombstone.c" } #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp22_ = _file_it; + _tmp18_ = _file_it; #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp23_ = gee_iterator_get (_tmp22_); + _tmp19_ = gee_iterator_get (_tmp18_); #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" - file = (TombstonedFile*) _tmp23_; -#line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp25_ = tombstone_table_get_instance (); + file = (TombstonedFile*) _tmp19_; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp26_ = _tmp25_; + _tmp21_ = tombstone_table_get_instance (); #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp27_ = file; + _tmp22_ = _tmp21_; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp28_ = _tmp27_->file; + _tmp23_ = file; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp29_ = g_file_get_path (_tmp28_); + _tmp24_ = _tmp23_->file; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp30_ = _tmp29_; + _tmp25_ = g_file_get_path (_tmp24_); #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp31_ = file; + _tmp26_ = _tmp25_; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp32_ = _tmp31_->filesize; + _tmp27_ = file; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp33_ = file; + _tmp28_ = _tmp27_->filesize; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp34_ = _tmp33_->md5; + _tmp29_ = file; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp35_ = reason; + _tmp30_ = _tmp29_->md5; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp36_ = tombstone_table_add (_tmp26_, _tmp30_, _tmp32_, _tmp34_, _tmp35_, &_inner_error_); + _tmp31_ = tombstone_table_add (_tmp22_, _tmp26_, _tmp28_, _tmp30_, reason, &_inner_error_); #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp37_ = _tmp36_; + _tmp32_ = _tmp31_; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_free0 (_tmp30_); + _g_free0 (_tmp26_); #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _database_table_unref0 (_tmp26_); + _database_table_unref0 (_tmp22_); #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp24_ = _tmp37_; + _tmp20_ = _tmp32_; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -2868,7 +3025,7 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason, _g_object_unref0 (to_destroy); #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 2871 "Tombstone.c" +#line 3028 "Tombstone.c" } else { #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" _tombstoned_file_unref0 (file); @@ -2884,48 +3041,50 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason, g_clear_error (&_inner_error_); #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 2887 "Tombstone.c" +#line 3044 "Tombstone.c" } } #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp38_ = tombstones; + _tmp33_ = tombstones; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp39_ = tombstone_new (_tmp24_); + _tmp34_ = tombstone_new (_tmp20_); #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp40_ = _tmp39_; + _tmp35_ = _tmp34_; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp40_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp35_); #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_tmp40_); + _g_object_unref0 (_tmp35_); #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tombstone_row_unref0 (_tmp24_); + _tombstone_row_unref0 (_tmp20_); #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" _tombstoned_file_unref0 (file); -#line 2904 "Tombstone.c" +#line 3061 "Tombstone.c" } #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_file_it); -#line 2908 "Tombstone.c" +#line 3065 "Tombstone.c" } #line 257 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp41_ = tombstone_global; + _tmp36_ = tombstone_global; #line 257 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp42_ = tombstones; + _tmp37_ = tombstones; #line 257 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp43_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); + _tmp38_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); #line 257 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp44_ = _tmp43_; + _tmp39_ = _tmp38_; #line 257 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_tmp44_); + _g_object_unref0 (_tmp39_); #line 239 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (tombstones); #line 239 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (to_destroy); -#line 2924 "Tombstone.c" +#line 3081 "Tombstone.c" } -static gchar* tombstone_real_get_typename (DataSource* base) { +static gchar* +tombstone_real_get_typename (DataSource* base) +{ Tombstone * self; gchar* result = NULL; gchar* _tmp0_; @@ -2937,11 +3096,13 @@ static gchar* tombstone_real_get_typename (DataSource* base) { result = _tmp0_; #line 261 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 2940 "Tombstone.c" +#line 3099 "Tombstone.c" } -static gint64 tombstone_real_get_instance_id (DataSource* base) { +static gint64 +tombstone_real_get_instance_id (DataSource* base) +{ Tombstone * self; gint64 result = 0LL; TombstoneID _tmp0_ = {0}; @@ -2956,11 +3117,13 @@ static gint64 tombstone_real_get_instance_id (DataSource* base) { result = _tmp1_; #line 265 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 2959 "Tombstone.c" +#line 3120 "Tombstone.c" } -static gchar* tombstone_real_get_name (DataObject* base) { +static gchar* +tombstone_real_get_name (DataObject* base) +{ Tombstone * self; gchar* result = NULL; TombstoneRow* _tmp0_; @@ -2978,11 +3141,13 @@ static gchar* tombstone_real_get_name (DataObject* base) { result = _tmp2_; #line 269 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 2981 "Tombstone.c" +#line 3144 "Tombstone.c" } -static gchar* tombstone_real_to_string (DataObject* base) { +static gchar* +tombstone_real_to_string (DataObject* base) +{ Tombstone * self; gchar* result = NULL; gchar* _tmp0_; @@ -3005,11 +3170,14 @@ static gchar* tombstone_real_to_string (DataObject* base) { result = _tmp3_; #line 273 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 3008 "Tombstone.c" +#line 3173 "Tombstone.c" } -void tombstone_get_tombstone_id (Tombstone* self, TombstoneID* result) { +void +tombstone_get_tombstone_id (Tombstone* self, + TombstoneID* result) +{ TombstoneRow* _tmp0_; TombstoneID _tmp1_; #line 276 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -3022,11 +3190,13 @@ void tombstone_get_tombstone_id (Tombstone* self, TombstoneID* result) { *result = _tmp1_; #line 277 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 3025 "Tombstone.c" +#line 3193 "Tombstone.c" } -GFile* tombstone_get_file (Tombstone* self) { +GFile* +tombstone_get_file (Tombstone* self) +{ GFile* result = NULL; GFile* _tmp0_; GFile* _tmp4_; @@ -3037,7 +3207,7 @@ GFile* tombstone_get_file (Tombstone* self) { _tmp0_ = self->priv->file; #line 281 "/home/jens/Source/shotwell/src/Tombstone.vala" if (_tmp0_ == NULL) { -#line 3040 "Tombstone.c" +#line 3210 "Tombstone.c" TombstoneRow* _tmp1_; const gchar* _tmp2_; GFile* _tmp3_; @@ -3051,7 +3221,7 @@ GFile* tombstone_get_file (Tombstone* self) { _g_object_unref0 (self->priv->file); #line 282 "/home/jens/Source/shotwell/src/Tombstone.vala" self->priv->file = _tmp3_; -#line 3054 "Tombstone.c" +#line 3224 "Tombstone.c" } #line 284 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp4_ = self->priv->file; @@ -3061,17 +3231,18 @@ GFile* tombstone_get_file (Tombstone* self) { result = _tmp5_; #line 284 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 3064 "Tombstone.c" +#line 3234 "Tombstone.c" } -gchar* tombstone_get_md5 (Tombstone* self) { +gchar* +tombstone_get_md5 (Tombstone* self) +{ gchar* result = NULL; const gchar* _tmp0_ = NULL; TombstoneRow* _tmp1_; const gchar* _tmp2_; - gboolean _tmp3_; - gchar* _tmp6_; + gchar* _tmp5_; #line 287 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_val_if_fail (IS_TOMBSTONE (self), NULL); #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -3079,34 +3250,34 @@ gchar* tombstone_get_md5 (Tombstone* self) { #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp2_ = _tmp1_->md5; #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp3_ = is_string_empty (_tmp2_); -#line 288 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_tmp3_) { + if (is_string_empty (_tmp2_)) { #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp0_ = NULL; -#line 3087 "Tombstone.c" +#line 3256 "Tombstone.c" } else { - TombstoneRow* _tmp4_; - const gchar* _tmp5_; + TombstoneRow* _tmp3_; + const gchar* _tmp4_; #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp4_ = self->priv->row; + _tmp3_ = self->priv->row; #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp5_ = _tmp4_->md5; + _tmp4_ = _tmp3_->md5; #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = _tmp5_; -#line 3097 "Tombstone.c" + _tmp0_ = _tmp4_; +#line 3266 "Tombstone.c" } #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp6_ = g_strdup (_tmp0_); + _tmp5_ = g_strdup (_tmp0_); #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala" - result = _tmp6_; + result = _tmp5_; #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 3105 "Tombstone.c" +#line 3274 "Tombstone.c" } -TombstoneReason tombstone_get_reason (Tombstone* self) { +TombstoneReason +tombstone_get_reason (Tombstone* self) +{ TombstoneReason result = 0; TombstoneRow* _tmp0_; TombstoneReason _tmp1_; @@ -3120,36 +3291,36 @@ TombstoneReason tombstone_get_reason (Tombstone* self) { result = _tmp1_; #line 292 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 3123 "Tombstone.c" +#line 3294 "Tombstone.c" } -void tombstone_move (Tombstone* self, GFile* file) { +void +tombstone_move (Tombstone* self, + GFile* file) +{ gchar* old_filepath = NULL; - TombstoneRow* _tmp8_; - const gchar* _tmp9_; - gchar* _tmp10_; - TombstoneRow* _tmp11_; + TombstoneRow* _tmp7_; + const gchar* _tmp8_; + gchar* _tmp9_; + TombstoneRow* _tmp10_; + gchar* _tmp11_; GFile* _tmp12_; - gchar* _tmp13_; - GFile* _tmp14_; - GFile* _tmp15_; - Alteration* _tmp16_; - Alteration* _tmp17_; + Alteration* _tmp13_; + Alteration* _tmp14_; GError * _inner_error_ = NULL; #line 295 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (IS_TOMBSTONE (self)); #line 295 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (G_IS_FILE (file)); -#line 3144 "Tombstone.c" +#line 3316 "Tombstone.c" { TombstoneTable* _tmp0_; TombstoneTable* _tmp1_; TombstoneRow* _tmp2_; TombstoneID _tmp3_; - GFile* _tmp4_; + gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp0_ = tombstone_table_get_instance (); #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -3159,23 +3330,21 @@ void tombstone_move (Tombstone* self, GFile* file) { #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp3_ = _tmp2_->id; #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp4_ = file; -#line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp5_ = g_file_get_path (_tmp4_); + _tmp4_ = g_file_get_path (file); #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" - tombstone_table_update_file (_tmp1_, &_tmp3_, _tmp6_, &_inner_error_); + tombstone_table_update_file (_tmp1_, &_tmp3_, _tmp5_, &_inner_error_); #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" _database_table_unref0 (_tmp1_); #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 3177 "Tombstone.c" - goto __catch552_database_error; +#line 3346 "Tombstone.c" + goto __catch561_database_error; } #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3183,27 +3352,27 @@ void tombstone_move (Tombstone* self, GFile* file) { g_clear_error (&_inner_error_); #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 3186 "Tombstone.c" +#line 3355 "Tombstone.c" } } - goto __finally552; - __catch552_database_error: + goto __finally561; + __catch561_database_error: { GError* err = NULL; - GError* _tmp7_; + GError* _tmp6_; #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala" err = _inner_error_; #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala" _inner_error_ = NULL; #line 299 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp7_ = err; + _tmp6_ = err; #line 299 "/home/jens/Source/shotwell/src/Tombstone.vala" - app_window_database_error (_tmp7_); + app_window_database_error (_tmp6_); #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_error_free0 (err); -#line 3204 "Tombstone.c" +#line 3373 "Tombstone.c" } - __finally552: + __finally561: #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -3212,71 +3381,66 @@ void tombstone_move (Tombstone* self, GFile* file) { g_clear_error (&_inner_error_); #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 3215 "Tombstone.c" +#line 3384 "Tombstone.c" } #line 302 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp8_ = self->priv->row; + _tmp7_ = self->priv->row; #line 302 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp9_ = _tmp8_->filepath; + _tmp8_ = _tmp7_->filepath; #line 302 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp10_ = g_strdup (_tmp9_); + _tmp9_ = g_strdup (_tmp8_); #line 302 "/home/jens/Source/shotwell/src/Tombstone.vala" - old_filepath = _tmp10_; -#line 303 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp11_ = self->priv->row; + old_filepath = _tmp9_; #line 303 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp12_ = file; + _tmp10_ = self->priv->row; #line 303 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp13_ = g_file_get_path (_tmp12_); + _tmp11_ = g_file_get_path (file); #line 303 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_free0 (_tmp11_->filepath); + _g_free0 (_tmp10_->filepath); #line 303 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp11_->filepath = _tmp13_; + _tmp10_->filepath = _tmp11_; #line 304 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp14_ = file; -#line 304 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp15_ = _g_object_ref0 (_tmp14_); + _tmp12_ = _g_object_ref0 (file); #line 304 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (self->priv->file); #line 304 "/home/jens/Source/shotwell/src/Tombstone.vala" - self->priv->file = _tmp15_; + self->priv->file = _tmp12_; #line 306 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp16_ = alteration_new ("file", old_filepath); + _tmp13_ = alteration_new ("file", old_filepath); #line 306 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp17_ = _tmp16_; + _tmp14_ = _tmp13_; #line 306 "/home/jens/Source/shotwell/src/Tombstone.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp17_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp14_); #line 306 "/home/jens/Source/shotwell/src/Tombstone.vala" - _alteration_unref0 (_tmp17_); + _alteration_unref0 (_tmp14_); #line 295 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_free0 (old_filepath); -#line 3253 "Tombstone.c" +#line 3418 "Tombstone.c" } -gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const gchar* md5) { +gboolean +tombstone_matches (Tombstone* self, + GFile* file, + gint64 filesize, + const gchar* md5) +{ gboolean result = FALSE; TombstoneRow* _tmp0_; gint64 _tmp1_; - gint64 _tmp2_; - const gchar* _tmp3_ = NULL; - TombstoneRow* _tmp4_; - const gchar* _tmp5_; - gboolean _tmp6_; + const gchar* _tmp2_ = NULL; + TombstoneRow* _tmp3_; + const gchar* _tmp4_; gchar* this_md5 = NULL; + gchar* _tmp7_; + const gchar* _tmp8_ = NULL; + gchar* other_md5 = NULL; gchar* _tmp9_; - const gchar* _tmp10_ = NULL; + const gchar* _tmp10_; const gchar* _tmp11_; - gboolean _tmp12_; - gchar* other_md5 = NULL; - gchar* _tmp14_; - const gchar* _tmp15_; - const gchar* _tmp16_; - GFile* _tmp17_; - GFile* _tmp18_; - GFile* _tmp19_; - gboolean _tmp20_; - gboolean _tmp21_; + GFile* _tmp12_; + GFile* _tmp13_; + gboolean _tmp14_; #line 309 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_val_if_fail (IS_TOMBSTONE (self), FALSE); #line 309 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -3286,68 +3450,57 @@ gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const #line 310 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp1_ = _tmp0_->filesize; #line 310 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp2_ = filesize; -#line 310 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_tmp1_ != _tmp2_) { + if (_tmp1_ != filesize) { #line 311 "/home/jens/Source/shotwell/src/Tombstone.vala" result = FALSE; #line 311 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 3296 "Tombstone.c" +#line 3458 "Tombstone.c" } #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp4_ = self->priv->row; + _tmp3_ = self->priv->row; #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp5_ = _tmp4_->md5; + _tmp4_ = _tmp3_->md5; #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp6_ = is_string_empty (_tmp5_); + if (is_string_empty (_tmp4_)) { #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_tmp6_) { -#line 314 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp3_ = NULL; -#line 3308 "Tombstone.c" + _tmp2_ = NULL; +#line 3468 "Tombstone.c" } else { - TombstoneRow* _tmp7_; - const gchar* _tmp8_; + TombstoneRow* _tmp5_; + const gchar* _tmp6_; #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp7_ = self->priv->row; + _tmp5_ = self->priv->row; #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp8_ = _tmp7_->md5; + _tmp6_ = _tmp5_->md5; #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp3_ = _tmp8_; -#line 3318 "Tombstone.c" + _tmp2_ = _tmp6_; +#line 3478 "Tombstone.c" } #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp9_ = g_strdup (_tmp3_); + _tmp7_ = g_strdup (_tmp2_); #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala" - this_md5 = _tmp9_; -#line 315 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp11_ = md5; + this_md5 = _tmp7_; #line 315 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp12_ = is_string_empty (_tmp11_); + if (is_string_empty (md5)) { #line 315 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_tmp12_) { -#line 315 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp10_ = NULL; -#line 3332 "Tombstone.c" + _tmp8_ = NULL; +#line 3488 "Tombstone.c" } else { - const gchar* _tmp13_; -#line 315 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp13_ = md5; #line 315 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp10_ = _tmp13_; -#line 3339 "Tombstone.c" + _tmp8_ = md5; +#line 3492 "Tombstone.c" } #line 315 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp14_ = g_strdup (_tmp10_); + _tmp9_ = g_strdup (_tmp8_); #line 315 "/home/jens/Source/shotwell/src/Tombstone.vala" - other_md5 = _tmp14_; + other_md5 = _tmp9_; #line 317 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp15_ = this_md5; + _tmp10_ = this_md5; #line 317 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp16_ = other_md5; + _tmp11_ = other_md5; #line 317 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (g_strcmp0 (_tmp15_, _tmp16_) != 0) { + if (g_strcmp0 (_tmp10_, _tmp11_) != 0) { #line 318 "/home/jens/Source/shotwell/src/Tombstone.vala" result = FALSE; #line 318 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -3356,22 +3509,18 @@ gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const _g_free0 (this_md5); #line 318 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 3359 "Tombstone.c" +#line 3512 "Tombstone.c" } #line 320 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp17_ = tombstone_get_file (self); -#line 320 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp18_ = _tmp17_; -#line 320 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp19_ = file; + _tmp12_ = tombstone_get_file (self); #line 320 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp20_ = g_file_equal (_tmp18_, _tmp19_); + _tmp13_ = _tmp12_; #line 320 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp21_ = !_tmp20_; + _tmp14_ = !g_file_equal (_tmp13_, file); #line 320 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp13_); #line 320 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_tmp21_) { + if (_tmp14_) { #line 321 "/home/jens/Source/shotwell/src/Tombstone.vala" result = FALSE; #line 321 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -3380,7 +3529,7 @@ gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const _g_free0 (this_md5); #line 321 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 3383 "Tombstone.c" +#line 3532 "Tombstone.c" } #line 323 "/home/jens/Source/shotwell/src/Tombstone.vala" result = TRUE; @@ -3390,16 +3539,18 @@ gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const _g_free0 (this_md5); #line 323 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 3393 "Tombstone.c" +#line 3542 "Tombstone.c" } -static void tombstone_real_destroy (DataSource* base) { +static void +tombstone_real_destroy (DataSource* base) +{ Tombstone * self; GError * _inner_error_ = NULL; #line 326 "/home/jens/Source/shotwell/src/Tombstone.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE, Tombstone); -#line 3402 "Tombstone.c" +#line 3553 "Tombstone.c" { TombstoneTable* _tmp0_; TombstoneTable* _tmp1_; @@ -3421,8 +3572,8 @@ static void tombstone_real_destroy (DataSource* base) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 328 "/home/jens/Source/shotwell/src/Tombstone.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 3424 "Tombstone.c" - goto __catch553_database_error; +#line 3575 "Tombstone.c" + goto __catch562_database_error; } #line 328 "/home/jens/Source/shotwell/src/Tombstone.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3430,11 +3581,11 @@ static void tombstone_real_destroy (DataSource* base) { g_clear_error (&_inner_error_); #line 328 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 3433 "Tombstone.c" +#line 3584 "Tombstone.c" } } - goto __finally553; - __catch553_database_error: + goto __finally562; + __catch562_database_error: { GError* err = NULL; GError* _tmp4_; @@ -3448,9 +3599,9 @@ static void tombstone_real_destroy (DataSource* base) { app_window_database_error (_tmp4_); #line 327 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_error_free0 (err); -#line 3451 "Tombstone.c" +#line 3602 "Tombstone.c" } - __finally553: + __finally562: #line 327 "/home/jens/Source/shotwell/src/Tombstone.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 327 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -3459,15 +3610,17 @@ static void tombstone_real_destroy (DataSource* base) { g_clear_error (&_inner_error_); #line 327 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 3462 "Tombstone.c" +#line 3613 "Tombstone.c" } #line 333 "/home/jens/Source/shotwell/src/Tombstone.vala" DATA_SOURCE_CLASS (tombstone_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource)); -#line 3466 "Tombstone.c" +#line 3617 "Tombstone.c" } -static void tombstone_class_init (TombstoneClass * klass) { +static void +tombstone_class_init (TombstoneClass * klass) +{ #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala" tombstone_parent_class = g_type_class_peek_parent (klass); #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -3484,20 +3637,24 @@ static void tombstone_class_init (TombstoneClass * klass) { ((DataSourceClass *) klass)->destroy = (void (*) (DataSource *)) tombstone_real_destroy; #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala" G_OBJECT_CLASS (klass)->finalize = tombstone_finalize; -#line 3487 "Tombstone.c" +#line 3640 "Tombstone.c" } -static void tombstone_instance_init (Tombstone * self) { +static void +tombstone_instance_init (Tombstone * self) +{ #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala" self->priv = TOMBSTONE_GET_PRIVATE (self); #line 200 "/home/jens/Source/shotwell/src/Tombstone.vala" self->priv->file = NULL; -#line 3496 "Tombstone.c" +#line 3651 "Tombstone.c" } -static void tombstone_finalize (GObject * obj) { +static void +tombstone_finalize (GObject * obj) +{ Tombstone * self; #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TOMBSTONE, Tombstone); @@ -3507,11 +3664,13 @@ static void tombstone_finalize (GObject * obj) { _g_object_unref0 (self->priv->file); #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala" G_OBJECT_CLASS (tombstone_parent_class)->finalize (obj); -#line 3510 "Tombstone.c" +#line 3667 "Tombstone.c" } -GType tombstone_get_type (void) { +GType +tombstone_get_type (void) +{ static volatile gsize tombstone_type_id__volatile = 0; if (g_once_init_enter (&tombstone_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TombstoneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tombstone_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Tombstone), 0, (GInstanceInitFunc) tombstone_instance_init, NULL }; @@ -3523,7 +3682,11 @@ GType tombstone_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) { @@ -3535,7 +3698,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); } |