From 49120f48474fc8fdc2448c75d961bc238213cfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 14:34:32 +0200 Subject: New upstream version 0.28.2 --- src/MediaMonitor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/MediaMonitor.c') diff --git a/src/MediaMonitor.c b/src/MediaMonitor.c index b06e19e..91da70c 100644 --- a/src/MediaMonitor.c +++ b/src/MediaMonitor.c @@ -2860,7 +2860,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) { #line 394 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2863 "MediaMonitor.c" - goto __catch585_g_error; + goto __catch594_g_error; } #line 395 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp39_ = controller; @@ -2868,8 +2868,8 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) { transaction_controller_commit (_tmp39_); #line 2870 "MediaMonitor.c" } - goto __finally585; - __catch585_g_error: + goto __finally594; + __catch594_g_error: { GError* err = NULL; GError* _tmp40_; @@ -2911,7 +2911,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) { _g_error_free0 (err); #line 2913 "MediaMonitor.c" } - __finally585: + __finally594: #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2918 "MediaMonitor.c" -- cgit v1.2.3 From ab841afa5cb39058d9ab2cebb67cfe6369443f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Jun 2018 20:55:59 +0200 Subject: New upstream version 0.28.3 --- src/MediaMonitor.c | 2393 +++++++++++++++++++++++++++++----------------------- 1 file changed, 1335 insertions(+), 1058 deletions(-) (limited to 'src/MediaMonitor.c') diff --git a/src/MediaMonitor.c b/src/MediaMonitor.c index 91da70c..551e8f0 100644 --- a/src/MediaMonitor.c +++ b/src/MediaMonitor.c @@ -1,4 +1,4 @@ -/* MediaMonitor.c generated by valac 0.36.6, the Vala compiler +/* MediaMonitor.c generated by valac 0.40.4, the Vala compiler * generated from MediaMonitor.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 #include #include @@ -142,6 +143,11 @@ typedef struct _MediaSourceCollectionClass MediaSourceCollectionClass; typedef struct _TransactionController TransactionController; typedef struct _TransactionControllerClass TransactionControllerClass; +enum { + MEDIA_MONITOR_0_PROPERTY, + MEDIA_MONITOR_NUM_PROPERTIES +}; +static GParamSpec* media_monitor_properties[MEDIA_MONITOR_NUM_PROPERTIES]; #define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL))) #define _g_free0(var) (var = (g_free (var), NULL)) #define _monitorable_updates_unref0(var) ((var == NULL) ? NULL : (var = (monitorable_updates_unref (var), NULL))) @@ -279,9 +285,15 @@ static gpointer media_monitor_parent_class = NULL; gpointer monitorable_updates_ref (gpointer instance); void monitorable_updates_unref (gpointer instance); -GParamSpec* param_spec_monitorable_updates (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_monitorable_updates (GValue* value, gpointer v_object); -void value_take_monitorable_updates (GValue* value, gpointer v_object); +GParamSpec* param_spec_monitorable_updates (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_monitorable_updates (GValue* value, + gpointer v_object); +void value_take_monitorable_updates (GValue* value, + gpointer v_object); gpointer value_get_monitorable_updates (const GValue* value); GType monitorable_updates_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; @@ -290,28 +302,36 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; GType monitorable_get_type (void) G_GNUC_CONST; #define MONITORABLE_UPDATES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MONITORABLE_UPDATES, MonitorableUpdatesPrivate)) -enum { - MONITORABLE_UPDATES_DUMMY_PROPERTY -}; MonitorableUpdates* monitorable_updates_new (Monitorable* monitorable); -MonitorableUpdates* monitorable_updates_construct (GType object_type, Monitorable* monitorable); +MonitorableUpdates* monitorable_updates_construct (GType object_type, + Monitorable* monitorable); GFile* monitorable_updates_get_master_file (MonitorableUpdates* self); GFileInfo* monitorable_updates_get_master_file_info (MonitorableUpdates* self); gboolean monitorable_updates_is_in_alteration (MonitorableUpdates* self); static gboolean monitorable_updates_real_is_in_alteration (MonitorableUpdates* self); gboolean monitorable_updates_is_set_offline (MonitorableUpdates* self); gboolean monitorable_updates_is_set_online (MonitorableUpdates* self); -void monitorable_updates_set_master_file (MonitorableUpdates* self, GFile* file); -static void monitorable_updates_real_set_master_file (MonitorableUpdates* self, GFile* file); +void monitorable_updates_set_master_file (MonitorableUpdates* self, + GFile* file); +static void monitorable_updates_real_set_master_file (MonitorableUpdates* self, + GFile* file); void monitorable_updates_mark_online (MonitorableUpdates* self); -void monitorable_updates_set_master_file_info_altered (MonitorableUpdates* self, gboolean altered); -static void monitorable_updates_real_set_master_file_info_altered (MonitorableUpdates* self, gboolean altered); -void monitorable_updates_set_master_file_info (MonitorableUpdates* self, GFileInfo* info); -static void monitorable_updates_real_set_master_file_info (MonitorableUpdates* self, GFileInfo* info); -void monitorable_updates_set_master_in_alteration (MonitorableUpdates* self, gboolean in_alteration); -static void monitorable_updates_real_set_master_in_alteration (MonitorableUpdates* self, gboolean in_alteration); -void monitorable_updates_set_master_alterations_complete (MonitorableUpdates* self, GFileInfo* info); -static void monitorable_updates_real_set_master_alterations_complete (MonitorableUpdates* self, GFileInfo* info); +void monitorable_updates_set_master_file_info_altered (MonitorableUpdates* self, + gboolean altered); +static void monitorable_updates_real_set_master_file_info_altered (MonitorableUpdates* self, + gboolean altered); +void monitorable_updates_set_master_file_info (MonitorableUpdates* self, + GFileInfo* info); +static void monitorable_updates_real_set_master_file_info (MonitorableUpdates* self, + GFileInfo* info); +void monitorable_updates_set_master_in_alteration (MonitorableUpdates* self, + gboolean in_alteration); +static void monitorable_updates_real_set_master_in_alteration (MonitorableUpdates* self, + gboolean in_alteration); +void monitorable_updates_set_master_alterations_complete (MonitorableUpdates* self, + GFileInfo* info); +static void monitorable_updates_real_set_master_alterations_complete (MonitorableUpdates* self, + GFileInfo* info); void monitorable_updates_mark_offline (MonitorableUpdates* self); static void monitorable_updates_real_mark_offline (MonitorableUpdates* self); static void monitorable_updates_real_mark_online (MonitorableUpdates* self); @@ -323,9 +343,15 @@ static void monitorable_updates_finalize (MonitorableUpdates * obj); GType media_monitor_get_type (void) G_GNUC_CONST; 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 source_collection_get_type (void) G_GNUC_CONST; @@ -334,21 +360,31 @@ GType media_source_collection_get_type (void) G_GNUC_CONST; GType media_monitor_discovered_file_get_type (void) G_GNUC_CONST; gpointer transaction_controller_ref (gpointer instance); void transaction_controller_unref (gpointer instance); -GParamSpec* param_spec_transaction_controller (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_transaction_controller (GValue* value, gpointer v_object); -void value_take_transaction_controller (GValue* value, gpointer v_object); +GParamSpec* param_spec_transaction_controller (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_transaction_controller (GValue* value, + gpointer v_object); +void value_take_transaction_controller (GValue* value, + gpointer v_object); gpointer value_get_transaction_controller (const GValue* value); GType transaction_controller_get_type (void) G_GNUC_CONST; #define MEDIA_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MEDIA_MONITOR, MediaMonitorPrivate)) -enum { - MEDIA_MONITOR_DUMMY_PROPERTY -}; -void media_monitor_on_media_source_destroyed (MediaMonitor* self, DataSource* source); -static void _media_monitor_on_media_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self); -static void _media_monitor_on_media_source_destroyed_source_collection_unlinked_destroyed (SourceCollection* _sender, DataSource* source, gpointer self); +void media_monitor_on_media_source_destroyed (MediaMonitor* self, + DataSource* source); +static void _media_monitor_on_media_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self); +static void _media_monitor_on_media_source_destroyed_source_collection_unlinked_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self); #define MEDIA_MONITOR_MAX_OPERATIONS_PER_CYCLE 100 #define MEDIA_MONITOR_FLUSH_PENDING_UPDATES_MSEC 500 -MediaMonitor* media_monitor_construct (GType object_type, MediaSourceCollection* sources, GCancellable* cancellable); +MediaMonitor* media_monitor_construct (GType object_type, + MediaSourceCollection* sources, + GCancellable* cancellable); static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self); static gboolean _media_monitor_on_flush_pending_updates_gsource_func (gpointer self); MediaSourceCollection* media_monitor_get_media_source_collection (MediaMonitor* self); @@ -358,60 +394,137 @@ static void media_monitor_real_close (MediaMonitor* self); gchar* media_monitor_to_string (MediaMonitor* self); static gchar* media_monitor_real_to_string (MediaMonitor* self); gchar* data_collection_to_string (DataCollection* self); -MonitorableUpdates* media_monitor_create_updates (MediaMonitor* self, Monitorable* monitorable); -static MonitorableUpdates* media_monitor_real_create_updates (MediaMonitor* self, Monitorable* monitorable); -static void media_monitor_real_on_media_source_destroyed (MediaMonitor* self, DataSource* source); -void media_monitor_remove_updates (MediaMonitor* self, Monitorable* monitorable); +MonitorableUpdates* media_monitor_create_updates (MediaMonitor* self, + Monitorable* monitorable); +static MonitorableUpdates* media_monitor_real_create_updates (MediaMonitor* self, + Monitorable* monitorable); +static void media_monitor_real_on_media_source_destroyed (MediaMonitor* self, + DataSource* source); +void media_monitor_remove_updates (MediaMonitor* self, + Monitorable* monitorable); void media_monitor_notify_discovery_started (MediaMonitor* self); static void media_monitor_real_notify_discovery_started (MediaMonitor* self); -MediaMonitorDiscoveredFile media_monitor_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable); -static MediaMonitorDiscoveredFile media_monitor_real_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable); -GeeCollection* media_monitor_candidates_for_unknown_file (MediaMonitor* self, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_); -static GeeCollection* media_monitor_real_candidates_for_unknown_file (MediaMonitor* self, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_); -GFile** media_monitor_get_auxilliary_backing_files (MediaMonitor* self, Monitorable* monitorable, int* result_length1); -static GFile** media_monitor_real_get_auxilliary_backing_files (MediaMonitor* self, Monitorable* monitorable, int* result_length1); -void media_monitor_update_backing_file_info (MediaMonitor* self, Monitorable* monitorable, GFile* file, GFileInfo* info); -static void media_monitor_real_update_backing_file_info (MediaMonitor* self, Monitorable* monitorable, GFile* file, GFileInfo* info); +MediaMonitorDiscoveredFile media_monitor_notify_file_discovered (MediaMonitor* self, + GFile* file, + GFileInfo* info, + Monitorable* * monitorable); +static MediaMonitorDiscoveredFile media_monitor_real_notify_file_discovered (MediaMonitor* self, + GFile* file, + GFileInfo* info, + Monitorable* * monitorable); +GeeCollection* media_monitor_candidates_for_unknown_file (MediaMonitor* self, + GFile* file, + GFileInfo* info, + MediaMonitorDiscoveredFile* _result_); +static GeeCollection* media_monitor_real_candidates_for_unknown_file (MediaMonitor* self, + GFile* file, + GFileInfo* info, + MediaMonitorDiscoveredFile* _result_); +GFile** media_monitor_get_auxilliary_backing_files (MediaMonitor* self, + Monitorable* monitorable, + int* result_length1); +static GFile** media_monitor_real_get_auxilliary_backing_files (MediaMonitor* self, + Monitorable* monitorable, + int* result_length1); +void media_monitor_update_backing_file_info (MediaMonitor* self, + Monitorable* monitorable, + GFile* file, + GFileInfo* info); +static void media_monitor_real_update_backing_file_info (MediaMonitor* self, + Monitorable* monitorable, + GFile* file, + GFileInfo* info); void media_monitor_notify_discovery_completing (MediaMonitor* self); static void media_monitor_real_notify_discovery_completing (MediaMonitor* self); -gboolean media_monitor_is_file_represented (MediaMonitor* self, GFile* file); -static gboolean media_monitor_real_is_file_represented (MediaMonitor* self, GFile* file); -gboolean media_monitor_notify_file_created (MediaMonitor* self, GFile* file, GFileInfo* info); -static gboolean media_monitor_real_notify_file_created (MediaMonitor* self, GFile* file, GFileInfo* info); -gboolean media_monitor_notify_file_moved (MediaMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info); -static gboolean media_monitor_real_notify_file_moved (MediaMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info); -gboolean media_monitor_notify_file_altered (MediaMonitor* self, GFile* file); -static gboolean media_monitor_real_notify_file_altered (MediaMonitor* self, GFile* file); -gboolean media_monitor_notify_file_attributes_altered (MediaMonitor* self, GFile* file); -static gboolean media_monitor_real_notify_file_attributes_altered (MediaMonitor* self, GFile* file); -gboolean media_monitor_notify_file_alteration_completed (MediaMonitor* self, GFile* file, GFileInfo* info); -static gboolean media_monitor_real_notify_file_alteration_completed (MediaMonitor* self, GFile* file, GFileInfo* info); -gboolean media_monitor_notify_file_deleted (MediaMonitor* self, GFile* file); -static gboolean media_monitor_real_notify_file_deleted (MediaMonitor* self, GFile* file); +gboolean media_monitor_is_file_represented (MediaMonitor* self, + GFile* file); +static gboolean media_monitor_real_is_file_represented (MediaMonitor* self, + GFile* file); +gboolean media_monitor_notify_file_created (MediaMonitor* self, + GFile* file, + GFileInfo* info); +static gboolean media_monitor_real_notify_file_created (MediaMonitor* self, + GFile* file, + GFileInfo* info); +gboolean media_monitor_notify_file_moved (MediaMonitor* self, + GFile* old_file, + GFile* new_file, + GFileInfo* new_file_info); +static gboolean media_monitor_real_notify_file_moved (MediaMonitor* self, + GFile* old_file, + GFile* new_file, + GFileInfo* new_file_info); +gboolean media_monitor_notify_file_altered (MediaMonitor* self, + GFile* file); +static gboolean media_monitor_real_notify_file_altered (MediaMonitor* self, + GFile* file); +gboolean media_monitor_notify_file_attributes_altered (MediaMonitor* self, + GFile* file); +static gboolean media_monitor_real_notify_file_attributes_altered (MediaMonitor* self, + GFile* file); +gboolean media_monitor_notify_file_alteration_completed (MediaMonitor* self, + GFile* file, + GFileInfo* info); +static gboolean media_monitor_real_notify_file_alteration_completed (MediaMonitor* self, + GFile* file, + GFileInfo* info); +gboolean media_monitor_notify_file_deleted (MediaMonitor* self, + GFile* file); +static gboolean media_monitor_real_notify_file_deleted (MediaMonitor* self, + GFile* file); void media_monitor_mdbg (const gchar* msg); gboolean media_monitor_has_pending_updates (MediaMonitor* self); GeeCollection* media_monitor_get_monitorables (MediaMonitor* self); -MonitorableUpdates* media_monitor_fetch_updates (MediaMonitor* self, Monitorable* monitorable); -MonitorableUpdates* media_monitor_get_existing_updates (MediaMonitor* self, Monitorable* monitorable); -gboolean media_monitor_is_online (MediaMonitor* self, Monitorable* monitorable); +MonitorableUpdates* media_monitor_fetch_updates (MediaMonitor* self, + Monitorable* monitorable); +MonitorableUpdates* media_monitor_get_existing_updates (MediaMonitor* self, + Monitorable* monitorable); +gboolean media_monitor_is_online (MediaMonitor* self, + Monitorable* monitorable); gboolean monitorable_is_offline (Monitorable* self); -gboolean media_monitor_is_offline (MediaMonitor* self, Monitorable* monitorable); -GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorable); +gboolean media_monitor_is_offline (MediaMonitor* self, + Monitorable* monitorable); +GFile* media_monitor_get_master_file (MediaMonitor* self, + Monitorable* monitorable); GFile* media_source_get_master_file (MediaSource* self); -void media_monitor_update_master_file (MediaMonitor* self, Monitorable* monitorable, GFile* file); -void media_monitor_update_master_file_info_altered (MediaMonitor* self, Monitorable* monitorable); -void media_monitor_update_master_file_in_alteration (MediaMonitor* self, Monitorable* monitorable, gboolean in_alteration); -void media_monitor_update_master_file_alterations_completed (MediaMonitor* self, Monitorable* monitorable, GFileInfo* info); -void media_monitor_update_online (MediaMonitor* self, Monitorable* monitorable); -void media_monitor_update_offline (MediaMonitor* self, Monitorable* monitorable); -void media_monitor_process_updates (MediaMonitor* self, GeeCollection* all_updates, TransactionController* controller, gint* op_count, GError** error); -static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollection* all_updates, TransactionController* controller, gint* op_count, GError** error); +void media_monitor_update_master_file (MediaMonitor* self, + Monitorable* monitorable, + GFile* file); +void media_monitor_update_master_file_info_altered (MediaMonitor* self, + Monitorable* monitorable); +void media_monitor_update_master_file_in_alteration (MediaMonitor* self, + Monitorable* monitorable, + gboolean in_alteration); +void media_monitor_update_master_file_alterations_completed (MediaMonitor* self, + Monitorable* monitorable, + GFileInfo* info); +void media_monitor_update_online (MediaMonitor* self, + Monitorable* monitorable); +void media_monitor_update_offline (MediaMonitor* self, + Monitorable* monitorable); +void media_monitor_process_updates (MediaMonitor* self, + GeeCollection* all_updates, + TransactionController* controller, + gint* op_count, + GError** error); +static void media_monitor_real_process_updates (MediaMonitor* self, + GeeCollection* all_updates, + TransactionController* controller, + gint* op_count, + GError** error); GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; -void monitorable_set_many_master_file (GeeMap* map, TransactionController* controller, GError** error); -void monitorable_set_many_master_timestamp (GeeMap* map, TransactionController* controller, GError** error); -void monitorable_mark_many_online_offline (GeeCollection* online, GeeCollection* offline, TransactionController* controller, GError** error); +void monitorable_set_many_master_file (GeeMap* map, + TransactionController* controller, + GError** error); +void monitorable_set_many_master_timestamp (GeeMap* map, + TransactionController* controller, + GError** error); +void monitorable_mark_many_online_offline (GeeCollection* online, + GeeCollection* offline, + TransactionController* controller, + GError** error); TransactionController* media_source_collection_get_transaction_controller (MediaSourceCollection* self); void transaction_controller_begin (TransactionController* self); void transaction_controller_commit (TransactionController* self); @@ -421,43 +534,49 @@ void app_window_panic (const gchar* msg); static void media_monitor_finalize (GObject * obj); -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 18 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return self ? g_object_ref (self) : NULL; -#line 428 "MediaMonitor.c" +#line 543 "MediaMonitor.c" } -MonitorableUpdates* monitorable_updates_construct (GType object_type, Monitorable* monitorable) { +MonitorableUpdates* +monitorable_updates_construct (GType object_type, + Monitorable* monitorable) +{ MonitorableUpdates* self = NULL; Monitorable* _tmp0_; - Monitorable* _tmp1_; #line 17 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL); #line 17 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self = (MonitorableUpdates*) g_type_create_instance (object_type); #line 18 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = monitorable; -#line 18 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (monitorable); #line 18 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (self->monitorable); #line 18 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - self->monitorable = _tmp1_; + self->monitorable = _tmp0_; #line 17 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return self; -#line 450 "MediaMonitor.c" +#line 565 "MediaMonitor.c" } -MonitorableUpdates* monitorable_updates_new (Monitorable* monitorable) { +MonitorableUpdates* +monitorable_updates_new (Monitorable* monitorable) +{ #line 17 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return monitorable_updates_construct (TYPE_MONITORABLE_UPDATES, monitorable); -#line 457 "MediaMonitor.c" +#line 574 "MediaMonitor.c" } -GFile* monitorable_updates_get_master_file (MonitorableUpdates* self) { +GFile* +monitorable_updates_get_master_file (MonitorableUpdates* self) +{ GFile* result = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -471,11 +590,13 @@ GFile* monitorable_updates_get_master_file (MonitorableUpdates* self) { result = _tmp1_; #line 22 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 475 "MediaMonitor.c" +#line 594 "MediaMonitor.c" } -GFileInfo* monitorable_updates_get_master_file_info (MonitorableUpdates* self) { +GFileInfo* +monitorable_updates_get_master_file_info (MonitorableUpdates* self) +{ GFileInfo* result = NULL; GFileInfo* _tmp0_; GFileInfo* _tmp1_; @@ -489,11 +610,13 @@ GFileInfo* monitorable_updates_get_master_file_info (MonitorableUpdates* self) { result = _tmp1_; #line 26 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 493 "MediaMonitor.c" +#line 614 "MediaMonitor.c" } -static gboolean monitorable_updates_real_is_in_alteration (MonitorableUpdates* self) { +static gboolean +monitorable_updates_real_is_in_alteration (MonitorableUpdates* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 30 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -502,20 +625,24 @@ static gboolean monitorable_updates_real_is_in_alteration (MonitorableUpdates* s result = _tmp0_; #line 30 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 506 "MediaMonitor.c" +#line 629 "MediaMonitor.c" } -gboolean monitorable_updates_is_in_alteration (MonitorableUpdates* self) { +gboolean +monitorable_updates_is_in_alteration (MonitorableUpdates* self) +{ #line 29 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MONITORABLE_UPDATES (self), FALSE); #line 29 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MONITORABLE_UPDATES_GET_CLASS (self)->is_in_alteration (self); -#line 515 "MediaMonitor.c" +#line 640 "MediaMonitor.c" } -gboolean monitorable_updates_is_set_offline (MonitorableUpdates* self) { +gboolean +monitorable_updates_is_set_offline (MonitorableUpdates* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 33 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -526,11 +653,13 @@ gboolean monitorable_updates_is_set_offline (MonitorableUpdates* self) { result = _tmp0_; #line 34 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 530 "MediaMonitor.c" +#line 657 "MediaMonitor.c" } -gboolean monitorable_updates_is_set_online (MonitorableUpdates* self) { +gboolean +monitorable_updates_is_set_online (MonitorableUpdates* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 37 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -541,150 +670,161 @@ gboolean monitorable_updates_is_set_online (MonitorableUpdates* self) { result = _tmp0_; #line 38 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 545 "MediaMonitor.c" +#line 674 "MediaMonitor.c" } -static void monitorable_updates_real_set_master_file (MonitorableUpdates* self, GFile* file) { +static void +monitorable_updates_real_set_master_file (MonitorableUpdates* self, + GFile* file) +{ GFile* _tmp0_; - GFile* _tmp1_; - GFile* _tmp2_; #line 41 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail ((file == NULL) || G_IS_FILE (file)); #line 42 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = file; -#line 42 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (file); #line 42 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (self->priv->master_file); #line 42 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - self->priv->master_file = _tmp1_; -#line 44 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = file; + self->priv->master_file = _tmp0_; #line 44 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp2_ != NULL) { + if (file != NULL) { #line 45 "/home/jens/Source/shotwell/src/MediaMonitor.vala" monitorable_updates_mark_online (self); -#line 569 "MediaMonitor.c" +#line 695 "MediaMonitor.c" } } -void monitorable_updates_set_master_file (MonitorableUpdates* self, GFile* file) { +void +monitorable_updates_set_master_file (MonitorableUpdates* self, + GFile* file) +{ #line 41 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE_UPDATES (self)); #line 41 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MONITORABLE_UPDATES_GET_CLASS (self)->set_master_file (self, file); -#line 579 "MediaMonitor.c" +#line 708 "MediaMonitor.c" } -static void monitorable_updates_real_set_master_file_info_altered (MonitorableUpdates* self, gboolean altered) { - gboolean _tmp0_; - gboolean _tmp1_; +static void +monitorable_updates_real_set_master_file_info_altered (MonitorableUpdates* self, + gboolean altered) +{ #line 49 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = altered; -#line 49 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - self->priv->master_file_info_altered = _tmp0_; -#line 51 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = altered; + self->priv->master_file_info_altered = altered; #line 51 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp1_) { + if (altered) { #line 52 "/home/jens/Source/shotwell/src/MediaMonitor.vala" monitorable_updates_mark_online (self); -#line 596 "MediaMonitor.c" +#line 722 "MediaMonitor.c" } } -void monitorable_updates_set_master_file_info_altered (MonitorableUpdates* self, gboolean altered) { +void +monitorable_updates_set_master_file_info_altered (MonitorableUpdates* self, + gboolean altered) +{ #line 48 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE_UPDATES (self)); #line 48 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MONITORABLE_UPDATES_GET_CLASS (self)->set_master_file_info_altered (self, altered); -#line 606 "MediaMonitor.c" +#line 735 "MediaMonitor.c" } -static void monitorable_updates_real_set_master_file_info (MonitorableUpdates* self, GFileInfo* info) { +static void +monitorable_updates_real_set_master_file_info (MonitorableUpdates* self, + GFileInfo* info) +{ GFileInfo* _tmp0_; GFileInfo* _tmp1_; - GFileInfo* _tmp2_; #line 55 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail ((info == NULL) || G_IS_FILE_INFO (info)); #line 56 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = info; -#line 56 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (info); #line 56 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (self->priv->master_file_info); #line 56 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - self->priv->master_file_info = _tmp1_; + self->priv->master_file_info = _tmp0_; #line 58 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = self->priv->master_file_info; + _tmp1_ = self->priv->master_file_info; #line 58 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 59 "/home/jens/Source/shotwell/src/MediaMonitor.vala" monitorable_updates_set_master_file_info_altered (self, FALSE); -#line 630 "MediaMonitor.c" +#line 759 "MediaMonitor.c" } } -void monitorable_updates_set_master_file_info (MonitorableUpdates* self, GFileInfo* info) { +void +monitorable_updates_set_master_file_info (MonitorableUpdates* self, + GFileInfo* info) +{ #line 55 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE_UPDATES (self)); #line 55 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MONITORABLE_UPDATES_GET_CLASS (self)->set_master_file_info (self, info); -#line 640 "MediaMonitor.c" +#line 772 "MediaMonitor.c" } -static void monitorable_updates_real_set_master_in_alteration (MonitorableUpdates* self, gboolean in_alteration) { - gboolean _tmp0_; -#line 63 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = in_alteration; +static void +monitorable_updates_real_set_master_in_alteration (MonitorableUpdates* self, + gboolean in_alteration) +{ #line 63 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - self->priv->master_in_alteration = _tmp0_; -#line 650 "MediaMonitor.c" + self->priv->master_in_alteration = in_alteration; +#line 782 "MediaMonitor.c" } -void monitorable_updates_set_master_in_alteration (MonitorableUpdates* self, gboolean in_alteration) { +void +monitorable_updates_set_master_in_alteration (MonitorableUpdates* self, + gboolean in_alteration) +{ #line 62 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE_UPDATES (self)); #line 62 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MONITORABLE_UPDATES_GET_CLASS (self)->set_master_in_alteration (self, in_alteration); -#line 659 "MediaMonitor.c" +#line 794 "MediaMonitor.c" } -static void monitorable_updates_real_set_master_alterations_complete (MonitorableUpdates* self, GFileInfo* info) { - GFileInfo* _tmp0_; +static void +monitorable_updates_real_set_master_alterations_complete (MonitorableUpdates* self, + GFileInfo* info) +{ #line 66 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 67 "/home/jens/Source/shotwell/src/MediaMonitor.vala" monitorable_updates_set_master_in_alteration (self, FALSE); #line 68 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = info; -#line 68 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_updates_set_master_file_info (self, _tmp0_); + monitorable_updates_set_master_file_info (self, info); #line 69 "/home/jens/Source/shotwell/src/MediaMonitor.vala" monitorable_updates_mark_online (self); -#line 675 "MediaMonitor.c" +#line 810 "MediaMonitor.c" } -void monitorable_updates_set_master_alterations_complete (MonitorableUpdates* self, GFileInfo* info) { +void +monitorable_updates_set_master_alterations_complete (MonitorableUpdates* self, + GFileInfo* info) +{ #line 66 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE_UPDATES (self)); #line 66 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MONITORABLE_UPDATES_GET_CLASS (self)->set_master_alterations_complete (self, info); -#line 684 "MediaMonitor.c" +#line 822 "MediaMonitor.c" } -static void monitorable_updates_real_mark_offline (MonitorableUpdates* self) { +static void +monitorable_updates_real_mark_offline (MonitorableUpdates* self) +{ #line 73 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self->priv->online = FALSE; #line 74 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -697,56 +837,68 @@ static void monitorable_updates_real_mark_offline (MonitorableUpdates* self) { self->priv->master_file_info = NULL; #line 78 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self->priv->master_in_alteration = FALSE; -#line 701 "MediaMonitor.c" +#line 841 "MediaMonitor.c" } -void monitorable_updates_mark_offline (MonitorableUpdates* self) { +void +monitorable_updates_mark_offline (MonitorableUpdates* self) +{ #line 72 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE_UPDATES (self)); #line 72 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MONITORABLE_UPDATES_GET_CLASS (self)->mark_offline (self); -#line 710 "MediaMonitor.c" +#line 852 "MediaMonitor.c" } -static void monitorable_updates_real_mark_online (MonitorableUpdates* self) { +static void +monitorable_updates_real_mark_online (MonitorableUpdates* self) +{ #line 82 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self->priv->online = TRUE; #line 83 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self->priv->offline = FALSE; -#line 719 "MediaMonitor.c" +#line 863 "MediaMonitor.c" } -void monitorable_updates_mark_online (MonitorableUpdates* self) { +void +monitorable_updates_mark_online (MonitorableUpdates* self) +{ #line 81 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE_UPDATES (self)); #line 81 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MONITORABLE_UPDATES_GET_CLASS (self)->mark_online (self); -#line 728 "MediaMonitor.c" +#line 874 "MediaMonitor.c" } -static void monitorable_updates_real_reset_online_offline (MonitorableUpdates* self) { +static void +monitorable_updates_real_reset_online_offline (MonitorableUpdates* self) +{ #line 87 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self->priv->online = FALSE; #line 88 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self->priv->offline = FALSE; -#line 737 "MediaMonitor.c" +#line 885 "MediaMonitor.c" } -void monitorable_updates_reset_online_offline (MonitorableUpdates* self) { +void +monitorable_updates_reset_online_offline (MonitorableUpdates* self) +{ #line 86 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE_UPDATES (self)); #line 86 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MONITORABLE_UPDATES_GET_CLASS (self)->reset_online_offline (self); -#line 746 "MediaMonitor.c" +#line 896 "MediaMonitor.c" } -static gboolean monitorable_updates_real_is_all_updated (MonitorableUpdates* self) { +static gboolean +monitorable_updates_real_is_all_updated (MonitorableUpdates* self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; @@ -758,189 +910,216 @@ static gboolean monitorable_updates_real_is_all_updated (MonitorableUpdates* sel _tmp5_ = self->priv->master_file; #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp5_ == NULL) { -#line 762 "MediaMonitor.c" +#line 914 "MediaMonitor.c" gboolean _tmp6_; #line 93 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp6_ = self->priv->master_file_info_altered; #line 93 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp4_ = _tmp6_ == FALSE; -#line 768 "MediaMonitor.c" +#line 920 "MediaMonitor.c" } else { #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp4_ = FALSE; -#line 772 "MediaMonitor.c" +#line 924 "MediaMonitor.c" } #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp4_) { -#line 776 "MediaMonitor.c" +#line 928 "MediaMonitor.c" GFileInfo* _tmp7_; #line 94 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp7_ = self->priv->master_file_info; #line 94 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp3_ = _tmp7_ == NULL; -#line 782 "MediaMonitor.c" +#line 934 "MediaMonitor.c" } else { #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp3_ = FALSE; -#line 786 "MediaMonitor.c" +#line 938 "MediaMonitor.c" } #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp3_) { -#line 790 "MediaMonitor.c" +#line 942 "MediaMonitor.c" gboolean _tmp8_; #line 95 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp8_ = self->priv->master_in_alteration; #line 95 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp2_ = _tmp8_ == FALSE; -#line 796 "MediaMonitor.c" +#line 948 "MediaMonitor.c" } else { #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp2_ = FALSE; -#line 800 "MediaMonitor.c" +#line 952 "MediaMonitor.c" } #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp2_) { -#line 804 "MediaMonitor.c" +#line 956 "MediaMonitor.c" gboolean _tmp9_; #line 96 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp9_ = self->priv->online; #line 96 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp1_ = _tmp9_ == FALSE; -#line 810 "MediaMonitor.c" +#line 962 "MediaMonitor.c" } else { #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp1_ = FALSE; -#line 814 "MediaMonitor.c" +#line 966 "MediaMonitor.c" } #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp1_) { -#line 818 "MediaMonitor.c" +#line 970 "MediaMonitor.c" gboolean _tmp10_; #line 97 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp10_ = self->priv->offline; #line 97 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp0_ = _tmp10_ == FALSE; -#line 824 "MediaMonitor.c" +#line 976 "MediaMonitor.c" } else { #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp0_ = FALSE; -#line 828 "MediaMonitor.c" +#line 980 "MediaMonitor.c" } #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" result = _tmp0_; #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 834 "MediaMonitor.c" +#line 986 "MediaMonitor.c" } -gboolean monitorable_updates_is_all_updated (MonitorableUpdates* self) { +gboolean +monitorable_updates_is_all_updated (MonitorableUpdates* self) +{ #line 91 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MONITORABLE_UPDATES (self), FALSE); #line 91 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MONITORABLE_UPDATES_GET_CLASS (self)->is_all_updated (self); -#line 843 "MediaMonitor.c" +#line 997 "MediaMonitor.c" } -static void value_monitorable_updates_init (GValue* value) { +static void +value_monitorable_updates_init (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" value->data[0].v_pointer = NULL; -#line 850 "MediaMonitor.c" +#line 1006 "MediaMonitor.c" } -static void value_monitorable_updates_free_value (GValue* value) { +static void +value_monitorable_updates_free_value (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" monitorable_updates_unref (value->data[0].v_pointer); -#line 859 "MediaMonitor.c" +#line 1017 "MediaMonitor.c" } } -static void value_monitorable_updates_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_monitorable_updates_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" dest_value->data[0].v_pointer = monitorable_updates_ref (src_value->data[0].v_pointer); -#line 869 "MediaMonitor.c" +#line 1030 "MediaMonitor.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" dest_value->data[0].v_pointer = NULL; -#line 873 "MediaMonitor.c" +#line 1034 "MediaMonitor.c" } } -static gpointer value_monitorable_updates_peek_pointer (const GValue* value) { +static gpointer +value_monitorable_updates_peek_pointer (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return value->data[0].v_pointer; -#line 881 "MediaMonitor.c" +#line 1044 "MediaMonitor.c" } -static gchar* value_monitorable_updates_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_monitorable_updates_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (collect_values[0].v_pointer) { -#line 888 "MediaMonitor.c" +#line 1056 "MediaMonitor.c" MonitorableUpdates * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 895 "MediaMonitor.c" +#line 1063 "MediaMonitor.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.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 899 "MediaMonitor.c" +#line 1067 "MediaMonitor.c" } #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" value->data[0].v_pointer = monitorable_updates_ref (object); -#line 903 "MediaMonitor.c" +#line 1071 "MediaMonitor.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" value->data[0].v_pointer = NULL; -#line 907 "MediaMonitor.c" +#line 1075 "MediaMonitor.c" } #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return NULL; -#line 911 "MediaMonitor.c" +#line 1079 "MediaMonitor.c" } -static gchar* value_monitorable_updates_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_monitorable_updates_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ MonitorableUpdates ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 922 "MediaMonitor.c" +#line 1095 "MediaMonitor.c" } #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" *object_p = NULL; -#line 928 "MediaMonitor.c" +#line 1101 "MediaMonitor.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" *object_p = value->data[0].v_pointer; -#line 932 "MediaMonitor.c" +#line 1105 "MediaMonitor.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" *object_p = monitorable_updates_ref (value->data[0].v_pointer); -#line 936 "MediaMonitor.c" +#line 1109 "MediaMonitor.c" } #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return NULL; -#line 940 "MediaMonitor.c" +#line 1113 "MediaMonitor.c" } -GParamSpec* param_spec_monitorable_updates (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_monitorable_updates (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecMonitorableUpdates* spec; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_MONITORABLE_UPDATES), NULL); @@ -950,20 +1129,25 @@ GParamSpec* param_spec_monitorable_updates (const gchar* name, const gchar* nick G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return G_PARAM_SPEC (spec); -#line 954 "MediaMonitor.c" +#line 1133 "MediaMonitor.c" } -gpointer value_get_monitorable_updates (const GValue* value) { +gpointer +value_get_monitorable_updates (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MONITORABLE_UPDATES), NULL); #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return value->data[0].v_pointer; -#line 963 "MediaMonitor.c" +#line 1144 "MediaMonitor.c" } -void value_set_monitorable_updates (GValue* value, gpointer v_object) { +void +value_set_monitorable_updates (GValue* value, + gpointer v_object) +{ MonitorableUpdates * old; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MONITORABLE_UPDATES)); @@ -979,22 +1163,25 @@ void value_set_monitorable_updates (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" monitorable_updates_ref (value->data[0].v_pointer); -#line 983 "MediaMonitor.c" +#line 1167 "MediaMonitor.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" value->data[0].v_pointer = NULL; -#line 987 "MediaMonitor.c" +#line 1171 "MediaMonitor.c" } #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" monitorable_updates_unref (old); -#line 993 "MediaMonitor.c" +#line 1177 "MediaMonitor.c" } } -void value_take_monitorable_updates (GValue* value, gpointer v_object) { +void +value_take_monitorable_updates (GValue* value, + gpointer v_object) +{ MonitorableUpdates * old; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MONITORABLE_UPDATES)); @@ -1008,22 +1195,24 @@ void value_take_monitorable_updates (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" value->data[0].v_pointer = v_object; -#line 1012 "MediaMonitor.c" +#line 1199 "MediaMonitor.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" value->data[0].v_pointer = NULL; -#line 1016 "MediaMonitor.c" +#line 1203 "MediaMonitor.c" } #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" monitorable_updates_unref (old); -#line 1022 "MediaMonitor.c" +#line 1209 "MediaMonitor.c" } } -static void monitorable_updates_class_init (MonitorableUpdatesClass * klass) { +static void +monitorable_updates_class_init (MonitorableUpdatesClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" monitorable_updates_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1050,11 +1239,13 @@ static void monitorable_updates_class_init (MonitorableUpdatesClass * klass) { ((MonitorableUpdatesClass *) klass)->reset_online_offline = (void (*) (MonitorableUpdates *)) monitorable_updates_real_reset_online_offline; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" ((MonitorableUpdatesClass *) klass)->is_all_updated = (gboolean (*) (MonitorableUpdates *)) monitorable_updates_real_is_all_updated; -#line 1054 "MediaMonitor.c" +#line 1243 "MediaMonitor.c" } -static void monitorable_updates_instance_init (MonitorableUpdates * self) { +static void +monitorable_updates_instance_init (MonitorableUpdates * self) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self->priv = MONITORABLE_UPDATES_GET_PRIVATE (self); #line 10 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1071,11 +1262,13 @@ static void monitorable_updates_instance_init (MonitorableUpdates * self) { self->priv->offline = FALSE; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self->ref_count = 1; -#line 1075 "MediaMonitor.c" +#line 1266 "MediaMonitor.c" } -static void monitorable_updates_finalize (MonitorableUpdates * obj) { +static void +monitorable_updates_finalize (MonitorableUpdates * obj) +{ MonitorableUpdates * self; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MONITORABLE_UPDATES, MonitorableUpdates); @@ -1087,11 +1280,13 @@ static void monitorable_updates_finalize (MonitorableUpdates * obj) { _g_object_unref0 (self->priv->master_file); #line 12 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (self->priv->master_file_info); -#line 1091 "MediaMonitor.c" +#line 1284 "MediaMonitor.c" } -GType monitorable_updates_get_type (void) { +GType +monitorable_updates_get_type (void) +{ static volatile gsize monitorable_updates_type_id__volatile = 0; if (g_once_init_enter (&monitorable_updates_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_monitorable_updates_init, value_monitorable_updates_free_value, value_monitorable_updates_copy_value, value_monitorable_updates_peek_pointer, "p", value_monitorable_updates_collect_value, "p", value_monitorable_updates_lcopy_value }; @@ -1105,18 +1300,22 @@ GType monitorable_updates_get_type (void) { } -gpointer monitorable_updates_ref (gpointer instance) { +gpointer +monitorable_updates_ref (gpointer instance) +{ MonitorableUpdates * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return instance; -#line 1116 "MediaMonitor.c" +#line 1313 "MediaMonitor.c" } -void monitorable_updates_unref (gpointer instance) { +void +monitorable_updates_unref (gpointer instance) +{ MonitorableUpdates * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1125,26 +1324,36 @@ void monitorable_updates_unref (gpointer instance) { MONITORABLE_UPDATES_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1129 "MediaMonitor.c" +#line 1328 "MediaMonitor.c" } } -static void _media_monitor_on_media_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { +static void +_media_monitor_on_media_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self) +{ #line 130 "/home/jens/Source/shotwell/src/MediaMonitor.vala" media_monitor_on_media_source_destroyed ((MediaMonitor*) self, source); -#line 1137 "MediaMonitor.c" +#line 1340 "MediaMonitor.c" } -static void _media_monitor_on_media_source_destroyed_source_collection_unlinked_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { +static void +_media_monitor_on_media_source_destroyed_source_collection_unlinked_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self) +{ #line 131 "/home/jens/Source/shotwell/src/MediaMonitor.vala" media_monitor_on_media_source_destroyed ((MediaMonitor*) self, source); -#line 1144 "MediaMonitor.c" +#line 1351 "MediaMonitor.c" } -GType media_monitor_discovered_file_get_type (void) { +GType +media_monitor_discovered_file_get_type (void) +{ static volatile gsize media_monitor_discovered_file_type_id__volatile = 0; if (g_once_init_enter (&media_monitor_discovered_file_type_id__volatile)) { static const GEnumValue values[] = {{MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED, "MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED", "represented"}, {MEDIA_MONITOR_DISCOVERED_FILE_IGNORE, "MEDIA_MONITOR_DISCOVERED_FILE_IGNORE", "ignore"}, {MEDIA_MONITOR_DISCOVERED_FILE_UNKNOWN, "MEDIA_MONITOR_DISCOVERED_FILE_UNKNOWN", "unknown"}, {0, NULL, NULL}}; @@ -1156,31 +1365,34 @@ GType media_monitor_discovered_file_get_type (void) { } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 119 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return self ? data_collection_ref (self) : NULL; -#line 1163 "MediaMonitor.c" +#line 1374 "MediaMonitor.c" } -static gboolean _media_monitor_on_flush_pending_updates_gsource_func (gpointer self) { +static gboolean +_media_monitor_on_flush_pending_updates_gsource_func (gpointer self) +{ gboolean result; result = media_monitor_on_flush_pending_updates ((MediaMonitor*) self); #line 125 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1172 "MediaMonitor.c" +#line 1385 "MediaMonitor.c" } -MediaMonitor* media_monitor_construct (GType object_type, MediaSourceCollection* sources, GCancellable* cancellable) { +MediaMonitor* +media_monitor_construct (GType object_type, + MediaSourceCollection* sources, + GCancellable* cancellable) +{ MediaMonitor * self = NULL; MediaSourceCollection* _tmp0_; - MediaSourceCollection* _tmp1_; - GCancellable* _tmp2_; - GCancellable* _tmp3_; - MediaSourceCollection* _tmp4_; - MediaSourceCollection* _tmp5_; - guint _tmp6_; + GCancellable* _tmp1_; #line 118 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (sources), NULL); #line 118 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1188,71 +1400,71 @@ MediaMonitor* media_monitor_construct (GType object_type, MediaSourceCollection* #line 118 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self = (MediaMonitor*) g_object_new (object_type, NULL); #line 119 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = sources; -#line 119 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = _data_collection_ref0 (_tmp0_); + _tmp0_ = _data_collection_ref0 (sources); #line 119 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _data_collection_unref0 (self->priv->sources); #line 119 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - self->priv->sources = _tmp1_; -#line 120 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = cancellable; + self->priv->sources = _tmp0_; #line 120 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (cancellable); #line 120 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (self->priv->cancellable); #line 120 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - self->priv->cancellable = _tmp3_; + self->priv->cancellable = _tmp1_; #line 122 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp4_ = sources; -#line 122 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _media_monitor_on_media_source_destroyed_source_collection_item_destroyed, self, 0); -#line 123 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp5_ = sources; + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _media_monitor_on_media_source_destroyed_source_collection_item_destroyed, self, 0); #line 123 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_SOURCE_COLLECTION, SourceCollection), "unlinked-destroyed", (GCallback) _media_monitor_on_media_source_destroyed_source_collection_unlinked_destroyed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_SOURCE_COLLECTION, SourceCollection), "unlinked-destroyed", (GCallback) _media_monitor_on_media_source_destroyed_source_collection_unlinked_destroyed, self, 0); #line 125 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp6_ = g_timeout_add_full (G_PRIORITY_LOW, (guint) MEDIA_MONITOR_FLUSH_PENDING_UPDATES_MSEC, _media_monitor_on_flush_pending_updates_gsource_func, g_object_ref (self), g_object_unref); -#line 125 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - self->priv->pending_updates_timer_id = _tmp6_; + self->priv->pending_updates_timer_id = g_timeout_add_full (G_PRIORITY_LOW, (guint) MEDIA_MONITOR_FLUSH_PENDING_UPDATES_MSEC, _media_monitor_on_flush_pending_updates_gsource_func, g_object_ref (self), g_object_unref); #line 118 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return self; -#line 1221 "MediaMonitor.c" +#line 1423 "MediaMonitor.c" } -static MediaSourceCollection* media_monitor_real_get_media_source_collection (MediaMonitor* self) { +static MediaSourceCollection* +media_monitor_real_get_media_source_collection (MediaMonitor* self) +{ #line 134 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_critical ("Type `%s' does not implement abstract method `media_monitor_get_media_source_collection'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 134 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return NULL; -#line 1230 "MediaMonitor.c" +#line 1434 "MediaMonitor.c" } -MediaSourceCollection* media_monitor_get_media_source_collection (MediaMonitor* self) { +MediaSourceCollection* +media_monitor_get_media_source_collection (MediaMonitor* self) +{ #line 134 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL); #line 134 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->get_media_source_collection (self); -#line 1239 "MediaMonitor.c" +#line 1445 "MediaMonitor.c" } -static void media_monitor_real_close (MediaMonitor* self) { +static void +media_monitor_real_close (MediaMonitor* self) +{ } -void media_monitor_close (MediaMonitor* self) { +void +media_monitor_close (MediaMonitor* self) +{ #line 136 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 136 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MEDIA_MONITOR_GET_CLASS (self)->close (self); -#line 1252 "MediaMonitor.c" +#line 1462 "MediaMonitor.c" } -static gchar* media_monitor_real_to_string (MediaMonitor* self) { +static gchar* +media_monitor_real_to_string (MediaMonitor* self) +{ gchar* result = NULL; MediaSourceCollection* _tmp0_; MediaSourceCollection* _tmp1_; @@ -1280,117 +1492,153 @@ static gchar* media_monitor_real_to_string (MediaMonitor* self) { result = _tmp5_; #line 140 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1284 "MediaMonitor.c" +#line 1496 "MediaMonitor.c" } -gchar* media_monitor_to_string (MediaMonitor* self) { +gchar* +media_monitor_to_string (MediaMonitor* self) +{ #line 139 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL); #line 139 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->to_string (self); -#line 1293 "MediaMonitor.c" +#line 1507 "MediaMonitor.c" } -static MonitorableUpdates* media_monitor_real_create_updates (MediaMonitor* self, Monitorable* monitorable) { +static MonitorableUpdates* +media_monitor_real_create_updates (MediaMonitor* self, + Monitorable* monitorable) +{ MonitorableUpdates* result = NULL; - Monitorable* _tmp0_; - MonitorableUpdates* _tmp1_; + MonitorableUpdates* _tmp0_; #line 143 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL); #line 144 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = monitorable; -#line 144 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = monitorable_updates_new (_tmp0_); + _tmp0_ = monitorable_updates_new (monitorable); #line 144 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - result = _tmp1_; + result = _tmp0_; #line 144 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1311 "MediaMonitor.c" +#line 1525 "MediaMonitor.c" } -MonitorableUpdates* media_monitor_create_updates (MediaMonitor* self, Monitorable* monitorable) { +MonitorableUpdates* +media_monitor_create_updates (MediaMonitor* self, + Monitorable* monitorable) +{ #line 143 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL); #line 143 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->create_updates (self, monitorable); -#line 1320 "MediaMonitor.c" +#line 1537 "MediaMonitor.c" } -static void media_monitor_real_on_media_source_destroyed (MediaMonitor* self, DataSource* source) { - DataSource* _tmp0_; +static void +media_monitor_real_on_media_source_destroyed (MediaMonitor* self, + DataSource* source) +{ #line 147 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 148 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = source; -#line 148 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - media_monitor_remove_updates (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MONITORABLE, Monitorable)); -#line 1332 "MediaMonitor.c" + media_monitor_remove_updates (self, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MONITORABLE, Monitorable)); +#line 1549 "MediaMonitor.c" } -void media_monitor_on_media_source_destroyed (MediaMonitor* self, DataSource* source) { +void +media_monitor_on_media_source_destroyed (MediaMonitor* self, + DataSource* source) +{ #line 147 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 147 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MEDIA_MONITOR_GET_CLASS (self)->on_media_source_destroyed (self, source); -#line 1341 "MediaMonitor.c" +#line 1561 "MediaMonitor.c" } -static void media_monitor_real_notify_discovery_started (MediaMonitor* self) { +static void +media_monitor_real_notify_discovery_started (MediaMonitor* self) +{ } -void media_monitor_notify_discovery_started (MediaMonitor* self) { +void +media_monitor_notify_discovery_started (MediaMonitor* self) +{ #line 155 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 155 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MEDIA_MONITOR_GET_CLASS (self)->notify_discovery_started (self); -#line 1354 "MediaMonitor.c" +#line 1578 "MediaMonitor.c" } -static MediaMonitorDiscoveredFile media_monitor_real_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable) { +static MediaMonitorDiscoveredFile +media_monitor_real_notify_file_discovered (MediaMonitor* self, + GFile* file, + GFileInfo* info, + Monitorable* * monitorable) +{ #line 160 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_discovered'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 160 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return 0; -#line 1363 "MediaMonitor.c" +#line 1592 "MediaMonitor.c" } -MediaMonitorDiscoveredFile media_monitor_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable) { +MediaMonitorDiscoveredFile +media_monitor_notify_file_discovered (MediaMonitor* self, + GFile* file, + GFileInfo* info, + Monitorable* * monitorable) +{ #line 160 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), 0); #line 160 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->notify_file_discovered (self, file, info, monitorable); -#line 1372 "MediaMonitor.c" +#line 1606 "MediaMonitor.c" } -static GeeCollection* media_monitor_real_candidates_for_unknown_file (MediaMonitor* self, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_) { +static GeeCollection* +media_monitor_real_candidates_for_unknown_file (MediaMonitor* self, + GFile* file, + GFileInfo* info, + MediaMonitorDiscoveredFile* _result_) +{ #line 169 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_critical ("Type `%s' does not implement abstract method `media_monitor_candidates_for_unknown_file'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 169 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return NULL; -#line 1381 "MediaMonitor.c" +#line 1620 "MediaMonitor.c" } -GeeCollection* media_monitor_candidates_for_unknown_file (MediaMonitor* self, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_) { +GeeCollection* +media_monitor_candidates_for_unknown_file (MediaMonitor* self, + GFile* file, + GFileInfo* info, + MediaMonitorDiscoveredFile* _result_) +{ #line 169 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL); #line 169 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->candidates_for_unknown_file (self, file, info, _result_); -#line 1390 "MediaMonitor.c" +#line 1634 "MediaMonitor.c" } -static GFile** media_monitor_real_get_auxilliary_backing_files (MediaMonitor* self, Monitorable* monitorable, int* result_length1) { +static GFile** +media_monitor_real_get_auxilliary_backing_files (MediaMonitor* self, + Monitorable* monitorable, + int* result_length1) +{ GFile** result = NULL; GFile** _tmp0_; gint _tmp0__length1; @@ -1404,199 +1652,271 @@ static GFile** media_monitor_real_get_auxilliary_backing_files (MediaMonitor* se if (result_length1) { #line 173 "/home/jens/Source/shotwell/src/MediaMonitor.vala" *result_length1 = _tmp0__length1; -#line 1408 "MediaMonitor.c" +#line 1656 "MediaMonitor.c" } #line 173 "/home/jens/Source/shotwell/src/MediaMonitor.vala" result = _tmp0_; #line 173 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1414 "MediaMonitor.c" +#line 1662 "MediaMonitor.c" } -GFile** media_monitor_get_auxilliary_backing_files (MediaMonitor* self, Monitorable* monitorable, int* result_length1) { +GFile** +media_monitor_get_auxilliary_backing_files (MediaMonitor* self, + Monitorable* monitorable, + int* result_length1) +{ #line 172 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL); #line 172 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->get_auxilliary_backing_files (self, monitorable, result_length1); -#line 1423 "MediaMonitor.c" +#line 1675 "MediaMonitor.c" } -static void media_monitor_real_update_backing_file_info (MediaMonitor* self, Monitorable* monitorable, GFile* file, GFileInfo* info) { +static void +media_monitor_real_update_backing_file_info (MediaMonitor* self, + Monitorable* monitorable, + GFile* file, + GFileInfo* info) +{ #line 178 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE (monitorable)); #line 178 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 178 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail ((info == NULL) || G_IS_FILE_INFO (info)); -#line 1434 "MediaMonitor.c" +#line 1691 "MediaMonitor.c" } -void media_monitor_update_backing_file_info (MediaMonitor* self, Monitorable* monitorable, GFile* file, GFileInfo* info) { +void +media_monitor_update_backing_file_info (MediaMonitor* self, + Monitorable* monitorable, + GFile* file, + GFileInfo* info) +{ #line 178 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 178 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MEDIA_MONITOR_GET_CLASS (self)->update_backing_file_info (self, monitorable, file, info); -#line 1443 "MediaMonitor.c" +#line 1705 "MediaMonitor.c" } -static void media_monitor_real_notify_discovery_completing (MediaMonitor* self) { +static void +media_monitor_real_notify_discovery_completing (MediaMonitor* self) +{ } -void media_monitor_notify_discovery_completing (MediaMonitor* self) { +void +media_monitor_notify_discovery_completing (MediaMonitor* self) +{ #line 182 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 182 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MEDIA_MONITOR_GET_CLASS (self)->notify_discovery_completing (self); -#line 1456 "MediaMonitor.c" +#line 1722 "MediaMonitor.c" } -static gboolean media_monitor_real_is_file_represented (MediaMonitor* self, GFile* file) { +static gboolean +media_monitor_real_is_file_represented (MediaMonitor* self, + GFile* file) +{ gboolean _tmp0_ = FALSE; #line 189 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_critical ("Type `%s' does not implement abstract method `media_monitor_is_file_represented'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 189 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return _tmp0_; -#line 1466 "MediaMonitor.c" +#line 1735 "MediaMonitor.c" } -gboolean media_monitor_is_file_represented (MediaMonitor* self, GFile* file) { +gboolean +media_monitor_is_file_represented (MediaMonitor* self, + GFile* file) +{ #line 189 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); #line 189 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->is_file_represented (self, file); -#line 1475 "MediaMonitor.c" +#line 1747 "MediaMonitor.c" } -static gboolean media_monitor_real_notify_file_created (MediaMonitor* self, GFile* file, GFileInfo* info) { +static gboolean +media_monitor_real_notify_file_created (MediaMonitor* self, + GFile* file, + GFileInfo* info) +{ gboolean _tmp0_ = FALSE; #line 191 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_created'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 191 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return _tmp0_; -#line 1485 "MediaMonitor.c" +#line 1761 "MediaMonitor.c" } -gboolean media_monitor_notify_file_created (MediaMonitor* self, GFile* file, GFileInfo* info) { +gboolean +media_monitor_notify_file_created (MediaMonitor* self, + GFile* file, + GFileInfo* info) +{ #line 191 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); #line 191 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->notify_file_created (self, file, info); -#line 1494 "MediaMonitor.c" +#line 1774 "MediaMonitor.c" } -static gboolean media_monitor_real_notify_file_moved (MediaMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info) { +static gboolean +media_monitor_real_notify_file_moved (MediaMonitor* self, + GFile* old_file, + GFile* new_file, + GFileInfo* new_file_info) +{ gboolean _tmp0_ = FALSE; #line 193 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_moved'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 193 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return _tmp0_; -#line 1504 "MediaMonitor.c" +#line 1789 "MediaMonitor.c" } -gboolean media_monitor_notify_file_moved (MediaMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info) { +gboolean +media_monitor_notify_file_moved (MediaMonitor* self, + GFile* old_file, + GFile* new_file, + GFileInfo* new_file_info) +{ #line 193 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); #line 193 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->notify_file_moved (self, old_file, new_file, new_file_info); -#line 1513 "MediaMonitor.c" +#line 1803 "MediaMonitor.c" } -static gboolean media_monitor_real_notify_file_altered (MediaMonitor* self, GFile* file) { +static gboolean +media_monitor_real_notify_file_altered (MediaMonitor* self, + GFile* file) +{ gboolean _tmp0_ = FALSE; #line 195 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_altered'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 195 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return _tmp0_; -#line 1523 "MediaMonitor.c" +#line 1816 "MediaMonitor.c" } -gboolean media_monitor_notify_file_altered (MediaMonitor* self, GFile* file) { +gboolean +media_monitor_notify_file_altered (MediaMonitor* self, + GFile* file) +{ #line 195 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); #line 195 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->notify_file_altered (self, file); -#line 1532 "MediaMonitor.c" +#line 1828 "MediaMonitor.c" } -static gboolean media_monitor_real_notify_file_attributes_altered (MediaMonitor* self, GFile* file) { +static gboolean +media_monitor_real_notify_file_attributes_altered (MediaMonitor* self, + GFile* file) +{ gboolean _tmp0_ = FALSE; #line 197 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_attributes_altered'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 197 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return _tmp0_; -#line 1542 "MediaMonitor.c" +#line 1841 "MediaMonitor.c" } -gboolean media_monitor_notify_file_attributes_altered (MediaMonitor* self, GFile* file) { +gboolean +media_monitor_notify_file_attributes_altered (MediaMonitor* self, + GFile* file) +{ #line 197 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); #line 197 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->notify_file_attributes_altered (self, file); -#line 1551 "MediaMonitor.c" +#line 1853 "MediaMonitor.c" } -static gboolean media_monitor_real_notify_file_alteration_completed (MediaMonitor* self, GFile* file, GFileInfo* info) { +static gboolean +media_monitor_real_notify_file_alteration_completed (MediaMonitor* self, + GFile* file, + GFileInfo* info) +{ gboolean _tmp0_ = FALSE; #line 199 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_alteration_completed'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 199 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return _tmp0_; -#line 1561 "MediaMonitor.c" +#line 1867 "MediaMonitor.c" } -gboolean media_monitor_notify_file_alteration_completed (MediaMonitor* self, GFile* file, GFileInfo* info) { +gboolean +media_monitor_notify_file_alteration_completed (MediaMonitor* self, + GFile* file, + GFileInfo* info) +{ #line 199 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); #line 199 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->notify_file_alteration_completed (self, file, info); -#line 1570 "MediaMonitor.c" +#line 1880 "MediaMonitor.c" } -static gboolean media_monitor_real_notify_file_deleted (MediaMonitor* self, GFile* file) { +static gboolean +media_monitor_real_notify_file_deleted (MediaMonitor* self, + GFile* file) +{ gboolean _tmp0_ = FALSE; #line 201 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_deleted'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 201 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return _tmp0_; -#line 1580 "MediaMonitor.c" +#line 1893 "MediaMonitor.c" } -gboolean media_monitor_notify_file_deleted (MediaMonitor* self, GFile* file) { +gboolean +media_monitor_notify_file_deleted (MediaMonitor* self, + GFile* file) +{ #line 201 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); #line 201 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->notify_file_deleted (self, file); -#line 1589 "MediaMonitor.c" +#line 1905 "MediaMonitor.c" } -void media_monitor_mdbg (const gchar* msg) { +void +media_monitor_mdbg (const gchar* msg) +{ #line 203 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (msg != NULL); -#line 1596 "MediaMonitor.c" +#line 1914 "MediaMonitor.c" } -gboolean media_monitor_has_pending_updates (MediaMonitor* self) { +gboolean +media_monitor_has_pending_updates (MediaMonitor* self) +{ gboolean result = FALSE; GeeHashMap* _tmp0_; gint _tmp1_; @@ -1613,11 +1933,13 @@ gboolean media_monitor_has_pending_updates (MediaMonitor* self) { result = _tmp2_ > 0; #line 210 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1617 "MediaMonitor.c" +#line 1937 "MediaMonitor.c" } -GeeCollection* media_monitor_get_monitorables (MediaMonitor* self) { +GeeCollection* +media_monitor_get_monitorables (MediaMonitor* self) +{ GeeCollection* result = NULL; GeeHashMap* _tmp0_; GeeSet* _tmp1_; @@ -1634,22 +1956,22 @@ GeeCollection* media_monitor_get_monitorables (MediaMonitor* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 214 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1638 "MediaMonitor.c" +#line 1960 "MediaMonitor.c" } -MonitorableUpdates* media_monitor_fetch_updates (MediaMonitor* self, Monitorable* monitorable) { +MonitorableUpdates* +media_monitor_fetch_updates (MediaMonitor* self, + Monitorable* monitorable) +{ MonitorableUpdates* result = NULL; MonitorableUpdates* updates = NULL; GeeHashMap* _tmp0_; - Monitorable* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; + MonitorableUpdates* _tmp2_; MonitorableUpdates* _tmp3_; - Monitorable* _tmp4_; + GeeHashMap* _tmp4_; MonitorableUpdates* _tmp5_; - GeeHashMap* _tmp6_; - Monitorable* _tmp7_; - MonitorableUpdates* _tmp8_; #line 219 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL); #line 219 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1657,50 +1979,46 @@ MonitorableUpdates* media_monitor_fetch_updates (MediaMonitor* self, Monitorable #line 220 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp0_ = self->priv->pending_updates; #line 220 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = monitorable; -#line 220 "/home/jens/Source/shotwell/src/MediaMonitor.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), monitorable); #line 220 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - updates = (MonitorableUpdates*) _tmp2_; + updates = (MonitorableUpdates*) _tmp1_; #line 221 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp3_ = updates; + _tmp2_ = updates; #line 221 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp3_ != NULL) { + if (_tmp2_ != NULL) { #line 222 "/home/jens/Source/shotwell/src/MediaMonitor.vala" result = updates; #line 222 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1674 "MediaMonitor.c" +#line 1994 "MediaMonitor.c" } #line 224 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp4_ = monitorable; -#line 224 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp5_ = media_monitor_create_updates (self, _tmp4_); + _tmp3_ = media_monitor_create_updates (self, monitorable); #line 224 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _monitorable_updates_unref0 (updates); #line 224 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - updates = _tmp5_; -#line 225 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp6_ = self->priv->pending_updates; + updates = _tmp3_; #line 225 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp7_ = monitorable; + _tmp4_ = self->priv->pending_updates; #line 225 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp8_ = updates; + _tmp5_ = updates; #line 225 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_, _tmp8_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), monitorable, _tmp5_); #line 227 "/home/jens/Source/shotwell/src/MediaMonitor.vala" result = updates; #line 227 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1696 "MediaMonitor.c" +#line 2012 "MediaMonitor.c" } -MonitorableUpdates* media_monitor_get_existing_updates (MediaMonitor* self, Monitorable* monitorable) { +MonitorableUpdates* +media_monitor_get_existing_updates (MediaMonitor* self, + Monitorable* monitorable) +{ MonitorableUpdates* result = NULL; GeeHashMap* _tmp0_; - Monitorable* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 230 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL); #line 230 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1708,20 +2026,20 @@ MonitorableUpdates* media_monitor_get_existing_updates (MediaMonitor* self, Moni #line 231 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp0_ = self->priv->pending_updates; #line 231 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = monitorable; + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), monitorable); #line 231 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 231 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - result = (MonitorableUpdates*) _tmp2_; + result = (MonitorableUpdates*) _tmp1_; #line 231 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1719 "MediaMonitor.c" +#line 2035 "MediaMonitor.c" } -void media_monitor_remove_updates (MediaMonitor* self, Monitorable* monitorable) { +void +media_monitor_remove_updates (MediaMonitor* self, + Monitorable* monitorable) +{ GeeHashMap* _tmp0_; - Monitorable* _tmp1_; #line 234 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 234 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1729,201 +2047,180 @@ void media_monitor_remove_updates (MediaMonitor* self, Monitorable* monitorable) #line 235 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp0_ = self->priv->pending_updates; #line 235 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = monitorable; -#line 235 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, NULL); -#line 1736 "MediaMonitor.c" + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), monitorable, NULL); +#line 2052 "MediaMonitor.c" } -gboolean media_monitor_is_online (MediaMonitor* self, Monitorable* monitorable) { +gboolean +media_monitor_is_online (MediaMonitor* self, + Monitorable* monitorable) +{ gboolean result = FALSE; MonitorableUpdates* updates = NULL; - Monitorable* _tmp0_; - MonitorableUpdates* _tmp1_; - gboolean _tmp2_ = FALSE; - MonitorableUpdates* _tmp3_; + MonitorableUpdates* _tmp0_; + gboolean _tmp1_ = FALSE; + MonitorableUpdates* _tmp2_; #line 238 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); #line 238 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MONITORABLE (monitorable), FALSE); #line 239 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = monitorable; -#line 239 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = media_monitor_get_existing_updates (self, _tmp0_); + _tmp0_ = media_monitor_get_existing_updates (self, monitorable); #line 239 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - updates = _tmp1_; -#line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp3_ = updates; + updates = _tmp0_; #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp3_ != NULL) { -#line 1761 "MediaMonitor.c" - MonitorableUpdates* _tmp4_; - gboolean _tmp5_; + _tmp2_ = updates; #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp4_ = updates; + if (_tmp2_ != NULL) { +#line 2077 "MediaMonitor.c" + MonitorableUpdates* _tmp3_; #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp5_ = monitorable_updates_is_set_online (_tmp4_); + _tmp3_ = updates; #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _tmp5_; -#line 1770 "MediaMonitor.c" + _tmp1_ = monitorable_updates_is_set_online (_tmp3_); +#line 2083 "MediaMonitor.c" } else { - Monitorable* _tmp6_; - gboolean _tmp7_; -#line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp6_ = monitorable; #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp7_ = monitorable_is_offline (_tmp6_); -#line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = !_tmp7_; -#line 1780 "MediaMonitor.c" + _tmp1_ = !monitorable_is_offline (monitorable); +#line 2087 "MediaMonitor.c" } #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - result = _tmp2_; + result = _tmp1_; #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _monitorable_updates_unref0 (updates); #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1788 "MediaMonitor.c" +#line 2095 "MediaMonitor.c" } -gboolean media_monitor_is_offline (MediaMonitor* self, Monitorable* monitorable) { +gboolean +media_monitor_is_offline (MediaMonitor* self, + Monitorable* monitorable) +{ gboolean result = FALSE; MonitorableUpdates* updates = NULL; - Monitorable* _tmp0_; - MonitorableUpdates* _tmp1_; - gboolean _tmp2_ = FALSE; - MonitorableUpdates* _tmp3_; + MonitorableUpdates* _tmp0_; + gboolean _tmp1_ = FALSE; + MonitorableUpdates* _tmp2_; #line 244 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); #line 244 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MONITORABLE (monitorable), FALSE); #line 245 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = monitorable; -#line 245 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = media_monitor_get_existing_updates (self, _tmp0_); + _tmp0_ = media_monitor_get_existing_updates (self, monitorable); #line 245 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - updates = _tmp1_; + updates = _tmp0_; #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp3_ = updates; + _tmp2_ = updates; #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp3_ != NULL) { -#line 1813 "MediaMonitor.c" - MonitorableUpdates* _tmp4_; - gboolean _tmp5_; -#line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp4_ = updates; + if (_tmp2_ != NULL) { +#line 2120 "MediaMonitor.c" + MonitorableUpdates* _tmp3_; #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp5_ = monitorable_updates_is_set_offline (_tmp4_); + _tmp3_ = updates; #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _tmp5_; -#line 1822 "MediaMonitor.c" + _tmp1_ = monitorable_updates_is_set_offline (_tmp3_); +#line 2126 "MediaMonitor.c" } else { - Monitorable* _tmp6_; - gboolean _tmp7_; -#line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp6_ = monitorable; #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp7_ = monitorable_is_offline (_tmp6_); -#line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _tmp7_; -#line 1832 "MediaMonitor.c" + _tmp1_ = monitorable_is_offline (monitorable); +#line 2130 "MediaMonitor.c" } #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - result = _tmp2_; + result = _tmp1_; #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _monitorable_updates_unref0 (updates); #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1840 "MediaMonitor.c" +#line 2138 "MediaMonitor.c" } -GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorable) { +GFile* +media_monitor_get_master_file (MediaMonitor* self, + Monitorable* monitorable) +{ GFile* result = NULL; MonitorableUpdates* updates = NULL; - Monitorable* _tmp0_; - MonitorableUpdates* _tmp1_; - GFile* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - MonitorableUpdates* _tmp4_; + MonitorableUpdates* _tmp0_; + GFile* _tmp1_ = NULL; + gboolean _tmp2_ = FALSE; + MonitorableUpdates* _tmp3_; #line 250 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL); #line 250 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL); #line 251 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = monitorable; -#line 251 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = media_monitor_get_existing_updates (self, _tmp0_); + _tmp0_ = media_monitor_get_existing_updates (self, monitorable); #line 251 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - updates = _tmp1_; + updates = _tmp0_; #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp4_ = updates; + _tmp3_ = updates; #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp4_ != NULL) { -#line 1866 "MediaMonitor.c" - MonitorableUpdates* _tmp5_; + if (_tmp3_ != NULL) { +#line 2164 "MediaMonitor.c" + MonitorableUpdates* _tmp4_; + GFile* _tmp5_; GFile* _tmp6_; - GFile* _tmp7_; #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp5_ = updates; + _tmp4_ = updates; #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp6_ = monitorable_updates_get_master_file (_tmp5_); + _tmp5_ = monitorable_updates_get_master_file (_tmp4_); #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp3_ = _tmp7_ != NULL; + _tmp2_ = _tmp6_ != NULL; #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_object_unref0 (_tmp7_); -#line 1880 "MediaMonitor.c" + _g_object_unref0 (_tmp6_); +#line 2178 "MediaMonitor.c" } else { #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp3_ = FALSE; -#line 1884 "MediaMonitor.c" + _tmp2_ = FALSE; +#line 2182 "MediaMonitor.c" } #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp3_) { -#line 1888 "MediaMonitor.c" - MonitorableUpdates* _tmp8_; - GFile* _tmp9_; + if (_tmp2_) { +#line 2186 "MediaMonitor.c" + MonitorableUpdates* _tmp7_; + GFile* _tmp8_; #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp8_ = updates; + _tmp7_ = updates; #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp9_ = monitorable_updates_get_master_file (_tmp8_); + _tmp8_ = monitorable_updates_get_master_file (_tmp7_); #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _tmp9_; -#line 1899 "MediaMonitor.c" + _tmp1_ = _tmp8_; +#line 2197 "MediaMonitor.c" } else { - Monitorable* _tmp10_; - GFile* _tmp11_; -#line 254 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp10_ = monitorable; + GFile* _tmp9_; #line 254 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp11_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp9_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (monitorable, TYPE_MEDIA_SOURCE, MediaSource)); #line 254 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 254 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _tmp11_; -#line 1911 "MediaMonitor.c" + _tmp1_ = _tmp9_; +#line 2206 "MediaMonitor.c" } #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - result = _tmp2_; + result = _tmp1_; #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _monitorable_updates_unref0 (updates); #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1919 "MediaMonitor.c" +#line 2214 "MediaMonitor.c" } -void media_monitor_update_master_file (MediaMonitor* self, Monitorable* monitorable, GFile* file) { - Monitorable* _tmp0_; +void +media_monitor_update_master_file (MediaMonitor* self, + Monitorable* monitorable, + GFile* file) +{ + MonitorableUpdates* _tmp0_; MonitorableUpdates* _tmp1_; - MonitorableUpdates* _tmp2_; - GFile* _tmp3_; #line 257 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 257 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1931,73 +2228,69 @@ void media_monitor_update_master_file (MediaMonitor* self, Monitorable* monitora #line 257 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 258 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = monitorable; + _tmp0_ = media_monitor_fetch_updates (self, monitorable); #line 258 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = media_monitor_fetch_updates (self, _tmp0_); -#line 258 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _tmp1_; -#line 258 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp3_ = file; + _tmp1_ = _tmp0_; #line 258 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_updates_set_master_file (_tmp2_, _tmp3_); + monitorable_updates_set_master_file (_tmp1_, file); #line 258 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 1946 "MediaMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 2239 "MediaMonitor.c" } -void media_monitor_update_master_file_info_altered (MediaMonitor* self, Monitorable* monitorable) { - Monitorable* _tmp0_; +void +media_monitor_update_master_file_info_altered (MediaMonitor* self, + Monitorable* monitorable) +{ + MonitorableUpdates* _tmp0_; MonitorableUpdates* _tmp1_; - MonitorableUpdates* _tmp2_; #line 261 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 261 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE (monitorable)); #line 262 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = monitorable; -#line 262 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = media_monitor_fetch_updates (self, _tmp0_); + _tmp0_ = media_monitor_fetch_updates (self, monitorable); #line 262 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 262 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_updates_set_master_file_info_altered (_tmp2_, TRUE); + monitorable_updates_set_master_file_info_altered (_tmp1_, TRUE); #line 262 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 1968 "MediaMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 2261 "MediaMonitor.c" } -void media_monitor_update_master_file_in_alteration (MediaMonitor* self, Monitorable* monitorable, gboolean in_alteration) { - Monitorable* _tmp0_; +void +media_monitor_update_master_file_in_alteration (MediaMonitor* self, + Monitorable* monitorable, + gboolean in_alteration) +{ + MonitorableUpdates* _tmp0_; MonitorableUpdates* _tmp1_; - MonitorableUpdates* _tmp2_; - gboolean _tmp3_; #line 265 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 265 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE (monitorable)); #line 266 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = monitorable; -#line 266 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = media_monitor_fetch_updates (self, _tmp0_); -#line 266 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _tmp1_; + _tmp0_ = media_monitor_fetch_updates (self, monitorable); #line 266 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp3_ = in_alteration; + _tmp1_ = _tmp0_; #line 266 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_updates_set_master_in_alteration (_tmp2_, _tmp3_); + monitorable_updates_set_master_in_alteration (_tmp1_, in_alteration); #line 266 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 1993 "MediaMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 2284 "MediaMonitor.c" } -void media_monitor_update_master_file_alterations_completed (MediaMonitor* self, Monitorable* monitorable, GFileInfo* info) { - Monitorable* _tmp0_; +void +media_monitor_update_master_file_alterations_completed (MediaMonitor* self, + Monitorable* monitorable, + GFileInfo* info) +{ + MonitorableUpdates* _tmp0_; MonitorableUpdates* _tmp1_; - MonitorableUpdates* _tmp2_; - GFileInfo* _tmp3_; #line 269 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 269 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2005,74 +2298,76 @@ void media_monitor_update_master_file_alterations_completed (MediaMonitor* self, #line 269 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 270 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = monitorable; -#line 270 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = media_monitor_fetch_updates (self, _tmp0_); + _tmp0_ = media_monitor_fetch_updates (self, monitorable); #line 270 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _tmp1_; -#line 270 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp3_ = info; + _tmp1_ = _tmp0_; #line 270 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_updates_set_master_alterations_complete (_tmp2_, _tmp3_); + monitorable_updates_set_master_alterations_complete (_tmp1_, info); #line 270 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 2020 "MediaMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 2309 "MediaMonitor.c" } -void media_monitor_update_online (MediaMonitor* self, Monitorable* monitorable) { - Monitorable* _tmp0_; +void +media_monitor_update_online (MediaMonitor* self, + Monitorable* monitorable) +{ + MonitorableUpdates* _tmp0_; MonitorableUpdates* _tmp1_; - MonitorableUpdates* _tmp2_; #line 273 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 273 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE (monitorable)); #line 274 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = monitorable; + _tmp0_ = media_monitor_fetch_updates (self, monitorable); #line 274 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = media_monitor_fetch_updates (self, _tmp0_); -#line 274 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 274 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_updates_mark_online (_tmp2_); + monitorable_updates_mark_online (_tmp1_); #line 274 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 2042 "MediaMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 2331 "MediaMonitor.c" } -void media_monitor_update_offline (MediaMonitor* self, Monitorable* monitorable) { - Monitorable* _tmp0_; +void +media_monitor_update_offline (MediaMonitor* self, + Monitorable* monitorable) +{ + MonitorableUpdates* _tmp0_; MonitorableUpdates* _tmp1_; - MonitorableUpdates* _tmp2_; #line 277 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 277 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE (monitorable)); #line 278 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = monitorable; + _tmp0_ = media_monitor_fetch_updates (self, monitorable); #line 278 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = media_monitor_fetch_updates (self, _tmp0_); -#line 278 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 278 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_updates_mark_offline (_tmp2_); + monitorable_updates_mark_offline (_tmp1_); #line 278 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 2064 "MediaMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 2353 "MediaMonitor.c" } -static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollection* all_updates, TransactionController* controller, gint* op_count, GError** error) { +static void +media_monitor_real_process_updates (MediaMonitor* self, + GeeCollection* all_updates, + TransactionController* controller, + gint* op_count, + GError** error) +{ GeeMap* set_master_file = NULL; GeeMap* set_master_file_info = NULL; GeeArrayList* to_offline = NULL; GeeArrayList* to_online = NULL; - GeeMap* _tmp53_; - GeeMap* _tmp63_; - gboolean _tmp73_ = FALSE; - GeeArrayList* _tmp74_; + GeeMap* _tmp48_; + GeeMap* _tmp57_; + gboolean _tmp66_ = FALSE; + GeeArrayList* _tmp67_; GError * _inner_error_ = NULL; #line 285 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (GEE_IS_COLLECTION (all_updates)); @@ -2086,326 +2381,308 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio to_offline = NULL; #line 290 "/home/jens/Source/shotwell/src/MediaMonitor.vala" to_online = NULL; -#line 2090 "MediaMonitor.c" +#line 2385 "MediaMonitor.c" { GeeIterator* _updates_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; -#line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = all_updates; + GeeIterator* _tmp0_; #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (all_updates, GEE_TYPE_ITERABLE, GeeIterable)); #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _updates_it = _tmp1_; + _updates_it = _tmp0_; #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" while (TRUE) { -#line 2103 "MediaMonitor.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 2395 "MediaMonitor.c" + GeeIterator* _tmp1_; MonitorableUpdates* updates = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - gint _tmp6_; - MonitorableUpdates* _tmp7_; - GFile* _tmp8_; - GFile* _tmp9_; - gboolean _tmp10_; - MonitorableUpdates* _tmp21_; - GFileInfo* _tmp22_; - GFileInfo* _tmp23_; - gboolean _tmp24_; - MonitorableUpdates* _tmp35_; - gboolean _tmp36_; - MonitorableUpdates* _tmp44_; - gboolean _tmp45_; -#line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _updates_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + MonitorableUpdates* _tmp4_; + GFile* _tmp5_; + GFile* _tmp6_; + gboolean _tmp7_; + MonitorableUpdates* _tmp18_; + GFileInfo* _tmp19_; + GFileInfo* _tmp20_; + gboolean _tmp21_; + MonitorableUpdates* _tmp32_; + MonitorableUpdates* _tmp40_; #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _updates_it; #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" break; -#line 2130 "MediaMonitor.c" +#line 2416 "MediaMonitor.c" } #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp4_ = _updates_it; + _tmp2_ = _updates_it; #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - updates = (MonitorableUpdates*) _tmp5_; + updates = (MonitorableUpdates*) _tmp3_; #line 293 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp6_ = *op_count; -#line 293 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp6_ >= MEDIA_MONITOR_MAX_OPERATIONS_PER_CYCLE) { + if ((*op_count) >= MEDIA_MONITOR_MAX_OPERATIONS_PER_CYCLE) { #line 294 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _monitorable_updates_unref0 (updates); #line 294 "/home/jens/Source/shotwell/src/MediaMonitor.vala" break; -#line 2146 "MediaMonitor.c" +#line 2430 "MediaMonitor.c" } #line 296 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp7_ = updates; + _tmp4_ = updates; #line 296 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp8_ = monitorable_updates_get_master_file (_tmp7_); + _tmp5_ = monitorable_updates_get_master_file (_tmp4_); #line 296 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 296 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp10_ = _tmp9_ != NULL; + _tmp7_ = _tmp6_ != NULL; #line 296 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp6_); #line 296 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp10_) { -#line 2160 "MediaMonitor.c" - GeeMap* _tmp11_; - GeeMap* _tmp13_; - MonitorableUpdates* _tmp14_; - Monitorable* _tmp15_; + if (_tmp7_) { +#line 2444 "MediaMonitor.c" + GeeMap* _tmp8_; + GeeMap* _tmp10_; + MonitorableUpdates* _tmp11_; + Monitorable* _tmp12_; + MonitorableUpdates* _tmp13_; + GFile* _tmp14_; + GFile* _tmp15_; MonitorableUpdates* _tmp16_; - GFile* _tmp17_; - GFile* _tmp18_; - MonitorableUpdates* _tmp19_; - gint _tmp20_; + gint _tmp17_; #line 297 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp11_ = set_master_file; + _tmp8_ = set_master_file; #line 297 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp11_ == NULL) { -#line 2174 "MediaMonitor.c" - GeeHashMap* _tmp12_; + if (_tmp8_ == NULL) { +#line 2458 "MediaMonitor.c" + GeeHashMap* _tmp9_; #line 298 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp12_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp9_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 298 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (set_master_file); #line 298 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - set_master_file = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_MAP, GeeMap); -#line 2182 "MediaMonitor.c" + set_master_file = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_MAP, GeeMap); +#line 2466 "MediaMonitor.c" } #line 300 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp13_ = set_master_file; + _tmp10_ = set_master_file; #line 300 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp14_ = updates; + _tmp11_ = updates; #line 300 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp15_ = _tmp14_->monitorable; + _tmp12_ = _tmp11_->monitorable; #line 300 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp16_ = updates; + _tmp13_ = updates; #line 300 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp17_ = monitorable_updates_get_master_file (_tmp16_); + _tmp14_ = monitorable_updates_get_master_file (_tmp13_); #line 300 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp18_ = _tmp17_; + _tmp15_ = _tmp14_; #line 300 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - gee_map_set (_tmp13_, _tmp15_, _tmp18_); + gee_map_set (_tmp10_, _tmp12_, _tmp15_); #line 300 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp15_); #line 301 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp19_ = updates; + _tmp16_ = updates; #line 301 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_updates_set_master_file (_tmp19_, NULL); + monitorable_updates_set_master_file (_tmp16_, NULL); #line 302 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp20_ = *op_count; + _tmp17_ = *op_count; #line 302 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - *op_count = _tmp20_ + 1; -#line 2208 "MediaMonitor.c" + *op_count = _tmp17_ + 1; +#line 2492 "MediaMonitor.c" } #line 305 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp21_ = updates; + _tmp18_ = updates; #line 305 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp22_ = monitorable_updates_get_master_file_info (_tmp21_); + _tmp19_ = monitorable_updates_get_master_file_info (_tmp18_); #line 305 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp23_ = _tmp22_; + _tmp20_ = _tmp19_; #line 305 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp24_ = _tmp23_ != NULL; + _tmp21_ = _tmp20_ != NULL; #line 305 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp20_); #line 305 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp24_) { -#line 2222 "MediaMonitor.c" - GeeMap* _tmp25_; - GeeMap* _tmp27_; - MonitorableUpdates* _tmp28_; - Monitorable* _tmp29_; + if (_tmp21_) { +#line 2506 "MediaMonitor.c" + GeeMap* _tmp22_; + GeeMap* _tmp24_; + MonitorableUpdates* _tmp25_; + Monitorable* _tmp26_; + MonitorableUpdates* _tmp27_; + GFileInfo* _tmp28_; + GFileInfo* _tmp29_; MonitorableUpdates* _tmp30_; - GFileInfo* _tmp31_; - GFileInfo* _tmp32_; - MonitorableUpdates* _tmp33_; - gint _tmp34_; + gint _tmp31_; #line 306 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp25_ = set_master_file_info; + _tmp22_ = set_master_file_info; #line 306 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp25_ == NULL) { -#line 2236 "MediaMonitor.c" - GeeHashMap* _tmp26_; + if (_tmp22_ == NULL) { +#line 2520 "MediaMonitor.c" + GeeHashMap* _tmp23_; #line 307 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp26_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp23_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 307 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (set_master_file_info); #line 307 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - set_master_file_info = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_MAP, GeeMap); -#line 2244 "MediaMonitor.c" + set_master_file_info = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_MAP, GeeMap); +#line 2528 "MediaMonitor.c" } #line 309 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp27_ = set_master_file_info; + _tmp24_ = set_master_file_info; #line 309 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp28_ = updates; + _tmp25_ = updates; #line 309 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp29_ = _tmp28_->monitorable; + _tmp26_ = _tmp25_->monitorable; #line 309 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp30_ = updates; + _tmp27_ = updates; #line 309 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp31_ = monitorable_updates_get_master_file_info (_tmp30_); + _tmp28_ = monitorable_updates_get_master_file_info (_tmp27_); #line 309 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp32_ = _tmp31_; + _tmp29_ = _tmp28_; #line 309 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - gee_map_set (_tmp27_, _tmp29_, _tmp32_); + gee_map_set (_tmp24_, _tmp26_, _tmp29_); #line 309 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_object_unref0 (_tmp32_); + _g_object_unref0 (_tmp29_); #line 310 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp33_ = updates; + _tmp30_ = updates; #line 310 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_updates_set_master_file_info (_tmp33_, NULL); + monitorable_updates_set_master_file_info (_tmp30_, NULL); #line 311 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp34_ = *op_count; + _tmp31_ = *op_count; #line 311 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - *op_count = _tmp34_ + 1; -#line 2270 "MediaMonitor.c" + *op_count = _tmp31_ + 1; +#line 2554 "MediaMonitor.c" } #line 314 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp35_ = updates; -#line 314 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp36_ = monitorable_updates_is_set_offline (_tmp35_); + _tmp32_ = updates; #line 314 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp36_) { -#line 2278 "MediaMonitor.c" - GeeArrayList* _tmp37_; - GeeArrayList* _tmp39_; - MonitorableUpdates* _tmp40_; - Monitorable* _tmp41_; - MonitorableUpdates* _tmp42_; - gint _tmp43_; + if (monitorable_updates_is_set_offline (_tmp32_)) { +#line 2560 "MediaMonitor.c" + GeeArrayList* _tmp33_; + GeeArrayList* _tmp35_; + MonitorableUpdates* _tmp36_; + Monitorable* _tmp37_; + MonitorableUpdates* _tmp38_; + gint _tmp39_; #line 315 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp37_ = to_offline; + _tmp33_ = to_offline; #line 315 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp37_ == NULL) { -#line 2289 "MediaMonitor.c" - GeeArrayList* _tmp38_; + if (_tmp33_ == NULL) { +#line 2571 "MediaMonitor.c" + GeeArrayList* _tmp34_; #line 316 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp38_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp34_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 316 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (to_offline); #line 316 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - to_offline = _tmp38_; -#line 2297 "MediaMonitor.c" + to_offline = _tmp34_; +#line 2579 "MediaMonitor.c" } #line 318 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp39_ = to_offline; + _tmp35_ = to_offline; #line 318 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp40_ = updates; + _tmp36_ = updates; #line 318 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp41_ = _tmp40_->monitorable; + _tmp37_ = _tmp36_->monitorable; #line 318 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp41_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp37_); #line 319 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp42_ = updates; + _tmp38_ = updates; #line 319 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_updates_reset_online_offline (_tmp42_); + monitorable_updates_reset_online_offline (_tmp38_); #line 320 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp43_ = *op_count; + _tmp39_ = *op_count; #line 320 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - *op_count = _tmp43_ + 1; -#line 2315 "MediaMonitor.c" + *op_count = _tmp39_ + 1; +#line 2597 "MediaMonitor.c" } #line 323 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp44_ = updates; + _tmp40_ = updates; #line 323 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp45_ = monitorable_updates_is_set_online (_tmp44_); -#line 323 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp45_) { -#line 2323 "MediaMonitor.c" - GeeArrayList* _tmp46_; - GeeArrayList* _tmp48_; - MonitorableUpdates* _tmp49_; - Monitorable* _tmp50_; - MonitorableUpdates* _tmp51_; - gint _tmp52_; + if (monitorable_updates_is_set_online (_tmp40_)) { +#line 2603 "MediaMonitor.c" + GeeArrayList* _tmp41_; + GeeArrayList* _tmp43_; + MonitorableUpdates* _tmp44_; + Monitorable* _tmp45_; + MonitorableUpdates* _tmp46_; + gint _tmp47_; #line 324 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp46_ = to_online; + _tmp41_ = to_online; #line 324 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp46_ == NULL) { -#line 2334 "MediaMonitor.c" - GeeArrayList* _tmp47_; + if (_tmp41_ == NULL) { +#line 2614 "MediaMonitor.c" + GeeArrayList* _tmp42_; #line 325 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp47_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp42_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 325 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (to_online); #line 325 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - to_online = _tmp47_; -#line 2342 "MediaMonitor.c" + to_online = _tmp42_; +#line 2622 "MediaMonitor.c" } #line 327 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp48_ = to_online; + _tmp43_ = to_online; #line 327 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp49_ = updates; + _tmp44_ = updates; #line 327 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp50_ = _tmp49_->monitorable; + _tmp45_ = _tmp44_->monitorable; #line 327 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp50_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp45_); #line 328 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp51_ = updates; + _tmp46_ = updates; #line 328 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_updates_reset_online_offline (_tmp51_); + monitorable_updates_reset_online_offline (_tmp46_); #line 329 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp52_ = *op_count; + _tmp47_ = *op_count; #line 329 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - *op_count = _tmp52_ + 1; -#line 2360 "MediaMonitor.c" + *op_count = _tmp47_ + 1; +#line 2640 "MediaMonitor.c" } #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _monitorable_updates_unref0 (updates); -#line 2364 "MediaMonitor.c" +#line 2644 "MediaMonitor.c" } #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (_updates_it); -#line 2368 "MediaMonitor.c" +#line 2648 "MediaMonitor.c" } #line 333 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp53_ = set_master_file; + _tmp48_ = set_master_file; #line 333 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp53_ != NULL) { -#line 2374 "MediaMonitor.c" - GeeMap* _tmp54_; - gint _tmp55_; - gint _tmp56_; - gchar* _tmp57_; - gchar* _tmp58_; - gchar* _tmp59_; - gchar* _tmp60_; - GeeMap* _tmp61_; - TransactionController* _tmp62_; + if (_tmp48_ != NULL) { +#line 2654 "MediaMonitor.c" + GeeMap* _tmp49_; + gint _tmp50_; + gint _tmp51_; + gchar* _tmp52_; + gchar* _tmp53_; + gchar* _tmp54_; + gchar* _tmp55_; + GeeMap* _tmp56_; #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp54_ = set_master_file; + _tmp49_ = set_master_file; #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp55_ = gee_map_get_size (_tmp54_); + _tmp50_ = gee_map_get_size (_tmp49_); #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp56_ = _tmp55_; + _tmp51_ = _tmp50_; #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp57_ = media_monitor_to_string (self); + _tmp52_ = media_monitor_to_string (self); #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp58_ = _tmp57_; + _tmp53_ = _tmp52_; #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp59_ = g_strdup_printf ("Changing master file of %d objects in %s", _tmp56_, _tmp58_); + _tmp54_ = g_strdup_printf ("Changing master file of %d objects in %s", _tmp51_, _tmp53_); #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp60_ = _tmp59_; + _tmp55_ = _tmp54_; #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - media_monitor_mdbg (_tmp60_); + media_monitor_mdbg (_tmp55_); #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_free0 (_tmp60_); + _g_free0 (_tmp55_); #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_free0 (_tmp58_); + _g_free0 (_tmp53_); #line 336 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp61_ = set_master_file; + _tmp56_ = set_master_file; #line 336 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp62_ = controller; -#line 336 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_set_many_master_file (_tmp61_, _tmp62_, &_inner_error_); + monitorable_set_many_master_file (_tmp56_, controller, &_inner_error_); #line 336 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 336 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2420,49 +2697,46 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio _g_object_unref0 (set_master_file); #line 336 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return; -#line 2424 "MediaMonitor.c" +#line 2701 "MediaMonitor.c" } } #line 339 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp63_ = set_master_file_info; + _tmp57_ = set_master_file_info; #line 339 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp63_ != NULL) { -#line 2431 "MediaMonitor.c" - GeeMap* _tmp64_; - gint _tmp65_; - gint _tmp66_; - gchar* _tmp67_; - gchar* _tmp68_; - gchar* _tmp69_; - gchar* _tmp70_; - GeeMap* _tmp71_; - TransactionController* _tmp72_; + if (_tmp57_ != NULL) { +#line 2708 "MediaMonitor.c" + GeeMap* _tmp58_; + gint _tmp59_; + gint _tmp60_; + gchar* _tmp61_; + gchar* _tmp62_; + gchar* _tmp63_; + gchar* _tmp64_; + GeeMap* _tmp65_; #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp64_ = set_master_file_info; + _tmp58_ = set_master_file_info; #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp65_ = gee_map_get_size (_tmp64_); + _tmp59_ = gee_map_get_size (_tmp58_); #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp66_ = _tmp65_; + _tmp60_ = _tmp59_; #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp67_ = media_monitor_to_string (self); + _tmp61_ = media_monitor_to_string (self); #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp68_ = _tmp67_; + _tmp62_ = _tmp61_; #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp69_ = g_strdup_printf ("Updating %d master files timestamps in %s", _tmp66_, _tmp68_); + _tmp63_ = g_strdup_printf ("Updating %d master files timestamps in %s", _tmp60_, _tmp62_); #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp70_ = _tmp69_; + _tmp64_ = _tmp63_; #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - media_monitor_mdbg (_tmp70_); + media_monitor_mdbg (_tmp64_); #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_free0 (_tmp70_); + _g_free0 (_tmp64_); #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_free0 (_tmp68_); -#line 343 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp71_ = set_master_file_info; + _g_free0 (_tmp62_); #line 343 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp72_ = controller; + _tmp65_ = set_master_file_info; #line 343 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_set_many_master_timestamp (_tmp71_, _tmp72_, &_inner_error_); + monitorable_set_many_master_timestamp (_tmp65_, controller, &_inner_error_); #line 343 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 343 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2477,104 +2751,101 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio _g_object_unref0 (set_master_file); #line 343 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return; -#line 2481 "MediaMonitor.c" +#line 2755 "MediaMonitor.c" } } #line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp74_ = to_offline; + _tmp67_ = to_offline; #line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp74_ != NULL) { + if (_tmp67_ != NULL) { #line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp73_ = TRUE; -#line 2490 "MediaMonitor.c" + _tmp66_ = TRUE; +#line 2764 "MediaMonitor.c" } else { - GeeArrayList* _tmp75_; + GeeArrayList* _tmp68_; #line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp75_ = to_online; + _tmp68_ = to_online; #line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp73_ = _tmp75_ != NULL; -#line 2497 "MediaMonitor.c" + _tmp66_ = _tmp68_ != NULL; +#line 2771 "MediaMonitor.c" } #line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp73_) { -#line 2501 "MediaMonitor.c" - gint _tmp76_ = 0; - GeeArrayList* _tmp77_; - gint _tmp81_ = 0; - GeeArrayList* _tmp82_; - gchar* _tmp86_; - gchar* _tmp87_; - gchar* _tmp88_; - gchar* _tmp89_; - GeeArrayList* _tmp90_; - GeeArrayList* _tmp91_; - TransactionController* _tmp92_; + if (_tmp66_) { +#line 2775 "MediaMonitor.c" + gint _tmp69_ = 0; + GeeArrayList* _tmp70_; + gint _tmp74_ = 0; + GeeArrayList* _tmp75_; + gchar* _tmp79_; + gchar* _tmp80_; + gchar* _tmp81_; + gchar* _tmp82_; + GeeArrayList* _tmp83_; + GeeArrayList* _tmp84_; #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp77_ = to_online; + _tmp70_ = to_online; #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp77_ != NULL) { -#line 2517 "MediaMonitor.c" - GeeArrayList* _tmp78_; - gint _tmp79_; - gint _tmp80_; + if (_tmp70_ != NULL) { +#line 2790 "MediaMonitor.c" + GeeArrayList* _tmp71_; + gint _tmp72_; + gint _tmp73_; #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp78_ = to_online; + _tmp71_ = to_online; #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp79_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp72_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp80_ = _tmp79_; + _tmp73_ = _tmp72_; #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp76_ = _tmp80_; -#line 2529 "MediaMonitor.c" + _tmp69_ = _tmp73_; +#line 2802 "MediaMonitor.c" } else { #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp76_ = 0; -#line 2533 "MediaMonitor.c" + _tmp69_ = 0; +#line 2806 "MediaMonitor.c" } #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp82_ = to_offline; + _tmp75_ = to_offline; #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp82_ != NULL) { -#line 2539 "MediaMonitor.c" - GeeArrayList* _tmp83_; - gint _tmp84_; - gint _tmp85_; + if (_tmp75_ != NULL) { +#line 2812 "MediaMonitor.c" + GeeArrayList* _tmp76_; + gint _tmp77_; + gint _tmp78_; #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp83_ = to_offline; + _tmp76_ = to_offline; #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp84_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp77_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp85_ = _tmp84_; + _tmp78_ = _tmp77_; #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp81_ = _tmp85_; -#line 2551 "MediaMonitor.c" + _tmp74_ = _tmp78_; +#line 2824 "MediaMonitor.c" } else { #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp81_ = 0; -#line 2555 "MediaMonitor.c" + _tmp74_ = 0; +#line 2828 "MediaMonitor.c" } #line 347 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp86_ = media_monitor_to_string (self); + _tmp79_ = media_monitor_to_string (self); #line 347 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp87_ = _tmp86_; + _tmp80_ = _tmp79_; #line 347 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp88_ = g_strdup_printf ("Marking %d online, %d offline in %s", _tmp76_, _tmp81_, _tmp87_); + _tmp81_ = g_strdup_printf ("Marking %d online, %d offline in %s", _tmp69_, _tmp74_, _tmp80_); #line 347 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp89_ = _tmp88_; + _tmp82_ = _tmp81_; #line 347 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - media_monitor_mdbg (_tmp89_); + media_monitor_mdbg (_tmp82_); #line 347 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_free0 (_tmp89_); + _g_free0 (_tmp82_); #line 347 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_free0 (_tmp87_); + _g_free0 (_tmp80_); #line 352 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp90_ = to_online; + _tmp83_ = to_online; #line 352 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp91_ = to_offline; + _tmp84_ = to_offline; #line 352 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp92_ = controller; -#line 352 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_mark_many_online_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, GEE_TYPE_COLLECTION, GeeCollection), _tmp92_, &_inner_error_); + monitorable_mark_many_online_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, GEE_TYPE_COLLECTION, GeeCollection), controller, &_inner_error_); #line 352 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 352 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2589,7 +2860,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio _g_object_unref0 (set_master_file); #line 352 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return; -#line 2593 "MediaMonitor.c" +#line 2864 "MediaMonitor.c" } } #line 285 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2600,322 +2871,320 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio _g_object_unref0 (set_master_file_info); #line 285 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (set_master_file); -#line 2604 "MediaMonitor.c" +#line 2875 "MediaMonitor.c" } -void media_monitor_process_updates (MediaMonitor* self, GeeCollection* all_updates, TransactionController* controller, gint* op_count, GError** error) { +void +media_monitor_process_updates (MediaMonitor* self, + GeeCollection* all_updates, + TransactionController* controller, + gint* op_count, + GError** error) +{ #line 285 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 285 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MEDIA_MONITOR_GET_CLASS (self)->process_updates (self, all_updates, controller, op_count, error); -#line 2613 "MediaMonitor.c" +#line 2890 "MediaMonitor.c" } -static gpointer _transaction_controller_ref0 (gpointer self) { +static gpointer +_transaction_controller_ref0 (gpointer self) +{ #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return self ? transaction_controller_ref (self) : NULL; -#line 2620 "MediaMonitor.c" +#line 2899 "MediaMonitor.c" } -static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) { +static gboolean +media_monitor_on_flush_pending_updates (MediaMonitor* self) +{ gboolean result = FALSE; GCancellable* _tmp0_; - gboolean _tmp1_; - GeeHashMap* _tmp2_; + GeeHashMap* _tmp1_; + gint _tmp2_; gint _tmp3_; - gint _tmp4_; GTimer* timer = NULL; - GTimer* _tmp5_; + GTimer* _tmp4_; GeeArrayList* to_process = NULL; GeeArrayList* to_remove = NULL; gint op_count = 0; - GeeArrayList* _tmp29_; - GeeArrayList* _tmp47_; + GeeArrayList* _tmp25_; + GeeArrayList* _tmp43_; gdouble elapsed = 0.0; - GTimer* _tmp60_; - gdouble _tmp61_; - gboolean _tmp62_ = FALSE; - gdouble _tmp63_; + GTimer* _tmp56_; + gdouble _tmp57_; + gboolean _tmp58_ = FALSE; + gdouble _tmp59_; GError * _inner_error_ = NULL; #line 356 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); #line 357 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp0_ = self->priv->cancellable; #line 357 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = g_cancellable_is_cancelled (_tmp0_); -#line 357 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp1_) { + if (g_cancellable_is_cancelled (_tmp0_)) { #line 358 "/home/jens/Source/shotwell/src/MediaMonitor.vala" result = FALSE; #line 358 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 2656 "MediaMonitor.c" +#line 2934 "MediaMonitor.c" } #line 360 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = self->priv->pending_updates; + _tmp1_ = self->priv->pending_updates; #line 360 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp3_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp2_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 360 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 360 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp4_ == 0) { + if (_tmp3_ == 0) { #line 361 "/home/jens/Source/shotwell/src/MediaMonitor.vala" result = TRUE; #line 361 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 2670 "MediaMonitor.c" +#line 2948 "MediaMonitor.c" } #line 363 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp5_ = g_timer_new (); + _tmp4_ = g_timer_new (); #line 363 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - timer = _tmp5_; + timer = _tmp4_; #line 368 "/home/jens/Source/shotwell/src/MediaMonitor.vala" to_process = NULL; #line 369 "/home/jens/Source/shotwell/src/MediaMonitor.vala" to_remove = NULL; -#line 2680 "MediaMonitor.c" +#line 2958 "MediaMonitor.c" { GeeIterator* _updates_it = NULL; - GeeHashMap* _tmp6_; + GeeHashMap* _tmp5_; + GeeCollection* _tmp6_; GeeCollection* _tmp7_; GeeCollection* _tmp8_; - GeeCollection* _tmp9_; + GeeIterator* _tmp9_; GeeIterator* _tmp10_; - GeeIterator* _tmp11_; #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp6_ = self->priv->pending_updates; + _tmp5_ = self->priv->pending_updates; #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp7_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp6_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable)); #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _updates_it = _tmp11_; + _updates_it = _tmp10_; #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" while (TRUE) { -#line 2707 "MediaMonitor.c" - GeeIterator* _tmp12_; - gboolean _tmp13_; +#line 2985 "MediaMonitor.c" + GeeIterator* _tmp11_; MonitorableUpdates* updates = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; - MonitorableUpdates* _tmp16_; - gboolean _tmp17_; - MonitorableUpdates* _tmp18_; - gboolean _tmp19_; - GeeArrayList* _tmp25_; - GeeArrayList* _tmp27_; - MonitorableUpdates* _tmp28_; -#line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp12_ = _updates_it; + GeeIterator* _tmp12_; + gpointer _tmp13_; + MonitorableUpdates* _tmp14_; + MonitorableUpdates* _tmp15_; + GeeArrayList* _tmp21_; + GeeArrayList* _tmp23_; + MonitorableUpdates* _tmp24_; #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp13_ = gee_iterator_next (_tmp12_); + _tmp11_ = _updates_it; #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp11_)) { #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" break; -#line 2728 "MediaMonitor.c" +#line 3001 "MediaMonitor.c" } #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp14_ = _updates_it; + _tmp12_ = _updates_it; #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp13_ = gee_iterator_get (_tmp12_); #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - updates = (MonitorableUpdates*) _tmp15_; -#line 371 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp16_ = updates; + updates = (MonitorableUpdates*) _tmp13_; #line 371 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp17_ = monitorable_updates_is_in_alteration (_tmp16_); + _tmp14_ = updates; #line 371 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp17_) { + if (monitorable_updates_is_in_alteration (_tmp14_)) { #line 372 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _monitorable_updates_unref0 (updates); #line 372 "/home/jens/Source/shotwell/src/MediaMonitor.vala" continue; -#line 2746 "MediaMonitor.c" +#line 3017 "MediaMonitor.c" } #line 374 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp18_ = updates; -#line 374 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp19_ = monitorable_updates_is_all_updated (_tmp18_); + _tmp15_ = updates; #line 374 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp19_) { -#line 2754 "MediaMonitor.c" - GeeArrayList* _tmp20_; - GeeArrayList* _tmp22_; - MonitorableUpdates* _tmp23_; - Monitorable* _tmp24_; + if (monitorable_updates_is_all_updated (_tmp15_)) { +#line 3023 "MediaMonitor.c" + GeeArrayList* _tmp16_; + GeeArrayList* _tmp18_; + MonitorableUpdates* _tmp19_; + Monitorable* _tmp20_; #line 375 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp20_ = to_remove; + _tmp16_ = to_remove; #line 375 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp20_ == NULL) { -#line 2763 "MediaMonitor.c" - GeeArrayList* _tmp21_; + if (_tmp16_ == NULL) { +#line 3032 "MediaMonitor.c" + GeeArrayList* _tmp17_; #line 376 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp21_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp17_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 376 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (to_remove); #line 376 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - to_remove = _tmp21_; -#line 2771 "MediaMonitor.c" + to_remove = _tmp17_; +#line 3040 "MediaMonitor.c" } #line 378 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp22_ = to_remove; + _tmp18_ = to_remove; #line 378 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp23_ = updates; + _tmp19_ = updates; #line 378 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp24_ = _tmp23_->monitorable; + _tmp20_ = _tmp19_->monitorable; #line 378 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_); #line 379 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _monitorable_updates_unref0 (updates); #line 379 "/home/jens/Source/shotwell/src/MediaMonitor.vala" continue; -#line 2785 "MediaMonitor.c" +#line 3054 "MediaMonitor.c" } #line 382 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp25_ = to_process; + _tmp21_ = to_process; #line 382 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp25_ == NULL) { -#line 2791 "MediaMonitor.c" - GeeArrayList* _tmp26_; + if (_tmp21_ == NULL) { +#line 3060 "MediaMonitor.c" + GeeArrayList* _tmp22_; #line 383 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp26_ = gee_array_list_new (TYPE_MONITORABLE_UPDATES, (GBoxedCopyFunc) monitorable_updates_ref, (GDestroyNotify) monitorable_updates_unref, NULL, NULL, NULL); + _tmp22_ = gee_array_list_new (TYPE_MONITORABLE_UPDATES, (GBoxedCopyFunc) monitorable_updates_ref, (GDestroyNotify) monitorable_updates_unref, NULL, NULL, NULL); #line 383 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (to_process); #line 383 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - to_process = _tmp26_; -#line 2799 "MediaMonitor.c" + to_process = _tmp22_; +#line 3068 "MediaMonitor.c" } #line 385 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp27_ = to_process; + _tmp23_ = to_process; #line 385 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp28_ = updates; + _tmp24_ = updates; #line 385 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp28_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_); #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _monitorable_updates_unref0 (updates); -#line 2809 "MediaMonitor.c" +#line 3078 "MediaMonitor.c" } #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (_updates_it); -#line 2813 "MediaMonitor.c" +#line 3082 "MediaMonitor.c" } #line 388 "/home/jens/Source/shotwell/src/MediaMonitor.vala" op_count = 0; #line 389 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp29_ = to_process; + _tmp25_ = to_process; #line 389 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp29_ != NULL) { -#line 2821 "MediaMonitor.c" + if (_tmp25_ != NULL) { +#line 3090 "MediaMonitor.c" TransactionController* controller = NULL; - MediaSourceCollection* _tmp30_; - MediaSourceCollection* _tmp31_; - TransactionController* _tmp32_; - TransactionController* _tmp33_; - TransactionController* _tmp34_; - TransactionController* _tmp35_; + MediaSourceCollection* _tmp26_; + MediaSourceCollection* _tmp27_; + TransactionController* _tmp28_; + TransactionController* _tmp29_; + TransactionController* _tmp30_; + TransactionController* _tmp31_; #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp30_ = media_monitor_get_media_source_collection (self); + _tmp26_ = media_monitor_get_media_source_collection (self); #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp31_ = _tmp30_; + _tmp27_ = _tmp26_; #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp32_ = media_source_collection_get_transaction_controller (_tmp31_); + _tmp28_ = media_source_collection_get_transaction_controller (_tmp27_); #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp33_ = _tmp32_; + _tmp29_ = _tmp28_; #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp34_ = _transaction_controller_ref0 (_tmp33_); + _tmp30_ = _transaction_controller_ref0 (_tmp29_); #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp35_ = _tmp34_; + _tmp31_ = _tmp30_; #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _data_collection_unref0 (_tmp31_); + _data_collection_unref0 (_tmp27_); #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - controller = _tmp35_; -#line 2845 "MediaMonitor.c" + controller = _tmp31_; +#line 3114 "MediaMonitor.c" { - TransactionController* _tmp36_; - GeeArrayList* _tmp37_; - TransactionController* _tmp38_; - TransactionController* _tmp39_; + TransactionController* _tmp32_; + GeeArrayList* _tmp33_; + TransactionController* _tmp34_; + TransactionController* _tmp35_; #line 393 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp36_ = controller; + _tmp32_ = controller; #line 393 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - transaction_controller_begin (_tmp36_); + transaction_controller_begin (_tmp32_); #line 394 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp37_ = to_process; + _tmp33_ = to_process; #line 394 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp38_ = controller; + _tmp34_ = controller; #line 394 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - media_monitor_process_updates (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection), _tmp38_, &op_count, &_inner_error_); + media_monitor_process_updates (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), _tmp34_, &op_count, &_inner_error_); #line 394 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2863 "MediaMonitor.c" +#line 3132 "MediaMonitor.c" goto __catch594_g_error; } #line 395 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp39_ = controller; + _tmp35_ = controller; #line 395 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - transaction_controller_commit (_tmp39_); -#line 2870 "MediaMonitor.c" + transaction_controller_commit (_tmp35_); +#line 3139 "MediaMonitor.c" } goto __finally594; __catch594_g_error: { GError* err = NULL; - GError* _tmp40_; + GError* _tmp36_; #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" err = _inner_error_; #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _inner_error_ = NULL; #line 397 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp40_ = err; + _tmp36_ = err; #line 397 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp40_->domain == DATABASE_ERROR) { -#line 2885 "MediaMonitor.c" - GError* _tmp41_; + if (_tmp36_->domain == DATABASE_ERROR) { +#line 3154 "MediaMonitor.c" + GError* _tmp37_; #line 398 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp41_ = err; + _tmp37_ = err; #line 398 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - app_window_database_error ((GError*) _tmp41_); -#line 2891 "MediaMonitor.c" + app_window_database_error ((GError*) _tmp37_); +#line 3160 "MediaMonitor.c" } else { - GError* _tmp42_; - const gchar* _tmp43_; - gchar* _tmp44_; - gchar* _tmp45_; + GError* _tmp38_; + const gchar* _tmp39_; + gchar* _tmp40_; + gchar* _tmp41_; #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp42_ = err; + _tmp38_ = err; #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp43_ = _tmp42_->message; + _tmp39_ = _tmp38_->message; #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp44_ = g_strdup_printf (_ ("Unable to process monitoring updates: %s"), _tmp43_); + _tmp40_ = g_strdup_printf (_ ("Unable to process monitoring updates: %s"), _tmp39_); #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp45_ = _tmp44_; + _tmp41_ = _tmp40_; #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - app_window_panic (_tmp45_); + app_window_panic (_tmp41_); #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_free0 (_tmp45_); -#line 2909 "MediaMonitor.c" + _g_free0 (_tmp41_); +#line 3178 "MediaMonitor.c" } #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_error_free0 (err); -#line 2913 "MediaMonitor.c" +#line 3182 "MediaMonitor.c" } __finally594: #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2918 "MediaMonitor.c" - gboolean _tmp46_ = FALSE; +#line 3187 "MediaMonitor.c" + gboolean _tmp42_ = FALSE; #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _transaction_controller_unref0 (controller); #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2929,138 +3198,138 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) { #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_clear_error (&_inner_error_); #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - return _tmp46_; -#line 2934 "MediaMonitor.c" + return _tmp42_; +#line 3203 "MediaMonitor.c" } #line 389 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _transaction_controller_unref0 (controller); -#line 2938 "MediaMonitor.c" +#line 3207 "MediaMonitor.c" } #line 404 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp47_ = to_remove; + _tmp43_ = to_remove; #line 404 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp47_ != NULL) { -#line 2944 "MediaMonitor.c" + if (_tmp43_ != NULL) { +#line 3213 "MediaMonitor.c" { GeeArrayList* _monitorable_list = NULL; - GeeArrayList* _tmp48_; - GeeArrayList* _tmp49_; + GeeArrayList* _tmp44_; + GeeArrayList* _tmp45_; gint _monitorable_size = 0; - GeeArrayList* _tmp50_; - gint _tmp51_; - gint _tmp52_; + GeeArrayList* _tmp46_; + gint _tmp47_; + gint _tmp48_; gint _monitorable_index = 0; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp48_ = to_remove; + _tmp44_ = to_remove; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp49_ = _g_object_ref0 (_tmp48_); + _tmp45_ = _g_object_ref0 (_tmp44_); #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _monitorable_list = _tmp49_; + _monitorable_list = _tmp45_; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp50_ = _monitorable_list; + _tmp46_ = _monitorable_list; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp51_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp47_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp52_ = _tmp51_; + _tmp48_ = _tmp47_; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _monitorable_size = _tmp52_; + _monitorable_size = _tmp48_; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _monitorable_index = -1; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" while (TRUE) { -#line 2972 "MediaMonitor.c" - gint _tmp53_; - gint _tmp54_; - gint _tmp55_; +#line 3241 "MediaMonitor.c" + gint _tmp49_; + gint _tmp50_; + gint _tmp51_; Monitorable* monitorable = NULL; - GeeArrayList* _tmp56_; - gint _tmp57_; - gpointer _tmp58_; - Monitorable* _tmp59_; + GeeArrayList* _tmp52_; + gint _tmp53_; + gpointer _tmp54_; + Monitorable* _tmp55_; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp53_ = _monitorable_index; + _tmp49_ = _monitorable_index; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _monitorable_index = _tmp53_ + 1; + _monitorable_index = _tmp49_ + 1; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp54_ = _monitorable_index; + _tmp50_ = _monitorable_index; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp55_ = _monitorable_size; + _tmp51_ = _monitorable_size; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (!(_tmp54_ < _tmp55_)) { + if (!(_tmp50_ < _tmp51_)) { #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" break; -#line 2993 "MediaMonitor.c" +#line 3262 "MediaMonitor.c" } #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp56_ = _monitorable_list; + _tmp52_ = _monitorable_list; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp57_ = _monitorable_index; + _tmp53_ = _monitorable_index; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp58_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp57_); + _tmp54_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp53_); #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable = (Monitorable*) _tmp58_; + monitorable = (Monitorable*) _tmp54_; #line 406 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp59_ = monitorable; + _tmp55_ = monitorable; #line 406 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - media_monitor_remove_updates (self, _tmp59_); + media_monitor_remove_updates (self, _tmp55_); #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (monitorable); -#line 3009 "MediaMonitor.c" +#line 3278 "MediaMonitor.c" } #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (_monitorable_list); -#line 3013 "MediaMonitor.c" +#line 3282 "MediaMonitor.c" } } #line 409 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp60_ = timer; + _tmp56_ = timer; #line 409 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp61_ = g_timer_elapsed (_tmp60_, NULL); + _tmp57_ = g_timer_elapsed (_tmp56_, NULL); #line 409 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - elapsed = _tmp61_; + elapsed = _tmp57_; #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp63_ = elapsed; + _tmp59_ = elapsed; #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp63_ > 0.01) { + if (_tmp59_ > 0.01) { #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp62_ = TRUE; -#line 3028 "MediaMonitor.c" + _tmp58_ = TRUE; +#line 3297 "MediaMonitor.c" } else { - gint _tmp64_; + gint _tmp60_; #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp64_ = op_count; + _tmp60_ = op_count; #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp62_ = _tmp64_ > 0; -#line 3035 "MediaMonitor.c" + _tmp58_ = _tmp60_ > 0; +#line 3304 "MediaMonitor.c" } #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp62_) { -#line 3039 "MediaMonitor.c" + if (_tmp58_) { +#line 3308 "MediaMonitor.c" + gchar* _tmp61_; + gchar* _tmp62_; + gdouble _tmp63_; + gint _tmp64_; gchar* _tmp65_; gchar* _tmp66_; - gdouble _tmp67_; - gint _tmp68_; - gchar* _tmp69_; - gchar* _tmp70_; -#line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp65_ = media_monitor_to_string (self); #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp66_ = _tmp65_; + _tmp61_ = media_monitor_to_string (self); #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp67_ = elapsed; + _tmp62_ = _tmp61_; #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp68_ = op_count; + _tmp63_ = elapsed; #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp69_ = g_strdup_printf ("Total pending queue time for %s: %lf (%d ops)", _tmp66_, _tmp67_, _tmp68_); + _tmp64_ = op_count; #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp70_ = _tmp69_; + _tmp65_ = g_strdup_printf ("Total pending queue time for %s: %lf (%d ops)", _tmp62_, _tmp63_, _tmp64_); #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - media_monitor_mdbg (_tmp70_); + _tmp66_ = _tmp65_; #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_free0 (_tmp70_); + media_monitor_mdbg (_tmp66_); #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_free0 (_tmp66_); -#line 3064 "MediaMonitor.c" +#line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" + _g_free0 (_tmp62_); +#line 3333 "MediaMonitor.c" } #line 415 "/home/jens/Source/shotwell/src/MediaMonitor.vala" result = TRUE; @@ -3072,11 +3341,13 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) { _g_timer_destroy0 (timer); #line 415 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 3076 "MediaMonitor.c" +#line 3345 "MediaMonitor.c" } -static void media_monitor_class_init (MediaMonitorClass * klass) { +static void +media_monitor_class_init (MediaMonitorClass * klass) +{ #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" media_monitor_parent_class = g_type_class_peek_parent (klass); #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -3121,11 +3392,13 @@ static void media_monitor_class_init (MediaMonitorClass * klass) { ((MediaMonitorClass *) klass)->process_updates = (void (*) (MediaMonitor *, GeeCollection*, TransactionController*, gint*, GError**)) media_monitor_real_process_updates; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" G_OBJECT_CLASS (klass)->finalize = media_monitor_finalize; -#line 3125 "MediaMonitor.c" +#line 3396 "MediaMonitor.c" } -static void media_monitor_instance_init (MediaMonitor * self) { +static void +media_monitor_instance_init (MediaMonitor * self) +{ GeeHashMap* _tmp0_; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self->priv = MEDIA_MONITOR_GET_PRIVATE (self); @@ -3135,11 +3408,13 @@ static void media_monitor_instance_init (MediaMonitor * self) { self->priv->pending_updates = _tmp0_; #line 116 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self->priv->pending_updates_timer_id = (guint) 0; -#line 3139 "MediaMonitor.c" +#line 3412 "MediaMonitor.c" } -static void media_monitor_finalize (GObject * obj) { +static void +media_monitor_finalize (GObject * obj) +{ MediaMonitor * self; MediaSourceCollection* _tmp0_; guint _tmp1_; @@ -3167,11 +3442,13 @@ static void media_monitor_finalize (GObject * obj) { _g_object_unref0 (self->priv->pending_updates); #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" G_OBJECT_CLASS (media_monitor_parent_class)->finalize (obj); -#line 3171 "MediaMonitor.c" +#line 3446 "MediaMonitor.c" } -GType media_monitor_get_type (void) { +GType +media_monitor_get_type (void) +{ static volatile gsize media_monitor_type_id__volatile = 0; if (g_once_init_enter (&media_monitor_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MediaMonitorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) media_monitor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MediaMonitor), 0, (GInstanceInitFunc) media_monitor_instance_init, NULL }; -- cgit v1.2.3