diff options
Diffstat (limited to 'src/core/DataCollection.c')
| -rw-r--r-- | src/core/DataCollection.c | 3118 |
1 files changed, 1619 insertions, 1499 deletions
diff --git a/src/core/DataCollection.c b/src/core/DataCollection.c index 658dfa3..f71e80c 100644 --- a/src/core/DataCollection.c +++ b/src/core/DataCollection.c @@ -1,4 +1,4 @@ -/* DataCollection.c generated by valac 0.36.6, the Vala compiler +/* DataCollection.c generated by valac 0.40.4, the Vala compiler * generated from DataCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include <glib.h> #include <glib-object.h> #include <stdlib.h> @@ -90,6 +91,11 @@ typedef struct _DataCollectionMarkerImplClass DataCollectionMarkerImplClass; typedef struct _DataCollectionMarkerImplPrivate DataCollectionMarkerImplPrivate; #define _alteration_unref0(var) ((var == NULL) ? NULL : (var = (alteration_unref (var), NULL))) #define __vala_GValue_free0(var) ((var == NULL) ? NULL : (var = (_vala_GValue_free (var), NULL))) +enum { + DATA_COLLECTION_MARKER_IMPL_0_PROPERTY, + DATA_COLLECTION_MARKER_IMPL_NUM_PROPERTIES +}; +static GParamSpec* data_collection_marker_impl_properties[DATA_COLLECTION_MARKER_IMPL_NUM_PROPERTIES]; typedef struct _ParamSpecDataCollection ParamSpecDataCollection; enum { DATA_COLLECTION_ITEMS_ADDED_SIGNAL, @@ -101,9 +107,9 @@ enum { DATA_COLLECTION_PROPERTY_CLEARED_SIGNAL, DATA_COLLECTION_FROZEN_SIGNAL, DATA_COLLECTION_THAWED_SIGNAL, - DATA_COLLECTION_LAST_SIGNAL + DATA_COLLECTION_NUM_SIGNALS }; -static guint data_collection_signals[DATA_COLLECTION_LAST_SIGNAL] = {0}; +static guint data_collection_signals[DATA_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; } @@ -202,69 +208,129 @@ static MarkerIface * data_collection_marker_impl_marker_parent_iface = 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; gpointer data_set_ref (gpointer instance); void data_set_unref (gpointer instance); -GParamSpec* param_spec_data_set (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_set (GValue* value, gpointer v_object); -void value_take_data_set (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_set (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_set (GValue* value, + gpointer v_object); +void value_take_data_set (GValue* value, + gpointer v_object); gpointer value_get_data_set (const GValue* value); GType data_set_get_type (void) G_GNUC_CONST; #define DATA_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DATA_COLLECTION, DataCollectionPrivate)) -enum { - DATA_COLLECTION_DUMMY_PROPERTY -}; DataSet* data_set_new (void); DataSet* data_set_construct (GType object_type); static GValue* _g_value_dup (GValue* self); static void _vala_GValue_free (GValue* self); #define DATA_COLLECTION_INVALID_OBJECT_ORDINAL ((gint64) -1) DataCollection* data_collection_new (const gchar* name); -DataCollection* data_collection_construct (GType object_type, const gchar* name); +DataCollection* data_collection_construct (GType object_type, + const gchar* name); gchar* data_collection_to_string (DataCollection* self); static gchar* data_collection_real_to_string (DataCollection* self); gint data_collection_get_count (DataCollection* self); -void data_collection_notify_items_added (DataCollection* self, GeeIterable* added); -static void data_collection_real_notify_items_added (DataCollection* self, GeeIterable* added); -void data_collection_notify_items_removed (DataCollection* self, GeeIterable* removed); -static void data_collection_real_notify_items_removed (DataCollection* self, GeeIterable* removed); -void data_collection_notify_contents_altered (DataCollection* self, GeeIterable* added, GeeIterable* removed); -static void data_collection_real_notify_contents_altered (DataCollection* self, GeeIterable* added, GeeIterable* removed); -void data_collection_notify_items_altered (DataCollection* self, GeeMap* items); -static void data_collection_real_notify_items_altered (DataCollection* self, GeeMap* items); +void data_collection_notify_items_added (DataCollection* self, + GeeIterable* added); +static void data_collection_real_notify_items_added (DataCollection* self, + GeeIterable* added); +void data_collection_notify_items_removed (DataCollection* self, + GeeIterable* removed); +static void data_collection_real_notify_items_removed (DataCollection* self, + GeeIterable* removed); +void data_collection_notify_contents_altered (DataCollection* self, + GeeIterable* added, + GeeIterable* removed); +static void data_collection_real_notify_contents_altered (DataCollection* self, + GeeIterable* added, + GeeIterable* removed); +void data_collection_notify_items_altered (DataCollection* self, + GeeMap* items); +static void data_collection_real_notify_items_altered (DataCollection* self, + GeeMap* items); void data_collection_notify_ordering_changed (DataCollection* self); static void data_collection_real_notify_ordering_changed (DataCollection* self); -void data_collection_notify_property_set (DataCollection* self, const gchar* name, GValue* old, GValue* val); -static void data_collection_real_notify_property_set (DataCollection* self, const gchar* name, GValue* old, GValue* val); -void data_collection_notify_property_cleared (DataCollection* self, const gchar* name); -static void data_collection_real_notify_property_cleared (DataCollection* self, const gchar* name); +void data_collection_notify_property_set (DataCollection* self, + const gchar* name, + GValue* old, + GValue* val); +static void data_collection_real_notify_property_set (DataCollection* self, + const gchar* name, + GValue* old, + GValue* val); +void data_collection_notify_property_cleared (DataCollection* self, + const gchar* name); +static void data_collection_real_notify_property_cleared (DataCollection* self, + const gchar* name); GeeCollection* data_collection_get_singleton (DataObject* object); -SingletonCollection* singleton_collection_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer object); -SingletonCollection* singleton_collection_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer object); +SingletonCollection* singleton_collection_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + gconstpointer object); +SingletonCollection* singleton_collection_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + gconstpointer object); GType singleton_collection_get_type (void) G_GNUC_CONST; -GeeMap* data_collection_get_alteration_singleton (DataObject* object, Alteration* alteration); -gboolean data_collection_valid_type (DataCollection* self, DataObject* object); -static gboolean data_collection_real_valid_type (DataCollection* self, DataObject* object); -Comparator data_collection_get_comparator (DataCollection* self, void** result_target); -Comparator data_set_get_comparator (DataSet* self, void** result_target); -ComparatorPredicate data_collection_get_comparator_predicate (DataCollection* self, void** result_target); -ComparatorPredicate data_set_get_comparator_predicate (DataSet* self, void** result_target); -void data_collection_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target); -static void data_collection_real_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target); -void data_set_set_comparator (DataSet* self, Comparator user_comparator, void* user_comparator_target, ComparatorPredicate comparator_predicate, void* comparator_predicate_target); +GeeMap* data_collection_get_alteration_singleton (DataObject* object, + Alteration* alteration); +gboolean data_collection_valid_type (DataCollection* self, + DataObject* object); +static gboolean data_collection_real_valid_type (DataCollection* self, + DataObject* object); +Comparator data_collection_get_comparator (DataCollection* self, + void** result_target); +Comparator data_set_get_comparator (DataSet* self, + void** result_target); +ComparatorPredicate data_collection_get_comparator_predicate (DataCollection* self, + void** result_target); +ComparatorPredicate data_set_get_comparator_predicate (DataSet* self, + void** result_target); +void data_collection_set_comparator (DataCollection* self, + Comparator comparator, + void* comparator_target, + ComparatorPredicate predicate, + void* predicate_target); +static void data_collection_real_set_comparator (DataCollection* self, + Comparator comparator, + void* comparator_target, + ComparatorPredicate predicate, + void* predicate_target); +void data_set_set_comparator (DataSet* self, + Comparator user_comparator, + void* user_comparator_target, + ComparatorPredicate comparator_predicate, + void* comparator_predicate_target); void data_collection_reset_comparator (DataCollection* self); static void data_collection_real_reset_comparator (DataCollection* self); void data_set_reset_comparator (DataSet* self); @@ -275,89 +341,177 @@ DataSet* data_collection_get_dataset_copy (DataCollection* self); DataSet* data_set_copy (DataSet* self); static gint data_collection_real_get_count (DataCollection* self); gint data_set_get_count (DataSet* self); -DataObject* data_collection_get_at (DataCollection* self, gint index); -static DataObject* data_collection_real_get_at (DataCollection* self, gint index); -DataObject* data_set_get_at (DataSet* self, gint index); -gint data_collection_index_of (DataCollection* self, DataObject* object); -static gint data_collection_real_index_of (DataCollection* self, DataObject* object); -gint data_set_index_of (DataSet* self, DataObject* object); -gboolean data_collection_contains (DataCollection* self, DataObject* object); -static gboolean data_collection_real_contains (DataCollection* self, DataObject* object); -static gboolean data_collection_internal_contains (DataCollection* self, DataObject* object); -gboolean data_set_contains (DataSet* self, DataObject* object); +DataObject* data_collection_get_at (DataCollection* self, + gint index); +static DataObject* data_collection_real_get_at (DataCollection* self, + gint index); +DataObject* data_set_get_at (DataSet* self, + gint index); +gint data_collection_index_of (DataCollection* self, + DataObject* object); +static gint data_collection_real_index_of (DataCollection* self, + DataObject* object); +gint data_set_index_of (DataSet* self, + DataObject* object); +gboolean data_collection_contains (DataCollection* self, + DataObject* object); +static gboolean data_collection_real_contains (DataCollection* self, + DataObject* object); +static gboolean data_collection_internal_contains (DataCollection* self, + DataObject* object); +gboolean data_set_contains (DataSet* self, + DataObject* object); DataCollection* data_object_get_membership (DataObject* self); -static void data_collection_internal_add (DataCollection* self, DataObject* object); -void data_object_internal_set_membership (DataObject* self, DataCollection* collection, gint64 ordinal); -gboolean data_set_add (DataSet* self, DataObject* object); -static void data_collection_internal_add_many (DataCollection* self, GeeList* objects, ProgressMonitor monitor, void* monitor_target); -gboolean data_set_add_many (DataSet* self, GeeCollection* objects); -static void data_collection_internal_remove (DataCollection* self, DataObject* object); -gboolean data_set_remove (DataSet* self, DataObject* object); +static void data_collection_internal_add (DataCollection* self, + DataObject* object); +void data_object_internal_set_membership (DataObject* self, + DataCollection* collection, + gint64 ordinal); +gboolean data_set_add (DataSet* self, + DataObject* object); +static void data_collection_internal_add_many (DataCollection* self, + GeeList* objects, + ProgressMonitor monitor, + void* monitor_target); +gboolean data_set_add_many (DataSet* self, + GeeCollection* objects); +static void data_collection_internal_remove (DataCollection* self, + DataObject* object); +gboolean data_set_remove (DataSet* self, + DataObject* object); void data_object_internal_clear_membership (DataObject* self); -gboolean data_collection_add (DataCollection* self, DataObject* object); -static gboolean data_collection_real_add (DataCollection* self, DataObject* object); +gboolean data_collection_add (DataCollection* self, + DataObject* object); +static gboolean data_collection_real_add (DataCollection* self, + DataObject* object); gchar* data_object_to_string (DataObject* self); -void data_object_notify_membership_changed (DataObject* self, DataCollection* collection); -GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target); -static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target); +void data_object_notify_membership_changed (DataObject* self, + DataCollection* collection); +GeeCollection* data_collection_add_many (DataCollection* self, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target); +static GeeCollection* data_collection_real_add_many (DataCollection* self, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target); Marker* data_collection_start_marking (DataCollection* self); static DataCollectionMarkerImpl* data_collection_marker_impl_new (DataCollection* owner); -static DataCollectionMarkerImpl* data_collection_marker_impl_construct (GType object_type, DataCollection* owner); +static DataCollectionMarkerImpl* data_collection_marker_impl_construct (GType object_type, + DataCollection* owner); static GType data_collection_marker_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -Marker* data_collection_mark (DataCollection* self, DataObject* object); -void marker_mark (Marker* self, DataObject* object); -Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects); -void marker_mark_many (Marker* self, GeeCollection* list); -void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedAction action, void* action_target, ProgressMonitor monitor, void* monitor_target, GObject* user); -static gboolean data_collection_marker_impl_is_valid (DataCollectionMarkerImpl* self, DataCollection* collection); +Marker* data_collection_mark (DataCollection* self, + DataObject* object); +void marker_mark (Marker* self, + DataObject* object); +Marker* data_collection_mark_many (DataCollection* self, + GeeCollection* objects); +void marker_mark_many (Marker* self, + GeeCollection* list); +void data_collection_act_on_marked (DataCollection* self, + Marker* m, + MarkedAction action, + void* action_target, + ProgressMonitor monitor, + void* monitor_target, + GObject* user); +static gboolean data_collection_marker_impl_is_valid (DataCollectionMarkerImpl* self, + DataCollection* collection); static void data_collection_marker_impl_freeze (DataCollectionMarkerImpl* self); static void data_collection_marker_impl_finished (DataCollectionMarkerImpl* self); -void data_collection_remove_marked (DataCollection* self, Marker* m); -static void data_collection_real_remove_marked (DataCollection* self, Marker* m); +void data_collection_remove_marked (DataCollection* self, + Marker* m); +static void data_collection_real_remove_marked (DataCollection* self, + Marker* m); void data_collection_clear (DataCollection* self); static void data_collection_real_clear (DataCollection* self); void data_collection_close (DataCollection* self); static void data_collection_real_close (DataCollection* self); -void data_collection_internal_notify_altered (DataCollection* self, DataObject* object, Alteration* alteration); -gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration* alteration); +void data_collection_internal_notify_altered (DataCollection* self, + DataObject* object, + Alteration* alteration); +gboolean data_set_resort_object (DataSet* self, + DataObject* object, + Alteration* alteration); gboolean data_collection_are_notifications_frozen (DataCollection* self); -Alteration* alteration_compress (Alteration* self, Alteration* other); -GValue* data_collection_get_property (DataCollection* self, const gchar* name); -void data_collection_set_property (DataCollection* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target); -gboolean bool_value_equals (GValue* a, GValue* b); -static gboolean _bool_value_equals_value_equal_func (GValue* a, GValue* b, gpointer self); -gboolean int_value_equals (GValue* a, GValue* b); -static gboolean _int_value_equals_value_equal_func (GValue* a, GValue* b, gpointer self); -void data_object_notify_collection_property_set (DataObject* self, const gchar* name, GValue* old, GValue* val); -void data_collection_clear_property (DataCollection* self, const gchar* name); -void data_object_notify_collection_property_cleared (DataObject* self, const gchar* name); +Alteration* alteration_compress (Alteration* self, + Alteration* other); +GValue* data_collection_get_property (DataCollection* self, + const gchar* name); +void data_collection_set_property (DataCollection* self, + const gchar* name, + GValue* val, + ValueEqualFunc value_equals, + void* value_equals_target); +gboolean bool_value_equals (GValue* a, + GValue* b); +static gboolean _bool_value_equals_value_equal_func (GValue* a, + GValue* b, + gpointer self); +gboolean int_value_equals (GValue* a, + GValue* b); +static gboolean _int_value_equals_value_equal_func (GValue* a, + GValue* b, + gpointer self); +void data_object_notify_collection_property_set (DataObject* self, + const gchar* name, + GValue* old, + GValue* val); +void data_collection_clear_property (DataCollection* self, + const gchar* name); +void data_object_notify_collection_property_cleared (DataObject* self, + const gchar* name); void data_collection_freeze_notifications (DataCollection* self); void data_collection_notify_frozen (DataCollection* self); void data_collection_thaw_notifications (DataCollection* self); void data_collection_notify_thawed (DataCollection* self); static void data_collection_real_notify_frozen (DataCollection* self); static void data_collection_real_notify_thawed (DataCollection* self); -static void data_collection_real_items_added (DataCollection* self, GeeIterable* added); -static void data_collection_real_items_removed (DataCollection* self, GeeIterable* removed); -static void data_collection_real_contents_altered (DataCollection* self, GeeIterable* added, GeeIterable* removed); -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void data_collection_real_items_altered (DataCollection* self, GeeMap* items); +static void data_collection_real_items_added (DataCollection* self, + GeeIterable* added); +static void data_collection_real_items_removed (DataCollection* self, + GeeIterable* removed); +static void data_collection_real_contents_altered (DataCollection* self, + GeeIterable* added, + GeeIterable* removed); +static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void data_collection_real_items_altered (DataCollection* self, + GeeMap* items); static void data_collection_real_ordering_changed (DataCollection* self); -static void data_collection_real_property_set (DataCollection* self, const gchar* name, GValue* old, GValue* val); -static void g_cclosure_user_marshal_VOID__STRING_POINTER_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void data_collection_real_property_cleared (DataCollection* self, const gchar* name); +static void data_collection_real_property_set (DataCollection* self, + const gchar* name, + GValue* old, + GValue* val); +static void g_cclosure_user_marshal_VOID__STRING_POINTER_BOXED (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void data_collection_real_property_cleared (DataCollection* self, + const gchar* name); static void data_collection_real_frozen (DataCollection* self); static void data_collection_real_thawed (DataCollection* self); -enum { - DATA_COLLECTION_MARKER_IMPL_DUMMY_PROPERTY -}; -static void data_collection_marker_impl_on_items_removed (DataCollectionMarkerImpl* self, GeeIterable* removed); -static void _data_collection_marker_impl_on_items_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self); -static void data_collection_marker_impl_real_mark (Marker* base, DataObject* object); -static void data_collection_marker_impl_real_unmark (Marker* base, DataObject* object); -static gboolean data_collection_marker_impl_real_toggle (Marker* base, DataObject* object); -static void data_collection_marker_impl_real_mark_many (Marker* base, GeeCollection* list); -static void data_collection_marker_impl_real_unmark_many (Marker* base, GeeCollection* list); +static void data_collection_marker_impl_on_items_removed (DataCollectionMarkerImpl* self, + GeeIterable* removed); +static void _data_collection_marker_impl_on_items_removed_data_collection_items_removed (DataCollection* _sender, + GeeIterable* removed, + gpointer self); +static void data_collection_marker_impl_real_mark (Marker* base, + DataObject* object); +static void data_collection_marker_impl_real_unmark (Marker* base, + DataObject* object); +static gboolean data_collection_marker_impl_real_toggle (Marker* base, + DataObject* object); +static void data_collection_marker_impl_real_mark_many (Marker* base, + GeeCollection* list); +static void data_collection_marker_impl_real_unmark_many (Marker* base, + GeeCollection* list); static void data_collection_marker_impl_real_mark_all (Marker* base); static gint data_collection_marker_impl_real_get_count (Marker* base); static GeeCollection* data_collection_marker_impl_real_get_all (Marker* base); @@ -365,258 +519,287 @@ static void data_collection_marker_impl_finalize (GObject * obj); static void data_collection_finalize (DataCollection * obj); -static GValue* _g_value_dup (GValue* self) { +static GValue* +_g_value_dup (GValue* self) +{ #line 109 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return g_boxed_copy (G_TYPE_VALUE, self); -#line 372 "DataCollection.c" +#line 528 "DataCollection.c" } -static void _vala_GValue_free (GValue* self) { +static void +_vala_GValue_free (GValue* self) +{ #line 109 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_value_unset (self); #line 109 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_free (self); -#line 381 "DataCollection.c" +#line 539 "DataCollection.c" } -DataCollection* data_collection_construct (GType object_type, const gchar* name) { +DataCollection* +data_collection_construct (GType object_type, + const gchar* name) +{ DataCollection* self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; #line 157 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (name != NULL, NULL); #line 157 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self = (DataCollection*) g_type_create_instance (object_type); #line 158 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = name; -#line 158 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (name); #line 158 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_free0 (self->priv->name); #line 158 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - self->priv->name = _tmp1_; + self->priv->name = _tmp0_; #line 157 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return self; -#line 403 "DataCollection.c" +#line 561 "DataCollection.c" } -DataCollection* data_collection_new (const gchar* name) { +DataCollection* +data_collection_new (const gchar* name) +{ #line 157 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return data_collection_construct (TYPE_DATA_COLLECTION, name); -#line 410 "DataCollection.c" +#line 570 "DataCollection.c" } -static gchar* data_collection_real_to_string (DataCollection* self) { +static gchar* +data_collection_real_to_string (DataCollection* self) +{ gchar* result = NULL; const gchar* _tmp0_; - gint _tmp1_; - gchar* _tmp2_; + gchar* _tmp1_; #line 168 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->name; #line 168 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = data_collection_get_count (self); -#line 168 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = g_strdup_printf ("%s (%d)", _tmp0_, _tmp1_); + _tmp1_ = g_strdup_printf ("%s (%d)", _tmp0_, data_collection_get_count (self)); #line 168 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - result = _tmp2_; + result = _tmp1_; #line 168 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 429 "DataCollection.c" +#line 588 "DataCollection.c" } -gchar* data_collection_to_string (DataCollection* self) { +gchar* +data_collection_to_string (DataCollection* self) +{ #line 167 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL); #line 167 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return DATA_COLLECTION_GET_CLASS (self)->to_string (self); -#line 438 "DataCollection.c" +#line 599 "DataCollection.c" } -static void data_collection_real_notify_items_added (DataCollection* self, GeeIterable* added) { - GeeIterable* _tmp0_; +static void +data_collection_real_notify_items_added (DataCollection* self, + GeeIterable* added) +{ #line 172 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (added)); #line 173 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = added; -#line 173 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ITEMS_ADDED_SIGNAL], 0, _tmp0_); -#line 450 "DataCollection.c" + g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ITEMS_ADDED_SIGNAL], 0, added); +#line 611 "DataCollection.c" } -void data_collection_notify_items_added (DataCollection* self, GeeIterable* added) { +void +data_collection_notify_items_added (DataCollection* self, + GeeIterable* added) +{ #line 172 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 172 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->notify_items_added (self, added); -#line 459 "DataCollection.c" +#line 623 "DataCollection.c" } -static void data_collection_real_notify_items_removed (DataCollection* self, GeeIterable* removed) { - GeeIterable* _tmp0_; +static void +data_collection_real_notify_items_removed (DataCollection* self, + GeeIterable* removed) +{ #line 176 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (removed)); #line 177 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = removed; -#line 177 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ITEMS_REMOVED_SIGNAL], 0, _tmp0_); -#line 471 "DataCollection.c" + g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ITEMS_REMOVED_SIGNAL], 0, removed); +#line 635 "DataCollection.c" } -void data_collection_notify_items_removed (DataCollection* self, GeeIterable* removed) { +void +data_collection_notify_items_removed (DataCollection* self, + GeeIterable* removed) +{ #line 176 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 176 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->notify_items_removed (self, removed); -#line 480 "DataCollection.c" +#line 647 "DataCollection.c" } -static void data_collection_real_notify_contents_altered (DataCollection* self, GeeIterable* added, GeeIterable* removed) { - GeeIterable* _tmp0_; - GeeIterable* _tmp1_; +static void +data_collection_real_notify_contents_altered (DataCollection* self, + GeeIterable* added, + GeeIterable* removed) +{ #line 180 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added)); #line 180 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed)); #line 182 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = added; -#line 182 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = removed; -#line 182 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_emit (self, data_collection_signals[DATA_COLLECTION_CONTENTS_ALTERED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 497 "DataCollection.c" + g_signal_emit (self, data_collection_signals[DATA_COLLECTION_CONTENTS_ALTERED_SIGNAL], 0, added, removed); +#line 662 "DataCollection.c" } -void data_collection_notify_contents_altered (DataCollection* self, GeeIterable* added, GeeIterable* removed) { +void +data_collection_notify_contents_altered (DataCollection* self, + GeeIterable* added, + GeeIterable* removed) +{ #line 180 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 180 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->notify_contents_altered (self, added, removed); -#line 506 "DataCollection.c" +#line 675 "DataCollection.c" } -static void data_collection_real_notify_items_altered (DataCollection* self, GeeMap* items) { - GeeMap* _tmp0_; +static void +data_collection_real_notify_items_altered (DataCollection* self, + GeeMap* items) +{ #line 185 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (GEE_IS_MAP (items)); #line 186 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = items; -#line 186 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ITEMS_ALTERED_SIGNAL], 0, _tmp0_); -#line 518 "DataCollection.c" + g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ITEMS_ALTERED_SIGNAL], 0, items); +#line 687 "DataCollection.c" } -void data_collection_notify_items_altered (DataCollection* self, GeeMap* items) { +void +data_collection_notify_items_altered (DataCollection* self, + GeeMap* items) +{ #line 185 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 185 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->notify_items_altered (self, items); -#line 527 "DataCollection.c" +#line 699 "DataCollection.c" } -static void data_collection_real_notify_ordering_changed (DataCollection* self) { +static void +data_collection_real_notify_ordering_changed (DataCollection* self) +{ #line 190 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ORDERING_CHANGED_SIGNAL], 0); -#line 534 "DataCollection.c" +#line 708 "DataCollection.c" } -void data_collection_notify_ordering_changed (DataCollection* self) { +void +data_collection_notify_ordering_changed (DataCollection* self) +{ #line 189 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 189 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->notify_ordering_changed (self); -#line 543 "DataCollection.c" +#line 719 "DataCollection.c" } -static void data_collection_real_notify_property_set (DataCollection* self, const gchar* name, GValue* old, GValue* val) { - const gchar* _tmp0_; - GValue* _tmp1_; - GValue _tmp2_; +static void +data_collection_real_notify_property_set (DataCollection* self, + const gchar* name, + GValue* old, + GValue* val) +{ + GValue _tmp0_; #line 193 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (name != NULL); #line 193 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (val != NULL); #line 194 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = name; -#line 194 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = old; -#line 194 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = *val; + _tmp0_ = *val; #line 194 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_emit (self, data_collection_signals[DATA_COLLECTION_PROPERTY_SET_SIGNAL], 0, _tmp0_, _tmp1_, &_tmp2_); -#line 563 "DataCollection.c" + g_signal_emit (self, data_collection_signals[DATA_COLLECTION_PROPERTY_SET_SIGNAL], 0, name, old, &_tmp0_); +#line 738 "DataCollection.c" } -void data_collection_notify_property_set (DataCollection* self, const gchar* name, GValue* old, GValue* val) { +void +data_collection_notify_property_set (DataCollection* self, + const gchar* name, + GValue* old, + GValue* val) +{ #line 193 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 193 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->notify_property_set (self, name, old, val); -#line 572 "DataCollection.c" +#line 752 "DataCollection.c" } -static void data_collection_real_notify_property_cleared (DataCollection* self, const gchar* name) { - const gchar* _tmp0_; +static void +data_collection_real_notify_property_cleared (DataCollection* self, + const gchar* name) +{ #line 197 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (name != NULL); #line 198 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = name; -#line 198 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_emit (self, data_collection_signals[DATA_COLLECTION_PROPERTY_CLEARED_SIGNAL], 0, _tmp0_); -#line 584 "DataCollection.c" + g_signal_emit (self, data_collection_signals[DATA_COLLECTION_PROPERTY_CLEARED_SIGNAL], 0, name); +#line 764 "DataCollection.c" } -void data_collection_notify_property_cleared (DataCollection* self, const gchar* name) { +void +data_collection_notify_property_cleared (DataCollection* self, + const gchar* name) +{ #line 197 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 197 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->notify_property_cleared (self, name); -#line 593 "DataCollection.c" +#line 776 "DataCollection.c" } -GeeCollection* data_collection_get_singleton (DataObject* object) { +GeeCollection* +data_collection_get_singleton (DataObject* object) +{ GeeCollection* result = NULL; - DataObject* _tmp0_; - SingletonCollection* _tmp1_; + SingletonCollection* _tmp0_; #line 206 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), NULL); #line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = object; + _tmp0_ = singleton_collection_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, object); #line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = singleton_collection_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_); -#line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); #line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 611 "DataCollection.c" +#line 793 "DataCollection.c" } -GeeMap* data_collection_get_alteration_singleton (DataObject* object, Alteration* alteration) { +GeeMap* +data_collection_get_alteration_singleton (DataObject* object, + Alteration* alteration) +{ GeeMap* result = NULL; GeeMap* map = NULL; GeeHashMap* _tmp0_; - DataObject* _tmp1_; - Alteration* _tmp2_; #line 210 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), NULL); #line 210 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -626,20 +809,19 @@ GeeMap* data_collection_get_alteration_singleton (DataObject* object, Alteration #line 212 "/home/jens/Source/shotwell/src/core/DataCollection.vala" map = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap); #line 213 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = object; -#line 213 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = alteration; -#line 213 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_map_set (map, _tmp1_, _tmp2_); + gee_map_set (map, object, alteration); #line 215 "/home/jens/Source/shotwell/src/core/DataCollection.vala" result = map; #line 215 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 639 "DataCollection.c" +#line 818 "DataCollection.c" } -static gboolean data_collection_real_valid_type (DataCollection* self, DataObject* object) { +static gboolean +data_collection_real_valid_type (DataCollection* self, + DataObject* object) +{ gboolean result = FALSE; #line 218 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); @@ -647,20 +829,26 @@ static gboolean data_collection_real_valid_type (DataCollection* self, DataObjec result = TRUE; #line 219 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 651 "DataCollection.c" +#line 833 "DataCollection.c" } -gboolean data_collection_valid_type (DataCollection* self, DataObject* object) { +gboolean +data_collection_valid_type (DataCollection* self, + DataObject* object) +{ #line 218 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), FALSE); #line 218 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return DATA_COLLECTION_GET_CLASS (self)->valid_type (self, object); -#line 660 "DataCollection.c" +#line 845 "DataCollection.c" } -Comparator data_collection_get_comparator (DataCollection* self, void** result_target) { +Comparator +data_collection_get_comparator (DataCollection* self, + void** result_target) +{ Comparator result = NULL; DataSet* _tmp0_; void* _tmp1_; @@ -683,11 +871,14 @@ Comparator data_collection_get_comparator (DataCollection* self, void** result_t result = _tmp3_; #line 223 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 687 "DataCollection.c" +#line 875 "DataCollection.c" } -ComparatorPredicate data_collection_get_comparator_predicate (DataCollection* self, void** result_target) { +ComparatorPredicate +data_collection_get_comparator_predicate (DataCollection* self, + void** result_target) +{ ComparatorPredicate result = NULL; DataSet* _tmp0_; void* _tmp1_; @@ -710,44 +901,46 @@ ComparatorPredicate data_collection_get_comparator_predicate (DataCollection* se result = _tmp3_; #line 227 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 714 "DataCollection.c" +#line 905 "DataCollection.c" } -static void data_collection_real_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target) { +static void +data_collection_real_set_comparator (DataCollection* self, + Comparator comparator, + void* comparator_target, + ComparatorPredicate predicate, + void* predicate_target) +{ DataSet* _tmp0_; - Comparator _tmp1_; - void* _tmp1__target; - ComparatorPredicate _tmp2_; - void* _tmp2__target; #line 231 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->dataset; #line 231 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = comparator; -#line 231 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1__target = comparator_target; -#line 231 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = predicate; -#line 231 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2__target = predicate_target; -#line 231 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_set_set_comparator (_tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp2__target); + data_set_set_comparator (_tmp0_, comparator, comparator_target, predicate, predicate_target); #line 232 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_notify_ordering_changed (self); -#line 738 "DataCollection.c" +#line 923 "DataCollection.c" } -void data_collection_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target) { +void +data_collection_set_comparator (DataCollection* self, + Comparator comparator, + void* comparator_target, + ComparatorPredicate predicate, + void* predicate_target) +{ #line 230 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 230 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->set_comparator (self, comparator, comparator_target, predicate, predicate_target); -#line 747 "DataCollection.c" +#line 938 "DataCollection.c" } -static void data_collection_real_reset_comparator (DataCollection* self) { +static void +data_collection_real_reset_comparator (DataCollection* self) +{ DataSet* _tmp0_; #line 237 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->dataset; @@ -755,20 +948,24 @@ static void data_collection_real_reset_comparator (DataCollection* self) { data_set_reset_comparator (_tmp0_); #line 238 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_notify_ordering_changed (self); -#line 759 "DataCollection.c" +#line 952 "DataCollection.c" } -void data_collection_reset_comparator (DataCollection* self) { +void +data_collection_reset_comparator (DataCollection* self) +{ #line 236 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 236 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->reset_comparator (self); -#line 768 "DataCollection.c" +#line 963 "DataCollection.c" } -static GeeCollection* data_collection_real_get_all (DataCollection* self) { +static GeeCollection* +data_collection_real_get_all (DataCollection* self) +{ GeeCollection* result = NULL; DataSet* _tmp0_; GeeList* _tmp1_; @@ -780,20 +977,24 @@ static GeeCollection* data_collection_real_get_all (DataCollection* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); #line 242 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 784 "DataCollection.c" +#line 981 "DataCollection.c" } -GeeCollection* data_collection_get_all (DataCollection* self) { +GeeCollection* +data_collection_get_all (DataCollection* self) +{ #line 241 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL); #line 241 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return DATA_COLLECTION_GET_CLASS (self)->get_all (self); -#line 793 "DataCollection.c" +#line 992 "DataCollection.c" } -DataSet* data_collection_get_dataset_copy (DataCollection* self) { +DataSet* +data_collection_get_dataset_copy (DataCollection* self) +{ DataSet* result = NULL; DataSet* _tmp0_; DataSet* _tmp1_; @@ -807,128 +1008,132 @@ DataSet* data_collection_get_dataset_copy (DataCollection* self) { result = _tmp1_; #line 246 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 811 "DataCollection.c" +#line 1012 "DataCollection.c" } -static gint data_collection_real_get_count (DataCollection* self) { +static gint +data_collection_real_get_count (DataCollection* self) +{ gint result = 0; DataSet* _tmp0_; - gint _tmp1_; #line 250 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->dataset; #line 250 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = data_set_get_count (_tmp0_); -#line 250 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - result = _tmp1_; + result = data_set_get_count (_tmp0_); #line 250 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 827 "DataCollection.c" +#line 1027 "DataCollection.c" } -gint data_collection_get_count (DataCollection* self) { +gint +data_collection_get_count (DataCollection* self) +{ #line 249 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), 0); #line 249 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return DATA_COLLECTION_GET_CLASS (self)->get_count (self); -#line 836 "DataCollection.c" +#line 1038 "DataCollection.c" } -static DataObject* data_collection_real_get_at (DataCollection* self, gint index) { +static DataObject* +data_collection_real_get_at (DataCollection* self, + gint index) +{ DataObject* result = NULL; DataSet* _tmp0_; - gint _tmp1_; - DataObject* _tmp2_; + DataObject* _tmp1_; #line 254 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->dataset; #line 254 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = index; + _tmp1_ = data_set_get_at (_tmp0_, index); #line 254 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = data_set_get_at (_tmp0_, _tmp1_); -#line 254 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - result = _tmp2_; + result = _tmp1_; #line 254 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 855 "DataCollection.c" +#line 1057 "DataCollection.c" } -DataObject* data_collection_get_at (DataCollection* self, gint index) { +DataObject* +data_collection_get_at (DataCollection* self, + gint index) +{ #line 253 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL); #line 253 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return DATA_COLLECTION_GET_CLASS (self)->get_at (self, index); -#line 864 "DataCollection.c" +#line 1069 "DataCollection.c" } -static gint data_collection_real_index_of (DataCollection* self, DataObject* object) { +static gint +data_collection_real_index_of (DataCollection* self, + DataObject* object) +{ gint result = 0; DataSet* _tmp0_; - DataObject* _tmp1_; - gint _tmp2_; #line 257 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), 0); #line 258 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->dataset; #line 258 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = object; -#line 258 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = data_set_index_of (_tmp0_, _tmp1_); -#line 258 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - result = _tmp2_; + result = data_set_index_of (_tmp0_, object); #line 258 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 885 "DataCollection.c" +#line 1087 "DataCollection.c" } -gint data_collection_index_of (DataCollection* self, DataObject* object) { +gint +data_collection_index_of (DataCollection* self, + DataObject* object) +{ #line 257 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), 0); #line 257 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return DATA_COLLECTION_GET_CLASS (self)->index_of (self, object); -#line 894 "DataCollection.c" +#line 1099 "DataCollection.c" } -static gboolean data_collection_real_contains (DataCollection* self, DataObject* object) { +static gboolean +data_collection_real_contains (DataCollection* self, + DataObject* object) +{ gboolean result = FALSE; - DataObject* _tmp0_; - gboolean _tmp1_; #line 261 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 262 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = object; -#line 262 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = data_collection_internal_contains (self, _tmp0_); -#line 262 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - result = _tmp1_; + result = data_collection_internal_contains (self, object); #line 262 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 912 "DataCollection.c" +#line 1114 "DataCollection.c" } -gboolean data_collection_contains (DataCollection* self, DataObject* object) { +gboolean +data_collection_contains (DataCollection* self, + DataObject* object) +{ #line 261 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), FALSE); #line 261 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return DATA_COLLECTION_GET_CLASS (self)->contains (self, object); -#line 921 "DataCollection.c" +#line 1126 "DataCollection.c" } -static gboolean data_collection_internal_contains (DataCollection* self, DataObject* object) { +static gboolean +data_collection_internal_contains (DataCollection* self, + DataObject* object) +{ gboolean result = FALSE; DataSet* _tmp0_; - DataObject* _tmp1_; - gboolean _tmp2_; - DataObject* _tmp3_; - DataCollection* _tmp4_; - DataCollection* _tmp5_; + DataCollection* _tmp1_; + DataCollection* _tmp2_; #line 267 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), FALSE); #line 267 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -936,215 +1141,175 @@ static gboolean data_collection_internal_contains (DataCollection* self, DataObj #line 268 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->dataset; #line 268 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = object; -#line 268 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = data_set_contains (_tmp0_, _tmp1_); -#line 268 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp2_) { + if (!data_set_contains (_tmp0_, object)) { #line 269 "/home/jens/Source/shotwell/src/core/DataCollection.vala" result = FALSE; #line 269 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 949 "DataCollection.c" +#line 1150 "DataCollection.c" } #line 271 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = object; -#line 271 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = data_object_get_membership (_tmp3_); + _tmp1_ = data_object_get_membership (object); #line 271 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = _tmp4_; + _tmp2_ = _tmp1_; #line 271 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp5_ == self, "object.get_membership() == this"); + _vala_assert (_tmp2_ == self, "object.get_membership() == this"); #line 271 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp2_); #line 273 "/home/jens/Source/shotwell/src/core/DataCollection.vala" result = TRUE; #line 273 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 965 "DataCollection.c" +#line 1164 "DataCollection.c" } -static void data_collection_internal_add (DataCollection* self, DataObject* object) { - DataObject* _tmp0_; - gboolean _tmp1_; - DataObject* _tmp2_; - gint64 _tmp3_; +static void +data_collection_internal_add (DataCollection* self, + DataObject* object) +{ + gint64 _tmp0_; gboolean added = FALSE; - DataSet* _tmp4_; - DataObject* _tmp5_; - gboolean _tmp6_; + DataSet* _tmp1_; #line 276 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 276 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_OBJECT (object)); #line 277 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = object; -#line 277 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = data_collection_valid_type (self, _tmp0_); -#line 277 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp1_, "valid_type(object)"); + _vala_assert (data_collection_valid_type (self, object), "valid_type(object)"); #line 279 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = object; + _tmp0_ = self->priv->object_ordinal_generator; #line 279 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = self->priv->object_ordinal_generator; + self->priv->object_ordinal_generator = _tmp0_ + 1; #line 279 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - self->priv->object_ordinal_generator = _tmp3_ + 1; -#line 279 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_object_internal_set_membership (_tmp2_, self, _tmp3_); -#line 281 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = self->priv->dataset; + data_object_internal_set_membership (object, self, _tmp0_); #line 281 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = object; + _tmp1_ = self->priv->dataset; #line 281 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = data_set_add (_tmp4_, _tmp5_); -#line 281 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - added = _tmp6_; + added = data_set_add (_tmp1_, object); #line 282 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _vala_assert (added, "added"); -#line 1006 "DataCollection.c" +#line 1193 "DataCollection.c" } -static void data_collection_internal_add_many (DataCollection* self, GeeList* objects, ProgressMonitor monitor, void* monitor_target) { +static void +data_collection_internal_add_many (DataCollection* self, + GeeList* objects, + ProgressMonitor monitor, + void* monitor_target) +{ gint count = 0; - GeeList* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; gboolean added = FALSE; - DataSet* _tmp18_; - GeeList* _tmp19_; - gboolean _tmp20_; + DataSet* _tmp13_; #line 285 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 285 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (GEE_IS_LIST (objects)); #line 286 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = objects; + _tmp0_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (objects, GEE_TYPE_COLLECTION, GeeCollection)); #line 286 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp1_ = _tmp0_; #line 286 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = _tmp1_; -#line 286 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - count = _tmp2_; -#line 1031 "DataCollection.c" + count = _tmp1_; +#line 1218 "DataCollection.c" { gint ctr = 0; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" ctr = 0; -#line 1036 "DataCollection.c" +#line 1223 "DataCollection.c" { - gboolean _tmp3_ = FALSE; + gboolean _tmp2_ = FALSE; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = TRUE; + _tmp2_ = TRUE; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 1043 "DataCollection.c" +#line 1230 "DataCollection.c" + gint _tmp4_; gint _tmp5_; - gint _tmp6_; DataObject* object = NULL; - GeeList* _tmp7_; - gint _tmp8_; - gpointer _tmp9_; - DataObject* _tmp10_; - gboolean _tmp11_; - DataObject* _tmp12_; - gint64 _tmp13_; - ProgressMonitor _tmp14_; - void* _tmp14__target; + gint _tmp6_; + gpointer _tmp7_; + DataObject* _tmp8_; + DataObject* _tmp9_; + gint64 _tmp10_; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp3_) { -#line 1058 "DataCollection.c" - gint _tmp4_; + if (!_tmp2_) { +#line 1241 "DataCollection.c" + gint _tmp3_; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = ctr; + _tmp3_ = ctr; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ctr = _tmp4_ + 1; -#line 1064 "DataCollection.c" + ctr = _tmp3_ + 1; +#line 1247 "DataCollection.c" } #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = FALSE; + _tmp2_ = FALSE; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = ctr; + _tmp4_ = ctr; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = count; + _tmp5_ = count; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!(_tmp5_ < _tmp6_)) { + if (!(_tmp4_ < _tmp5_)) { #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1076 "DataCollection.c" +#line 1259 "DataCollection.c" } #line 288 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = objects; + _tmp6_ = ctr; #line 288 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = ctr; -#line 288 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = gee_list_get (_tmp7_, _tmp8_); + _tmp7_ = gee_list_get (objects, _tmp6_); #line 288 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - object = (DataObject*) _tmp9_; -#line 289 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = object; + object = (DataObject*) _tmp7_; #line 289 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp11_ = data_collection_valid_type (self, _tmp10_); + _tmp8_ = object; #line 289 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp11_, "valid_type(object)"); + _vala_assert (data_collection_valid_type (self, _tmp8_), "valid_type(object)"); #line 291 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp12_ = object; + _tmp9_ = object; #line 291 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp13_ = self->priv->object_ordinal_generator; + _tmp10_ = self->priv->object_ordinal_generator; #line 291 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - self->priv->object_ordinal_generator = _tmp13_ + 1; + self->priv->object_ordinal_generator = _tmp10_ + 1; #line 291 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_object_internal_set_membership (_tmp12_, self, _tmp13_); -#line 293 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp14_ = monitor; + data_object_internal_set_membership (_tmp9_, self, _tmp10_); #line 293 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp14__target = monitor_target; -#line 293 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp14_ != NULL) { -#line 1106 "DataCollection.c" - ProgressMonitor _tmp15_; - void* _tmp15__target; - gint _tmp16_; - gint _tmp17_; -#line 294 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp15_ = monitor; + if (monitor != NULL) { +#line 1281 "DataCollection.c" + gint _tmp11_; + gint _tmp12_; #line 294 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp15__target = monitor_target; + _tmp11_ = ctr; #line 294 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp16_ = ctr; + _tmp12_ = count; #line 294 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp17_ = count; -#line 294 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp15_ ((guint64) _tmp16_, (guint64) _tmp17_, TRUE, _tmp15__target); -#line 1121 "DataCollection.c" + monitor ((guint64) _tmp11_, (guint64) _tmp12_, TRUE, monitor_target); +#line 1290 "DataCollection.c" } #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 1125 "DataCollection.c" +#line 1294 "DataCollection.c" } } } #line 297 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp18_ = self->priv->dataset; -#line 297 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp19_ = objects; -#line 297 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp20_ = data_set_add_many (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp13_ = self->priv->dataset; #line 297 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - added = _tmp20_; + added = data_set_add_many (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (objects, GEE_TYPE_COLLECTION, GeeCollection)); #line 298 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _vala_assert (added, "added"); -#line 1139 "DataCollection.c" +#line 1304 "DataCollection.c" } -static void data_collection_internal_remove (DataCollection* self, DataObject* object) { +static void +data_collection_internal_remove (DataCollection* self, + DataObject* object) +{ gboolean removed = FALSE; DataSet* _tmp0_; - DataObject* _tmp1_; - gboolean _tmp2_; - DataObject* _tmp3_; #line 301 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 301 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1152,304 +1317,276 @@ static void data_collection_internal_remove (DataCollection* self, DataObject* o #line 302 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->dataset; #line 302 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = object; -#line 302 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = data_set_remove (_tmp0_, _tmp1_); -#line 302 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - removed = _tmp2_; + removed = data_set_remove (_tmp0_, object); #line 303 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _vala_assert (removed, "removed"); #line 305 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = object; -#line 305 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_object_internal_clear_membership (_tmp3_); -#line 1167 "DataCollection.c" + data_object_internal_clear_membership (object); +#line 1326 "DataCollection.c" } -static gboolean data_collection_real_add (DataCollection* self, DataObject* object) { +static gboolean +data_collection_real_add (DataCollection* self, + DataObject* object) +{ gboolean result = FALSE; - DataObject* _tmp0_; - gboolean _tmp1_; - DataObject* _tmp7_; GeeCollection* added = NULL; - DataObject* _tmp8_; - GeeCollection* _tmp9_; - GeeCollection* _tmp10_; - GeeCollection* _tmp11_; - DataObject* _tmp12_; + GeeCollection* _tmp4_; + GeeCollection* _tmp5_; + GeeCollection* _tmp6_; #line 309 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 310 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = object; -#line 310 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = data_collection_internal_contains (self, _tmp0_); -#line 310 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp1_) { -#line 1190 "DataCollection.c" + if (data_collection_internal_contains (self, object)) { +#line 1343 "DataCollection.c" + gchar* _tmp0_; + gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - DataObject* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; -#line 311 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = data_collection_to_string (self); -#line 311 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = _tmp2_; #line 311 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = object; + _tmp0_ = data_collection_to_string (self); #line 311 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = data_object_to_string (_tmp4_); + _tmp1_ = _tmp0_; #line 311 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = _tmp5_; + _tmp2_ = data_object_to_string (object); #line 311 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_debug ("DataCollection.vala:311: %s cannot add %s: already present", _tmp3_, _tmp6_); + _tmp3_ = _tmp2_; #line 311 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _g_free0 (_tmp6_); + g_debug ("DataCollection.vala:311: %s cannot add %s: already present", _tmp1_, _tmp3_); #line 311 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_free0 (_tmp3_); +#line 311 "/home/jens/Source/shotwell/src/core/DataCollection.vala" + _g_free0 (_tmp1_); #line 313 "/home/jens/Source/shotwell/src/core/DataCollection.vala" result = FALSE; #line 313 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 1216 "DataCollection.c" +#line 1366 "DataCollection.c" } #line 316 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = object; -#line 316 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_internal_add (self, _tmp7_); + data_collection_internal_add (self, object); #line 319 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = object; + _tmp4_ = data_collection_get_singleton (object); #line 319 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = data_collection_get_singleton (_tmp8_); -#line 319 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - added = _tmp9_; + added = _tmp4_; #line 320 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = added; + _tmp5_ = added; #line 320 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_notify_items_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable)); + data_collection_notify_items_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable)); #line 321 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp11_ = added; + _tmp6_ = added; #line 321 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_notify_contents_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable), NULL); -#line 324 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp12_ = object; + data_collection_notify_contents_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable), NULL); #line 324 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_object_notify_membership_changed (_tmp12_, self); + data_object_notify_membership_changed (object, self); #line 326 "/home/jens/Source/shotwell/src/core/DataCollection.vala" result = TRUE; #line 326 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (added); #line 326 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 1246 "DataCollection.c" +#line 1390 "DataCollection.c" } -gboolean data_collection_add (DataCollection* self, DataObject* object) { +gboolean +data_collection_add (DataCollection* self, + DataObject* object) +{ #line 309 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), FALSE); #line 309 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return DATA_COLLECTION_GET_CLASS (self)->add (self, object); -#line 1255 "DataCollection.c" +#line 1402 "DataCollection.c" } -static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target) { +static GeeCollection* +data_collection_real_add_many (DataCollection* self, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target) +{ GeeCollection* result = NULL; GeeArrayList* added = NULL; GeeArrayList* _tmp0_; gint count = 0; - GeeArrayList* _tmp16_; - gint _tmp17_; - gint _tmp18_; - gint _tmp19_; - GeeArrayList* _tmp20_; - ProgressMonitor _tmp21_; - void* _tmp21__target; - GeeArrayList* _tmp22_; - GeeArrayList* _tmp23_; + GeeArrayList* _tmp13_; + gint _tmp14_; + gint _tmp15_; + gint _tmp16_; + GeeArrayList* _tmp17_; + GeeArrayList* _tmp18_; + GeeArrayList* _tmp19_; #line 330 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (GEE_IS_COLLECTION (objects), NULL); #line 332 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 332 "/home/jens/Source/shotwell/src/core/DataCollection.vala" added = _tmp0_; -#line 1279 "DataCollection.c" +#line 1429 "DataCollection.c" { GeeIterator* _object_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; -#line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = objects; + GeeIterator* _tmp1_; #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (objects, GEE_TYPE_ITERABLE, GeeIterable)); #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _object_it = _tmp2_; + _object_it = _tmp1_; #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 1292 "DataCollection.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 1439 "DataCollection.c" + GeeIterator* _tmp2_; DataObject* object = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - DataObject* _tmp7_; - gboolean _tmp8_; - GeeArrayList* _tmp14_; - DataObject* _tmp15_; -#line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = _object_it; + GeeIterator* _tmp3_; + gpointer _tmp4_; + DataObject* _tmp5_; + GeeArrayList* _tmp11_; + DataObject* _tmp12_; #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _object_it; #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1310 "DataCollection.c" +#line 1453 "DataCollection.c" } #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = _object_it; + _tmp3_ = _object_it; #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - object = (DataObject*) _tmp6_; -#line 334 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = object; + object = (DataObject*) _tmp4_; #line 334 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = data_collection_internal_contains (self, _tmp7_); + _tmp5_ = object; #line 334 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp8_) { -#line 1324 "DataCollection.c" + if (data_collection_internal_contains (self, _tmp5_)) { +#line 1465 "DataCollection.c" + gchar* _tmp6_; + gchar* _tmp7_; + DataObject* _tmp8_; gchar* _tmp9_; gchar* _tmp10_; - DataObject* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; #line 335 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = data_collection_to_string (self); + _tmp6_ = data_collection_to_string (self); #line 335 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = _tmp9_; -#line 335 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp11_ = object; + _tmp7_ = _tmp6_; #line 335 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp12_ = data_object_to_string (_tmp11_); + _tmp8_ = object; #line 335 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp13_ = _tmp12_; + _tmp9_ = data_object_to_string (_tmp8_); #line 335 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_debug ("DataCollection.vala:335: %s cannot add %s: already present", _tmp10_, _tmp13_); + _tmp10_ = _tmp9_; #line 335 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _g_free0 (_tmp13_); + g_debug ("DataCollection.vala:335: %s cannot add %s: already present", _tmp7_, _tmp10_); #line 335 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_free0 (_tmp10_); +#line 335 "/home/jens/Source/shotwell/src/core/DataCollection.vala" + _g_free0 (_tmp7_); #line 337 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); #line 337 "/home/jens/Source/shotwell/src/core/DataCollection.vala" continue; -#line 1350 "DataCollection.c" +#line 1491 "DataCollection.c" } #line 340 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp14_ = added; + _tmp11_ = added; #line 340 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp15_ = object; + _tmp12_ = object; #line 340 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp12_); #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 1360 "DataCollection.c" +#line 1501 "DataCollection.c" } #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 1364 "DataCollection.c" +#line 1505 "DataCollection.c" } #line 343 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp16_ = added; + _tmp13_ = added; #line 343 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp14_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 343 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp18_ = _tmp17_; + _tmp15_ = _tmp14_; #line 343 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - count = _tmp18_; + count = _tmp15_; #line 344 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp19_ = count; + _tmp16_ = count; #line 344 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp19_ == 0) { + if (_tmp16_ == 0) { #line 345 "/home/jens/Source/shotwell/src/core/DataCollection.vala" result = G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_COLLECTION, GeeCollection); #line 345 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 1382 "DataCollection.c" +#line 1523 "DataCollection.c" } #line 347 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp20_ = added; -#line 347 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp21_ = monitor; + _tmp17_ = added; #line 347 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp21__target = monitor_target; -#line 347 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_internal_add_many (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_LIST, GeeList), _tmp21_, _tmp21__target); + data_collection_internal_add_many (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_LIST, GeeList), monitor, monitor_target); #line 350 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp22_ = added; + _tmp18_ = added; #line 350 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_notify_items_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ITERABLE, GeeIterable)); + data_collection_notify_items_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable)); #line 351 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp23_ = added; + _tmp19_ = added; #line 351 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_notify_contents_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ITERABLE, GeeIterable), NULL); -#line 1400 "DataCollection.c" + data_collection_notify_contents_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable), NULL); +#line 1537 "DataCollection.c" { gint ctr = 0; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" ctr = 0; -#line 1405 "DataCollection.c" +#line 1542 "DataCollection.c" { - gboolean _tmp24_ = FALSE; + gboolean _tmp20_ = FALSE; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp24_ = TRUE; + _tmp20_ = TRUE; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 1412 "DataCollection.c" - gint _tmp26_; - gint _tmp27_; - GeeArrayList* _tmp28_; - gint _tmp29_; - gpointer _tmp30_; - DataObject* _tmp31_; +#line 1549 "DataCollection.c" + gint _tmp22_; + gint _tmp23_; + GeeArrayList* _tmp24_; + gint _tmp25_; + gpointer _tmp26_; + DataObject* _tmp27_; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp24_) { -#line 1421 "DataCollection.c" - gint _tmp25_; + if (!_tmp20_) { +#line 1558 "DataCollection.c" + gint _tmp21_; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp25_ = ctr; + _tmp21_ = ctr; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ctr = _tmp25_ + 1; -#line 1427 "DataCollection.c" + ctr = _tmp21_ + 1; +#line 1564 "DataCollection.c" } #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp24_ = FALSE; + _tmp20_ = FALSE; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp26_ = ctr; + _tmp22_ = ctr; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp27_ = count; + _tmp23_ = count; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!(_tmp26_ < _tmp27_)) { + if (!(_tmp22_ < _tmp23_)) { #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1439 "DataCollection.c" +#line 1576 "DataCollection.c" } #line 355 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp28_ = added; + _tmp24_ = added; #line 355 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp29_ = ctr; + _tmp25_ = ctr; #line 355 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp30_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp29_); + _tmp26_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp25_); #line 355 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp31_ = (DataObject*) _tmp30_; + _tmp27_ = (DataObject*) _tmp26_; #line 355 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_object_notify_membership_changed (_tmp31_, self); + data_object_notify_membership_changed (_tmp27_, self); #line 355 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _g_object_unref0 (_tmp31_); -#line 1453 "DataCollection.c" + _g_object_unref0 (_tmp27_); +#line 1590 "DataCollection.c" } } } @@ -1457,20 +1594,27 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo result = G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_COLLECTION, GeeCollection); #line 357 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 1461 "DataCollection.c" +#line 1598 "DataCollection.c" } -GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target) { +GeeCollection* +data_collection_add_many (DataCollection* self, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target) +{ #line 330 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL); #line 330 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return DATA_COLLECTION_GET_CLASS (self)->add_many (self, objects, monitor, monitor_target); -#line 1470 "DataCollection.c" +#line 1612 "DataCollection.c" } -Marker* data_collection_start_marking (DataCollection* self) { +Marker* +data_collection_start_marking (DataCollection* self) +{ Marker* result = NULL; DataCollectionMarkerImpl* _tmp0_; #line 361 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1481,15 +1625,17 @@ Marker* data_collection_start_marking (DataCollection* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MARKER, Marker); #line 362 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 1485 "DataCollection.c" +#line 1629 "DataCollection.c" } -Marker* data_collection_mark (DataCollection* self, DataObject* object) { +Marker* +data_collection_mark (DataCollection* self, + DataObject* object) +{ Marker* result = NULL; Marker* marker = NULL; DataCollectionMarkerImpl* _tmp0_; - DataObject* _tmp1_; #line 366 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL); #line 366 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1499,22 +1645,22 @@ Marker* data_collection_mark (DataCollection* self, DataObject* object) { #line 367 "/home/jens/Source/shotwell/src/core/DataCollection.vala" marker = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MARKER, Marker); #line 368 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = object; -#line 368 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - marker_mark (marker, _tmp1_); + marker_mark (marker, object); #line 370 "/home/jens/Source/shotwell/src/core/DataCollection.vala" result = marker; #line 370 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 1510 "DataCollection.c" +#line 1654 "DataCollection.c" } -Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects) { +Marker* +data_collection_mark_many (DataCollection* self, + GeeCollection* objects) +{ Marker* result = NULL; Marker* marker = NULL; DataCollectionMarkerImpl* _tmp0_; - GeeCollection* _tmp1_; #line 374 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL); #line 374 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1524,38 +1670,44 @@ Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects) #line 375 "/home/jens/Source/shotwell/src/core/DataCollection.vala" marker = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MARKER, Marker); #line 376 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = objects; -#line 376 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - marker_mark_many (marker, _tmp1_); + marker_mark_many (marker, objects); #line 378 "/home/jens/Source/shotwell/src/core/DataCollection.vala" result = marker; #line 378 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 1535 "DataCollection.c" +#line 1679 "DataCollection.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 385 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return self ? g_object_ref (self) : NULL; -#line 1542 "DataCollection.c" +#line 1688 "DataCollection.c" } -void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedAction action, void* action_target, ProgressMonitor monitor, void* monitor_target, GObject* user) { +void +data_collection_act_on_marked (DataCollection* self, + Marker* m, + MarkedAction action, + void* action_target, + ProgressMonitor monitor, + void* monitor_target, + GObject* user) +{ DataCollectionMarkerImpl* marker = NULL; - Marker* _tmp0_; + DataCollectionMarkerImpl* _tmp0_; DataCollectionMarkerImpl* _tmp1_; DataCollectionMarkerImpl* _tmp2_; - gboolean _tmp3_; - DataCollectionMarkerImpl* _tmp4_; guint64 count = 0ULL; guint64 total = 0ULL; - DataCollectionMarkerImpl* _tmp5_; - GeeHashSet* _tmp6_; - gint _tmp7_; - gint _tmp8_; - DataCollectionMarkerImpl* _tmp31_; + DataCollectionMarkerImpl* _tmp3_; + GeeHashSet* _tmp4_; + gint _tmp5_; + gint _tmp6_; + DataCollectionMarkerImpl* _tmp21_; #line 383 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 383 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1563,644 +1715,598 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio #line 383 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail ((user == NULL) || G_IS_OBJECT (user)); #line 385 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = m; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (m, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl)); #line 385 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl)); -#line 385 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - marker = _tmp1_; -#line 387 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = marker; + marker = _tmp0_; #line 387 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = data_collection_marker_impl_is_valid (_tmp2_, self); + _tmp1_ = marker; #line 387 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp3_, "marker.is_valid(this)"); + _vala_assert (data_collection_marker_impl_is_valid (_tmp1_, self), "marker.is_valid(this)"); #line 390 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = marker; + _tmp2_ = marker; #line 390 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_marker_impl_freeze (_tmp4_); + data_collection_marker_impl_freeze (_tmp2_); #line 392 "/home/jens/Source/shotwell/src/core/DataCollection.vala" count = (guint64) 0; #line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = marker; + _tmp3_ = marker; #line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = _tmp5_->marked; + _tmp4_ = _tmp3_->marked; #line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - total = (guint64) _tmp8_; -#line 1594 "DataCollection.c" + total = (guint64) _tmp6_; +#line 1742 "DataCollection.c" { GeeIterator* _object_it = NULL; - DataCollectionMarkerImpl* _tmp9_; - GeeHashSet* _tmp10_; - GeeIterator* _tmp11_; + DataCollectionMarkerImpl* _tmp7_; + GeeHashSet* _tmp8_; + GeeIterator* _tmp9_; #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = marker; + _tmp7_ = marker; #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = _tmp9_->marked; + _tmp8_ = _tmp7_->marked; #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp11_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp9_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _object_it = _tmp11_; + _object_it = _tmp9_; #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 1610 "DataCollection.c" - GeeIterator* _tmp12_; - gboolean _tmp13_; +#line 1758 "DataCollection.c" + GeeIterator* _tmp10_; DataObject* object = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; - DataObject* _tmp16_; - gboolean _tmp17_; - MarkedAction _tmp21_; - void* _tmp21__target; - DataObject* _tmp22_; - GObject* _tmp23_; - gboolean _tmp24_; - ProgressMonitor _tmp25_; - void* _tmp25__target; + GeeIterator* _tmp11_; + gpointer _tmp12_; + DataObject* _tmp13_; + DataObject* _tmp17_; #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp12_ = _object_it; -#line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp13_ = gee_iterator_next (_tmp12_); + _tmp10_ = _object_it; #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp10_)) { #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1633 "DataCollection.c" +#line 1771 "DataCollection.c" } #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp14_ = _object_it; + _tmp11_ = _object_it; #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp12_ = gee_iterator_get (_tmp11_); #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - object = (DataObject*) _tmp15_; -#line 398 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp16_ = object; + object = (DataObject*) _tmp12_; #line 398 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp17_ = data_collection_internal_contains (self, _tmp16_); + _tmp13_ = object; #line 398 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp17_) { -#line 1647 "DataCollection.c" - DataObject* _tmp18_; - gchar* _tmp19_; - gchar* _tmp20_; + if (!data_collection_internal_contains (self, _tmp13_)) { +#line 1783 "DataCollection.c" + DataObject* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; #line 399 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp18_ = object; + _tmp14_ = object; #line 399 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp19_ = data_object_to_string (_tmp18_); + _tmp15_ = data_object_to_string (_tmp14_); #line 399 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp20_ = _tmp19_; + _tmp16_ = _tmp15_; #line 399 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_warning ("DataCollection.vala:399: act_on_marked: marker holding ref to unknown " \ -"%s", _tmp20_); +"%s", _tmp16_); #line 399 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp16_); #line 401 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); #line 401 "/home/jens/Source/shotwell/src/core/DataCollection.vala" continue; -#line 1665 "DataCollection.c" +#line 1801 "DataCollection.c" } #line 404 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp21_ = action; -#line 404 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp21__target = action_target; -#line 404 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp22_ = object; -#line 404 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp23_ = user; -#line 404 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp24_ = _tmp21_ (_tmp22_, _tmp23_, _tmp21__target); + _tmp17_ = object; #line 404 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp24_) { + if (!action (_tmp17_, user, action_target)) { #line 405 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); #line 405 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1683 "DataCollection.c" +#line 1811 "DataCollection.c" } #line 407 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp25_ = monitor; -#line 407 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp25__target = monitor_target; -#line 407 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp25_ != NULL) { -#line 1691 "DataCollection.c" - ProgressMonitor _tmp26_; - void* _tmp26__target; - guint64 _tmp27_; - guint64 _tmp28_; - guint64 _tmp29_; - gboolean _tmp30_; -#line 408 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp26_ = monitor; + if (monitor != NULL) { +#line 1815 "DataCollection.c" + guint64 _tmp18_; + guint64 _tmp19_; + guint64 _tmp20_; #line 408 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp26__target = monitor_target; + _tmp18_ = count; #line 408 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp27_ = count; + count = _tmp18_ + 1; #line 408 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - count = _tmp27_ + 1; + _tmp19_ = count; #line 408 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp28_ = count; + _tmp20_ = total; #line 408 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp29_ = total; -#line 408 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp30_ = _tmp26_ (_tmp28_, _tmp29_, TRUE, _tmp26__target); -#line 408 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp30_) { + if (!monitor (_tmp19_, _tmp20_, TRUE, monitor_target)) { #line 409 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); #line 409 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1718 "DataCollection.c" +#line 1833 "DataCollection.c" } } #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 1723 "DataCollection.c" +#line 1838 "DataCollection.c" } #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 1727 "DataCollection.c" +#line 1842 "DataCollection.c" } #line 414 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp31_ = marker; + _tmp21_ = marker; #line 414 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_marker_impl_finished (_tmp31_); + data_collection_marker_impl_finished (_tmp21_); #line 383 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (marker); -#line 1735 "DataCollection.c" +#line 1850 "DataCollection.c" } -static void data_collection_real_remove_marked (DataCollection* self, Marker* m) { +static void +data_collection_real_remove_marked (DataCollection* self, + Marker* m) +{ DataCollectionMarkerImpl* marker = NULL; - Marker* _tmp0_; + DataCollectionMarkerImpl* _tmp0_; DataCollectionMarkerImpl* _tmp1_; DataCollectionMarkerImpl* _tmp2_; - gboolean _tmp3_; - DataCollectionMarkerImpl* _tmp4_; GeeArrayList* skipped = NULL; - GeeArrayList* _tmp22_; - DataCollectionMarkerImpl* _tmp26_; - GeeHashSet* _tmp27_; - gint _tmp28_; - gint _tmp29_; - DataCollectionMarkerImpl* _tmp42_; + GeeArrayList* _tmp18_; + DataCollectionMarkerImpl* _tmp22_; + GeeHashSet* _tmp23_; + gint _tmp24_; + gint _tmp25_; + DataCollectionMarkerImpl* _tmp37_; #line 419 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_MARKER (m)); #line 420 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = m; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (m, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl)); #line 420 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl)); -#line 420 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - marker = _tmp1_; -#line 422 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = marker; + marker = _tmp0_; #line 422 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = data_collection_marker_impl_is_valid (_tmp2_, self); + _tmp1_ = marker; #line 422 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp3_, "marker.is_valid(this)"); + _vala_assert (data_collection_marker_impl_is_valid (_tmp1_, self), "marker.is_valid(this)"); #line 425 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = marker; + _tmp2_ = marker; #line 425 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_marker_impl_freeze (_tmp4_); + data_collection_marker_impl_freeze (_tmp2_); #line 428 "/home/jens/Source/shotwell/src/core/DataCollection.vala" skipped = NULL; -#line 1773 "DataCollection.c" +#line 1885 "DataCollection.c" { GeeIterator* _object_it = NULL; - DataCollectionMarkerImpl* _tmp5_; - GeeHashSet* _tmp6_; - GeeIterator* _tmp7_; + DataCollectionMarkerImpl* _tmp3_; + GeeHashSet* _tmp4_; + GeeIterator* _tmp5_; #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = marker; + _tmp3_ = marker; #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = _tmp5_->marked; + _tmp4_ = _tmp3_->marked; #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp5_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _object_it = _tmp7_; + _object_it = _tmp5_; #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 1789 "DataCollection.c" - GeeIterator* _tmp8_; - gboolean _tmp9_; +#line 1901 "DataCollection.c" + GeeIterator* _tmp6_; DataObject* object = NULL; - GeeIterator* _tmp10_; - gpointer _tmp11_; - DataObject* _tmp12_; - gboolean _tmp13_; - DataObject* _tmp21_; -#line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = _object_it; + GeeIterator* _tmp7_; + gpointer _tmp8_; + DataObject* _tmp9_; + DataObject* _tmp17_; #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = gee_iterator_next (_tmp8_); + _tmp6_ = _object_it; #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp9_) { + if (!gee_iterator_next (_tmp6_)) { #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1806 "DataCollection.c" +#line 1914 "DataCollection.c" } #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = _object_it; + _tmp7_ = _object_it; #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp11_ = gee_iterator_get (_tmp10_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - object = (DataObject*) _tmp11_; -#line 431 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp12_ = object; + object = (DataObject*) _tmp8_; #line 431 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp13_ = data_collection_internal_contains (self, _tmp12_); + _tmp9_ = object; #line 431 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp13_) { -#line 1820 "DataCollection.c" - DataObject* _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; - GeeArrayList* _tmp17_; - GeeArrayList* _tmp19_; - DataObject* _tmp20_; + if (!data_collection_internal_contains (self, _tmp9_)) { +#line 1926 "DataCollection.c" + DataObject* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + GeeArrayList* _tmp13_; + GeeArrayList* _tmp15_; + DataObject* _tmp16_; #line 432 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp14_ = object; + _tmp10_ = object; #line 432 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp15_ = data_object_to_string (_tmp14_); + _tmp11_ = data_object_to_string (_tmp10_); #line 432 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp16_ = _tmp15_; + _tmp12_ = _tmp11_; #line 432 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_warning ("DataCollection.vala:432: remove_marked: marker holding ref to unknown " \ -"%s", _tmp16_); +"%s", _tmp12_); #line 432 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp12_); #line 434 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp17_ = skipped; + _tmp13_ = skipped; #line 434 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp17_ == NULL) { -#line 1841 "DataCollection.c" - GeeArrayList* _tmp18_; + if (_tmp13_ == NULL) { +#line 1947 "DataCollection.c" + GeeArrayList* _tmp14_; #line 435 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp18_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp14_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 435 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (skipped); #line 435 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - skipped = _tmp18_; -#line 1849 "DataCollection.c" + skipped = _tmp14_; +#line 1955 "DataCollection.c" } #line 437 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp19_ = skipped; + _tmp15_ = skipped; #line 437 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp20_ = object; + _tmp16_ = object; #line 437 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_); #line 439 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); #line 439 "/home/jens/Source/shotwell/src/core/DataCollection.vala" continue; -#line 1861 "DataCollection.c" +#line 1967 "DataCollection.c" } #line 442 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp21_ = object; + _tmp17_ = object; #line 442 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_internal_remove (self, _tmp21_); + data_collection_internal_remove (self, _tmp17_); #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 1869 "DataCollection.c" +#line 1975 "DataCollection.c" } #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 1873 "DataCollection.c" +#line 1979 "DataCollection.c" } #line 445 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp22_ = skipped; + _tmp18_ = skipped; #line 445 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp22_ != NULL) { -#line 1879 "DataCollection.c" - DataCollectionMarkerImpl* _tmp23_; - GeeHashSet* _tmp24_; - GeeArrayList* _tmp25_; + if (_tmp18_ != NULL) { +#line 1985 "DataCollection.c" + DataCollectionMarkerImpl* _tmp19_; + GeeHashSet* _tmp20_; + GeeArrayList* _tmp21_; #line 446 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp23_ = marker; + _tmp19_ = marker; #line 446 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp24_ = _tmp23_->marked; + _tmp20_ = _tmp19_->marked; #line 446 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp25_ = skipped; + _tmp21_ = skipped; #line 446 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1891 "DataCollection.c" + gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection)); +#line 1997 "DataCollection.c" } #line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp26_ = marker; + _tmp22_ = marker; #line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp27_ = _tmp26_->marked; + _tmp23_ = _tmp22_->marked; #line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp24_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp29_ = _tmp28_; + _tmp25_ = _tmp24_; #line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp29_ > 0) { -#line 1903 "DataCollection.c" - DataCollectionMarkerImpl* _tmp30_; - GeeHashSet* _tmp31_; - DataCollectionMarkerImpl* _tmp32_; - GeeHashSet* _tmp33_; + if (_tmp25_ > 0) { +#line 2009 "DataCollection.c" + DataCollectionMarkerImpl* _tmp26_; + GeeHashSet* _tmp27_; + DataCollectionMarkerImpl* _tmp28_; + GeeHashSet* _tmp29_; #line 450 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp30_ = marker; + _tmp26_ = marker; #line 450 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp31_ = _tmp30_->marked; + _tmp27_ = _tmp26_->marked; #line 450 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_notify_items_removed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ITERABLE, GeeIterable)); + data_collection_notify_items_removed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ITERABLE, GeeIterable)); #line 451 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp32_ = marker; + _tmp28_ = marker; #line 451 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp33_ = _tmp32_->marked; + _tmp29_ = _tmp28_->marked; #line 451 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1920 "DataCollection.c" + data_collection_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ITERABLE, GeeIterable)); +#line 2026 "DataCollection.c" { GeeIterator* _object_it = NULL; - DataCollectionMarkerImpl* _tmp34_; - GeeHashSet* _tmp35_; - GeeIterator* _tmp36_; + DataCollectionMarkerImpl* _tmp30_; + GeeHashSet* _tmp31_; + GeeIterator* _tmp32_; #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp34_ = marker; + _tmp30_ = marker; #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp35_ = _tmp34_->marked; + _tmp31_ = _tmp30_->marked; #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp36_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp32_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _object_it = _tmp36_; + _object_it = _tmp32_; #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 1936 "DataCollection.c" - GeeIterator* _tmp37_; - gboolean _tmp38_; +#line 2042 "DataCollection.c" + GeeIterator* _tmp33_; DataObject* object = NULL; - GeeIterator* _tmp39_; - gpointer _tmp40_; - DataObject* _tmp41_; -#line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp37_ = _object_it; + GeeIterator* _tmp34_; + gpointer _tmp35_; + DataObject* _tmp36_; #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp38_ = gee_iterator_next (_tmp37_); + _tmp33_ = _object_it; #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp38_) { + if (!gee_iterator_next (_tmp33_)) { #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1951 "DataCollection.c" +#line 2054 "DataCollection.c" } #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp39_ = _object_it; + _tmp34_ = _object_it; #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp40_ = gee_iterator_get (_tmp39_); + _tmp35_ = gee_iterator_get (_tmp34_); #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - object = (DataObject*) _tmp40_; + object = (DataObject*) _tmp35_; #line 455 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp41_ = object; + _tmp36_ = object; #line 455 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_object_notify_membership_changed (_tmp41_, NULL); + data_object_notify_membership_changed (_tmp36_, NULL); #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 1965 "DataCollection.c" +#line 2068 "DataCollection.c" } #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 1969 "DataCollection.c" +#line 2072 "DataCollection.c" } } #line 459 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp42_ = marker; + _tmp37_ = marker; #line 459 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_marker_impl_finished (_tmp42_); + data_collection_marker_impl_finished (_tmp37_); #line 419 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (skipped); #line 419 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (marker); -#line 1980 "DataCollection.c" +#line 2083 "DataCollection.c" } -void data_collection_remove_marked (DataCollection* self, Marker* m) { +void +data_collection_remove_marked (DataCollection* self, + Marker* m) +{ #line 419 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 419 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->remove_marked (self, m); -#line 1989 "DataCollection.c" +#line 2095 "DataCollection.c" } -static void data_collection_real_clear (DataCollection* self) { +static void +data_collection_real_clear (DataCollection* self) +{ DataSet* _tmp0_; - gint _tmp1_; GeeArrayList* removed = NULL; - GeeArrayList* _tmp2_; - GeeArrayList* _tmp12_; - GeeArrayList* _tmp13_; + GeeArrayList* _tmp1_; + GeeArrayList* _tmp10_; + GeeArrayList* _tmp11_; #line 463 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->dataset; #line 463 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = data_set_get_count (_tmp0_); -#line 463 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp1_ == 0) { + if (data_set_get_count (_tmp0_) == 0) { #line 464 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return; -#line 2008 "DataCollection.c" +#line 2113 "DataCollection.c" } #line 468 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 468 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - removed = _tmp2_; -#line 2014 "DataCollection.c" + removed = _tmp1_; +#line 2119 "DataCollection.c" { - gboolean _tmp3_ = FALSE; + gboolean _tmp2_ = FALSE; #line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = TRUE; + _tmp2_ = TRUE; #line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 2021 "DataCollection.c" +#line 2126 "DataCollection.c" DataObject* object = NULL; - DataSet* _tmp6_; - DataObject* _tmp7_; + DataSet* _tmp4_; + DataObject* _tmp5_; + DataObject* _tmp6_; + GeeArrayList* _tmp7_; DataObject* _tmp8_; - GeeArrayList* _tmp9_; - DataObject* _tmp10_; - DataObject* _tmp11_; + DataObject* _tmp9_; #line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp3_) { -#line 2031 "DataCollection.c" - DataSet* _tmp4_; - gint _tmp5_; + if (!_tmp2_) { +#line 2136 "DataCollection.c" + DataSet* _tmp3_; #line 475 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = self->priv->dataset; + _tmp3_ = self->priv->dataset; #line 475 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = data_set_get_count (_tmp4_); -#line 475 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!(_tmp5_ > 0)) { + if (!(data_set_get_count (_tmp3_) > 0)) { #line 475 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 2042 "DataCollection.c" +#line 2144 "DataCollection.c" } } #line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = FALSE; + _tmp2_ = FALSE; #line 470 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = self->priv->dataset; + _tmp4_ = self->priv->dataset; #line 470 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = data_set_get_at (_tmp6_, 0); + _tmp5_ = data_set_get_at (_tmp4_, 0); #line 470 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - object = _tmp7_; + object = _tmp5_; #line 471 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = object; + _tmp6_ = object; #line 471 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp8_ != NULL, "object != null"); + _vala_assert (_tmp6_ != NULL, "object != null"); #line 473 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = removed; + _tmp7_ = removed; #line 473 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = object; + _tmp8_ = object; #line 473 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_); #line 474 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp11_ = object; + _tmp9_ = object; #line 474 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_internal_remove (self, _tmp11_); + data_collection_internal_remove (self, _tmp9_); #line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 2069 "DataCollection.c" +#line 2171 "DataCollection.c" } } #line 478 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp12_ = removed; + _tmp10_ = removed; #line 478 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_notify_items_removed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); + data_collection_notify_items_removed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable)); #line 479 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp13_ = removed; + _tmp11_ = removed; #line 479 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 2080 "DataCollection.c" + data_collection_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); +#line 2182 "DataCollection.c" { GeeArrayList* _object_list = NULL; - GeeArrayList* _tmp14_; - GeeArrayList* _tmp15_; + GeeArrayList* _tmp12_; + GeeArrayList* _tmp13_; gint _object_size = 0; - GeeArrayList* _tmp16_; - gint _tmp17_; - gint _tmp18_; + GeeArrayList* _tmp14_; + gint _tmp15_; + gint _tmp16_; gint _object_index = 0; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp14_ = removed; + _tmp12_ = removed; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp15_ = _g_object_ref0 (_tmp14_); + _tmp13_ = _g_object_ref0 (_tmp12_); #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _object_list = _tmp15_; + _object_list = _tmp13_; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp16_ = _object_list; + _tmp14_ = _object_list; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp15_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp18_ = _tmp17_; + _tmp16_ = _tmp15_; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _object_size = _tmp18_; + _object_size = _tmp16_; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _object_index = -1; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 2108 "DataCollection.c" +#line 2210 "DataCollection.c" + gint _tmp17_; + gint _tmp18_; gint _tmp19_; - gint _tmp20_; - gint _tmp21_; DataObject* object = NULL; - GeeArrayList* _tmp22_; - gint _tmp23_; - gpointer _tmp24_; - DataObject* _tmp25_; + GeeArrayList* _tmp20_; + gint _tmp21_; + gpointer _tmp22_; + DataObject* _tmp23_; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp19_ = _object_index; + _tmp17_ = _object_index; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _object_index = _tmp19_ + 1; + _object_index = _tmp17_ + 1; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp20_ = _object_index; + _tmp18_ = _object_index; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp21_ = _object_size; + _tmp19_ = _object_size; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!(_tmp20_ < _tmp21_)) { + if (!(_tmp18_ < _tmp19_)) { #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 2129 "DataCollection.c" +#line 2231 "DataCollection.c" } #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp22_ = _object_list; + _tmp20_ = _object_list; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp23_ = _object_index; + _tmp21_ = _object_index; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp24_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp23_); + _tmp22_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp21_); #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - object = (DataObject*) _tmp24_; + object = (DataObject*) _tmp22_; #line 483 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp25_ = object; + _tmp23_ = object; #line 483 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_object_notify_membership_changed (_tmp25_, NULL); + data_object_notify_membership_changed (_tmp23_, NULL); #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 2145 "DataCollection.c" +#line 2247 "DataCollection.c" } #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_list); -#line 2149 "DataCollection.c" +#line 2251 "DataCollection.c" } #line 462 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (removed); -#line 2153 "DataCollection.c" +#line 2255 "DataCollection.c" } -void data_collection_clear (DataCollection* self) { +void +data_collection_clear (DataCollection* self) +{ #line 462 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 462 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->clear (self); -#line 2162 "DataCollection.c" +#line 2266 "DataCollection.c" } -static void data_collection_real_close (DataCollection* self) { +static void +data_collection_real_close (DataCollection* self) +{ #line 493 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_clear (self); -#line 2169 "DataCollection.c" +#line 2275 "DataCollection.c" } -void data_collection_close (DataCollection* self) { +void +data_collection_close (DataCollection* self) +{ #line 492 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 492 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->close (self); -#line 2178 "DataCollection.c" +#line 2286 "DataCollection.c" } -static gpointer _alteration_ref0 (gpointer self) { +static gpointer +_alteration_ref0 (gpointer self) +{ #line 513 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return self ? alteration_ref (self) : NULL; -#line 2185 "DataCollection.c" +#line 2295 "DataCollection.c" } -void data_collection_internal_notify_altered (DataCollection* self, DataObject* object, Alteration* alteration) { - DataObject* _tmp0_; - gboolean _tmp1_; +void +data_collection_internal_notify_altered (DataCollection* self, + DataObject* object, + Alteration* alteration) +{ gboolean resort_occurred = FALSE; - DataSet* _tmp2_; - DataObject* _tmp3_; - Alteration* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; - gboolean _tmp24_; - DataObject* _tmp25_; - Alteration* _tmp26_; - GeeMap* _tmp27_; - GeeMap* _tmp28_; + DataSet* _tmp0_; + gboolean _tmp14_; + GeeMap* _tmp15_; + GeeMap* _tmp16_; #line 498 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 498 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2208,151 +2314,125 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject* #line 498 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_ALTERATION (alteration)); #line 499 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = object; -#line 499 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = data_collection_internal_contains (self, _tmp0_); -#line 499 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp1_, "internal_contains(object)"); + _vala_assert (data_collection_internal_contains (self, object), "internal_contains(object)"); #line 501 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = self->priv->dataset; -#line 501 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = object; -#line 501 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = alteration; -#line 501 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = data_set_resort_object (_tmp2_, _tmp3_, _tmp4_); + _tmp0_ = self->priv->dataset; #line 501 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - resort_occurred = _tmp5_; -#line 503 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = data_collection_are_notifications_frozen (self); + resort_occurred = data_set_resort_object (_tmp0_, object, alteration); #line 503 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp6_) { -#line 2229 "DataCollection.c" - GeeHashMap* _tmp7_; + if (data_collection_are_notifications_frozen (self)) { +#line 2323 "DataCollection.c" + GeeHashMap* _tmp1_; Alteration* current = NULL; + GeeHashMap* _tmp3_; + gpointer _tmp4_; + Alteration* _tmp5_; GeeHashMap* _tmp9_; - DataObject* _tmp10_; - gpointer _tmp11_; - Alteration* _tmp12_; - GeeHashMap* _tmp18_; - DataObject* _tmp19_; - Alteration* _tmp20_; - gboolean _tmp21_ = FALSE; - gboolean _tmp22_; + Alteration* _tmp10_; + gboolean _tmp11_ = FALSE; + gboolean _tmp12_; #line 504 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = self->priv->frozen_items_altered; + _tmp1_ = self->priv->frozen_items_altered; #line 504 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp7_ == NULL) { -#line 2245 "DataCollection.c" - GeeHashMap* _tmp8_; + if (_tmp1_ == NULL) { +#line 2337 "DataCollection.c" + GeeHashMap* _tmp2_; #line 505 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = gee_hash_map_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_ALTERATION, (GBoxedCopyFunc) alteration_ref, (GDestroyNotify) alteration_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp2_ = gee_hash_map_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_ALTERATION, (GBoxedCopyFunc) alteration_ref, (GDestroyNotify) alteration_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 505 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (self->priv->frozen_items_altered); #line 505 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - self->priv->frozen_items_altered = _tmp8_; -#line 2253 "DataCollection.c" + self->priv->frozen_items_altered = _tmp2_; +#line 2345 "DataCollection.c" } #line 509 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = self->priv->frozen_items_altered; -#line 509 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = object; + _tmp3_ = self->priv->frozen_items_altered; #line 509 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp11_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp10_); + _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), object); #line 509 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - current = (Alteration*) _tmp11_; + current = (Alteration*) _tmp4_; #line 510 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp12_ = current; + _tmp5_ = current; #line 510 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp12_ != NULL) { -#line 2267 "DataCollection.c" - Alteration* _tmp13_; - Alteration* _tmp14_; - Alteration* _tmp15_; + if (_tmp5_ != NULL) { +#line 2357 "DataCollection.c" + Alteration* _tmp6_; + Alteration* _tmp7_; #line 511 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp13_ = current; + _tmp6_ = current; #line 511 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp14_ = alteration; -#line 511 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp15_ = alteration_compress (_tmp13_, _tmp14_); + _tmp7_ = alteration_compress (_tmp6_, alteration); #line 511 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _alteration_unref0 (current); #line 511 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - current = _tmp15_; -#line 2281 "DataCollection.c" + current = _tmp7_; +#line 2368 "DataCollection.c" } else { - Alteration* _tmp16_; - Alteration* _tmp17_; -#line 513 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp16_ = alteration; + Alteration* _tmp8_; #line 513 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp17_ = _alteration_ref0 (_tmp16_); + _tmp8_ = _alteration_ref0 (alteration); #line 513 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _alteration_unref0 (current); #line 513 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - current = _tmp17_; -#line 2293 "DataCollection.c" + current = _tmp8_; +#line 2377 "DataCollection.c" } #line 515 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp18_ = self->priv->frozen_items_altered; -#line 515 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp19_ = object; + _tmp9_ = self->priv->frozen_items_altered; #line 515 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp20_ = current; + _tmp10_ = current; #line 515 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp19_, _tmp20_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), object, _tmp10_); #line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp22_ = self->priv->fire_ordering_changed; + _tmp12_ = self->priv->fire_ordering_changed; #line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp22_) { + if (_tmp12_) { #line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp21_ = TRUE; -#line 2309 "DataCollection.c" + _tmp11_ = TRUE; +#line 2391 "DataCollection.c" } else { - gboolean _tmp23_; + gboolean _tmp13_; #line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp23_ = resort_occurred; + _tmp13_ = resort_occurred; #line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp21_ = _tmp23_; -#line 2316 "DataCollection.c" + _tmp11_ = _tmp13_; +#line 2398 "DataCollection.c" } #line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - self->priv->fire_ordering_changed = _tmp21_; + self->priv->fire_ordering_changed = _tmp11_; #line 519 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _alteration_unref0 (current); #line 519 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return; -#line 2324 "DataCollection.c" +#line 2406 "DataCollection.c" } #line 522 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp24_ = resort_occurred; + _tmp14_ = resort_occurred; #line 522 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp24_) { + if (_tmp14_) { #line 523 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_notify_ordering_changed (self); -#line 2332 "DataCollection.c" +#line 2414 "DataCollection.c" } #line 525 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp25_ = object; -#line 525 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp26_ = alteration; + _tmp15_ = data_collection_get_alteration_singleton (object, alteration); #line 525 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp27_ = data_collection_get_alteration_singleton (_tmp25_, _tmp26_); + _tmp16_ = _tmp15_; #line 525 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp28_ = _tmp27_; + data_collection_notify_items_altered (self, _tmp16_); #line 525 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_notify_items_altered (self, _tmp28_); -#line 525 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _g_object_unref0 (_tmp28_); -#line 2346 "DataCollection.c" + _g_object_unref0 (_tmp16_); +#line 2424 "DataCollection.c" } -GValue* data_collection_get_property (DataCollection* self, const gchar* name) { +GValue* +data_collection_get_property (DataCollection* self, + const gchar* name) +{ GValue* result = NULL; GeeHashMap* _tmp0_; - const gchar* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 528 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL); #line 528 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2360,52 +2440,58 @@ GValue* data_collection_get_property (DataCollection* self, const gchar* name) { #line 529 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->properties; #line 529 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = name; -#line 529 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), name); #line 529 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - result = (GValue*) _tmp2_; + result = (GValue*) _tmp1_; #line 529 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 2369 "DataCollection.c" +#line 2447 "DataCollection.c" } -static gboolean _bool_value_equals_value_equal_func (GValue* a, GValue* b, gpointer self) { +static gboolean +_bool_value_equals_value_equal_func (GValue* a, + GValue* b, + gpointer self) +{ gboolean result; result = bool_value_equals (a, b); #line 535 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 2378 "DataCollection.c" +#line 2460 "DataCollection.c" } -static gboolean _int_value_equals_value_equal_func (GValue* a, GValue* b, gpointer self) { +static gboolean +_int_value_equals_value_equal_func (GValue* a, + GValue* b, + gpointer self) +{ gboolean result; result = int_value_equals (a, b); #line 537 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 2387 "DataCollection.c" +#line 2473 "DataCollection.c" } -void data_collection_set_property (DataCollection* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target) { - ValueEqualFunc _tmp0_; - void* _tmp0__target; +void +data_collection_set_property (DataCollection* self, + const gchar* name, + GValue* val, + ValueEqualFunc value_equals, + void* value_equals_target) +{ GValue* old = NULL; - GeeHashMap* _tmp3_; - const gchar* _tmp4_; - gpointer _tmp5_; - GValue* _tmp6_; - GeeHashMap* _tmp12_; - const gchar* _tmp13_; - GValue _tmp14_; - const gchar* _tmp15_; - GValue* _tmp16_; - GValue _tmp17_; + GeeHashMap* _tmp0_; + gpointer _tmp1_; + GValue* _tmp2_; + GeeHashMap* _tmp6_; + GValue _tmp7_; + GValue* _tmp8_; + GValue _tmp9_; gint count = 0; - DataSet* _tmp18_; - gint _tmp19_; + DataSet* _tmp10_; #line 532 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 532 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2413,182 +2499,151 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal #line 532 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (val != NULL); #line 533 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = value_equals; -#line 533 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0__target = value_equals_target; -#line 533 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp0_ == NULL) { -#line 2420 "DataCollection.c" - gboolean _tmp1_; + if (value_equals == NULL) { #line 534 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = G_VALUE_HOLDS (val, G_TYPE_BOOLEAN); -#line 534 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp1_) { + if (G_VALUE_HOLDS (val, G_TYPE_BOOLEAN)) { #line 535 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value_equals = _bool_value_equals_value_equal_func; #line 535 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value_equals_target = NULL; -#line 2430 "DataCollection.c" +#line 2508 "DataCollection.c" } else { - gboolean _tmp2_; -#line 536 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = G_VALUE_HOLDS (val, G_TYPE_INT); #line 536 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp2_) { + if (G_VALUE_HOLDS (val, G_TYPE_INT)) { #line 537 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value_equals = _int_value_equals_value_equal_func; #line 537 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value_equals_target = NULL; -#line 2441 "DataCollection.c" +#line 2516 "DataCollection.c" } else { #line 539 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_error ("DataCollection.vala:539: value_equals must be specified for this type"); -#line 2445 "DataCollection.c" +#line 2520 "DataCollection.c" } } } #line 542 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = self->priv->properties; -#line 542 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = name; + _tmp0_ = self->priv->properties; #line 542 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), name); #line 542 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - old = (GValue*) _tmp5_; + old = (GValue*) _tmp1_; #line 543 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = old; + _tmp2_ = old; #line 543 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp6_ != NULL) { -#line 2461 "DataCollection.c" - ValueEqualFunc _tmp7_; - void* _tmp7__target; - GValue* _tmp8_; - GValue _tmp9_; - GValue _tmp10_; - gboolean _tmp11_; + if (_tmp2_ != NULL) { +#line 2534 "DataCollection.c" + GValue* _tmp3_; + GValue _tmp4_; + GValue _tmp5_; #line 544 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = value_equals; + _tmp3_ = old; #line 544 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7__target = value_equals_target; + _tmp4_ = *val; #line 544 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = old; + _tmp5_ = *_tmp3_; #line 544 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = *val; -#line 544 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = *_tmp8_; -#line 544 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp11_ = _tmp7_ (&_tmp10_, &_tmp9_, _tmp7__target); -#line 544 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp11_) { + if (value_equals (&_tmp5_, &_tmp4_, value_equals_target)) { #line 545 "/home/jens/Source/shotwell/src/core/DataCollection.vala" __vala_GValue_free0 (old); #line 545 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return; -#line 2486 "DataCollection.c" +#line 2550 "DataCollection.c" } } #line 548 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp12_ = self->priv->properties; + _tmp6_ = self->priv->properties; #line 548 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp13_ = name; + _tmp7_ = *val; #line 548 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp14_ = *val; -#line 548 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_, &_tmp14_); -#line 550 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp15_ = name; + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), name, &_tmp7_); #line 550 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp16_ = old; + _tmp8_ = old; #line 550 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp17_ = *val; + _tmp9_ = *val; #line 550 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_notify_property_set (self, _tmp15_, _tmp16_, &_tmp17_); -#line 553 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp18_ = self->priv->dataset; + data_collection_notify_property_set (self, name, _tmp8_, &_tmp9_); #line 553 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp19_ = data_set_get_count (_tmp18_); + _tmp10_ = self->priv->dataset; #line 553 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - count = _tmp19_; -#line 2511 "DataCollection.c" + count = data_set_get_count (_tmp10_); +#line 2569 "DataCollection.c" { gint ctr = 0; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" ctr = 0; -#line 2516 "DataCollection.c" +#line 2574 "DataCollection.c" { - gboolean _tmp20_ = FALSE; + gboolean _tmp11_ = FALSE; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp20_ = TRUE; + _tmp11_ = TRUE; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 2523 "DataCollection.c" - gint _tmp22_; - gint _tmp23_; - DataSet* _tmp24_; - gint _tmp25_; - DataObject* _tmp26_; - DataObject* _tmp27_; - const gchar* _tmp28_; - GValue* _tmp29_; - GValue _tmp30_; +#line 2581 "DataCollection.c" + gint _tmp13_; + gint _tmp14_; + DataSet* _tmp15_; + gint _tmp16_; + DataObject* _tmp17_; + DataObject* _tmp18_; + GValue* _tmp19_; + GValue _tmp20_; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp20_) { -#line 2535 "DataCollection.c" - gint _tmp21_; + if (!_tmp11_) { +#line 2592 "DataCollection.c" + gint _tmp12_; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp21_ = ctr; + _tmp12_ = ctr; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ctr = _tmp21_ + 1; -#line 2541 "DataCollection.c" + ctr = _tmp12_ + 1; +#line 2598 "DataCollection.c" } #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp20_ = FALSE; + _tmp11_ = FALSE; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp22_ = ctr; + _tmp13_ = ctr; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp23_ = count; + _tmp14_ = count; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!(_tmp22_ < _tmp23_)) { + if (!(_tmp13_ < _tmp14_)) { #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 2553 "DataCollection.c" +#line 2610 "DataCollection.c" } #line 555 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp24_ = self->priv->dataset; + _tmp15_ = self->priv->dataset; #line 555 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp25_ = ctr; + _tmp16_ = ctr; #line 555 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp26_ = data_set_get_at (_tmp24_, _tmp25_); + _tmp17_ = data_set_get_at (_tmp15_, _tmp16_); #line 555 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp27_ = _tmp26_; + _tmp18_ = _tmp17_; #line 555 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp28_ = name; + _tmp19_ = old; #line 555 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp29_ = old; + _tmp20_ = *val; #line 555 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp30_ = *val; + data_object_notify_collection_property_set (_tmp18_, name, _tmp19_, &_tmp20_); #line 555 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_object_notify_collection_property_set (_tmp27_, _tmp28_, _tmp29_, &_tmp30_); -#line 555 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _g_object_unref0 (_tmp27_); -#line 2573 "DataCollection.c" + _g_object_unref0 (_tmp18_); +#line 2628 "DataCollection.c" } } } #line 532 "/home/jens/Source/shotwell/src/core/DataCollection.vala" __vala_GValue_free0 (old); -#line 2579 "DataCollection.c" +#line 2634 "DataCollection.c" } -void data_collection_clear_property (DataCollection* self, const gchar* name) { +void +data_collection_clear_property (DataCollection* self, + const gchar* name) +{ GeeHashMap* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; - const gchar* _tmp3_; + gboolean _tmp1_; gint count = 0; - DataSet* _tmp4_; - gint _tmp5_; + DataSet* _tmp2_; #line 558 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 558 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2596,89 +2651,82 @@ void data_collection_clear_property (DataCollection* self, const gchar* name) { #line 559 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->properties; #line 559 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = name; -#line 559 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, NULL); + _tmp1_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), name, NULL); #line 559 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp2_) { + if (!_tmp1_) { #line 560 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return; -#line 2605 "DataCollection.c" +#line 2658 "DataCollection.c" } #line 563 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = name; -#line 563 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_notify_property_cleared (self, _tmp3_); -#line 566 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = self->priv->dataset; + data_collection_notify_property_cleared (self, name); #line 566 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = data_set_get_count (_tmp4_); + _tmp2_ = self->priv->dataset; #line 566 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - count = _tmp5_; -#line 2617 "DataCollection.c" + count = data_set_get_count (_tmp2_); +#line 2666 "DataCollection.c" { gint ctr = 0; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" ctr = 0; -#line 2622 "DataCollection.c" +#line 2671 "DataCollection.c" { - gboolean _tmp6_ = FALSE; + gboolean _tmp3_ = FALSE; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = TRUE; + _tmp3_ = TRUE; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 2629 "DataCollection.c" +#line 2678 "DataCollection.c" + gint _tmp5_; + gint _tmp6_; + DataSet* _tmp7_; gint _tmp8_; - gint _tmp9_; - DataSet* _tmp10_; - gint _tmp11_; - DataObject* _tmp12_; - DataObject* _tmp13_; - const gchar* _tmp14_; + DataObject* _tmp9_; + DataObject* _tmp10_; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp6_) { -#line 2639 "DataCollection.c" - gint _tmp7_; + if (!_tmp3_) { +#line 2687 "DataCollection.c" + gint _tmp4_; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = ctr; + _tmp4_ = ctr; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ctr = _tmp7_ + 1; -#line 2645 "DataCollection.c" + ctr = _tmp4_ + 1; +#line 2693 "DataCollection.c" } #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = FALSE; + _tmp3_ = FALSE; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = ctr; + _tmp5_ = ctr; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = count; + _tmp6_ = count; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!(_tmp8_ < _tmp9_)) { + if (!(_tmp5_ < _tmp6_)) { #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 2657 "DataCollection.c" +#line 2705 "DataCollection.c" } #line 568 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = self->priv->dataset; -#line 568 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp11_ = ctr; + _tmp7_ = self->priv->dataset; #line 568 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp12_ = data_set_get_at (_tmp10_, _tmp11_); + _tmp8_ = ctr; #line 568 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp13_ = _tmp12_; + _tmp9_ = data_set_get_at (_tmp7_, _tmp8_); #line 568 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp14_ = name; + _tmp10_ = _tmp9_; #line 568 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_object_notify_collection_property_cleared (_tmp13_, _tmp14_); + data_object_notify_collection_property_cleared (_tmp10_, name); #line 568 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _g_object_unref0 (_tmp13_); -#line 2673 "DataCollection.c" + _g_object_unref0 (_tmp10_); +#line 2719 "DataCollection.c" } } } } -void data_collection_freeze_notifications (DataCollection* self) { +void +data_collection_freeze_notifications (DataCollection* self) +{ gint _tmp0_; #line 581 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); @@ -2690,12 +2738,14 @@ void data_collection_freeze_notifications (DataCollection* self) { if (_tmp0_ == 0) { #line 583 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_notify_frozen (self); -#line 2692 "DataCollection.c" +#line 2740 "DataCollection.c" } } -void data_collection_thaw_notifications (DataCollection* self) { +void +data_collection_thaw_notifications (DataCollection* self) +{ gint _tmp0_; gint _tmp1_; gint _tmp2_; @@ -2707,7 +2757,7 @@ void data_collection_thaw_notifications (DataCollection* self) { if (_tmp0_ == 0) { #line 588 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return; -#line 2709 "DataCollection.c" +#line 2759 "DataCollection.c" } #line 590 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp1_ = self->priv->notifies_frozen; @@ -2719,12 +2769,14 @@ void data_collection_thaw_notifications (DataCollection* self) { if (_tmp2_ == 0) { #line 591 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_notify_thawed (self); -#line 2721 "DataCollection.c" +#line 2771 "DataCollection.c" } } -gboolean data_collection_are_notifications_frozen (DataCollection* self) { +gboolean +data_collection_are_notifications_frozen (DataCollection* self) +{ gboolean result = FALSE; gint _tmp0_; #line 594 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2735,34 +2787,40 @@ gboolean data_collection_are_notifications_frozen (DataCollection* self) { result = _tmp0_ > 0; #line 595 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 2737 "DataCollection.c" +#line 2789 "DataCollection.c" } -static void data_collection_real_notify_frozen (DataCollection* self) { +static void +data_collection_real_notify_frozen (DataCollection* self) +{ #line 601 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_signal_emit (self, data_collection_signals[DATA_COLLECTION_FROZEN_SIGNAL], 0); -#line 2744 "DataCollection.c" +#line 2798 "DataCollection.c" } -void data_collection_notify_frozen (DataCollection* self) { +void +data_collection_notify_frozen (DataCollection* self) +{ #line 600 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 600 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->notify_frozen (self); -#line 2753 "DataCollection.c" +#line 2809 "DataCollection.c" } -static void data_collection_real_notify_thawed (DataCollection* self) { +static void +data_collection_real_notify_thawed (DataCollection* self) +{ GeeHashMap* _tmp0_; gboolean _tmp4_; #line 607 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->frozen_items_altered; #line 607 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (_tmp0_ != NULL) { -#line 2764 "DataCollection.c" +#line 2822 "DataCollection.c" GeeMap* copy = NULL; GeeHashMap* _tmp1_; GeeMap* _tmp2_; @@ -2783,7 +2841,7 @@ static void data_collection_real_notify_thawed (DataCollection* self) { data_collection_notify_items_altered (self, _tmp3_); #line 607 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (copy); -#line 2785 "DataCollection.c" +#line 2843 "DataCollection.c" } #line 615 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp4_ = self->priv->fire_ordering_changed; @@ -2793,47 +2851,66 @@ static void data_collection_real_notify_thawed (DataCollection* self) { self->priv->fire_ordering_changed = FALSE; #line 617 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_notify_ordering_changed (self); -#line 2795 "DataCollection.c" +#line 2853 "DataCollection.c" } #line 620 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_signal_emit (self, data_collection_signals[DATA_COLLECTION_THAWED_SIGNAL], 0); -#line 2799 "DataCollection.c" +#line 2857 "DataCollection.c" } -void data_collection_notify_thawed (DataCollection* self) { +void +data_collection_notify_thawed (DataCollection* self) +{ #line 606 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 606 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->notify_thawed (self); -#line 2808 "DataCollection.c" +#line 2868 "DataCollection.c" } -static void data_collection_real_items_added (DataCollection* self, GeeIterable* added) { +static void +data_collection_real_items_added (DataCollection* self, + GeeIterable* added) +{ #line 116 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (added)); -#line 2815 "DataCollection.c" +#line 2878 "DataCollection.c" } -static void data_collection_real_items_removed (DataCollection* self, GeeIterable* removed) { +static void +data_collection_real_items_removed (DataCollection* self, + GeeIterable* removed) +{ #line 120 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (removed)); -#line 2822 "DataCollection.c" +#line 2888 "DataCollection.c" } -static void data_collection_real_contents_altered (DataCollection* self, GeeIterable* added, GeeIterable* removed) { +static void +data_collection_real_contents_altered (DataCollection* self, + GeeIterable* added, + GeeIterable* removed) +{ #line 124 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added)); #line 124 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed)); -#line 2831 "DataCollection.c" +#line 2901 "DataCollection.c" } -static void g_cclosure_user_marshal_VOID__OBJECT_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__OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2); register GMarshalFunc_VOID__OBJECT_OBJECT callback; register GCClosure * cc; @@ -2848,43 +2925,60 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa data1 = closure->data; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data2 = param_values->data[0].v_pointer; -#line 2850 "DataCollection.c" +#line 2927 "DataCollection.c" } else { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data1 = param_values->data[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data2 = closure->data; -#line 2856 "DataCollection.c" +#line 2933 "DataCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 2862 "DataCollection.c" +#line 2939 "DataCollection.c" } -static void data_collection_real_items_altered (DataCollection* self, GeeMap* items) { +static void +data_collection_real_items_altered (DataCollection* self, + GeeMap* items) +{ #line 130 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (GEE_IS_MAP (items)); -#line 2869 "DataCollection.c" +#line 2949 "DataCollection.c" } -static void data_collection_real_ordering_changed (DataCollection* self) { +static void +data_collection_real_ordering_changed (DataCollection* self) +{ } -static void data_collection_real_property_set (DataCollection* self, const gchar* name, GValue* old, GValue* val) { +static void +data_collection_real_property_set (DataCollection* self, + const gchar* name, + GValue* old, + GValue* val) +{ #line 140 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (name != NULL); #line 140 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (val != NULL); -#line 2882 "DataCollection.c" +#line 2969 "DataCollection.c" } -static void g_cclosure_user_marshal_VOID__STRING_POINTER_BOXED (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__STRING_POINTER_BOXED (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__STRING_POINTER_BOXED) (gpointer data1, const char* arg_1, gpointer arg_2, gpointer arg_3, gpointer data2); register GMarshalFunc_VOID__STRING_POINTER_BOXED callback; register GCClosure * cc; @@ -2899,92 +2993,104 @@ static void g_cclosure_user_marshal_VOID__STRING_POINTER_BOXED (GClosure * closu data1 = closure->data; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data2 = param_values->data[0].v_pointer; -#line 2901 "DataCollection.c" +#line 2995 "DataCollection.c" } else { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data1 = param_values->data[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data2 = closure->data; -#line 2907 "DataCollection.c" +#line 3001 "DataCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" callback = (GMarshalFunc_VOID__STRING_POINTER_BOXED) (marshal_data ? marshal_data : cc->callback); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" callback (data1, g_value_get_string (param_values + 1), g_value_get_pointer (param_values + 2), g_value_get_boxed (param_values + 3), data2); -#line 2913 "DataCollection.c" +#line 3007 "DataCollection.c" } -static void data_collection_real_property_cleared (DataCollection* self, const gchar* name) { +static void +data_collection_real_property_cleared (DataCollection* self, + const gchar* name) +{ #line 144 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (name != NULL); -#line 2920 "DataCollection.c" +#line 3017 "DataCollection.c" } -static void data_collection_real_frozen (DataCollection* self) { +static void +data_collection_real_frozen (DataCollection* self) +{ } -static void data_collection_real_thawed (DataCollection* self) { +static void +data_collection_real_thawed (DataCollection* self) +{ } -static void _data_collection_marker_impl_on_items_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) { +static void +_data_collection_marker_impl_on_items_removed_data_collection_items_removed (DataCollection* _sender, + GeeIterable* removed, + gpointer self) +{ #line 24 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_marker_impl_on_items_removed ((DataCollectionMarkerImpl*) self, removed); -#line 2935 "DataCollection.c" +#line 3040 "DataCollection.c" } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 16 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return self ? data_collection_ref (self) : NULL; -#line 2942 "DataCollection.c" +#line 3049 "DataCollection.c" } -static DataCollectionMarkerImpl* data_collection_marker_impl_construct (GType object_type, DataCollection* owner) { +static DataCollectionMarkerImpl* +data_collection_marker_impl_construct (GType object_type, + DataCollection* owner) +{ DataCollectionMarkerImpl * self = NULL; DataCollection* _tmp0_; - DataCollection* _tmp1_; - DataCollection* _tmp2_; #line 15 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (owner), NULL); #line 15 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self = (DataCollectionMarkerImpl*) g_object_new (object_type, NULL); #line 16 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = owner; -#line 16 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = _data_collection_ref0 (_tmp0_); + _tmp0_ = _data_collection_ref0 (owner); #line 16 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _data_collection_unref0 (self->owner); #line 16 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - self->owner = _tmp1_; -#line 20 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = owner; + self->owner = _tmp0_; #line 20 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_connect_object (_tmp2_, "items-removed", (GCallback) _data_collection_marker_impl_on_items_removed_data_collection_items_removed, self, 0); + g_signal_connect_object (owner, "items-removed", (GCallback) _data_collection_marker_impl_on_items_removed_data_collection_items_removed, self, 0); #line 15 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return self; -#line 2969 "DataCollection.c" +#line 3073 "DataCollection.c" } -static DataCollectionMarkerImpl* data_collection_marker_impl_new (DataCollection* owner) { +static DataCollectionMarkerImpl* +data_collection_marker_impl_new (DataCollection* owner) +{ #line 15 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return data_collection_marker_impl_construct (DATA_COLLECTION_TYPE_MARKER_IMPL, owner); -#line 2976 "DataCollection.c" +#line 3082 "DataCollection.c" } -static void data_collection_marker_impl_real_mark (Marker* base, DataObject* object) { +static void +data_collection_marker_impl_real_mark (Marker* base, + DataObject* object) +{ DataCollectionMarkerImpl * self; DataCollection* _tmp0_; - DataObject* _tmp1_; - gboolean _tmp2_; - GeeHashSet* _tmp3_; - DataObject* _tmp4_; + GeeHashSet* _tmp1_; #line 27 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl); #line 27 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2992,28 +3098,22 @@ static void data_collection_marker_impl_real_mark (Marker* base, DataObject* obj #line 28 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->owner; #line 28 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = object; -#line 28 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = data_collection_internal_contains (_tmp0_, _tmp1_); -#line 28 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp2_, "owner.internal_contains(object)"); -#line 30 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = self->marked; + _vala_assert (data_collection_internal_contains (_tmp0_, object), "owner.internal_contains(object)"); #line 30 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = object; + _tmp1_ = self->marked; #line 30 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_); -#line 3005 "DataCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), object); +#line 3105 "DataCollection.c" } -static void data_collection_marker_impl_real_unmark (Marker* base, DataObject* object) { +static void +data_collection_marker_impl_real_unmark (Marker* base, + DataObject* object) +{ DataCollectionMarkerImpl * self; DataCollection* _tmp0_; - DataObject* _tmp1_; - gboolean _tmp2_; - GeeHashSet* _tmp3_; - DataObject* _tmp4_; + GeeHashSet* _tmp1_; #line 33 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl); #line 33 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3021,33 +3121,24 @@ static void data_collection_marker_impl_real_unmark (Marker* base, DataObject* o #line 34 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->owner; #line 34 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = object; -#line 34 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = data_collection_internal_contains (_tmp0_, _tmp1_); -#line 34 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp2_, "owner.internal_contains(object)"); -#line 36 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = self->marked; + _vala_assert (data_collection_internal_contains (_tmp0_, object), "owner.internal_contains(object)"); #line 36 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = object; + _tmp1_ = self->marked; #line 36 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_); -#line 3034 "DataCollection.c" + gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), object); +#line 3128 "DataCollection.c" } -static gboolean data_collection_marker_impl_real_toggle (Marker* base, DataObject* object) { +static gboolean +data_collection_marker_impl_real_toggle (Marker* base, + DataObject* object) +{ DataCollectionMarkerImpl * self; gboolean result = FALSE; DataCollection* _tmp0_; - DataObject* _tmp1_; - gboolean _tmp2_; - GeeHashSet* _tmp3_; - DataObject* _tmp4_; - gboolean _tmp5_; - GeeHashSet* _tmp10_; - DataObject* _tmp11_; - gboolean _tmp12_; + GeeHashSet* _tmp1_; + GeeHashSet* _tmp4_; #line 39 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl); #line 39 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3055,201 +3146,173 @@ static gboolean data_collection_marker_impl_real_toggle (Marker* base, DataObjec #line 40 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->owner; #line 40 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = object; -#line 40 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = data_collection_internal_contains (_tmp0_, _tmp1_); -#line 40 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp2_, "owner.internal_contains(object)"); + _vala_assert (data_collection_internal_contains (_tmp0_, object), "owner.internal_contains(object)"); #line 42 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = self->marked; -#line 42 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = object; -#line 42 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_); + _tmp1_ = self->marked; #line 42 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp5_) { -#line 3070 "DataCollection.c" - GeeHashSet* _tmp6_; - DataObject* _tmp7_; -#line 43 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = self->marked; + if (gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), object)) { +#line 3153 "DataCollection.c" + GeeHashSet* _tmp2_; #line 43 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = object; + _tmp2_ = self->marked; #line 43 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_); -#line 3079 "DataCollection.c" + gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), object); +#line 3159 "DataCollection.c" } else { - GeeHashSet* _tmp8_; - DataObject* _tmp9_; -#line 45 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = self->marked; + GeeHashSet* _tmp3_; #line 45 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = object; + _tmp3_ = self->marked; #line 45 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_); -#line 3089 "DataCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), object); +#line 3166 "DataCollection.c" } #line 48 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = self->marked; -#line 48 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp11_ = object; + _tmp4_ = self->marked; #line 48 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp12_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_); -#line 48 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - result = _tmp12_; + result = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), object); #line 48 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 3101 "DataCollection.c" +#line 3174 "DataCollection.c" } -static void data_collection_marker_impl_real_mark_many (Marker* base, GeeCollection* list) { +static void +data_collection_marker_impl_real_mark_many (Marker* base, + GeeCollection* list) +{ DataCollectionMarkerImpl * self; #line 51 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl); #line 51 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (list)); -#line 3111 "DataCollection.c" +#line 3187 "DataCollection.c" { GeeIterator* _object_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = list; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_ITERABLE, GeeIterable)); #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 3124 "DataCollection.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 3197 "DataCollection.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - DataCollection* _tmp6_; + GeeIterator* _tmp2_; + gpointer _tmp3_; + DataCollection* _tmp4_; + DataObject* _tmp5_; + GeeHashSet* _tmp6_; DataObject* _tmp7_; - gboolean _tmp8_; - GeeHashSet* _tmp9_; - DataObject* _tmp10_; -#line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = _object_it; #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _object_it; #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 3143 "DataCollection.c" +#line 3212 "DataCollection.c" } #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - object = (DataObject*) _tmp5_; -#line 53 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = self->owner; + object = (DataObject*) _tmp3_; #line 53 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = object; + _tmp4_ = self->owner; #line 53 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = data_collection_internal_contains (_tmp6_, _tmp7_); + _tmp5_ = object; #line 53 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp8_, "owner.internal_contains(object)"); + _vala_assert (data_collection_internal_contains (_tmp4_, _tmp5_), "owner.internal_contains(object)"); #line 55 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = self->marked; + _tmp6_ = self->marked; #line 55 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = object; + _tmp7_ = object; #line 55 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_); #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 3167 "DataCollection.c" +#line 3234 "DataCollection.c" } #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 3171 "DataCollection.c" +#line 3238 "DataCollection.c" } } -static void data_collection_marker_impl_real_unmark_many (Marker* base, GeeCollection* list) { +static void +data_collection_marker_impl_real_unmark_many (Marker* base, + GeeCollection* list) +{ DataCollectionMarkerImpl * self; #line 59 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl); #line 59 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (list)); -#line 3182 "DataCollection.c" +#line 3252 "DataCollection.c" { GeeIterator* _object_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; -#line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = list; + GeeIterator* _tmp0_; #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_ITERABLE, GeeIterable)); #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 3195 "DataCollection.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 3262 "DataCollection.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - DataCollection* _tmp6_; + GeeIterator* _tmp2_; + gpointer _tmp3_; + DataCollection* _tmp4_; + DataObject* _tmp5_; + GeeHashSet* _tmp6_; DataObject* _tmp7_; - gboolean _tmp8_; - GeeHashSet* _tmp9_; - DataObject* _tmp10_; #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = _object_it; -#line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _object_it; #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 3214 "DataCollection.c" +#line 3277 "DataCollection.c" } #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - object = (DataObject*) _tmp5_; + object = (DataObject*) _tmp3_; #line 61 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = self->owner; + _tmp4_ = self->owner; #line 61 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = object; -#line 61 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = data_collection_internal_contains (_tmp6_, _tmp7_); + _tmp5_ = object; #line 61 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp8_, "owner.internal_contains(object)"); + _vala_assert (data_collection_internal_contains (_tmp4_, _tmp5_), "owner.internal_contains(object)"); #line 63 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = self->marked; + _tmp6_ = self->marked; #line 63 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = object; + _tmp7_ = object; #line 63 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); + gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_); #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 3238 "DataCollection.c" +#line 3299 "DataCollection.c" } #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 3242 "DataCollection.c" +#line 3303 "DataCollection.c" } } -static void data_collection_marker_impl_real_mark_all (Marker* base) { +static void +data_collection_marker_impl_real_mark_all (Marker* base) +{ DataCollectionMarkerImpl * self; #line 67 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl); -#line 3251 "DataCollection.c" +#line 3314 "DataCollection.c" { GeeIterator* _object_it = NULL; DataCollection* _tmp0_; @@ -3273,48 +3336,47 @@ static void data_collection_marker_impl_real_mark_all (Marker* base) { _object_it = _tmp4_; #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 3275 "DataCollection.c" +#line 3338 "DataCollection.c" GeeIterator* _tmp5_; - gboolean _tmp6_; DataObject* object = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; - GeeHashSet* _tmp9_; - DataObject* _tmp10_; + GeeIterator* _tmp6_; + gpointer _tmp7_; + GeeHashSet* _tmp8_; + DataObject* _tmp9_; #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp5_ = _object_it; #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = gee_iterator_next (_tmp5_); -#line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp5_)) { #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 3291 "DataCollection.c" +#line 3351 "DataCollection.c" } #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = _object_it; + _tmp6_ = _object_it; #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - object = (DataObject*) _tmp8_; + object = (DataObject*) _tmp7_; #line 69 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = self->marked; + _tmp8_ = self->marked; #line 69 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = object; + _tmp9_ = object; #line 69 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_); #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 3307 "DataCollection.c" +#line 3367 "DataCollection.c" } #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 3311 "DataCollection.c" +#line 3371 "DataCollection.c" } } -static gint data_collection_marker_impl_real_get_count (Marker* base) { +static gint +data_collection_marker_impl_real_get_count (Marker* base) +{ DataCollectionMarkerImpl * self; gint result = 0; gint _tmp0_ = 0; @@ -3325,7 +3387,7 @@ static gint data_collection_marker_impl_real_get_count (Marker* base) { _tmp1_ = self->marked; #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (_tmp1_ != NULL) { -#line 3327 "DataCollection.c" +#line 3389 "DataCollection.c" GeeHashSet* _tmp2_; gint _tmp3_; gint _tmp4_; @@ -3337,24 +3399,26 @@ static gint data_collection_marker_impl_real_get_count (Marker* base) { _tmp4_ = _tmp3_; #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = _tmp4_; -#line 3339 "DataCollection.c" +#line 3401 "DataCollection.c" } else { gint _tmp5_; #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp5_ = self->freeze_count; #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = _tmp5_; -#line 3346 "DataCollection.c" +#line 3408 "DataCollection.c" } #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala" result = _tmp0_; #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 3352 "DataCollection.c" +#line 3414 "DataCollection.c" } -static GeeCollection* data_collection_marker_impl_real_get_all (Marker* base) { +static GeeCollection* +data_collection_marker_impl_real_get_all (Marker* base) +{ DataCollectionMarkerImpl * self; GeeCollection* result = NULL; GeeArrayList* copy = NULL; @@ -3374,70 +3438,69 @@ static GeeCollection* data_collection_marker_impl_real_get_all (Marker* base) { result = G_TYPE_CHECK_INSTANCE_CAST (copy, GEE_TYPE_COLLECTION, GeeCollection); #line 80 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 3376 "DataCollection.c" +#line 3440 "DataCollection.c" } -static void data_collection_marker_impl_on_items_removed (DataCollectionMarkerImpl* self, GeeIterable* removed) { +static void +data_collection_marker_impl_on_items_removed (DataCollectionMarkerImpl* self, + GeeIterable* removed) +{ #line 83 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (DATA_COLLECTION_IS_MARKER_IMPL (self)); #line 83 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (removed)); -#line 3385 "DataCollection.c" +#line 3452 "DataCollection.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; -#line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = removed; + GeeIterator* _tmp0_; #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); + _tmp0_ = gee_iterable_iterator (removed); #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 3398 "DataCollection.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 3462 "DataCollection.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - GeeHashSet* _tmp6_; - DataObject* _tmp7_; -#line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = _object_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + GeeHashSet* _tmp4_; + DataObject* _tmp5_; #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _object_it; #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 3414 "DataCollection.c" +#line 3475 "DataCollection.c" } #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - object = (DataObject*) _tmp5_; + object = (DataObject*) _tmp3_; #line 85 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = self->marked; + _tmp4_ = self->marked; #line 85 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = object; + _tmp5_ = object; #line 85 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_); + gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp5_); #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 3430 "DataCollection.c" +#line 3491 "DataCollection.c" } #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 3434 "DataCollection.c" +#line 3495 "DataCollection.c" } } -static void data_collection_marker_impl_freeze (DataCollectionMarkerImpl* self) { +static void +data_collection_marker_impl_freeze (DataCollectionMarkerImpl* self) +{ DataCollection* _tmp0_; guint _tmp1_; #line 91 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3448,11 +3511,13 @@ static void data_collection_marker_impl_freeze (DataCollectionMarkerImpl* self) g_signal_parse_name ("items-removed", TYPE_DATA_COLLECTION, &_tmp1_, NULL, FALSE); #line 92 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _data_collection_marker_impl_on_items_removed_data_collection_items_removed, self); -#line 3450 "DataCollection.c" +#line 3513 "DataCollection.c" } -static void data_collection_marker_impl_finished (DataCollectionMarkerImpl* self) { +static void +data_collection_marker_impl_finished (DataCollectionMarkerImpl* self) +{ GeeHashSet* _tmp0_; #line 95 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (DATA_COLLECTION_IS_MARKER_IMPL (self)); @@ -3460,7 +3525,7 @@ static void data_collection_marker_impl_finished (DataCollectionMarkerImpl* self _tmp0_ = self->marked; #line 96 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (_tmp0_ != NULL) { -#line 3462 "DataCollection.c" +#line 3527 "DataCollection.c" GeeHashSet* _tmp1_; gint _tmp2_; gint _tmp3_; @@ -3472,61 +3537,65 @@ static void data_collection_marker_impl_finished (DataCollectionMarkerImpl* self _tmp3_ = _tmp2_; #line 97 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self->freeze_count = _tmp3_; -#line 3474 "DataCollection.c" +#line 3539 "DataCollection.c" } #line 99 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (self->marked); #line 99 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self->marked = NULL; -#line 3480 "DataCollection.c" +#line 3545 "DataCollection.c" } -static gboolean data_collection_marker_impl_is_valid (DataCollectionMarkerImpl* self, DataCollection* collection) { +static gboolean +data_collection_marker_impl_is_valid (DataCollectionMarkerImpl* self, + DataCollection* collection) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; DataCollection* _tmp1_; - DataCollection* _tmp2_; #line 102 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (DATA_COLLECTION_IS_MARKER_IMPL (self), FALSE); #line 102 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (collection), FALSE); #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = collection; + _tmp1_ = self->owner; #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = self->owner; -#line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp1_ == _tmp2_) { -#line 3499 "DataCollection.c" - GeeHashSet* _tmp3_; + if (collection == _tmp1_) { +#line 3564 "DataCollection.c" + GeeHashSet* _tmp2_; #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = self->marked; + _tmp2_ = self->marked; #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = _tmp3_ != NULL; -#line 3505 "DataCollection.c" + _tmp0_ = _tmp2_ != NULL; +#line 3570 "DataCollection.c" } else { #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = FALSE; -#line 3509 "DataCollection.c" +#line 3574 "DataCollection.c" } #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala" result = _tmp0_; #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 3515 "DataCollection.c" +#line 3580 "DataCollection.c" } -static void data_collection_marker_impl_class_init (DataCollectionMarkerImplClass * klass) { +static void +data_collection_marker_impl_class_init (DataCollectionMarkerImplClass * klass) +{ #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_marker_impl_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala" G_OBJECT_CLASS (klass)->finalize = data_collection_marker_impl_finalize; -#line 3524 "DataCollection.c" +#line 3591 "DataCollection.c" } -static void data_collection_marker_impl_marker_interface_init (MarkerIface * iface) { +static void +data_collection_marker_impl_marker_interface_init (MarkerIface * iface) +{ #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_marker_impl_marker_parent_iface = g_type_interface_peek_parent (iface); #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3545,11 +3614,13 @@ static void data_collection_marker_impl_marker_interface_init (MarkerIface * ifa iface->get_count = (gint (*) (Marker *)) data_collection_marker_impl_real_get_count; #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala" iface->get_all = (GeeCollection* (*) (Marker *)) data_collection_marker_impl_real_get_all; -#line 3547 "DataCollection.c" +#line 3616 "DataCollection.c" } -static void data_collection_marker_impl_instance_init (DataCollectionMarkerImpl * self) { +static void +data_collection_marker_impl_instance_init (DataCollectionMarkerImpl * self) +{ GeeHashSet* _tmp0_; #line 12 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = gee_hash_set_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); @@ -3557,11 +3628,13 @@ static void data_collection_marker_impl_instance_init (DataCollectionMarkerImpl self->marked = _tmp0_; #line 13 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self->freeze_count = 0; -#line 3559 "DataCollection.c" +#line 3630 "DataCollection.c" } -static void data_collection_marker_impl_finalize (GObject * obj) { +static void +data_collection_marker_impl_finalize (GObject * obj) +{ DataCollectionMarkerImpl * self; DataCollection* _tmp0_; guint _tmp1_; @@ -3579,11 +3652,13 @@ static void data_collection_marker_impl_finalize (GObject * obj) { _g_object_unref0 (self->marked); #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala" G_OBJECT_CLASS (data_collection_marker_impl_parent_class)->finalize (obj); -#line 3581 "DataCollection.c" +#line 3654 "DataCollection.c" } -static GType data_collection_marker_impl_get_type (void) { +static GType +data_collection_marker_impl_get_type (void) +{ static volatile gsize data_collection_marker_impl_type_id__volatile = 0; if (g_once_init_enter (&data_collection_marker_impl_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DataCollectionMarkerImplClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_collection_marker_impl_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataCollectionMarkerImpl), 0, (GInstanceInitFunc) data_collection_marker_impl_instance_init, NULL }; @@ -3597,104 +3672,129 @@ static GType data_collection_marker_impl_get_type (void) { } -static void value_data_collection_init (GValue* value) { +static void +value_data_collection_init (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value->data[0].v_pointer = NULL; -#line 3602 "DataCollection.c" +#line 3679 "DataCollection.c" } -static void value_data_collection_free_value (GValue* value) { +static void +value_data_collection_free_value (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_unref (value->data[0].v_pointer); -#line 3611 "DataCollection.c" +#line 3690 "DataCollection.c" } } -static void value_data_collection_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_data_collection_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" dest_value->data[0].v_pointer = data_collection_ref (src_value->data[0].v_pointer); -#line 3621 "DataCollection.c" +#line 3703 "DataCollection.c" } else { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" dest_value->data[0].v_pointer = NULL; -#line 3625 "DataCollection.c" +#line 3707 "DataCollection.c" } } -static gpointer value_data_collection_peek_pointer (const GValue* value) { +static gpointer +value_data_collection_peek_pointer (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return value->data[0].v_pointer; -#line 3633 "DataCollection.c" +#line 3717 "DataCollection.c" } -static gchar* value_data_collection_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_data_collection_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (collect_values[0].v_pointer) { -#line 3640 "DataCollection.c" +#line 3729 "DataCollection.c" DataCollection * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3647 "DataCollection.c" +#line 3736 "DataCollection.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3651 "DataCollection.c" +#line 3740 "DataCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value->data[0].v_pointer = data_collection_ref (object); -#line 3655 "DataCollection.c" +#line 3744 "DataCollection.c" } else { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value->data[0].v_pointer = NULL; -#line 3659 "DataCollection.c" +#line 3748 "DataCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return NULL; -#line 3663 "DataCollection.c" +#line 3752 "DataCollection.c" } -static gchar* value_data_collection_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_data_collection_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ DataCollection ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3674 "DataCollection.c" +#line 3768 "DataCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" *object_p = NULL; -#line 3680 "DataCollection.c" +#line 3774 "DataCollection.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" *object_p = value->data[0].v_pointer; -#line 3684 "DataCollection.c" +#line 3778 "DataCollection.c" } else { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" *object_p = data_collection_ref (value->data[0].v_pointer); -#line 3688 "DataCollection.c" +#line 3782 "DataCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return NULL; -#line 3692 "DataCollection.c" +#line 3786 "DataCollection.c" } -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecDataCollection* spec; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_DATA_COLLECTION), NULL); @@ -3704,20 +3804,25 @@ GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, co G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return G_PARAM_SPEC (spec); -#line 3706 "DataCollection.c" +#line 3806 "DataCollection.c" } -gpointer value_get_data_collection (const GValue* value) { +gpointer +value_get_data_collection (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATA_COLLECTION), NULL); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return value->data[0].v_pointer; -#line 3715 "DataCollection.c" +#line 3817 "DataCollection.c" } -void value_set_data_collection (GValue* value, gpointer v_object) { +void +value_set_data_collection (GValue* value, + gpointer v_object) +{ DataCollection * old; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATA_COLLECTION)); @@ -3733,22 +3838,25 @@ void value_set_data_collection (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_ref (value->data[0].v_pointer); -#line 3735 "DataCollection.c" +#line 3840 "DataCollection.c" } else { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value->data[0].v_pointer = NULL; -#line 3739 "DataCollection.c" +#line 3844 "DataCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_unref (old); -#line 3745 "DataCollection.c" +#line 3850 "DataCollection.c" } } -void value_take_data_collection (GValue* value, gpointer v_object) { +void +value_take_data_collection (GValue* value, + gpointer v_object) +{ DataCollection * old; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATA_COLLECTION)); @@ -3762,22 +3870,24 @@ void value_take_data_collection (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value->data[0].v_pointer = v_object; -#line 3764 "DataCollection.c" +#line 3872 "DataCollection.c" } else { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value->data[0].v_pointer = NULL; -#line 3768 "DataCollection.c" +#line 3876 "DataCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_unref (old); -#line 3774 "DataCollection.c" +#line 3882 "DataCollection.c" } } -static void data_collection_class_init (DataCollectionClass * klass) { +static void +data_collection_class_init (DataCollectionClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3866,11 +3976,13 @@ static void data_collection_class_init (DataCollectionClass * klass) { data_collection_signals[DATA_COLLECTION_FROZEN_SIGNAL] = g_signal_new ("frozen", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, frozen), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_signals[DATA_COLLECTION_THAWED_SIGNAL] = g_signal_new ("thawed", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, thawed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 3868 "DataCollection.c" +#line 3978 "DataCollection.c" } -static void data_collection_instance_init (DataCollection * self) { +static void +data_collection_instance_init (DataCollection * self) +{ DataSet* _tmp0_; GeeHashMap* _tmp1_; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3893,11 +4005,13 @@ static void data_collection_instance_init (DataCollection * self) { self->priv->fire_ordering_changed = FALSE; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self->ref_count = 1; -#line 3895 "DataCollection.c" +#line 4007 "DataCollection.c" } -static void data_collection_finalize (DataCollection * obj) { +static void +data_collection_finalize (DataCollection * obj) +{ DataCollection * self; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATA_COLLECTION, DataCollection); @@ -3911,11 +4025,13 @@ static void data_collection_finalize (DataCollection * obj) { _g_object_unref0 (self->priv->properties); #line 112 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (self->priv->frozen_items_altered); -#line 3913 "DataCollection.c" +#line 4027 "DataCollection.c" } -GType data_collection_get_type (void) { +GType +data_collection_get_type (void) +{ static volatile gsize data_collection_type_id__volatile = 0; if (g_once_init_enter (&data_collection_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_data_collection_init, value_data_collection_free_value, value_data_collection_copy_value, value_data_collection_peek_pointer, "p", value_data_collection_collect_value, "p", value_data_collection_lcopy_value }; @@ -3929,18 +4045,22 @@ GType data_collection_get_type (void) { } -gpointer data_collection_ref (gpointer instance) { +gpointer +data_collection_ref (gpointer instance) +{ DataCollection * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return instance; -#line 3938 "DataCollection.c" +#line 4056 "DataCollection.c" } -void data_collection_unref (gpointer instance) { +void +data_collection_unref (gpointer instance) +{ DataCollection * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3949,7 +4069,7 @@ void data_collection_unref (gpointer instance) { DATA_COLLECTION_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3951 "DataCollection.c" +#line 4071 "DataCollection.c" } } |