diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-06-25 20:55:59 +0200 | 
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-06-25 20:55:59 +0200 | 
| commit | ab841afa5cb39058d9ab2cebb67cfe6369443f6e (patch) | |
| tree | 64961342a79003ee865b3f9f8f41f99f09f37a2e /src/core/SourceCollection.c | |
| parent | 49120f48474fc8fdc2448c75d961bc238213cfac (diff) | |
New upstream version 0.28.3upstream/0.28.3
Diffstat (limited to 'src/core/SourceCollection.c')
| -rw-r--r-- | src/core/SourceCollection.c | 1300 | 
1 files changed, 700 insertions, 600 deletions
| diff --git a/src/core/SourceCollection.c b/src/core/SourceCollection.c index 6742476..9de9400 100644 --- a/src/core/SourceCollection.c +++ b/src/core/SourceCollection.c @@ -1,4 +1,4 @@ -/* SourceCollection.c generated by valac 0.36.6, the Vala compiler +/* SourceCollection.c generated by valac 0.40.4, the Vala compiler   * generated from SourceCollection.vala, do not modify */  /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@   * (version 2.1 or later).  See the COPYING file in this distribution.   */ +  #include <glib.h>  #include <glib-object.h>  #include <stdlib.h> @@ -117,15 +118,20 @@ typedef struct _SourceCollectionDestroyCounterClass SourceCollectionDestroyCount  typedef struct _SourceCollectionDestroyCounterPrivate SourceCollectionDestroyCounterPrivate;  #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))  enum  { +	SOURCE_COLLECTION_DESTROY_COUNTER_0_PROPERTY, +	SOURCE_COLLECTION_DESTROY_COUNTER_NUM_PROPERTIES +}; +static GParamSpec* source_collection_destroy_counter_properties[SOURCE_COLLECTION_DESTROY_COUNTER_NUM_PROPERTIES]; +enum  {  	SOURCE_COLLECTION_ITEMS_UNLINKING_SIGNAL,  	SOURCE_COLLECTION_ITEMS_RELINKED_SIGNAL,  	SOURCE_COLLECTION_ITEM_DESTROYED_SIGNAL,  	SOURCE_COLLECTION_ITEMS_DESTROYED_SIGNAL,  	SOURCE_COLLECTION_UNLINKED_DESTROYED_SIGNAL,  	SOURCE_COLLECTION_BACKLINK_REMOVED_SIGNAL, -	SOURCE_COLLECTION_LAST_SIGNAL +	SOURCE_COLLECTION_NUM_SIGNALS  }; -static guint source_collection_signals[SOURCE_COLLECTION_LAST_SIGNAL] = {0}; +static guint source_collection_signals[SOURCE_COLLECTION_NUM_SIGNALS] = {0};  #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);  #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }  #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -236,17 +242,29 @@ static gpointer source_collection_destroy_counter_parent_class = NULL;  gpointer data_collection_ref (gpointer instance);  void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, +                                        const gchar* nick, +                                        const gchar* blurb, +                                        GType object_type, +                                        GParamFlags flags); +void value_set_data_collection (GValue* value, +                                gpointer v_object); +void value_take_data_collection (GValue* value, +                                 gpointer v_object);  gpointer value_get_data_collection (const GValue* value);  GType data_collection_get_type (void) G_GNUC_CONST;  GType data_object_get_type (void) G_GNUC_CONST;  gpointer alteration_ref (gpointer instance);  void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, +                                   const gchar* nick, +                                   const gchar* blurb, +                                   GType object_type, +                                   GParamFlags flags); +void value_set_alteration (GValue* value, +                           gpointer v_object); +void value_take_alteration (GValue* value, +                            gpointer v_object);  gpointer value_get_alteration (const GValue* value);  GType alteration_get_type (void) G_GNUC_CONST;  GType marker_get_type (void) G_GNUC_CONST; @@ -254,312 +272,433 @@ GType source_collection_get_type (void) G_GNUC_CONST;  GType data_source_get_type (void) G_GNUC_CONST;  gpointer source_backlink_ref (gpointer instance);  void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, +                                        const gchar* nick, +                                        const gchar* blurb, +                                        GType object_type, +                                        GParamFlags flags); +void value_set_source_backlink (GValue* value, +                                gpointer v_object); +void value_take_source_backlink (GValue* value, +                                 gpointer v_object);  gpointer value_get_source_backlink (const GValue* value);  GType source_backlink_get_type (void) G_GNUC_CONST;  #define SOURCE_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SOURCE_COLLECTION, SourceCollectionPrivate)) -enum  { -	SOURCE_COLLECTION_DUMMY_PROPERTY -}; -SourceCollection* source_collection_construct (GType object_type, const gchar* name); +SourceCollection* source_collection_construct (GType object_type, +                                               const gchar* name);  DataCollection* data_collection_new (const gchar* name); -DataCollection* data_collection_construct (GType object_type, const gchar* name); -gboolean source_collection_holds_type_of_source (SourceCollection* self, DataSource* source); -static gboolean source_collection_real_holds_type_of_source (SourceCollection* self, DataSource* source); -void source_collection_notify_items_unlinking (SourceCollection* self, GeeCollection* unlinking); -static void source_collection_real_notify_items_unlinking (SourceCollection* self, GeeCollection* unlinking); -void source_collection_notify_items_relinked (SourceCollection* self, GeeCollection* relinked); -static void source_collection_real_notify_items_relinked (SourceCollection* self, GeeCollection* relinked); -void source_collection_notify_item_destroyed (SourceCollection* self, DataSource* source); -static void source_collection_real_notify_item_destroyed (SourceCollection* self, DataSource* source); -void source_collection_notify_items_destroyed (SourceCollection* self, GeeCollection* destroyed); -static void source_collection_real_notify_items_destroyed (SourceCollection* self, GeeCollection* destroyed); -void source_collection_notify_unlinked_destroyed (SourceCollection* self, DataSource* unlinked); -static void source_collection_real_notify_unlinked_destroyed (SourceCollection* self, DataSource* unlinked); -void source_collection_notify_backlink_removed (SourceCollection* self, SourceBacklink* backlink, GeeCollection* sources); -static void source_collection_real_notify_backlink_removed (SourceCollection* self, SourceBacklink* backlink, GeeCollection* sources); -static gboolean source_collection_real_valid_type (DataCollection* base, DataObject* object); +DataCollection* data_collection_construct (GType object_type, +                                           const gchar* name); +gboolean source_collection_holds_type_of_source (SourceCollection* self, +                                                 DataSource* source); +static gboolean source_collection_real_holds_type_of_source (SourceCollection* self, +                                                      DataSource* source); +void source_collection_notify_items_unlinking (SourceCollection* self, +                                               GeeCollection* unlinking); +static void source_collection_real_notify_items_unlinking (SourceCollection* self, +                                                    GeeCollection* unlinking); +void source_collection_notify_items_relinked (SourceCollection* self, +                                              GeeCollection* relinked); +static void source_collection_real_notify_items_relinked (SourceCollection* self, +                                                   GeeCollection* relinked); +void source_collection_notify_item_destroyed (SourceCollection* self, +                                              DataSource* source); +static void source_collection_real_notify_item_destroyed (SourceCollection* self, +                                                   DataSource* source); +void source_collection_notify_items_destroyed (SourceCollection* self, +                                               GeeCollection* destroyed); +static void source_collection_real_notify_items_destroyed (SourceCollection* self, +                                                    GeeCollection* destroyed); +void source_collection_notify_unlinked_destroyed (SourceCollection* self, +                                                  DataSource* unlinked); +static void source_collection_real_notify_unlinked_destroyed (SourceCollection* self, +                                                       DataSource* unlinked); +void source_collection_notify_backlink_removed (SourceCollection* self, +                                                SourceBacklink* backlink, +                                                GeeCollection* sources); +static void source_collection_real_notify_backlink_removed (SourceCollection* self, +                                                     SourceBacklink* backlink, +                                                     GeeCollection* sources); +static gboolean source_collection_real_valid_type (DataCollection* base, +                                            DataObject* object);  GType thumbnail_source_get_type (void) G_GNUC_CONST;  GType media_source_get_type (void) G_GNUC_CONST; -gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed); +gint source_collection_destroy_marked (SourceCollection* self, +                                       Marker* marker, +                                       gboolean delete_backing, +                                       ProgressMonitor monitor, +                                       void* monitor_target, +                                       GeeList* not_removed);  static GType source_collection_destroy_counter_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;  Marker* data_collection_start_marking (DataCollection* self);  static SourceCollectionDestroyCounter* source_collection_destroy_counter_new (Marker* remove_marker); -static SourceCollectionDestroyCounter* source_collection_destroy_counter_construct (GType object_type, Marker* remove_marker); -void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedAction action, void* action_target, ProgressMonitor monitor, void* monitor_target, GObject* user); -static gboolean source_collection_destroy_and_delete_source (SourceCollection* self, DataObject* object, GObject* user); -static gboolean _source_collection_destroy_and_delete_source_marked_action (DataObject* object, GObject* user, gpointer self); -static gboolean source_collection_destroy_source (SourceCollection* self, DataObject* object, GObject* user); -static gboolean _source_collection_destroy_source_marked_action (DataObject* object, GObject* user, gpointer self); -void data_collection_remove_marked (DataCollection* self, Marker* m); -gboolean data_source_internal_delete_backing (DataSource* self, GError** error); +static SourceCollectionDestroyCounter* source_collection_destroy_counter_construct (GType object_type, +                                                                             Marker* remove_marker); +void data_collection_act_on_marked (DataCollection* self, +                                    Marker* m, +                                    MarkedAction action, +                                    void* action_target, +                                    ProgressMonitor monitor, +                                    void* monitor_target, +                                    GObject* user); +static gboolean source_collection_destroy_and_delete_source (SourceCollection* self, +                                                      DataObject* object, +                                                      GObject* user); +static gboolean _source_collection_destroy_and_delete_source_marked_action (DataObject* object, +                                                                     GObject* user, +                                                                     gpointer self); +static gboolean source_collection_destroy_source (SourceCollection* self, +                                           DataObject* object, +                                           GObject* user); +static gboolean _source_collection_destroy_source_marked_action (DataObject* object, +                                                          GObject* user, +                                                          gpointer self); +void data_collection_remove_marked (DataCollection* self, +                                    Marker* m); +gboolean data_source_internal_delete_backing (DataSource* self, +                                              GError** error);  void data_source_internal_mark_for_destroy (DataSource* self);  void data_source_destroy (DataSource* self); -void marker_mark (Marker* self, DataObject* object); -void source_collection_internal_backlink_set (SourceCollection* self, DataSource* source, SourceBacklink* backlink); +void marker_mark (Marker* self, +                  DataObject* object); +void source_collection_internal_backlink_set (SourceCollection* self, +                                              DataSource* source, +                                              SourceBacklink* backlink);  guint source_backlink_hash_func (SourceBacklink* backlink); -static guint _source_backlink_hash_func_gee_hash_data_func (gconstpointer v, gpointer self); -gboolean source_backlink_equal_func (SourceBacklink* alink, SourceBacklink* blink); -static gboolean _source_backlink_equal_func_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); -void source_collection_internal_backlink_removed (SourceCollection* self, DataSource* source, SourceBacklink* backlink); -gboolean source_collection_has_backlink (SourceCollection* self, SourceBacklink* backlink); -static gboolean source_collection_real_has_backlink (SourceCollection* self, SourceBacklink* backlink); -GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* marker, ProgressMonitor monitor, void* monitor_target); -static gboolean source_collection_prepare_for_unlink (SourceCollection* self, DataObject* object, GObject* user); -static gboolean _source_collection_prepare_for_unlink_marked_action (DataObject* object, GObject* user, gpointer self); -Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects); -void data_source_notify_unlinking (DataSource* self, SourceCollection* collection); -void source_collection_relink (SourceCollection* self, DataSource* source); -void data_source_notify_relinking (DataSource* self, SourceCollection* collection); -gboolean data_collection_add (DataCollection* self, DataObject* object); +static guint _source_backlink_hash_func_gee_hash_data_func (gconstpointer v, +                                                     gpointer self); +gboolean source_backlink_equal_func (SourceBacklink* alink, +                                     SourceBacklink* blink); +static gboolean _source_backlink_equal_func_gee_equal_data_func (gconstpointer a, +                                                          gconstpointer b, +                                                          gpointer self); +void source_collection_internal_backlink_removed (SourceCollection* self, +                                                  DataSource* source, +                                                  SourceBacklink* backlink); +gboolean source_collection_has_backlink (SourceCollection* self, +                                         SourceBacklink* backlink); +static gboolean source_collection_real_has_backlink (SourceCollection* self, +                                              SourceBacklink* backlink); +GeeCollection* source_collection_unlink_marked (SourceCollection* self, +                                                Marker* marker, +                                                ProgressMonitor monitor, +                                                void* monitor_target); +static gboolean source_collection_prepare_for_unlink (SourceCollection* self, +                                               DataObject* object, +                                               GObject* user); +static gboolean _source_collection_prepare_for_unlink_marked_action (DataObject* object, +                                                              GObject* user, +                                                              gpointer self); +Marker* data_collection_mark_many (DataCollection* self, +                                   GeeCollection* objects); +void data_source_notify_unlinking (DataSource* self, +                                   SourceCollection* collection); +void source_collection_relink (SourceCollection* self, +                               DataSource* source); +void data_source_notify_relinking (DataSource* self, +                                   SourceCollection* collection); +gboolean data_collection_add (DataCollection* self, +                              DataObject* object);  GeeCollection* data_collection_get_singleton (DataObject* object);  void data_source_notify_relinked (DataSource* self); -void source_collection_relink_many (SourceCollection* self, GeeCollection* relink); -GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target); -void source_collection_remove_backlink (SourceCollection* self, SourceBacklink* backlink); -static void source_collection_real_remove_backlink (SourceCollection* self, SourceBacklink* backlink); -gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink); -static void source_collection_real_items_unlinking (SourceCollection* self, GeeCollection* unlinking); -static void source_collection_real_items_relinked (SourceCollection* self, GeeCollection* relinked); -static void source_collection_real_item_destroyed (SourceCollection* self, DataSource* source); -static void source_collection_real_items_destroyed (SourceCollection* self, GeeCollection* destroyed); -static void source_collection_real_unlinked_destroyed (SourceCollection* self, DataSource* source); -static void source_collection_real_backlink_removed (SourceCollection* self, SourceBacklink* backlink, GeeCollection* sources); -static void g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -enum  { -	SOURCE_COLLECTION_DESTROY_COUNTER_DUMMY_PROPERTY -}; +void source_collection_relink_many (SourceCollection* self, +                                    GeeCollection* relink); +GeeCollection* data_collection_add_many (DataCollection* self, +                                         GeeCollection* objects, +                                         ProgressMonitor monitor, +                                         void* monitor_target); +void source_collection_remove_backlink (SourceCollection* self, +                                        SourceBacklink* backlink); +static void source_collection_real_remove_backlink (SourceCollection* self, +                                             SourceBacklink* backlink); +gboolean data_source_remove_backlink (DataSource* self, +                                      SourceBacklink* backlink); +static void source_collection_real_items_unlinking (SourceCollection* self, +                                             GeeCollection* unlinking); +static void source_collection_real_items_relinked (SourceCollection* self, +                                            GeeCollection* relinked); +static void source_collection_real_item_destroyed (SourceCollection* self, +                                            DataSource* source); +static void source_collection_real_items_destroyed (SourceCollection* self, +                                             GeeCollection* destroyed); +static void source_collection_real_unlinked_destroyed (SourceCollection* self, +                                                DataSource* source); +static void source_collection_real_backlink_removed (SourceCollection* self, +                                              SourceBacklink* backlink, +                                              GeeCollection* sources); +static void g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT (GClosure * closure, +                                                           GValue * return_value, +                                                           guint n_param_values, +                                                           const GValue * param_values, +                                                           gpointer invocation_hint, +                                                           gpointer marshal_data);  static void source_collection_destroy_counter_finalize (GObject * obj);  static void source_collection_finalize (DataCollection * obj); -SourceCollection* source_collection_construct (GType object_type, const gchar* name) { +SourceCollection* +source_collection_construct (GType object_type, +                             const gchar* name) +{  	SourceCollection* self = NULL; -	const gchar* _tmp0_;  #line 50 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_val_if_fail (name != NULL, NULL);  #line 51 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp0_ = name; -#line 51 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	self = (SourceCollection*) data_collection_construct (object_type, _tmp0_); +	self = (SourceCollection*) data_collection_construct (object_type, name);  #line 50 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	return self; -#line 350 "SourceCollection.c" +#line 451 "SourceCollection.c"  } -static gboolean source_collection_real_holds_type_of_source (SourceCollection* self, DataSource* source) { +static gboolean +source_collection_real_holds_type_of_source (SourceCollection* self, +                                             DataSource* source) +{  	gboolean _tmp0_ = FALSE;  #line 54 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_critical ("Type `%s' does not implement abstract method `source_collection_holds_type_of_source'", g_type_name (G_TYPE_FROM_INSTANCE (self)));  #line 54 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	return _tmp0_; -#line 360 "SourceCollection.c" +#line 464 "SourceCollection.c"  } -gboolean source_collection_holds_type_of_source (SourceCollection* self, DataSource* source) { +gboolean +source_collection_holds_type_of_source (SourceCollection* self, +                                        DataSource* source) +{  #line 54 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE);  #line 54 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	return SOURCE_COLLECTION_GET_CLASS (self)->holds_type_of_source (self, source); -#line 369 "SourceCollection.c" +#line 476 "SourceCollection.c"  } -static void source_collection_real_notify_items_unlinking (SourceCollection* self, GeeCollection* unlinking) { -	GeeCollection* _tmp0_; +static void +source_collection_real_notify_items_unlinking (SourceCollection* self, +                                               GeeCollection* unlinking) +{  #line 56 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (GEE_IS_COLLECTION (unlinking));  #line 57 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp0_ = unlinking; -#line 57 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_UNLINKING_SIGNAL], 0, _tmp0_); -#line 381 "SourceCollection.c" +	g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_UNLINKING_SIGNAL], 0, unlinking); +#line 488 "SourceCollection.c"  } -void source_collection_notify_items_unlinking (SourceCollection* self, GeeCollection* unlinking) { +void +source_collection_notify_items_unlinking (SourceCollection* self, +                                          GeeCollection* unlinking) +{  #line 56 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (IS_SOURCE_COLLECTION (self));  #line 56 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	SOURCE_COLLECTION_GET_CLASS (self)->notify_items_unlinking (self, unlinking); -#line 390 "SourceCollection.c" +#line 500 "SourceCollection.c"  } -static void source_collection_real_notify_items_relinked (SourceCollection* self, GeeCollection* relinked) { -	GeeCollection* _tmp0_; +static void +source_collection_real_notify_items_relinked (SourceCollection* self, +                                              GeeCollection* relinked) +{  #line 60 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (GEE_IS_COLLECTION (relinked));  #line 61 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp0_ = relinked; -#line 61 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_RELINKED_SIGNAL], 0, _tmp0_); -#line 402 "SourceCollection.c" +	g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_RELINKED_SIGNAL], 0, relinked); +#line 512 "SourceCollection.c"  } -void source_collection_notify_items_relinked (SourceCollection* self, GeeCollection* relinked) { +void +source_collection_notify_items_relinked (SourceCollection* self, +                                         GeeCollection* relinked) +{  #line 60 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (IS_SOURCE_COLLECTION (self));  #line 60 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	SOURCE_COLLECTION_GET_CLASS (self)->notify_items_relinked (self, relinked); -#line 411 "SourceCollection.c" +#line 524 "SourceCollection.c"  } -static void source_collection_real_notify_item_destroyed (SourceCollection* self, DataSource* source) { -	DataSource* _tmp0_; +static void +source_collection_real_notify_item_destroyed (SourceCollection* self, +                                              DataSource* source) +{  #line 64 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (IS_DATA_SOURCE (source));  #line 65 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp0_ = source; -#line 65 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEM_DESTROYED_SIGNAL], 0, _tmp0_); -#line 423 "SourceCollection.c" +	g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEM_DESTROYED_SIGNAL], 0, source); +#line 536 "SourceCollection.c"  } -void source_collection_notify_item_destroyed (SourceCollection* self, DataSource* source) { +void +source_collection_notify_item_destroyed (SourceCollection* self, +                                         DataSource* source) +{  #line 64 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (IS_SOURCE_COLLECTION (self));  #line 64 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	SOURCE_COLLECTION_GET_CLASS (self)->notify_item_destroyed (self, source); -#line 432 "SourceCollection.c" +#line 548 "SourceCollection.c"  } -static void source_collection_real_notify_items_destroyed (SourceCollection* self, GeeCollection* destroyed) { -	GeeCollection* _tmp0_; +static void +source_collection_real_notify_items_destroyed (SourceCollection* self, +                                               GeeCollection* destroyed) +{  #line 68 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (GEE_IS_COLLECTION (destroyed));  #line 69 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp0_ = destroyed; -#line 69 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_DESTROYED_SIGNAL], 0, _tmp0_); -#line 444 "SourceCollection.c" +	g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_DESTROYED_SIGNAL], 0, destroyed); +#line 560 "SourceCollection.c"  } -void source_collection_notify_items_destroyed (SourceCollection* self, GeeCollection* destroyed) { +void +source_collection_notify_items_destroyed (SourceCollection* self, +                                          GeeCollection* destroyed) +{  #line 68 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (IS_SOURCE_COLLECTION (self));  #line 68 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	SOURCE_COLLECTION_GET_CLASS (self)->notify_items_destroyed (self, destroyed); -#line 453 "SourceCollection.c" +#line 572 "SourceCollection.c"  } -static void source_collection_real_notify_unlinked_destroyed (SourceCollection* self, DataSource* unlinked) { -	DataSource* _tmp0_; +static void +source_collection_real_notify_unlinked_destroyed (SourceCollection* self, +                                                  DataSource* unlinked) +{  #line 73 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (IS_DATA_SOURCE (unlinked));  #line 74 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp0_ = unlinked; -#line 74 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_UNLINKED_DESTROYED_SIGNAL], 0, _tmp0_); -#line 465 "SourceCollection.c" +	g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_UNLINKED_DESTROYED_SIGNAL], 0, unlinked); +#line 584 "SourceCollection.c"  } -void source_collection_notify_unlinked_destroyed (SourceCollection* self, DataSource* unlinked) { +void +source_collection_notify_unlinked_destroyed (SourceCollection* self, +                                             DataSource* unlinked) +{  #line 73 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (IS_SOURCE_COLLECTION (self));  #line 73 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	SOURCE_COLLECTION_GET_CLASS (self)->notify_unlinked_destroyed (self, unlinked); -#line 474 "SourceCollection.c" +#line 596 "SourceCollection.c"  } -static void source_collection_real_notify_backlink_removed (SourceCollection* self, SourceBacklink* backlink, GeeCollection* sources) { -	SourceBacklink* _tmp0_; -	GeeCollection* _tmp1_; +static void +source_collection_real_notify_backlink_removed (SourceCollection* self, +                                                SourceBacklink* backlink, +                                                GeeCollection* sources) +{  #line 77 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (IS_SOURCE_BACKLINK (backlink));  #line 77 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (GEE_IS_COLLECTION (sources));  #line 79 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp0_ = backlink; -#line 79 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp1_ = sources; -#line 79 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_BACKLINK_REMOVED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 491 "SourceCollection.c" +	g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_BACKLINK_REMOVED_SIGNAL], 0, backlink, sources); +#line 611 "SourceCollection.c"  } -void source_collection_notify_backlink_removed (SourceCollection* self, SourceBacklink* backlink, GeeCollection* sources) { +void +source_collection_notify_backlink_removed (SourceCollection* self, +                                           SourceBacklink* backlink, +                                           GeeCollection* sources) +{  #line 77 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (IS_SOURCE_COLLECTION (self));  #line 77 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	SOURCE_COLLECTION_GET_CLASS (self)->notify_backlink_removed (self, backlink, sources); -#line 500 "SourceCollection.c" +#line 624 "SourceCollection.c"  } -static gboolean source_collection_real_valid_type (DataCollection* base, DataObject* object) { +static gboolean +source_collection_real_valid_type (DataCollection* base, +                                   DataObject* object) +{  	SourceCollection * self;  	gboolean result = FALSE; -	DataObject* _tmp0_;  #line 82 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SOURCE_COLLECTION, SourceCollection);  #line 82 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);  #line 83 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp0_ = object; -#line 83 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_DATA_SOURCE); +	result = G_TYPE_CHECK_INSTANCE_TYPE (object, TYPE_DATA_SOURCE);  #line 83 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	return result; -#line 518 "SourceCollection.c" +#line 642 "SourceCollection.c"  } -static gboolean _source_collection_destroy_and_delete_source_marked_action (DataObject* object, GObject* user, gpointer self) { +static gboolean +_source_collection_destroy_and_delete_source_marked_action (DataObject* object, +                                                            GObject* user, +                                                            gpointer self) +{  	gboolean result;  	result = source_collection_destroy_and_delete_source ((SourceCollection*) self, object, user);  #line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	return result; -#line 527 "SourceCollection.c" +#line 655 "SourceCollection.c"  } -static gboolean _source_collection_destroy_source_marked_action (DataObject* object, GObject* user, gpointer self) { +static gboolean +_source_collection_destroy_source_marked_action (DataObject* object, +                                                 GObject* user, +                                                 gpointer self) +{  	gboolean result;  	result = source_collection_destroy_source ((SourceCollection*) self, object, user);  #line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	return result; -#line 536 "SourceCollection.c" +#line 668 "SourceCollection.c"  } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{  #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	return self ? g_object_ref (self) : NULL; -#line 543 "SourceCollection.c" +#line 677 "SourceCollection.c"  } -gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed) { +gint +source_collection_destroy_marked (SourceCollection* self, +                                  Marker* marker, +                                  gboolean delete_backing, +                                  ProgressMonitor monitor, +                                  void* monitor_target, +                                  GeeList* not_removed) +{  	gint result = 0;  	SourceCollectionDestroyCounter* counter = NULL;  	Marker* _tmp0_;  	Marker* _tmp1_;  	SourceCollectionDestroyCounter* _tmp2_;  	SourceCollectionDestroyCounter* _tmp3_; -	gboolean _tmp4_; -	SourceCollectionDestroyCounter* _tmp24_; -	GeeArrayList* _tmp25_; -	SourceCollectionDestroyCounter* _tmp26_; -	Marker* _tmp27_; -	GeeList* _tmp28_; -	SourceCollectionDestroyCounter* _tmp32_; -	GeeArrayList* _tmp33_; -	gint _tmp34_; -	gint _tmp35_; +	SourceCollectionDestroyCounter* _tmp19_; +	GeeArrayList* _tmp20_; +	SourceCollectionDestroyCounter* _tmp21_; +	Marker* _tmp22_; +	SourceCollectionDestroyCounter* _tmp25_; +	GeeArrayList* _tmp26_; +	gint _tmp27_; +	gint _tmp28_;  #line 88 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_val_if_fail (IS_SOURCE_COLLECTION (self), 0);  #line 88 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -579,172 +718,148 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g  #line 90 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	counter = _tmp3_;  #line 92 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp4_ = delete_backing; -#line 92 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	if (_tmp4_) { -#line 586 "SourceCollection.c" -		Marker* _tmp5_; -		ProgressMonitor _tmp6_; -		void* _tmp6__target; -		SourceCollectionDestroyCounter* _tmp7_; -#line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp5_ = marker; -#line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp6_ = monitor; -#line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp6__target = monitor_target; +	if (delete_backing) { +#line 723 "SourceCollection.c" +		SourceCollectionDestroyCounter* _tmp4_;  #line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp7_ = counter; +		_tmp4_ = counter;  #line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp5_, _source_collection_destroy_and_delete_source_marked_action, self, _tmp6_, _tmp6__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, G_TYPE_OBJECT, GObject)); -#line 601 "SourceCollection.c" +		data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), marker, _source_collection_destroy_and_delete_source_marked_action, self, monitor, monitor_target, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, G_TYPE_OBJECT, GObject)); +#line 729 "SourceCollection.c"  	} else { -		Marker* _tmp8_; -		ProgressMonitor _tmp9_; -		void* _tmp9__target; -		SourceCollectionDestroyCounter* _tmp10_; +		SourceCollectionDestroyCounter* _tmp5_;  #line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp8_ = marker; +		_tmp5_ = counter;  #line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp9_ = monitor; -#line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp9__target = monitor_target; -#line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp10_ = counter; -#line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp8_, _source_collection_destroy_source_marked_action, self, _tmp9_, _tmp9__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, G_TYPE_OBJECT, GObject)); -#line 617 "SourceCollection.c" +		data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), marker, _source_collection_destroy_source_marked_action, self, monitor, monitor_target, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, G_TYPE_OBJECT, GObject)); +#line 736 "SourceCollection.c"  	}  	{  		GeeArrayList* _source_list = NULL; -		SourceCollectionDestroyCounter* _tmp11_; -		GeeArrayList* _tmp12_; -		GeeArrayList* _tmp13_; +		SourceCollectionDestroyCounter* _tmp6_; +		GeeArrayList* _tmp7_; +		GeeArrayList* _tmp8_;  		gint _source_size = 0; -		GeeArrayList* _tmp14_; -		gint _tmp15_; -		gint _tmp16_; +		GeeArrayList* _tmp9_; +		gint _tmp10_; +		gint _tmp11_;  		gint _source_index = 0;  #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp11_ = counter; +		_tmp6_ = counter;  #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp12_ = _tmp11_->notify_list; +		_tmp7_ = _tmp6_->notify_list;  #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp13_ = _g_object_ref0 (_tmp12_); +		_tmp8_ = _g_object_ref0 (_tmp7_);  #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_source_list = _tmp13_; +		_source_list = _tmp8_;  #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp14_ = _source_list; +		_tmp9_ = _source_list;  #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp15_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); +		_tmp10_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));  #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp16_ = _tmp15_; +		_tmp11_ = _tmp10_;  #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_source_size = _tmp16_; +		_source_size = _tmp11_;  #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		_source_index = -1;  #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		while (TRUE) { -#line 649 "SourceCollection.c" -			gint _tmp17_; -			gint _tmp18_; -			gint _tmp19_; +#line 768 "SourceCollection.c" +			gint _tmp12_; +			gint _tmp13_; +			gint _tmp14_;  			DataSource* source = NULL; -			GeeArrayList* _tmp20_; -			gint _tmp21_; -			gpointer _tmp22_; -			DataSource* _tmp23_; +			GeeArrayList* _tmp15_; +			gint _tmp16_; +			gpointer _tmp17_; +			DataSource* _tmp18_;  #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp17_ = _source_index; +			_tmp12_ = _source_index;  #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_source_index = _tmp17_ + 1; +			_source_index = _tmp12_ + 1;  #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp18_ = _source_index; +			_tmp13_ = _source_index;  #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp19_ = _source_size; +			_tmp14_ = _source_size;  #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			if (!(_tmp18_ < _tmp19_)) { +			if (!(_tmp13_ < _tmp14_)) {  #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  				break; -#line 670 "SourceCollection.c" +#line 789 "SourceCollection.c"  			}  #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp20_ = _source_list; +			_tmp15_ = _source_list;  #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp21_ = _source_index; +			_tmp16_ = _source_index;  #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp22_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp21_); +			_tmp17_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp16_);  #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			source = (DataSource*) _tmp22_; +			source = (DataSource*) _tmp17_;  #line 99 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp23_ = source; +			_tmp18_ = source;  #line 99 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			source_collection_notify_item_destroyed (self, _tmp23_); +			source_collection_notify_item_destroyed (self, _tmp18_);  #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  			_g_object_unref0 (source); -#line 686 "SourceCollection.c" +#line 805 "SourceCollection.c"  		}  #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		_g_object_unref0 (_source_list); -#line 690 "SourceCollection.c" +#line 809 "SourceCollection.c"  	}  #line 100 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp24_ = counter; +	_tmp19_ = counter;  #line 100 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp25_ = _tmp24_->notify_list; +	_tmp20_ = _tmp19_->notify_list;  #line 100 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	source_collection_notify_items_destroyed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection)); +	source_collection_notify_items_destroyed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));  #line 103 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp26_ = counter; +	_tmp21_ = counter;  #line 103 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp27_ = _tmp26_->remove_marker; +	_tmp22_ = _tmp21_->remove_marker;  #line 103 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp27_); +	data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp22_);  #line 105 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp28_ = not_removed; -#line 105 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	if (NULL != _tmp28_) { -#line 708 "SourceCollection.c" -		GeeList* _tmp29_; -		SourceCollectionDestroyCounter* _tmp30_; -		GeeArrayList* _tmp31_; -#line 106 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp29_ = not_removed; +	if (NULL != not_removed) { +#line 825 "SourceCollection.c" +		SourceCollectionDestroyCounter* _tmp23_; +		GeeArrayList* _tmp24_;  #line 106 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp30_ = counter; +		_tmp23_ = counter;  #line 106 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp31_ = _tmp30_->not_removed; +		_tmp24_ = _tmp23_->not_removed;  #line 106 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 720 "SourceCollection.c" +		gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (not_removed, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection)); +#line 834 "SourceCollection.c"  	}  #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp32_ = counter; +	_tmp25_ = counter;  #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp33_ = _tmp32_->not_removed; +	_tmp26_ = _tmp25_->not_removed;  #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); +	_tmp27_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));  #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp35_ = _tmp34_; +	_tmp28_ = _tmp27_;  #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	result = _tmp35_; +	result = _tmp28_;  #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	_g_object_unref0 (counter);  #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	return result; -#line 736 "SourceCollection.c" +#line 850 "SourceCollection.c"  } -static gboolean source_collection_destroy_and_delete_source (SourceCollection* self, DataObject* object, GObject* user) { +static gboolean +source_collection_destroy_and_delete_source (SourceCollection* self, +                                             DataObject* object, +                                             GObject* user) +{  	gboolean result = FALSE;  	gboolean success = FALSE; -	gboolean _tmp4_ = FALSE; -	gboolean _tmp5_; -	gboolean _tmp10_ = FALSE; -	DataObject* _tmp11_; -	GObject* _tmp12_; -	gboolean _tmp13_; +	gboolean _tmp2_ = FALSE; +	gboolean _tmp3_; +	gboolean _tmp5_ = FALSE;  	GError * _inner_error_ = NULL;  #line 112 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE); @@ -754,25 +869,19 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s  	g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE);  #line 113 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	success = FALSE; -#line 758 "SourceCollection.c" +#line 873 "SourceCollection.c"  	{  		gboolean _tmp0_ = FALSE; -		DataObject* _tmp1_; -		gboolean _tmp2_; -#line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp1_ = object; -#line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp2_ = data_source_internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource), &_inner_error_);  #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp0_ = _tmp2_; +		_tmp0_ = data_source_internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_SOURCE, DataSource), &_inner_error_);  #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 771 "SourceCollection.c" +#line 880 "SourceCollection.c"  			goto __catch53_g_error;  		}  #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		success = _tmp0_; -#line 776 "SourceCollection.c" +#line 885 "SourceCollection.c"  	}  	goto __finally53;  	__catch53_g_error: @@ -786,90 +895,75 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s  		success = FALSE;  #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		_g_error_free0 (err); -#line 790 "SourceCollection.c" +#line 899 "SourceCollection.c"  	}  	__finally53:  #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 795 "SourceCollection.c" -		gboolean _tmp3_ = FALSE; +#line 904 "SourceCollection.c" +		gboolean _tmp1_ = FALSE;  #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);  #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		g_clear_error (&_inner_error_);  #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		return _tmp3_; -#line 803 "SourceCollection.c" +		return _tmp1_; +#line 912 "SourceCollection.c"  	}  #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp5_ = success; -#line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	if (!_tmp5_) { -#line 809 "SourceCollection.c" -		DataObject* _tmp6_; +	_tmp3_ = success;  #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp6_ = object; +	if (!_tmp3_) {  #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_MEDIA_SOURCE); -#line 815 "SourceCollection.c" +		_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (object, TYPE_MEDIA_SOURCE); +#line 920 "SourceCollection.c"  	} else {  #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp4_ = FALSE; -#line 819 "SourceCollection.c" +		_tmp2_ = FALSE; +#line 924 "SourceCollection.c"  	}  #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	if (_tmp4_) { -#line 823 "SourceCollection.c" -		GObject* _tmp7_; -		GeeArrayList* _tmp8_; -		DataObject* _tmp9_; -#line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp7_ = user; -#line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter)->not_removed; +	if (_tmp2_) { +#line 928 "SourceCollection.c" +		GeeArrayList* _tmp4_;  #line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp9_ = object; +		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (user, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter)->not_removed;  #line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 835 "SourceCollection.c" +		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_MEDIA_SOURCE, MediaSource)); +#line 934 "SourceCollection.c"  	}  #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp11_ = object; -#line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp12_ = user; -#line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp13_ = source_collection_destroy_source (self, _tmp11_, _tmp12_); +	if (source_collection_destroy_source (self, object, user)) { +#line 938 "SourceCollection.c" +		gboolean _tmp6_;  #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	if (_tmp13_) { -#line 845 "SourceCollection.c" -		gboolean _tmp14_; +		_tmp6_ = success;  #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp14_ = success; -#line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp10_ = _tmp14_; -#line 851 "SourceCollection.c" +		_tmp5_ = _tmp6_; +#line 944 "SourceCollection.c"  	} else {  #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp10_ = FALSE; -#line 855 "SourceCollection.c" +		_tmp5_ = FALSE; +#line 948 "SourceCollection.c"  	}  #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	result = _tmp10_; +	result = _tmp5_;  #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	return result; -#line 861 "SourceCollection.c" +#line 954 "SourceCollection.c"  } -static gboolean source_collection_destroy_source (SourceCollection* self, DataObject* object, GObject* user) { +static gboolean +source_collection_destroy_source (SourceCollection* self, +                                  DataObject* object, +                                  GObject* user) +{  	gboolean result = FALSE;  	DataSource* source = NULL; -	DataObject* _tmp0_; -	DataSource* _tmp1_; -	GObject* _tmp2_; -	Marker* _tmp3_; -	GObject* _tmp4_; -	GeeArrayList* _tmp5_; +	DataSource* _tmp0_; +	Marker* _tmp1_; +	GeeArrayList* _tmp2_;  #line 127 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE);  #line 127 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -877,60 +971,63 @@ static gboolean source_collection_destroy_source (SourceCollection* self, DataOb  #line 127 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE);  #line 128 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp0_ = object; -#line 128 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource)); +	_tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_SOURCE, DataSource));  #line 128 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	source = _tmp1_; +	source = _tmp0_;  #line 130 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	data_source_internal_mark_for_destroy (source);  #line 131 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	data_source_destroy (source);  #line 133 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp2_ = user; -#line 133 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter)->remove_marker; +	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (user, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter)->remove_marker;  #line 133 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	marker_mark (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); +	marker_mark (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject));  #line 134 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp4_ = user; +	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (user, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter)->notify_list;  #line 134 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter)->notify_list; -#line 134 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), source); +	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), source);  #line 136 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	result = TRUE;  #line 136 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	_g_object_unref0 (source);  #line 136 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	return result; -#line 908 "SourceCollection.c" +#line 996 "SourceCollection.c"  } -static guint _source_backlink_hash_func_gee_hash_data_func (gconstpointer v, gpointer self) { +static guint +_source_backlink_hash_func_gee_hash_data_func (gconstpointer v, +                                               gpointer self) +{  	guint result;  	result = source_backlink_hash_func ((SourceBacklink*) v);  #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	return result; -#line 917 "SourceCollection.c" +#line 1008 "SourceCollection.c"  } -static gboolean _source_backlink_equal_func_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gboolean +_source_backlink_equal_func_gee_equal_data_func (gconstpointer a, +                                                 gconstpointer b, +                                                 gpointer self) +{  	gboolean result;  	result = source_backlink_equal_func ((SourceBacklink*) a, (SourceBacklink*) b);  #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	return result; -#line 926 "SourceCollection.c" +#line 1021 "SourceCollection.c"  } -void source_collection_internal_backlink_set (SourceCollection* self, DataSource* source, SourceBacklink* backlink) { +void +source_collection_internal_backlink_set (SourceCollection* self, +                                         DataSource* source, +                                         SourceBacklink* backlink) +{  	GeeMultiMap* _tmp0_;  	GeeMultiMap* _tmp2_; -	SourceBacklink* _tmp3_; -	DataSource* _tmp4_;  #line 140 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (IS_SOURCE_COLLECTION (self));  #line 140 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -941,7 +1038,7 @@ void source_collection_internal_backlink_set (SourceCollection* self, DataSource  	_tmp0_ = self->priv->backlinks;  #line 141 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	if (_tmp0_ == NULL) { -#line 945 "SourceCollection.c" +#line 1042 "SourceCollection.c"  		GeeHashMultiMap* _tmp1_;  #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		_tmp1_ = gee_hash_multi_map_new (TYPE_SOURCE_BACKLINK, (GBoxedCopyFunc) source_backlink_ref, (GDestroyNotify) source_backlink_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _source_backlink_hash_func_gee_hash_data_func, NULL, NULL, _source_backlink_equal_func_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); @@ -949,27 +1046,24 @@ void source_collection_internal_backlink_set (SourceCollection* self, DataSource  		_g_object_unref0 (self->priv->backlinks);  #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		self->priv->backlinks = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MULTI_MAP, GeeMultiMap); -#line 953 "SourceCollection.c" +#line 1050 "SourceCollection.c"  	}  #line 146 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	_tmp2_ = self->priv->backlinks;  #line 146 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp3_ = backlink; -#line 146 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp4_ = source; -#line 146 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	gee_multi_map_set (_tmp2_, _tmp3_, _tmp4_); -#line 963 "SourceCollection.c" +	gee_multi_map_set (_tmp2_, backlink, source); +#line 1056 "SourceCollection.c"  } -void source_collection_internal_backlink_removed (SourceCollection* self, DataSource* source, SourceBacklink* backlink) { +void +source_collection_internal_backlink_removed (SourceCollection* self, +                                             DataSource* source, +                                             SourceBacklink* backlink) +{  	GeeMultiMap* _tmp0_;  	gboolean removed = FALSE;  	GeeMultiMap* _tmp1_; -	SourceBacklink* _tmp2_; -	DataSource* _tmp3_; -	gboolean _tmp4_;  #line 150 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (IS_SOURCE_COLLECTION (self));  #line 150 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -983,20 +1077,17 @@ void source_collection_internal_backlink_removed (SourceCollection* self, DataSo  #line 153 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	_tmp1_ = self->priv->backlinks;  #line 153 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp2_ = backlink; -#line 153 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp3_ = source; -#line 153 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp4_ = gee_multi_map_remove (_tmp1_, _tmp2_, _tmp3_); -#line 153 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	removed = _tmp4_; +	removed = gee_multi_map_remove (_tmp1_, backlink, source);  #line 154 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	_vala_assert (removed, "removed"); -#line 996 "SourceCollection.c" +#line 1084 "SourceCollection.c"  } -static gboolean source_collection_real_has_backlink (SourceCollection* self, SourceBacklink* backlink) { +static gboolean +source_collection_real_has_backlink (SourceCollection* self, +                                     SourceBacklink* backlink) +{  	gboolean result = FALSE;  	gboolean _tmp0_ = FALSE;  	GeeMultiMap* _tmp1_; @@ -1006,65 +1097,68 @@ static gboolean source_collection_real_has_backlink (SourceCollection* self, Sou  	_tmp1_ = self->priv->backlinks;  #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	if (_tmp1_ != NULL) { -#line 1010 "SourceCollection.c" +#line 1101 "SourceCollection.c"  		GeeMultiMap* _tmp2_; -		SourceBacklink* _tmp3_; -		gboolean _tmp4_;  #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		_tmp2_ = self->priv->backlinks;  #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp3_ = backlink; -#line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp4_ = gee_multi_map_contains (_tmp2_, _tmp3_); -#line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp0_ = _tmp4_; -#line 1022 "SourceCollection.c" +		_tmp0_ = gee_multi_map_contains (_tmp2_, backlink); +#line 1107 "SourceCollection.c"  	} else {  #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		_tmp0_ = FALSE; -#line 1026 "SourceCollection.c" +#line 1111 "SourceCollection.c"  	}  #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	result = _tmp0_;  #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	return result; -#line 1032 "SourceCollection.c" +#line 1117 "SourceCollection.c"  } -gboolean source_collection_has_backlink (SourceCollection* self, SourceBacklink* backlink) { +gboolean +source_collection_has_backlink (SourceCollection* self, +                                SourceBacklink* backlink) +{  #line 157 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE);  #line 157 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	return SOURCE_COLLECTION_GET_CLASS (self)->has_backlink (self, backlink); -#line 1041 "SourceCollection.c" +#line 1129 "SourceCollection.c"  } -static gboolean _source_collection_prepare_for_unlink_marked_action (DataObject* object, GObject* user, gpointer self) { +static gboolean +_source_collection_prepare_for_unlink_marked_action (DataObject* object, +                                                     GObject* user, +                                                     gpointer self) +{  	gboolean result;  	result = source_collection_prepare_for_unlink ((SourceCollection*) self, object, user);  #line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	return result; -#line 1050 "SourceCollection.c" +#line 1142 "SourceCollection.c"  } -GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* marker, ProgressMonitor monitor, void* monitor_target) { +GeeCollection* +source_collection_unlink_marked (SourceCollection* self, +                                 Marker* marker, +                                 ProgressMonitor monitor, +                                 void* monitor_target) +{  	GeeCollection* result = NULL;  	GeeArrayList* list = NULL;  	GeeArrayList* _tmp0_; -	Marker* _tmp1_; -	ProgressMonitor _tmp2_; -	void* _tmp2__target; -	GeeArrayList* _tmp3_; -	GeeArrayList* _tmp4_; -	gint _tmp5_; -	gint _tmp6_; -	GeeArrayList* _tmp7_; -	GeeArrayList* _tmp8_; -	Marker* _tmp9_; -	Marker* _tmp10_; +	GeeArrayList* _tmp1_; +	GeeArrayList* _tmp2_; +	gint _tmp3_; +	gint _tmp4_; +	GeeArrayList* _tmp5_; +	GeeArrayList* _tmp6_; +	Marker* _tmp7_; +	Marker* _tmp8_;  #line 161 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_val_if_fail (IS_SOURCE_COLLECTION (self), NULL);  #line 161 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1074,59 +1168,55 @@ GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker*  #line 162 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	list = _tmp0_;  #line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp1_ = marker; +	_tmp1_ = list;  #line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp2_ = monitor; -#line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp2__target = monitor_target; -#line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp3_ = list; -#line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_, _source_collection_prepare_for_unlink_marked_action, self, _tmp2_, _tmp2__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_OBJECT, GObject)); +	data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), marker, _source_collection_prepare_for_unlink_marked_action, self, monitor, monitor_target, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_OBJECT, GObject));  #line 165 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp4_ = list; +	_tmp2_ = list;  #line 165 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); +	_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));  #line 165 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp6_ = _tmp5_; +	_tmp4_ = _tmp3_;  #line 165 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	if (_tmp6_ == 0) { +	if (_tmp4_ == 0) {  #line 166 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		result = NULL;  #line 166 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		_g_object_unref0 (list);  #line 166 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		return result; -#line 1101 "SourceCollection.c" +#line 1189 "SourceCollection.c"  	}  #line 168 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp7_ = list; +	_tmp5_ = list;  #line 168 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	source_collection_notify_items_unlinking (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); +	source_collection_notify_items_unlinking (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));  #line 170 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp8_ = list; +	_tmp6_ = list;  #line 170 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp9_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); +	_tmp7_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));  #line 170 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp10_ = _tmp9_; +	_tmp8_ = _tmp7_;  #line 170 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp10_); +	data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp8_);  #line 170 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_g_object_unref0 (_tmp10_); +	_g_object_unref0 (_tmp8_);  #line 172 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	result = G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_COLLECTION, GeeCollection);  #line 172 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	return result; -#line 1121 "SourceCollection.c" +#line 1209 "SourceCollection.c"  } -static gboolean source_collection_prepare_for_unlink (SourceCollection* self, DataObject* object, GObject* user) { +static gboolean +source_collection_prepare_for_unlink (SourceCollection* self, +                                      DataObject* object, +                                      GObject* user) +{  	gboolean result = FALSE;  	DataSource* source = NULL; -	DataObject* _tmp0_; -	DataSource* _tmp1_; -	GObject* _tmp2_; +	DataSource* _tmp0_;  #line 175 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE);  #line 175 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1134,209 +1224,179 @@ static gboolean source_collection_prepare_for_unlink (SourceCollection* self, Da  #line 175 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE);  #line 176 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp0_ = object; +	_tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_SOURCE, DataSource));  #line 176 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource)); -#line 176 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	source = _tmp1_; +	source = _tmp0_;  #line 178 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	data_source_notify_unlinking (source, self);  #line 179 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp2_ = user; -#line 179 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList), GEE_TYPE_COLLECTION, GeeCollection), source); +	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (user, GEE_TYPE_LIST, GeeList), GEE_TYPE_COLLECTION, GeeCollection), source);  #line 181 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	result = TRUE;  #line 181 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	_g_object_unref0 (source);  #line 181 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	return result; -#line 1155 "SourceCollection.c" +#line 1241 "SourceCollection.c"  } -void source_collection_relink (SourceCollection* self, DataSource* source) { -	DataSource* _tmp0_; -	DataSource* _tmp1_; -	DataSource* _tmp2_; -	GeeCollection* _tmp3_; -	GeeCollection* _tmp4_; -	DataSource* _tmp5_; +void +source_collection_relink (SourceCollection* self, +                          DataSource* source) +{ +	GeeCollection* _tmp0_; +	GeeCollection* _tmp1_;  #line 184 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (IS_SOURCE_COLLECTION (self));  #line 184 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (IS_DATA_SOURCE (source));  #line 185 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp0_ = source; -#line 185 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	data_source_notify_relinking (_tmp0_, self); -#line 187 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp1_ = source; +	data_source_notify_relinking (source, self);  #line 187 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); +	data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject));  #line 188 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp2_ = source; +	_tmp0_ = data_collection_get_singleton (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject));  #line 188 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp3_ = data_collection_get_singleton (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject)); +	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);  #line 188 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); +	source_collection_notify_items_relinked (self, _tmp1_);  #line 188 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	source_collection_notify_items_relinked (self, _tmp4_); -#line 188 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_g_object_unref0 (_tmp4_); -#line 190 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp5_ = source; +	_g_object_unref0 (_tmp1_);  #line 190 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	data_source_notify_relinked (_tmp5_); -#line 1192 "SourceCollection.c" +	data_source_notify_relinked (source); +#line 1269 "SourceCollection.c"  } -void source_collection_relink_many (SourceCollection* self, GeeCollection* relink) { -	GeeCollection* _tmp0_; +void +source_collection_relink_many (SourceCollection* self, +                               GeeCollection* relink) +{ +	gint _tmp0_;  	gint _tmp1_; -	gint _tmp2_; -	GeeCollection* _tmp10_; -	GeeCollection* _tmp11_; -	GeeCollection* _tmp12_; -	GeeCollection* _tmp13_; +	GeeCollection* _tmp7_; +	GeeCollection* _tmp8_;  #line 193 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (IS_SOURCE_COLLECTION (self));  #line 193 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (GEE_IS_COLLECTION (relink));  #line 194 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp0_ = relink; -#line 194 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp1_ = gee_collection_get_size (_tmp0_); +	_tmp0_ = gee_collection_get_size (relink);  #line 194 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp2_ = _tmp1_; +	_tmp1_ = _tmp0_;  #line 194 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	if (_tmp2_ == 0) { +	if (_tmp1_ == 0) {  #line 195 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		return; -#line 1218 "SourceCollection.c" +#line 1293 "SourceCollection.c"  	}  	{  		GeeIterator* _source_it = NULL; -		GeeCollection* _tmp3_; -		GeeIterator* _tmp4_; -#line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp3_ = relink; +		GeeIterator* _tmp2_;  #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); +		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (relink, GEE_TYPE_ITERABLE, GeeIterable));  #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_source_it = _tmp4_; +		_source_it = _tmp2_;  #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		while (TRUE) { -#line 1232 "SourceCollection.c" -			GeeIterator* _tmp5_; -			gboolean _tmp6_; +#line 1304 "SourceCollection.c" +			GeeIterator* _tmp3_;  			DataSource* source = NULL; -			GeeIterator* _tmp7_; -			gpointer _tmp8_; -			DataSource* _tmp9_; +			GeeIterator* _tmp4_; +			gpointer _tmp5_; +			DataSource* _tmp6_;  #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp5_ = _source_it; +			_tmp3_ = _source_it;  #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp6_ = gee_iterator_next (_tmp5_); -#line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			if (!_tmp6_) { +			if (!gee_iterator_next (_tmp3_)) {  #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  				break; -#line 1247 "SourceCollection.c" +#line 1316 "SourceCollection.c"  			}  #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp7_ = _source_it; +			_tmp4_ = _source_it;  #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp8_ = gee_iterator_get (_tmp7_); +			_tmp5_ = gee_iterator_get (_tmp4_);  #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			source = (DataSource*) _tmp8_; +			source = (DataSource*) _tmp5_;  #line 198 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp9_ = source; +			_tmp6_ = source;  #line 198 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			data_source_notify_relinking (_tmp9_, self); +			data_source_notify_relinking (_tmp6_, self);  #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  			_g_object_unref0 (source); -#line 1261 "SourceCollection.c" +#line 1330 "SourceCollection.c"  		}  #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		_g_object_unref0 (_source_it); -#line 1265 "SourceCollection.c" +#line 1334 "SourceCollection.c"  	}  #line 200 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp10_ = relink; -#line 200 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp11_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp10_, NULL, NULL); +	_tmp7_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), relink, NULL, NULL);  #line 200 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp12_ = _tmp11_; +	_tmp8_ = _tmp7_;  #line 200 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_g_object_unref0 (_tmp12_); -#line 201 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp13_ = relink; +	_g_object_unref0 (_tmp8_);  #line 201 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	source_collection_notify_items_relinked (self, _tmp13_); -#line 1279 "SourceCollection.c" +	source_collection_notify_items_relinked (self, relink); +#line 1344 "SourceCollection.c"  	{  		GeeIterator* _source_it = NULL; -		GeeCollection* _tmp14_; -		GeeIterator* _tmp15_; +		GeeIterator* _tmp9_;  #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp14_ = relink; +		_tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (relink, GEE_TYPE_ITERABLE, GeeIterable));  #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_source_it = _tmp15_; +		_source_it = _tmp9_;  #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		while (TRUE) { -#line 1292 "SourceCollection.c" -			GeeIterator* _tmp16_; -			gboolean _tmp17_; +#line 1354 "SourceCollection.c" +			GeeIterator* _tmp10_;  			DataSource* source = NULL; -			GeeIterator* _tmp18_; -			gpointer _tmp19_; -			DataSource* _tmp20_; -#line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp16_ = _source_it; +			GeeIterator* _tmp11_; +			gpointer _tmp12_; +			DataSource* _tmp13_;  #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp17_ = gee_iterator_next (_tmp16_); +			_tmp10_ = _source_it;  #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			if (!_tmp17_) { +			if (!gee_iterator_next (_tmp10_)) {  #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  				break; -#line 1307 "SourceCollection.c" +#line 1366 "SourceCollection.c"  			}  #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp18_ = _source_it; +			_tmp11_ = _source_it;  #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp19_ = gee_iterator_get (_tmp18_); +			_tmp12_ = gee_iterator_get (_tmp11_);  #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			source = (DataSource*) _tmp19_; +			source = (DataSource*) _tmp12_;  #line 204 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp20_ = source; +			_tmp13_ = source;  #line 204 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			data_source_notify_relinked (_tmp20_); +			data_source_notify_relinked (_tmp13_);  #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  			_g_object_unref0 (source); -#line 1321 "SourceCollection.c" +#line 1380 "SourceCollection.c"  		}  #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		_g_object_unref0 (_source_it); -#line 1325 "SourceCollection.c" +#line 1384 "SourceCollection.c"  	}  } -static void source_collection_real_remove_backlink (SourceCollection* self, SourceBacklink* backlink) { +static void +source_collection_real_remove_backlink (SourceCollection* self, +                                        SourceBacklink* backlink) +{  	GeeMultiMap* _tmp0_;  	GeeArrayList* sources = NULL;  	GeeArrayList* _tmp1_;  	GeeArrayList* _tmp2_;  	GeeMultiMap* _tmp3_; -	SourceBacklink* _tmp4_; +	GeeCollection* _tmp4_;  	GeeCollection* _tmp5_; -	GeeCollection* _tmp6_; -	SourceBacklink* _tmp20_; -	GeeArrayList* _tmp21_; +	GeeArrayList* _tmp18_;  #line 207 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (IS_SOURCE_BACKLINK (backlink));  #line 208 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1345,7 +1405,7 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour  	if (_tmp0_ == NULL) {  #line 209 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		return; -#line 1349 "SourceCollection.c" +#line 1409 "SourceCollection.c"  	}  #line 212 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	_tmp1_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); @@ -1356,155 +1416,177 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour  #line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	_tmp3_ = self->priv->backlinks;  #line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp4_ = backlink; -#line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp5_ = gee_multi_map_get (_tmp3_, _tmp4_); +	_tmp4_ = gee_multi_map_get (_tmp3_, backlink);  #line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp6_ = _tmp5_; +	_tmp5_ = _tmp4_;  #line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	gee_array_list_add_all (_tmp2_, _tmp6_); +	gee_array_list_add_all (_tmp2_, _tmp5_);  #line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_g_object_unref0 (_tmp6_); -#line 1369 "SourceCollection.c" +	_g_object_unref0 (_tmp5_); +#line 1427 "SourceCollection.c"  	{  		GeeArrayList* _source_list = NULL; +		GeeArrayList* _tmp6_;  		GeeArrayList* _tmp7_; -		GeeArrayList* _tmp8_;  		gint _source_size = 0; -		GeeArrayList* _tmp9_; +		GeeArrayList* _tmp8_; +		gint _tmp9_;  		gint _tmp10_; -		gint _tmp11_;  		gint _source_index = 0;  #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp7_ = sources; +		_tmp6_ = sources;  #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp8_ = _g_object_ref0 (_tmp7_); +		_tmp7_ = _g_object_ref0 (_tmp6_);  #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_source_list = _tmp8_; +		_source_list = _tmp7_;  #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp9_ = _source_list; +		_tmp8_ = _source_list;  #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp10_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); +		_tmp9_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));  #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_tmp11_ = _tmp10_; +		_tmp10_ = _tmp9_;  #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -		_source_size = _tmp11_; +		_source_size = _tmp10_;  #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		_source_index = -1;  #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		while (TRUE) { -#line 1397 "SourceCollection.c" +#line 1455 "SourceCollection.c" +			gint _tmp11_;  			gint _tmp12_;  			gint _tmp13_; -			gint _tmp14_;  			DataSource* source = NULL; -			GeeArrayList* _tmp15_; -			gint _tmp16_; -			gpointer _tmp17_; -			DataSource* _tmp18_; -			SourceBacklink* _tmp19_; +			GeeArrayList* _tmp14_; +			gint _tmp15_; +			gpointer _tmp16_; +			DataSource* _tmp17_;  #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp12_ = _source_index; +			_tmp11_ = _source_index;  #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_source_index = _tmp12_ + 1; +			_source_index = _tmp11_ + 1;  #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp13_ = _source_index; +			_tmp12_ = _source_index;  #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp14_ = _source_size; +			_tmp13_ = _source_size;  #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			if (!(_tmp13_ < _tmp14_)) { +			if (!(_tmp12_ < _tmp13_)) {  #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  				break; -#line 1419 "SourceCollection.c" +#line 1476 "SourceCollection.c"  			}  #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp15_ = _source_list; +			_tmp14_ = _source_list;  #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp16_ = _source_index; +			_tmp15_ = _source_index;  #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp17_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp16_); +			_tmp16_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp15_);  #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			source = (DataSource*) _tmp17_; +			source = (DataSource*) _tmp16_;  #line 216 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp18_ = source; +			_tmp17_ = source;  #line 216 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			_tmp19_ = backlink; -#line 216 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -			data_source_remove_backlink (_tmp18_, _tmp19_); +			data_source_remove_backlink (_tmp17_, backlink);  #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  			_g_object_unref0 (source); -#line 1437 "SourceCollection.c" +#line 1492 "SourceCollection.c"  		}  #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		_g_object_unref0 (_source_list); -#line 1441 "SourceCollection.c" +#line 1496 "SourceCollection.c"  	}  #line 218 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp20_ = backlink; -#line 218 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp21_ = sources; +	_tmp18_ = sources;  #line 218 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	source_collection_notify_backlink_removed (self, _tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection)); +	source_collection_notify_backlink_removed (self, backlink, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));  #line 207 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	_g_object_unref0 (sources); -#line 1451 "SourceCollection.c" +#line 1504 "SourceCollection.c"  } -void source_collection_remove_backlink (SourceCollection* self, SourceBacklink* backlink) { +void +source_collection_remove_backlink (SourceCollection* self, +                                   SourceBacklink* backlink) +{  #line 207 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (IS_SOURCE_COLLECTION (self));  #line 207 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	SOURCE_COLLECTION_GET_CLASS (self)->remove_backlink (self, backlink); -#line 1460 "SourceCollection.c" +#line 1516 "SourceCollection.c"  } -static void source_collection_real_items_unlinking (SourceCollection* self, GeeCollection* unlinking) { +static void +source_collection_real_items_unlinking (SourceCollection* self, +                                        GeeCollection* unlinking) +{  #line 20 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (GEE_IS_COLLECTION (unlinking)); -#line 1467 "SourceCollection.c" +#line 1526 "SourceCollection.c"  } -static void source_collection_real_items_relinked (SourceCollection* self, GeeCollection* relinked) { +static void +source_collection_real_items_relinked (SourceCollection* self, +                                       GeeCollection* relinked) +{  #line 25 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (GEE_IS_COLLECTION (relinked)); -#line 1474 "SourceCollection.c" +#line 1536 "SourceCollection.c"  } -static void source_collection_real_item_destroyed (SourceCollection* self, DataSource* source) { +static void +source_collection_real_item_destroyed (SourceCollection* self, +                                       DataSource* source) +{  #line 30 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (IS_DATA_SOURCE (source)); -#line 1481 "SourceCollection.c" +#line 1546 "SourceCollection.c"  } -static void source_collection_real_items_destroyed (SourceCollection* self, GeeCollection* destroyed) { +static void +source_collection_real_items_destroyed (SourceCollection* self, +                                        GeeCollection* destroyed) +{  #line 35 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (GEE_IS_COLLECTION (destroyed)); -#line 1488 "SourceCollection.c" +#line 1556 "SourceCollection.c"  } -static void source_collection_real_unlinked_destroyed (SourceCollection* self, DataSource* source) { +static void +source_collection_real_unlinked_destroyed (SourceCollection* self, +                                           DataSource* source) +{  #line 40 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (IS_DATA_SOURCE (source)); -#line 1495 "SourceCollection.c" +#line 1566 "SourceCollection.c"  } -static void source_collection_real_backlink_removed (SourceCollection* self, SourceBacklink* backlink, GeeCollection* sources) { +static void +source_collection_real_backlink_removed (SourceCollection* self, +                                         SourceBacklink* backlink, +                                         GeeCollection* sources) +{  #line 44 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (IS_SOURCE_BACKLINK (backlink));  #line 44 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_if_fail (GEE_IS_COLLECTION (sources)); -#line 1504 "SourceCollection.c" +#line 1579 "SourceCollection.c"  } -static void g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT (GClosure * closure, +                                                      GValue * return_value, +                                                      guint n_param_values, +                                                      const GValue * param_values, +                                                      gpointer invocation_hint, +                                                      gpointer marshal_data) +{  	typedef void (*GMarshalFunc_VOID__SOURCE_BACKLINK_OBJECT) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2);  	register GMarshalFunc_VOID__SOURCE_BACKLINK_OBJECT callback;  	register GCClosure * cc; @@ -1519,61 +1601,67 @@ static void g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT (GClosure * clo  		data1 = closure->data;  #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		data2 = param_values->data[0].v_pointer; -#line 1523 "SourceCollection.c" +#line 1605 "SourceCollection.c"  	} else {  #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		data1 = param_values->data[0].v_pointer;  #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		data2 = closure->data; -#line 1529 "SourceCollection.c" +#line 1611 "SourceCollection.c"  	}  #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	callback = (GMarshalFunc_VOID__SOURCE_BACKLINK_OBJECT) (marshal_data ? marshal_data : cc->callback);  #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	callback (data1, value_get_source_backlink (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 1535 "SourceCollection.c" +#line 1617 "SourceCollection.c"  } -static SourceCollectionDestroyCounter* source_collection_destroy_counter_construct (GType object_type, Marker* remove_marker) { +static SourceCollectionDestroyCounter* +source_collection_destroy_counter_construct (GType object_type, +                                             Marker* remove_marker) +{  	SourceCollectionDestroyCounter * self = NULL;  	Marker* _tmp0_; -	Marker* _tmp1_;  #line 13 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	g_return_val_if_fail (IS_MARKER (remove_marker), NULL);  #line 13 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	self = (SourceCollectionDestroyCounter*) g_object_new (object_type, NULL);  #line 14 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp0_ = remove_marker; -#line 14 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	_tmp1_ = _g_object_ref0 (_tmp0_); +	_tmp0_ = _g_object_ref0 (remove_marker);  #line 14 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	_g_object_unref0 (self->remove_marker);  #line 14 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" -	self->remove_marker = _tmp1_; +	self->remove_marker = _tmp0_;  #line 13 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	return self; -#line 1557 "SourceCollection.c" +#line 1639 "SourceCollection.c"  } -static SourceCollectionDestroyCounter* source_collection_destroy_counter_new (Marker* remove_marker) { +static SourceCollectionDestroyCounter* +source_collection_destroy_counter_new (Marker* remove_marker) +{  #line 13 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	return source_collection_destroy_counter_construct (SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, remove_marker); -#line 1564 "SourceCollection.c" +#line 1648 "SourceCollection.c"  } -static void source_collection_destroy_counter_class_init (SourceCollectionDestroyCounterClass * klass) { +static void +source_collection_destroy_counter_class_init (SourceCollectionDestroyCounterClass * klass) +{  #line 8 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	source_collection_destroy_counter_parent_class = g_type_class_peek_parent (klass);  #line 8 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	G_OBJECT_CLASS (klass)->finalize = source_collection_destroy_counter_finalize; -#line 1573 "SourceCollection.c" +#line 1659 "SourceCollection.c"  } -static void source_collection_destroy_counter_instance_init (SourceCollectionDestroyCounter * self) { +static void +source_collection_destroy_counter_instance_init (SourceCollectionDestroyCounter * self) +{  	GeeArrayList* _tmp0_;  	GeeArrayList* _tmp1_;  #line 10 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1584,11 +1672,13 @@ static void source_collection_destroy_counter_instance_init (SourceCollectionDes  	_tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);  #line 11 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	self->not_removed = _tmp1_; -#line 1588 "SourceCollection.c" +#line 1676 "SourceCollection.c"  } -static void source_collection_destroy_counter_finalize (GObject * obj) { +static void +source_collection_destroy_counter_finalize (GObject * obj) +{  	SourceCollectionDestroyCounter * self;  #line 8 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter); @@ -1600,11 +1690,13 @@ static void source_collection_destroy_counter_finalize (GObject * obj) {  	_g_object_unref0 (self->not_removed);  #line 8 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	G_OBJECT_CLASS (source_collection_destroy_counter_parent_class)->finalize (obj); -#line 1604 "SourceCollection.c" +#line 1694 "SourceCollection.c"  } -static GType source_collection_destroy_counter_get_type (void) { +static GType +source_collection_destroy_counter_get_type (void) +{  	static volatile gsize source_collection_destroy_counter_type_id__volatile = 0;  	if (g_once_init_enter (&source_collection_destroy_counter_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (SourceCollectionDestroyCounterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) source_collection_destroy_counter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SourceCollectionDestroyCounter), 0, (GInstanceInitFunc) source_collection_destroy_counter_instance_init, NULL }; @@ -1616,7 +1708,9 @@ static GType source_collection_destroy_counter_get_type (void) {  } -static void source_collection_class_init (SourceCollectionClass * klass) { +static void +source_collection_class_init (SourceCollectionClass * klass) +{  #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	source_collection_parent_class = g_type_class_peek_parent (klass);  #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1667,20 +1761,24 @@ static void source_collection_class_init (SourceCollectionClass * klass) {  	source_collection_signals[SOURCE_COLLECTION_UNLINKED_DESTROYED_SIGNAL] = g_signal_new ("unlinked-destroyed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, unlinked_destroyed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE);  #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	source_collection_signals[SOURCE_COLLECTION_BACKLINK_REMOVED_SIGNAL] = g_signal_new ("backlink-removed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, backlink_removed), NULL, NULL, g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT, G_TYPE_NONE, 2, TYPE_SOURCE_BACKLINK, GEE_TYPE_COLLECTION); -#line 1671 "SourceCollection.c" +#line 1765 "SourceCollection.c"  } -static void source_collection_instance_init (SourceCollection * self) { +static void +source_collection_instance_init (SourceCollection * self) +{  #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	self->priv = SOURCE_COLLECTION_GET_PRIVATE (self);  #line 48 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	self->priv->backlinks = NULL; -#line 1680 "SourceCollection.c" +#line 1776 "SourceCollection.c"  } -static void source_collection_finalize (DataCollection * obj) { +static void +source_collection_finalize (DataCollection * obj) +{  	SourceCollection * self;  #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SOURCE_COLLECTION, SourceCollection); @@ -1688,11 +1786,13 @@ static void source_collection_finalize (DataCollection * obj) {  	_g_object_unref0 (self->priv->backlinks);  #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	DATA_COLLECTION_CLASS (source_collection_parent_class)->finalize (obj); -#line 1692 "SourceCollection.c" +#line 1790 "SourceCollection.c"  } -GType source_collection_get_type (void) { +GType +source_collection_get_type (void) +{  	static volatile gsize source_collection_type_id__volatile = 0;  	if (g_once_init_enter (&source_collection_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (SourceCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) source_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SourceCollection), 0, (GInstanceInitFunc) source_collection_instance_init, NULL }; | 
